7083537 Xorg 1.12 & associated module updates
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 06 Apr 2012 21:57:14 -0700
changeset 1265 0b5cc5c013e4
parent 1264 a3323e4f263f
child 1266 79ac6b45d8f4
7083537 Xorg 1.12 & associated module updates
exception_lists/packaging
open-src/app/xfs/Makefile
open-src/app/xfs/solaris-make.patch
open-src/common/Makefile.init
open-src/common/pkg-manifest-generate.pl
open-src/driver/efb/Makefile
open-src/driver/efb/pciTag.patch
open-src/driver/xf86-input-hotkey/sun-src/hotkey.c
open-src/driver/xf86-input-keyboard/Makefile
open-src/driver/xf86-input-mouse/6892799.patch
open-src/driver/xf86-input-mouse/Makefile
open-src/driver/xf86-input-synaptics/Makefile
open-src/driver/xf86-input-vmmouse/Makefile
open-src/driver/xf86-video-ast/Makefile
open-src/driver/xf86-video-ast/sparc-ast.patch
open-src/driver/xf86-video-ast/sun-src/src/ast_sparc_driver.c
open-src/driver/xf86-video-ati/Makefile
open-src/driver/xf86-video-ati/mapfiles.patch
open-src/driver/xf86-video-cirrus/Makefile
open-src/driver/xf86-video-dummy/Makefile
open-src/driver/xf86-video-intel/6538497_6554161.patch
open-src/driver/xf86-video-intel/Makefile
open-src/driver/xf86-video-intel/batch.patch
open-src/driver/xf86-video-intel/bromolow-chipset.patch
open-src/driver/xf86-video-intel/build-dri.patch
open-src/driver/xf86-video-intel/build-with-Xorg1.10.patch
open-src/driver/xf86-video-intel/libraries.patch
open-src/driver/xf86-video-intel/pad.patch
open-src/driver/xf86-video-intel/sandybridge.patch
open-src/driver/xf86-video-intel/xserver-1.9-abi.patch
open-src/driver/xf86-video-intel/xserver-1.9-list.h.patch
open-src/driver/xf86-video-mach64/Makefile
open-src/driver/xf86-video-mga/Makefile
open-src/driver/xf86-video-mga/g200se_pilot3_offscreen.patch
open-src/driver/xf86-video-mga/sparc.patch
open-src/driver/xf86-video-openchrome/Makefile
open-src/driver/xf86-video-r128/Makefile
open-src/driver/xf86-video-trident/6452329.patch
open-src/driver/xf86-video-trident/Makefile
open-src/driver/xf86-video-vesa/Makefile
open-src/driver/xf86-video-vesa/vesa_xorg72.patch
open-src/driver/xf86-video-vmware/Makefile
open-src/font/util/Makefile
open-src/lib/libX11/1234757.patch
open-src/lib/libX11/6714036.patch
open-src/lib/libX11/Makefile
open-src/lib/libX11/SolarisIA.patch
open-src/lib/libX11/compose-el_GR.UTF-8.patch
open-src/lib/libX11/compose-en_US.UTF-8.patch
open-src/lib/libX11/compose-iso8859-7.patch
open-src/lib/libX11/compose-ja_JP.UTF-8.patch
open-src/lib/libX11/compose-ko_KR.UTF-8.patch
open-src/lib/libX11/compose-pt_BR.UTF-8.patch
open-src/lib/libX11/compose-zh_CN.UTF-8.patch
open-src/lib/libX11/compose-zh_HK.UTF-8.patch
open-src/lib/libX11/compose-zh_TW.UTF-8.patch
open-src/lib/libX11/locale.aliases.patch
open-src/lib/libX11/locale.paths.patch
open-src/lib/libX11/mapfile-vers
open-src/lib/libXfixes/Makefile
open-src/lib/libXfixes/soversion.patch
open-src/lib/libXfont/Makefile
open-src/lib/libXi/Makefile
open-src/lib/libXi/man-fixme.patch
open-src/lib/libXi/shadow-man-pages.patch
open-src/lib/libXi/solaris-abi.patch
open-src/lib/libdrm/Makefile
open-src/lib/libdrm/solaris-drm-port.patch
open-src/lib/libpciaccess/Makefile
open-src/lib/libpciaccess/pciaccess_private.h.patch
open-src/lib/libpciaccess/primary-vga.patch
open-src/lib/libpciaccess/scanpci_64bit.patch
open-src/lib/libpciaccess/solx_devfs.c.patch
open-src/lib/mesa/Makefile
open-src/lib/mesa/bromolow-chipset.patch
open-src/lib/mesa/gallium-endian.patch
open-src/lib/mesa/gcc-bitcount.patch
open-src/lib/mesa/solaris-port.patch
open-src/lib/mesa/sun-src/src/glx/mapfile.scope
open-src/lib/mesa/sun-src/src/mesa/drivers/dri/mapfile.externs
open-src/lib/pixman/Makefile
open-src/proto/dri2proto/Makefile
open-src/proto/fixesproto/Makefile
open-src/proto/glproto/Makefile
open-src/proto/inputproto/Makefile
open-src/util/util-macros/Makefile
open-src/xserver/xorg/IA.patch
open-src/xserver/xorg/Makefile
open-src/xserver/xorg/amd64-loader-path.patch
open-src/xserver/xorg/autoconfig.patch
open-src/xserver/xorg/cli-nobanner.patch
open-src/xserver/xorg/cli-nolock.patch
open-src/xserver/xorg/dixmods-deps.patch
open-src/xserver/xorg/dtlogin-userinfo.patch
open-src/xserver/xorg/fontmod.patch
open-src/xserver/xorg/hotkey.patch
open-src/xserver/xorg/make_xkm_output_dir.patch
open-src/xserver/xorg/mapfile-Xorg-externs.i386
open-src/xserver/xorg/mapfile-Xorg-externs.sparc
open-src/xserver/xorg/nvidia-autoconfig.patch
open-src/xserver/xorg/osaudit.patch
open-src/xserver/xorg/patch-list
open-src/xserver/xorg/record-regset.patch
open-src/xserver/xorg/signal-handler.patch
open-src/xserver/xorg/sun-manpage.patch
open-src/xserver/xorg/sun-paths.patch
open-src/xserver/xorg/sun-src/IA/interactive.c
open-src/xserver/xorg/sun-src/hw/xfree86/doc/man/xorgcfg.1
open-src/xserver/xorg/sun-src/hw/xfree86/doc/man/xorgconfig.1
open-src/xserver/xorg/sun-src/hw/xfree86/man/xorgcfg.1
open-src/xserver/xorg/sun-src/hw/xfree86/man/xorgconfig.1
open-src/xserver/xorg/sun-src/os/osaudit.c
open-src/xserver/xorg/sun-src/os/solaris/mdb/README
open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_clients.c
open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_device_grabs.c
open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_mdb.h
open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/mapfile
open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/mdb_module.c
open-src/xserver/xorg/sun-src/os/solaris/mdb/scripts/list_Xserver_clients
open-src/xserver/xorg/vt.patch
open-src/xserver/xorg/workaround-7154410.patch
open-src/xserver/xorg/xtsol.patch
open-src/xserver/xvnc/Makefile
open-src/xserver/xvnc/tigervnc11-xorg111.patch
pkg/manifests/x11-demo-mesa-demos.p5m
pkg/manifests/x11-header-x11-protocols.p5m
pkg/manifests/x11-library-libdrm.p5m
pkg/manifests/x11-library-libx11.p5m
pkg/manifests/x11-library-libxi.p5m
pkg/manifests/x11-library-mesa.p5m
pkg/manifests/x11-server-xorg-driver-xorg-video-vmware.p5m
pkg/manifests/x11-server-xorg.p5m
--- a/exception_lists/packaging	Thu Mar 29 13:35:26 2012 -0700
+++ b/exception_lists/packaging	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -48,7 +48,7 @@
 usr/share/doc/X11/specs/Xserver/analysis.xml
 usr/share/doc/X11/specs/Xserver/secint.xml
 usr/share/doc/X11/MAINTAINERS
-usr/share/doc/libXi/doc
+usr/share/doc/inputproto
 
 # Obsolete man pages
 usr/share/man/man5/Consortium.5
--- a/open-src/app/xfs/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/app/xfs/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xfs Makefile
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,15 +29,15 @@
 MODULE_NAME=xfs
 
 # Version number (used in path names)
-MODULE_VERSION=1.1.1
+MODULE_VERSION=1.1.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = e02c6cae689c082b8c98a421df8f8670
-TARBALL_SHA1 = aa0f4cb4e307c531a78ba9d09c44d042c072742b
+TARBALL_MD5   = 39e507a7a1b656885c4828a915e5805b
+TARBALL_SHA1  = d4a64e12f8a773bd0120977191586ca12baf1ace
+TARBALL_SHA256= 0dea61cce3897b4d9d844bbd2c7850cd4e80e12c12b38158b4f92574b027e39d
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
-	solaris-make.patch,-p1 \
 	smf-manpage.patch \
 	config-warning.patch
 
--- a/open-src/app/xfs/solaris-make.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-From 68bf267fa4080e4a85df91e4a196bb701ee921d1 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Fri, 7 Jan 2011 18:19:56 -0800
-Subject: [PATCH:xfs] Make config.cpp rule compatible with Solaris make
-
-Solaris make doesn't support $< in direct target rules.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- config/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config/Makefile.am b/config/Makefile.am
-index 70bb896..4f8613e 100644
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -33,5 +33,5 @@ MAN_SUBSTS += -e 's|DEFAULTFONTPATH|$(FONTPATH)|g'
- MAN_SUBSTS += -e 's|FSERRORS|/var/log/xfs.log|g'
- 
- config: config.cpp
--	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < config.cpp > $@
- 
--- 
-1.7.3.2
-
--- a/open-src/common/Makefile.init	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/common/Makefile.init	Fri Apr 06 21:57:14 2012 -0700
@@ -1,7 +1,7 @@
 # -*- Makefile -*- rules commonly shared among X consolidation open source dirs
 # Makefile.init has definitions that are needed before the module/modtype rules
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -364,15 +364,15 @@
 # referenced in multiple places, so it's kept here for easy sharing.
 # 
 # Current Xorg server source tarball to use sources from:
-XORGSERVER_VERS=1.10.3
+XORGSERVER_VERS=1.12.0
 # Minimum Xorg server version that we expect to be ABI compatible with.
 # Usually .99 of the previous minor release series, as that's the convention
 # for the development snapshots of the next release series.
-MIN_XSERVER_VERS=1.9.99
+MIN_XSERVER_VERS=1.11.99
 # Next highest Xorg server version that we expect to be ABI incompatible with.
 # Usually .99 of the current release series, as Xorg tends to break ABI's
 # in each minor release train (1.8, 1.9, etc.)
-NEXT_XSERVER_VERS=1.10.99
+NEXT_XSERVER_VERS=1.12.99
 
 # Version of pkgfmt output rules to apply
 PKGFMT_OUTPUT=v2
--- a/open-src/common/pkg-manifest-generate.pl	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/common/pkg-manifest-generate.pl	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 #! /usr/perl5/bin/perl
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -72,7 +72,10 @@
 
     while (my $l = <$FH>) {
       chomp($l);
-      if ($l =~ m{^(.*)\\$}) {  # Line continues
+      if ($l =~ m{^\#}) { # comment
+	$action .= $l;
+	return $action;
+      } elsif ($l =~ m{^(.*)\\$}) {  # Line continues
 	$action .= $1 . " ";
       } else {
 	$action .= $l;
--- a/open-src/driver/efb/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/efb/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # efb Makefile
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -39,7 +39,8 @@
 SOURCE_PATCHES = \
 	RAC-API-removal.patch,-p1 \
 	no-modes.patch,-p1 \
-	sparc-efb.patch,-p1
+	sparc-efb.patch,-p1 \
+	pciTag.patch
 
 # Need to regenerate configure after patching Makefile.am in sparc-efb.patch
 AUTORECONF=yes
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/efb/pciTag.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,14 @@
+--- src/radeon_driver.c	Tue Mar 20 13:30:57 2012
++++ src/radeon_driver.c	Tue Mar 20 13:33:00 2012
+@@ -2662,9 +2662,11 @@
+     }
+ 
+     info->PciInfo = RADEONGetPciInfo(info);
++#ifndef XSERVER_LIBPCIACCESS
+     info->PciTag  = pciTag(PCI_DEV_BUS(info->PciInfo),
+ 			   PCI_DEV_DEV(info->PciInfo),
+ 			   PCI_DEV_FUNC(info->PciInfo));
++#endif
+     info->MMIOAddr = PCI_REGION_BASE(info->PciInfo, 2, REGION_MEM) & ~0xffUL;
+     info->MMIOSize = PCI_REGION_SIZE(info->PciInfo, 2);
+     if (info->pEnt->device->IOBase) {
--- a/open-src/driver/xf86-input-hotkey/sun-src/hotkey.c	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-input-hotkey/sun-src/hotkey.c	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -184,13 +184,13 @@
 	keysym = buf + HOTKEY_KEYSYM_ROOT;
 
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
-    if (dev->u.master)
-	curKeySyms = XkbGetCoreMap(dev->u.master);
+    if (dev->master)
+	curKeySyms = XkbGetCoreMap(dev->master);
     else
 	curKeySyms = XkbGetCoreMap(inputInfo.keyboard);
 #else
-    if (dev->u.master)
-	curKeySyms = &dev->u.master->key->curKeySyms;
+    if (dev->master)
+	curKeySyms = &dev->master->key->curKeySyms;
     else
 	curKeySyms = &inputInfo.keyboard->key->curKeySyms;
 #endif
@@ -261,8 +261,8 @@
 	    xf86FlushInput(pInfo->fd);
 	    AddEnabledDevice(pInfo->fd);
 
-	    if (device->u.master)
-		dixSetPrivate(&device->u.master->devPrivates, 
+	    if (device->master)
+		dixSetPrivate(&device->master->devPrivates, 
 		    HotkeyMapDevicePrivateKey, device);
 
 	    device->public.on = TRUE;
@@ -280,8 +280,8 @@
 	    if (pInfo->fd != -1)
 		RemoveEnabledDevice(pInfo->fd);
 
-	    if (device->u.master)
-		dixSetPrivate(&device->u.master->devPrivates, 
+	    if (device->master)
+		dixSetPrivate(&device->master->devPrivates, 
 		    HotkeyMapDevicePrivateKey, NULL);
 
     	    device->public.on = FALSE;
--- a/open-src/driver/xf86-input-keyboard/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-input-keyboard/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -29,11 +29,12 @@
 MODULE_NAME=xf86-input-keyboard
 
 # Version number (used in path names)
-MODULE_VERSION=1.6.0
+MODULE_VERSION=1.6.1
 
 # Checksums for upstream tarball
-TARBALL_MD5  = e2abe9f13e526a73cb68a7d257546eba
-TARBALL_SHA1 = 8e845086749f8c4b64fdfa852b4b26cf7bb62dc9
+TARBALL_MD5   = 09744e8dc9a1fe5e61927c1073cd3428
+TARBALL_SHA1  = ef30fecb9e846a5268ae339846401489a785e413
+TARBALL_SHA256= aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = leds.patch,-p1
--- a/open-src/driver/xf86-input-mouse/6892799.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-input-mouse/6892799.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -20,10 +20,10 @@
 # DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/mouse.c b/src/mouse.c
-index d981f6f..298f042 100644
+index f4c7c82..0e577b3 100644
 --- a/src/mouse.c
 +++ b/src/mouse.c
-@@ -1614,13 +1614,14 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1616,13 +1616,14 @@ MouseProc(DeviceIntPtr device, int what)
  	ErrorF("assigning %p atom=%d name=%s\n", device, pInfo->atom,
  		pInfo->name);
  #endif
@@ -42,7 +42,7 @@
  	    if (pMse->xisbscale)
  		pMse->buffer = XisbNew(pInfo->fd, pMse->xisbscale * 4);
  	    else
-@@ -1676,8 +1677,6 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1678,8 +1679,6 @@ MouseProc(DeviceIntPtr device, int what)
  		XisbFree(pMse->buffer);
  		pMse->buffer = NULL;
  	    }
@@ -51,7 +51,7 @@
  	    if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft)
  	    {
  		RemoveBlockAndWakeupHandlers (MouseBlockHandler,
-@@ -1688,6 +1687,10 @@ MouseProc(DeviceIntPtr device, int what)
+@@ -1690,6 +1689,10 @@ MouseProc(DeviceIntPtr device, int what)
  	device->public.on = FALSE;
  	break;
      case DEVICE_CLOSE:
--- a/open-src/driver/xf86-input-mouse/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-input-mouse/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-input-mouse 1.x Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,15 +29,15 @@
 MODULE_NAME=xf86-input-mouse
 
 # Version number (used in path names)
-MODULE_VERSION=1.7.1
+MODULE_VERSION=1.7.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 13276d780b8ef3a82088f009185bf42b
-TARBALL_SHA1 = 11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed
+TARBALL_MD5    = 871c828b88e9c973f1457724b35576fb
+TARBALL_SHA1   = 0da6390c6f3d7d636110a52f08193739929ae4ae
+TARBALL_SHA256 = 332b7357c18e6b9daba51c8ed48ce118e9b51fb5990b6a2a68637be62da7413b
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES  = \
-	vuid-autoprobe.patch,-p1 \
 	6892799.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
--- a/open-src/driver/xf86-input-synaptics/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-input-synaptics/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-input-synaptics Makefile
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,12 @@
 MODULE_NAME=xf86-input-synaptics
 
 # Version number (used in path names)
-MODULE_VERSION=1.4.1
+MODULE_VERSION=1.5.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 2dac10f93918ed5bf7d1039d56880cf4
-TARBALL_SHA1 = e41201476f4bc8658291808d2d6ef2e0535179ae
+TARBALL_MD5   = f064477ef3a553634f3dcf6696d0f538
+TARBALL_SHA1  = ce93cfa218c2c7bce7881ac2dd2160e583eb4c4f
+TARBALL_SHA256= ac6f6efad8ddf85fa6c5d68cac0c452bcea91aa53d5ee10b6205a353dfffaa92
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-input-vmmouse/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-input-vmmouse/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-input-vmmouse Makefile
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,14 +29,15 @@
 MODULE_NAME=xf86-input-vmmouse
 
 # Version number (used in path names)
-MODULE_VERSION=12.7.0
+MODULE_VERSION=12.8.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = dc77181330f983c7d0ec1ea1592c2ca7
-TARBALL_SHA1 = 6618f84a037c8f4817e1a2822d6a5a795814e544
+TARBALL_MD5   = 15fce165117706cd5e774a8aa58122ce
+TARBALL_SHA1  = ecca90d5e992f9358f7932e0c46e92ebe715f9de
+TARBALL_SHA256= a8a6ec0b567c48c130ccb830e15dfc2b201831841de0c2cc56bd87256d2d869a
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 
+SOURCE_PATCHES =
 
 # vmmouse_client code won't build with Sun compiler
 MODULE_COMPILER=gcc
--- a/open-src/driver/xf86-video-ast/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-ast/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-ast 1.x Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,16 +29,15 @@
 MODULE_NAME=xf86-video-ast
 
 # Version number (used in path names)
-MODULE_VERSION=0.91.10
+MODULE_VERSION=0.93.10
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 65da53af3ebd1685149b6145976fdb2d
-TARBALL_SHA1 = a90624e63f33fdcb50ccefcdeebb34052f341ef3
+TARBALL_MD5   = de0bf8e0c8ab67be42c14f07ca427271
+TARBALL_SHA1  = 40e8acd04ccf670b196be74a2c806d064f7b68db
+TARBALL_SHA256= c9d466fef391bdf960f79b82f1f776a1c1ab870e93475c3d1b3d028531fac4e0
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = \
-		sparc-ast.patch \
-		6924667.patch 
+SOURCE_PATCHES += sparc-ast.patch,-p1
 
 # Link in additional source files from sun-src directory
 ADDITIONAL_SOURCE_DIR=sun-src
--- a/open-src/driver/xf86-video-ast/sparc-ast.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-ast/sparc-ast.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,7 @@
-diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am	2008-08-15 10:54:35.000000000 -0700
-+++ src/Makefile.am	2010-08-16 13:45:07.710404820 -0700
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4cd7075..58274df 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -42,4 +42,5 @@ ast_drv_la_SOURCES =	\
  	ast_pcirename.h \
  	ast_tool.c 	\
@@ -8,9 +9,10 @@
 -	ast_vgatool.h
 +	ast_vgatool.h	\
 +	ast_sparc_driver.c
-diff -urp -x '*~' -x '*.orig' src/ast.h src/ast.h
---- src/ast.h	2010-08-10 07:38:29.000000000 -0700
-+++ src/ast.h	2010-08-16 13:45:07.710712331 -0700
+diff --git a/src/ast.h b/src/ast.h
+index 7ceee31..a6af228 100644
+--- a/src/ast.h
++++ b/src/ast.h
 @@ -20,8 +20,17 @@
   * PERFORMANCE OF THIS SOFTWARE.
   */
@@ -29,10 +31,11 @@
  
  #include "ast_pcirename.h"
  
-@@ -84,6 +93,15 @@ typedef CARD32  	ULONG;
+@@ -90,6 +99,15 @@ typedef CARD32  	ULONG;
  typedef struct _ASTRegRec {
      UCHAR 	ExtCRTC[0x50];
-     
+     ULONG	GFX[12];
++
 +#if	(defined(__sparc__))
 +    UCHAR 	MISC;	
 +    UCHAR 	SEQ[4];
@@ -41,31 +44,23 @@
 +    UCHAR 	GR[9];
 +    UCHAR	DAC[256][3];
 +#endif
-+     
  } ASTRegRec, *ASTRegPtr;
  
  typedef struct _VIDEOMODE {
-@@ -194,12 +212,108 @@ typedef struct _ASTRec {
-     int			clip_right;    
-     int			clip_bottom;    	
-    		
+@@ -249,12 +267,94 @@ typedef struct _ASTRec {
+     Atom		xvGammaRed, xvGammaGreen, xvGammaBlue;
+ #endif
+ 
 +#if defined(__sparc__)
 +    char 		*deviceName;
 +    int  		fd;
 +#endif /* __sparc__ */
 +
- } ASTRec, *ASTRecPtr;
- 	
+ } ASTRec, *ASTRecPtr, *ASTPtr;
+ 
  #define ASTPTR(p) ((ASTRecPtr)((p)->driverPrivate))
  
 +#if defined(__sparc__)
-+#define ASTDECL \
-+    ASTRecPtr	pAST = ASTPTR(pScrn);	\
-+    int		fd = pAST->fd;
-+
-+#define ASTDECL_FD \
-+    int		fd = pAST->fd;
-+
 +#ifndef VIS_GETPCICONFIG
 +
 +/*
@@ -138,13 +133,6 @@
 +extern void		  ASTSaveHW(ScrnInfoPtr);
 +extern void		  ASTRestoreHW(ScrnInfoPtr);
 +
-+#else
-+
-+#define ASTDECL \
-+    ASTRecPtr	pAST = ASTPTR(pScrn);
-+
-+#define ASTDECL_FD
-+
 +#endif
 +
  /* Include Files */
@@ -154,55 +142,10 @@
  #include "ast_cursor.h"
 +
 +#endif /* AST_H */
-diff -urp -x '*~' -x '*.orig' src/ast_2dtool.c src/ast_2dtool.c
---- src/ast_2dtool.c	2010-08-10 07:38:29.000000000 -0700
-+++ src/ast_2dtool.c	2010-08-16 13:45:07.711030285 -0700
-@@ -256,6 +256,7 @@ bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr p
- {
-     ULONG ulData;
-     PFN_bENABLE_CMDQ pfnEnableCMDQ = bEnableCMDQ;
-+    ASTDECL_FD
-     
-     if (pAST->jChipType == AST2300)
-         pfnEnableCMDQ = bEnableCMDQ2300;
-@@ -295,6 +296,7 @@ bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr p
- void
- vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST)
- {
-+    ASTDECL_FD
- 	
-     vWaitEngIdle(pScrn, pAST);
-     vWaitEngIdle(pScrn, pAST);
-@@ -310,6 +312,7 @@ vWaitEngIdle(ScrnInfoPtr pScrn, ASTRecPt
-     ULONG ulEngState, ulEngState2;
-     UCHAR jReg;
-     ULONG ulEngCheckSetting; 
-+    ASTDECL_FD
-     
-     if (pAST->MMIO2D)     
-         ulEngCheckSetting = 0x10000000;
-diff -urp -x '*~' -x '*.orig' src/ast_2dtool.h src/ast_2dtool.h
---- src/ast_2dtool.h	2010-08-10 07:38:29.000000000 -0700
-+++ src/ast_2dtool.h	2010-08-16 13:45:07.711347075 -0700
-@@ -20,6 +20,9 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#ifndef AST2DTOOL_H
-+#define AST2DTOOL_H
-+
- /* Eng Capability Definition */
- #define	ENG_CAP_Sync				0x0001
- #define	ENG_CAP_ScreenToScreenCopy		0x0002
-@@ -533,3 +536,5 @@ typedef struct {
-         addr->PKT_SC_dwHeader  = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_NUMBER); 	\
-         addr->PKT_SC_dwData[0] = (ULONG)(no);					\
-       }
-+
-+#endif /* AST2DTOOL_H */
-diff -urp -x '*~' -x '*.orig' src/ast_accel.c src/ast_accel.c
---- src/ast_accel.c	2010-08-10 07:38:29.000000000 -0700
-+++ src/ast_accel.c	2010-08-16 13:45:07.711848515 -0700
+diff --git a/src/ast_accel.c b/src/ast_accel.c
+index 2d3dab3..74ca45d 100644
+--- a/src/ast_accel.c
++++ b/src/ast_accel.c
 @@ -189,7 +189,12 @@ ASTAccelInit(ScreenPtr pScreen)
      {    
          infoPtr->SetupForSolidFill = ASTSetupForSolidFill;
@@ -216,110 +159,27 @@
      } 
          
      /* Solid Lines */
-diff -urp -x '*~' -x '*.orig' src/ast_cursor.c src/ast_cursor.c
---- src/ast_cursor.c	2009-10-29 13:33:38.000000000 -0700
-+++ src/ast_cursor.c	2010-08-16 13:45:07.712204039 -0700
-@@ -82,9 +82,14 @@ ASTCursorInit(ScreenPtr pScreen)
+diff --git a/src/ast_cursor.c b/src/ast_cursor.c
+index b3f2061..9b7f1c8 100644
+--- a/src/ast_cursor.c
++++ b/src/ast_cursor.c
+@@ -87,7 +87,11 @@ ASTCursorInit(ScreenPtr pScreen)
  
-     pAST->HWCInfoPtr = infoPtr;
- 
-+#if     !defined(__sparc__)
      infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
                       HARDWARE_CURSOR_INVERT_MASK |        
++#if     !defined(__sparc__)
                       HARDWARE_CURSOR_BIT_ORDER_MSBFIRST;
 +#else
-+    infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
-+                     HARDWARE_CURSOR_INVERT_MASK;
++                     0;
 +#endif
  
      infoPtr->MaxWidth  = MAX_HWC_WIDTH;
      infoPtr->MaxHeight = MAX_HWC_HEIGHT;
-@@ -135,6 +140,7 @@ ASTShowCursor(ScrnInfoPtr pScrn)
- {
-     ASTRecPtr   pAST = ASTPTR(pScrn);    
-     UCHAR 	jReg;
-+    ASTDECL_FD
- 
-     jReg= 0x02;
-     if (pAST->HWCInfo.cursortype ==HWC_COLOR)
-@@ -148,6 +154,7 @@ void
- ASTHideCursor(ScrnInfoPtr pScrn)
- {
-     ASTRecPtr  pAST = ASTPTR(pScrn);
-+    ASTDECL_FD
-         
-     SetIndexRegMask(CRTC_PORT, 0xCB, 0xFC, 0x00);	/* disable HWC */ 	
-         
-@@ -160,6 +167,7 @@ ASTSetCursorPosition(ScrnInfoPtr pScrn, 
-     DisplayModePtr mode = pAST->ModePtr;    
-     int		x_offset, y_offset;
-     UCHAR 	*pjSignature;    
-+    ASTDECL_FD
-        
-     /* Set cursor info to Offscreen */    
-     pjSignature = (UCHAR *) pAST->HWCInfo.pjHWCVirtualAddr + (HWC_SIZE+HWC_SIGNATURE_SIZE)*pAST->HWCInfo.HWC_NUM_Next + HWC_SIZE;   
-@@ -223,6 +231,7 @@ ASTLoadCursorImage(ScrnInfoPtr pScrn, UC
-     UCHAR    	jTempSrcAnd32, jTempSrcXor32;
-     ULONG	ulCheckSum = 0;  		               
-     ULONG 	ulPatternAddr;    
-+    ASTDECL_FD
-        
-     /* init cursor info. */
-     pAST->HWCInfo.cursortype = HWC_MONO;
-@@ -320,6 +329,7 @@ ASTLoadCursorARGB(ScrnInfoPtr pScrn, Cur
-     } usData16;
-     ULONG	ulCheckSum = 0;  		           
-     ULONG 	ulPatternAddr;
-+    ASTDECL_FD
-  
-     /* init cursor info. */
-     pAST->HWCInfo.cursortype = HWC_COLOR;
-@@ -407,6 +417,7 @@ static void
- ASTFireCursor(ScrnInfoPtr pScrn)
- {
-     ASTRecPtr  pAST = ASTPTR(pScrn);
-+    ASTDECL_FD
-     
-     SetIndexRegMask(CRTC_PORT, 0xCB, 0xFF, 0x00);	/* dummp write to fire HWC */ 	
-     
-diff -urp -x '*~' -x '*.orig' src/ast_cursor.h src/ast_cursor.h
---- src/ast_cursor.h	2008-03-17 10:20:40.000000000 -0700
-+++ src/ast_cursor.h	2010-08-16 13:45:07.712406043 -0700
-@@ -20,6 +20,9 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#ifndef ASTCURSOR_H
-+#define ASTCURSOR_H
-+
- #define	MAX_HWC_WIDTH		64
- #define	MAX_HWC_HEIGHT		64
- #define HWC_SIZE		(MAX_HWC_WIDTH*MAX_HWC_HEIGHT*2)
-@@ -37,3 +40,5 @@
- #define HWC_SIGNATURE_Y         0x10
- #define HWC_SIGNATURE_HOTSPOTX  0x14
- #define HWC_SIGNATURE_HOTSPOTY  0x18
-+
-+#endif /* ASTCURSOR_H */
-diff -urp -x '*~' -x '*.orig' src/ast_driver.c src/ast_driver.c
---- src/ast_driver.c    2010-10-18 07:38:29.000000000 -0700
-+++ src/ast_driver.c    2010-10-18 13:45:07.713360394 -0700
-@@ -80,6 +80,14 @@ extern Bool bIsVGAEnabled(ScrnInfoPtr pS
- extern void ASTBlankScreen(ScrnInfoPtr pScreen, Bool unblack);
- extern Bool InitVGA(ScrnInfoPtr pScrn);
- 
-+#if defined(__sparc__)
-+extern Bool InitVGA(ScrnInfoPtr pScrn);
-+extern Bool GetVGAEDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer);
-+extern pciVideoPtr ASTGetPciInfo(ASTRecPtr);
-+extern ScrnInfoPtr ASTAllocScreen(DriverPtr, GDevPtr);
-+extern void        ASTSaveHW(ScrnInfoPtr);
-+#endif /* __sparc__ */
-+
- extern Bool bInitCMDQInfo(ScrnInfoPtr pScrn, ASTRecPtr pAST);
- extern Bool bEnableCMDQ(ScrnInfoPtr pScrn, ASTRecPtr pAST);
- extern void vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST);
-@@ -103,7 +111,7 @@ static void ASTFreeScreen(int scrnIndex,
+diff --git a/src/ast_driver.c b/src/ast_driver.c
+index 896f22c..c4afa21 100644
+--- a/src/ast_driver.c
++++ b/src/ast_driver.c
+@@ -106,7 +106,7 @@ static void ASTFreeScreen(int scrnIndex, int flags);
  static ModeStatus ASTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags);
  
  /* Internally used functions */
@@ -328,7 +188,7 @@
  static void ASTFreeRec(ScrnInfoPtr pScrn);
  static Bool ASTSaveScreen(ScreenPtr pScreen, Bool unblack);
  static Bool ASTCloseScreen(int scrnIndex, ScreenPtr pScreen);
-@@ -257,7 +265,7 @@ ASTProbe(DriverPtr drv, int flags)
+@@ -270,7 +270,7 @@ ASTProbe(DriverPtr drv, int flags)
        return FALSE;
      }
  
@@ -337,7 +197,7 @@
     /*
      * This probing is just checking the PCI data the server already
      * collected.
-@@ -267,6 +275,7 @@ ASTProbe(DriverPtr drv, int flags)
+@@ -280,6 +280,7 @@ ASTProbe(DriverPtr drv, int flags)
      }
  #endif
  
@@ -345,41 +205,45 @@
      numUsed = xf86MatchPciInstances(AST_NAME, PCI_VENDOR_AST,
  				   ASTChipsets, ASTPciChipsets,
  				   devSections, numDevSections,
-@@ -310,6 +319,33 @@ ASTProbe(DriverPtr drv, int flags)
+@@ -323,6 +324,37 @@ ASTProbe(DriverPtr drv, int flags)
      } /* end of if flags */	   
  
-     xfree(usedChips);
+     free(usedChips);
 +#else
 +
-+    for (i = 0; i < numDevSections; i++) {
++    if (flags & PROBE_DETECT) {
++        foundScreen = TRUE;
++    } else {
++        for (i = 0; i < numDevSections; i++) {
++
++	    ScrnInfoPtr pScrn = NULL;
++
++	    /* Allocate new ScrnInfoRec and claim the slot */
++	    if (pScrn = ASTAllocScreen(drv, devSections[i])) {
++		pScrn->driverVersion = AST_VERSION;
++		pScrn->driverName = AST_DRIVER_NAME;
++		pScrn->name = AST_NAME;
 +
-+	ScrnInfoPtr pScrn = NULL;
-+	
-+	/* Allocate new ScrnInfoRec and claim the slot */
-+	if (pScrn = ASTAllocScreen(drv, devSections[i])) {
-+	    pScrn->driverVersion = AST_VERSION;
-+	    pScrn->driverName = AST_DRIVER_NAME;
-+	    pScrn->name = AST_NAME;
-+	    
-+	    pScrn->Probe = ASTProbe;
-+	    pScrn->PreInit = ASTPreInit;
-+	    pScrn->ScreenInit = ASTScreenInit;
-+	    pScrn->SwitchMode = ASTSwitchMode;
-+	    pScrn->AdjustFrame = ASTAdjustFrame;   
-+	    pScrn->EnterVT = ASTEnterVT;
-+	    pScrn->LeaveVT = ASTLeaveVT;
-+	    pScrn->FreeScreen = ASTFreeScreen;
-+	    pScrn->ValidMode = ASTValidMode;
-+	    
-+	    foundScreen = TRUE;	    
++		pScrn->Probe = ASTProbe;
++		pScrn->PreInit = ASTPreInit;
++		pScrn->ScreenInit = ASTScreenInit;
++		pScrn->SwitchMode = ASTSwitchMode;
++		pScrn->AdjustFrame = ASTAdjustFrame;
++		pScrn->EnterVT = ASTEnterVT;
++		pScrn->LeaveVT = ASTLeaveVT;
++		pScrn->FreeScreen = ASTFreeScreen;
++		pScrn->ValidMode = ASTValidMode;
++
++		foundScreen = TRUE;
++	    }
 +	}
 +    }
-+    xfree(devSections);
++    free(devSections);
 +#endif
  
      return foundScreen;
  }
-@@ -325,7 +361,9 @@ static Bool
+@@ -338,7 +370,9 @@ static Bool
  ASTPreInit(ScrnInfoPtr pScrn, int flags)
  {
     EntityInfoPtr pEnt;
@@ -389,7 +253,7 @@
     int flags24;
     rgb defaultWeight = { 0, 0, 0 };
        
-@@ -341,6 +379,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -355,6 +389,10 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
  
     pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
  
@@ -400,11 +264,11 @@
     if (flags & PROBE_DETECT) {
         ASTProbeDDC(pScrn, pEnt->index);
         return TRUE;
-@@ -354,18 +396,22 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -368,19 +406,23 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
         return FALSE;
  #endif
  
-+#if !(defined(__sparc__))       
++#if !(defined(__sparc__))
     /* The vgahw module should be loaded here when needed */
     if (!xf86LoadSubModule(pScrn, "vgahw"))
        return FALSE;
@@ -414,75 +278,74 @@
     if (!xf86LoadSubModule(pScrn, "fb"))
        return FALSE;
     	
-+#if !(defined(__sparc__))             	
++#if !(defined(__sparc__))
     /* Allocate a vgaHWRec */
     if (!vgaHWGetHWRec(pScrn))
         return FALSE;
     hwp = VGAHWPTR(pScrn);
+    vgaHWSetStdFuncs(hwp);
 +#endif
  
     /* Color Depth Check */
     flags24 = Support32bppFb;
-@@ -438,7 +484,12 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -453,7 +495,12 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
     /* Fill AST Info */
     pAST = ASTPTR(pScrn);
     pAST->pEnt    = xf86GetEntityInfo(pScrn->entityList[0]);
 +#if !defined(__sparc__)
     pAST->PciInfo = xf86GetPciInfoForEntity(pAST->pEnt->index);
 +#else
-+   pAST->PciInfo = (ASTGetPciInfo(pAST));
++   pAST->PciInfo = ASTGetPciInfo(pAST);
 +#endif
 +
  #ifndef XSERVER_LIBPCIACCESS
     pAST->PciTag  = pciTag(pAST->PciInfo->bus, pAST->PciInfo->device,
  			  pAST->PciInfo->func);
-@@ -485,10 +536,13 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
- 
-    /* Resource Allocation */
-     pAST->IODBase = pScrn->domainIOBase;  
-+
-+#if !(defined(__sparc__))
-     /* "Patch" the PIOOffset inside vgaHW in order to force
+@@ -508,11 +555,13 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
       * the vgaHW module to use our relocated i/o ports.
       */
-     VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
+ 
++#if !(defined(__sparc__))
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+     VGAHWPTR(pScrn)->PIOOffset = /* ... */
+ #endif
+        	pAST->PIOOffset =
+ 	pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
 +#endif
  	
      pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
  	
-@@ -695,7 +749,6 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
+@@ -757,7 +806,9 @@ ASTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
  {
     ScrnInfoPtr pScrn;
     ASTRecPtr pAST;
--   vgaHWPtr hwp;   
++#if (!defined(__sparc__))
+    vgaHWPtr hwp;   
++#endif
     VisualPtr visual;
   
     /* for FB Manager */
-@@ -704,7 +757,6 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
+@@ -766,7 +817,9 @@ ASTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
  
     pScrn = xf86Screens[pScreen->myNum];
     pAST = ASTPTR(pScrn);
--   hwp = VGAHWPTR(pScrn);
++#if (!defined(__sparc__))
+    hwp = VGAHWPTR(pScrn);
++#endif
  
     if (!ASTMapMem(pScrn)) {
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Map FB Memory Failed \n");      	
-@@ -728,7 +780,14 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
+@@ -795,7 +848,9 @@ ASTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
  
     }
         
--   vgaHWGetIOBase(hwp);
 +#if (!defined(__sparc__))
-+   {
-+       vgaHWPtr hwp;   
-+
-+       hwp = VGAHWPTR(pScrn);
-+       vgaHWGetIOBase(hwp);
-+   }
+    vgaHWGetIOBase(hwp);
 +#endif
  
     vFillASTModeInfo (pScrn);      
  
-@@ -769,6 +828,10 @@ ASTScreenInit(int scrnIndex, ScreenPtr p
+@@ -836,6 +891,10 @@ ASTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
                
     }
  
@@ -493,50 +356,47 @@
     if (pScrn->bitsPerPixel > 8) {
        /* Fixup RGB ordering */
        visual = pScreen->visuals + pScreen->numVisuals;
-@@ -905,8 +968,10 @@ ASTLeaveVT(int scrnIndex, int flags)
- {
+@@ -999,7 +1058,9 @@ ASTLeaveVT(int scrnIndex, int flags)
  	
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
--   vgaHWPtr hwp = VGAHWPTR(pScrn);
     ASTRecPtr pAST = ASTPTR(pScrn);
-+#if	(!defined(__sparc__))                 
-+   vgaHWPtr hwp = VGAHWPTR(pScrn);
++#if (!defined(__sparc__))
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
 +#endif
  
  #ifdef	HWC
     if (pAST->pHWCPtr) {
-@@ -925,7 +990,10 @@ ASTLeaveVT(int scrnIndex, int flags)
- #endif
-       
-    ASTRestore(pScrn);  
-+
-+#if (!defined(__sparc__))                 
+@@ -1022,7 +1083,9 @@ ASTLeaveVT(int scrnIndex, int flags)
+    if (pAST->jChipType == AST1180)
+        ASTBlankScreen(pScrn, 0);
+ 
++#if (!defined(__sparc__))
     vgaHWLock(hwp);	
 +#endif
  
  }
  
-@@ -933,8 +1001,11 @@ static void
+@@ -1030,8 +1093,11 @@ static void
  ASTFreeScreen(int scrnIndex, int flags)
  {
     ASTFreeRec(xf86Screens[scrnIndex]);
 +
-+#if (!defined(__sparc__))            
++#if (!defined(__sparc__))
     if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
        vgaHWFreeHWRec(xf86Screens[scrnIndex]);   
-+#endif      
++#endif
  }
  
- 
-@@ -1009,7 +1080,6 @@ ASTValidMode(int scrnIndex, DisplayModeP
- }			
- 
+ static ModeStatus
+@@ -1122,7 +1188,6 @@ ASTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+    return Flags;
+ }
  
 -/* Internal used modules */
  /*
   * ASTGetRec and ASTFreeRec --
   *
-@@ -1017,7 +1087,7 @@ ASTValidMode(int scrnIndex, DisplayModeP
+@@ -1130,7 +1195,7 @@ ASTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
   * These two functions create and destroy that private data.
   *
   */
@@ -545,7 +405,7 @@
  ASTGetRec(ScrnInfoPtr pScrn)
  {
     if (pScrn->driverPrivate)
-@@ -1027,6 +1097,8 @@ ASTGetRec(ScrnInfoPtr pScrn)
+@@ -1140,6 +1205,8 @@ ASTGetRec(ScrnInfoPtr pScrn)
     return TRUE;
  }
  
@@ -554,23 +414,23 @@
  static void
  ASTFreeRec(ScrnInfoPtr pScrn)
  {
-@@ -1058,7 +1130,9 @@ static Bool
+@@ -1171,7 +1238,9 @@ static Bool
  ASTCloseScreen(int scrnIndex, ScreenPtr pScreen)
  {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+#if (!defined(__sparc__))         
++#if (!defined(__sparc__))
     vgaHWPtr hwp = VGAHWPTR(pScrn);
-+#endif   
++#endif
     ASTRecPtr pAST = ASTPTR(pScrn);
  
     if (pScrn->vtSema == TRUE)
-@@ -1080,11 +1154,15 @@ ASTCloseScreen(int scrnIndex, ScreenPtr 
- #endif
-          
-       ASTRestore(pScrn);
-+#if (!defined(__sparc__))      
+@@ -1197,11 +1266,15 @@ ASTCloseScreen(int scrnIndex, ScreenPtr pScreen)
+       if (pAST->jChipType == AST1180)
+           ASTBlankScreen(pScrn, 0);
+       
++#if (!defined(__sparc__))
        vgaHWLock(hwp);
-+#endif      
++#endif
     }
  
     ASTUnmapMem(pScrn);
@@ -580,23 +440,22 @@
  
     if(pAST->AccelInfoPtr) {
         XAADestroyInfoRec(pAST->AccelInfoPtr);
-@@ -1104,12 +1182,12 @@ ASTCloseScreen(int scrnIndex, ScreenPtr 
- static void
+@@ -1222,12 +1295,13 @@ static void
  ASTSave(ScrnInfoPtr pScrn)
  {
--   ASTRecPtr pAST;
+    ASTRecPtr pAST;
 -   vgaRegPtr vgaReg;
-+   ASTDECL
     ASTRegPtr astReg;   
     int i, icount=0;
+    ULONG ulData;
  
--   pAST = ASTPTR(pScrn);
+    pAST = ASTPTR(pScrn);
 +#if !defined(__sparc__)
 +   vgaRegPtr vgaReg;
     vgaReg = &VGAHWPTR(pScrn)->SavedReg;
     astReg = &pAST->SavedReg;
      
-@@ -1120,6 +1198,10 @@ ASTSave(ScrnInfoPtr pScrn)
+@@ -1238,6 +1312,10 @@ ASTSave(ScrnInfoPtr pScrn)
     else {
         vgaHWSave(pScrn, vgaReg, VGA_SR_MODE);
     }
@@ -606,93 +465,77 @@
 +#endif
     
     /* Ext. Save */
-    vASTOpenKey(pScrn);
-@@ -1136,12 +1218,12 @@ ASTSave(ScrnInfoPtr pScrn)
- static void
+    if (pAST->jChipType == AST1180)
+@@ -1266,12 +1344,13 @@ static void
  ASTRestore(ScrnInfoPtr pScrn)
  {
--   ASTRecPtr pAST;
+    ASTRecPtr pAST;
 -   vgaRegPtr vgaReg;
-+   ASTDECL
     ASTRegPtr astReg;   
     int i, icount=0;
+    ULONG ulData;
  
--   pAST = ASTPTR(pScrn);
+    pAST = ASTPTR(pScrn);
 +#if !defined(__sparc__)
 +   vgaRegPtr vgaReg;
     vgaReg = &VGAHWPTR(pScrn)->SavedReg;
     astReg = &pAST->SavedReg;
      
-@@ -1162,12 +1244,25 @@ ASTRestore(ScrnInfoPtr pScrn)
-    for (i=0xBC; i<=0xC1; i++)
-        SetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
-    SetIndexReg(CRTC_PORT, (UCHAR) (0xBB), astReg->ExtCRTC[icount]);
-+#endif
- 
+@@ -1303,18 +1382,21 @@ ASTRestore(ScrnInfoPtr pScrn)
+           SetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+       SetIndexReg(CRTC_PORT, (UCHAR) (0xBB), astReg->ExtCRTC[icount]);
+    }
+-
++#endif /* __sparc__ */
  }
  
  static void
  ASTProbeDDC(ScrnInfoPtr pScrn, int index)
  {
-+   unsigned char DDC_data[128];
-+	
+-   vbeInfoPtr pVbe;	
+    ASTRecPtr pAST = ASTPTR(pScrn);	
+    unsigned char DDC_data[128];
+    Bool Flags;
+ 
 +#if defined(__sparc__)
-+   if ((xf86LoadSubModule(pScrn, "ddc")) && (GetVGAEDID(pScrn, DDC_data) == TRUE))
-+   {
-+      ConfiguredMonitor = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
-+   }	
-+   else
-+   {
-+      xf86DrvMsg(pScrn->scrnIndex, X_INFO,"[ASTProbeDDC] Can't Load DDC Sub-Modules or Read EDID Failed \n"); 
-+   }	
-+#else	
-    vbeInfoPtr pVbe;
- 
-    if (xf86LoadSubModule(pScrn, "vbe")) {
-@@ -1175,6 +1270,7 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index
-       ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
-       vbeFree(pVbe);
++   if (xf86LoadSubModule(pScrn, "ddc"))
++#else
+    if ( (pAST->jChipType == AST1180) || (!xf86IsPrimaryPci(pAST->PciInfo)) )
++#endif
+    {
+        if (pAST->jChipType == AST1180)	
+            Flags = GetVGA2EDID(pScrn, DDC_data);
+@@ -1328,14 +1410,16 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index)
+        else
+            xf86DrvMsg(pScrn->scrnIndex, X_INFO,"[ASTProbeDDC] Can't Get EDID Properly \n");               
+    }   
++#if !defined(__sparc__)
+    else
+    {
+        if (xf86LoadSubModule(pScrn, "vbe")) {
+-          pVbe = VBEInit(NULL, index);
++          vbeInfoPtr pVbe = VBEInit(NULL, index);
+           ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
+           vbeFree(pVbe);
+        }
     }
 +#endif
  }
  
  #define SkipDT	0x00
-@@ -1184,15 +1280,18 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index
+@@ -1345,6 +1429,7 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index)
  static xf86MonPtr
  ASTDoDDC(ScrnInfoPtr pScrn, int index)
  {
 +#if !defined(__sparc__)
     vbeInfoPtr pVbe;
--   xf86MonPtr MonInfo = NULL, MonInfo1 = NULL, MonInfo2 = NULL;
--   ASTRecPtr pAST = ASTPTR(pScrn);
-+   xf86MonPtr MonInfo1 = NULL, MonInfo2 = NULL;
-    unsigned long i, j, k;
--   unsigned char DDC_data[128];
-    struct monitor_ranges ranges, ranges1, ranges2;
-    int DTSelect, dclock1=0, h_active1=0, v_active1=0, dclock2=0, h_active2=0, v_active2=0;
-    struct std_timings stdtiming, *stdtiming1, *stdtiming2;
+    xf86MonPtr MonInfo = NULL, MonInfo1 = NULL, MonInfo2 = NULL;
+    ASTRecPtr pAST = ASTPTR(pScrn);
+@@ -1539,6 +1624,30 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
+        }
     
-+   xf86MonPtr MonInfo = NULL;
-+   ASTRecPtr pAST = ASTPTR(pScrn);
-+   unsigned char DDC_data[128];
-+
-    /* Honour Option "noDDC" */
-    if (xf86ReturnOptValBool(pAST->Options, OPTION_NO_DDC, FALSE)) {
-       return MonInfo;
-@@ -1203,7 +1302,7 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
-       MonInfo = MonInfo1;
-       
-       /* For VGA2 CLONE Support, ycchen@012508 */
--      if ((xf86ReturnOptValBool(pAST->Options, OPTION_VGA2_CLONE, FALSE)) || pAST->VGA2Clone) {
-+      if (xf86ReturnOptValBool(pAST->Options, OPTION_VGA2_CLONE, FALSE)) {
-           if (GetVGA2EDID(pScrn, DDC_data) == TRUE) {
-               xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Get VGA2 EDID Correctly!! \n");	
-               MonInfo2 = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
-@@ -1350,6 +1449,30 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
-       xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- 		 "this driver cannot do DDC without VBE\n");
-    }
-+#else
+    } /* AST1180 */
++#else /* __sparc__ */
 +
 +   xf86MonPtr MonInfo = NULL;
 +   ASTRecPtr pAST = ASTPTR(pScrn);
@@ -716,10 +559,10 @@
 +   }
 +
 +#endif
- 	
+ 
     return MonInfo;
  }
-@@ -1375,9 +1498,14 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayMo
+@@ -1564,9 +1673,14 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
      vgaHWPtr hwp;
      ASTRecPtr pAST;
  
@@ -728,131 +571,35 @@
  
 +    pScrn->vtSema = TRUE;
 +    pAST->ModePtr = mode;
-+	
++
 +#if !defined(__sparc__)
 +    hwp = VGAHWPTR(pScrn);
 +
      vgaHWUnlock(hwp);
  
      if (!vgaHWInit(pScrn, mode))
-@@ -1390,6 +1518,10 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayMo
+@@ -1579,6 +1693,10 @@ ASTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
        return FALSE;
      
      vgaHWProtect(pScrn, FALSE);
 +#else
 +    if (!ASTSetMode(pScrn, mode))
-+      return FALSE;	
++      return FALSE;
 +#endif
  
      return TRUE;
  }
-diff -urp -x '*~' -x '*.orig' src/ast_mode.c src/ast_mode.c
---- src/ast_mode.c	2010-08-10 07:38:29.000000000 -0700
-+++ src/ast_mode.c	2010-08-16 13:45:07.713865832 -0700
-@@ -425,11 +425,9 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayMod
- 
- Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
- {
--    ASTRecPtr pAST;	
-+    ASTDECL
-     ULONG ulModeID, ulColorIndex, ulRefreshRate, ulRefreshRateIndex = 0;
-     ULONG ulHBorder, ulVBorder;
--        
--    pAST = ASTPTR(pScrn);
-     
-     switch (pScrn->bitsPerPixel)
-     {
-@@ -536,13 +534,12 @@ Bool bGetAST1000VGAModeInfo(ScrnInfoPtr 
- void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
- {
- 	
-+    ASTDECL	
-     PVBIOS_STDTABLE_STRUCT pStdModePtr;
--    ASTRecPtr pAST;		    
-     ULONG i;
-     UCHAR jReg;    
-         
-     pStdModePtr = pVGAModeInfo->pStdTableEntry;
--    pAST = ASTPTR(pScrn);        
-     
-     /* Set Misc */
-     jReg = pStdModePtr->MISC;
-@@ -566,7 +563,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
-     }
- 
-     /* Set AR */
--    jReg = GetReg(INPUT_STATUS1_READ);
-+    GetReg(INPUT_STATUS1_READ, jReg);
-     for (i=0; i<20; i++)
-     {
-         jReg = pStdModePtr->AR[i];
-@@ -576,7 +573,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
-     SetReg(AR_PORT_WRITE, 0x14);         
-     SetReg(AR_PORT_WRITE, 0x00);  
-     
--    jReg = GetReg(INPUT_STATUS1_READ);
-+    GetReg(INPUT_STATUS1_READ, jReg);
-     SetReg (AR_PORT_WRITE, 0x20);		/* set POS */
-                          
-     /* Set GR */
-@@ -593,11 +590,10 @@ void vSetStdReg(ScrnInfoPtr pScrn, Displ
- void
- vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
- {
--    ASTRecPtr pAST;	
-+    ASTDECL
-     USHORT usTemp;	
-     UCHAR jReg05, jReg07, jReg09, jRegAC, jRegAD, jRegAE;
- 
--    pAST = ASTPTR(pScrn);
-     jReg05 = jReg07 = jReg09 = jRegAC = jRegAD = jRegAE = 0;
-     
-     /* unlock CRTC */
-@@ -667,11 +663,9 @@ vSetCRTCReg(ScrnInfoPtr pScrn, DisplayMo
- 
- void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
- {
--    ASTRecPtr pAST;	
-+    ASTDECL
-     USHORT usOffset;	
- 
--    pAST = ASTPTR(pScrn);
--
-     usOffset = 	pAST->VideoModeInfo.ScreenPitch >> 3;		/* Unit: char */
-         
-     SetIndexReg(CRTC_PORT,0x13, (UCHAR) (usOffset & 0xFF));         	
-@@ -681,11 +675,9 @@ void vSetOffsetReg(ScrnInfoPtr pScrn, Di
- 
- void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
- {
-+    ASTDECL
-     PVBIOS_ENHTABLE_STRUCT pEnhModePtr;
-     PVBIOS_DCLK_INFO pDCLKPtr;
--    ASTRecPtr pAST;	
--        
--    pAST = ASTPTR(pScrn);
- 
-     pEnhModePtr = pVGAModeInfo->pEnhTableEntry;
-     pDCLKPtr = &DCLKTable[pEnhModePtr->DCLKIndex];
-@@ -700,11 +692,10 @@ void vSetDCLKReg(ScrnInfoPtr pScrn, Disp
- void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
- {
- 	
--    ASTRecPtr pAST;
-+    ASTDECL
-     UCHAR jRegA0, jRegA3, jRegA8;
-+    UCHAR jRegA2 = 0x00;
-     	
--    pAST = ASTPTR(pScrn);
--
-     jRegA0=jRegA3=jRegA8=0;	
-     /* Mode Type Setting */	
-     switch (pScrn->bitsPerPixel) {
-@@ -729,6 +720,14 @@ void vSetExtReg(ScrnInfoPtr pScrn, Displ
+diff --git a/src/ast_mode.c b/src/ast_mode.c
+index b58916f..3ea5089 100644
+--- a/src/ast_mode.c
++++ b/src/ast_mode.c
+@@ -798,6 +798,16 @@ void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMod
      SetIndexRegMask(CRTC_PORT,0xA3, 0xF0, (UCHAR) jRegA3);                                
      SetIndexRegMask(CRTC_PORT,0xA8, 0xFD, (UCHAR) jRegA8);                                
  
 +#if defined(__sparc__)
++    UCHAR jRegA2 = 0x00;
++
 +    if ((pScrn->bitsPerPixel == 15) || (pScrn->bitsPerPixel == 16) )
 +        jRegA2 |= 0xC0;
 +    else if  (pScrn->bitsPerPixel == 32)
@@ -863,60 +610,10 @@
      /* Set Threshold */
      if (pAST->jChipType == AST2300)
      {
-@@ -750,14 +749,13 @@ void vSetExtReg(ScrnInfoPtr pScrn, Displ
- 
- void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
- {
-+    ASTDECL
-     PVBIOS_ENHTABLE_STRUCT pEnhModePtr;
--    ASTRecPtr pAST;
-     UCHAR jReg;	
-         
--    pAST = ASTPTR(pScrn);
-     pEnhModePtr = pVGAModeInfo->pEnhTableEntry;
- 
--    jReg  = GetReg(MISC_PORT_READ);
-+    GetReg(MISC_PORT_READ, jReg);
-     jReg |= (UCHAR) (pEnhModePtr->Flags & SyncNN);
-     SetReg(MISC_PORT_WRITE,jReg);
- 	
-@@ -765,13 +763,11 @@ void vSetSyncReg(ScrnInfoPtr pScrn, Disp
- 
- Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo)
- {
-+    ASTDECL
-     PVBIOS_DAC_INFO pDACPtr;
--    ASTRecPtr pAST;  	
-     ULONG i, ulDACNumber;
-     UCHAR DACR, DACG, DACB;
- 
--    pAST = ASTPTR(pScrn);    
--
-     switch (pScrn->bitsPerPixel)
-     {
-     case 8:
-diff -urp -x '*~' -x '*.orig' src/ast_mode.h src/ast_mode.h
---- src/ast_mode.h	2010-08-10 07:38:29.000000000 -0700
-+++ src/ast_mode.h	2010-08-16 13:45:07.714072591 -0700
-@@ -20,6 +20,9 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
-+#ifndef ASTMODE_H
-+#define ASTMODE_H
-+
- /* Mode Limitation */
- #define MAX_HResolution		1920
- #define MAX_VResolution		1200
-@@ -119,3 +122,5 @@ typedef struct {
-     PVBIOS_ENHTABLE_STRUCT pEnhTableEntry;
-     	
- } VBIOS_MODE_INFO, *PVBIOS_MODE_INFO;
-+
-+#endif /* ASTMODE_H */
-diff -urp -x '*~' -x '*.orig' src/ast_tool.c src/ast_tool.c
---- src/ast_tool.c	2009-10-29 13:33:38.000000000 -0700
-+++ src/ast_tool.c	2010-08-16 13:45:07.714339101 -0700
+diff --git a/src/ast_tool.c b/src/ast_tool.c
+index 1dd87f0..7d9ed0d 100644
+--- a/src/ast_tool.c
++++ b/src/ast_tool.c
 @@ -60,16 +60,29 @@ Bool ASTUnmapMem(ScrnInfoPtr pScrn);
  Bool ASTMapMMIO(ScrnInfoPtr pScrn);
  void ASTUnmapMMIO(ScrnInfoPtr pScrn);
@@ -958,7 +655,7 @@
     xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pAST->FBVirtualAddr,
  		   pAST->FbMapSize);
  #else
-+    ASTUnmapVidMem(pScrn, (pointer)pAST->FBVirtualAddr, pAST->FbMapSize);
++   ASTUnmapVidMem(pScrn, (pointer)pAST->FBVirtualAddr, pAST->FbMapSize);
 +#endif
 +#else
     pci_device_unmap_range(pAST->PciInfo, pAST->FBVirtualAddr, pAST->FbMapSize);
@@ -1005,38 +702,18 @@
     pci_device_unmap_range(pAST->PciInfo, pAST->MMIOVirtualAddr, pAST->MMIOMapSize);
  #endif
     pAST->MMIOVirtualAddr = 0;
-diff -urp -x '*~' -x '*.orig' src/ast_vgatool.c src/ast_vgatool.c
---- src/ast_vgatool.c	2010-08-10 07:38:29.000000000 -0700
-+++ src/ast_vgatool.c	2010-08-16 13:45:15.622974545 -0700
-@@ -71,11 +71,14 @@ Bool GetVGA2EDID(ScrnInfoPtr pScrn, unsi
- void vInitDRAMReg(ScrnInfoPtr pScrn);
- Bool bIsVGAEnabled(ScrnInfoPtr pScrn);
- Bool InitVGA(ScrnInfoPtr pScrn);
-+#if defined(__sparc__)
-+Bool GetVGAEDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer);
-+#endif
- 
- void
- vASTOpenKey(ScrnInfoPtr pScrn)
- {   	
--   ASTRecPtr pAST = ASTPTR(pScrn);
-+   ASTDECL
-    
-    SetIndexReg(CRTC_PORT,0x80, 0xA8);     
-    
-@@ -84,11 +87,31 @@ vASTOpenKey(ScrnInfoPtr pScrn)
- Bool
- bASTRegInit(ScrnInfoPtr pScrn)
- {
--   ASTRecPtr pAST = ASTPTR(pScrn);
-+   ASTDECL
-+   UCHAR       jReg;
- 
+diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
+index 4a90dd4..fa0722c 100644
+--- a/src/ast_vgatool.c
++++ b/src/ast_vgatool.c
+@@ -95,6 +95,27 @@ bASTRegInit(ScrnInfoPtr pScrn)
     /* Enable MMIO */
     SetIndexRegMask(CRTC_PORT,0xA1, 0xFF, 0x04);
  
 +   /* Enable Big-Endian */
 +#if	defined(__sparc__)
++   UCHAR       jReg = 0x00;
++
 +   switch (pScrn->bitsPerPixel)   
 +   {
 +   case 8:
@@ -1057,153 +734,23 @@
     return (TRUE);
     	
  }
-@@ -96,7 +119,7 @@ bASTRegInit(ScrnInfoPtr pScrn)
- void
- GetDRAMInfo(ScrnInfoPtr pScrn)
- {
--    ASTRecPtr pAST = ASTPTR(pScrn);
-+    ASTDECL
-     ULONG ulData;
-     
-     if ( (pAST->jChipType != AST2000) )
-@@ -136,7 +159,7 @@ GetDRAMInfo(ScrnInfoPtr pScrn)
- ULONG
- GetVRAMInfo(ScrnInfoPtr pScrn)
- {
--   ASTRecPtr pAST = ASTPTR(pScrn);
-+   ASTDECL
-    UCHAR jReg;
- 
-    vASTOpenKey(pScrn);
-@@ -162,7 +185,7 @@ GetVRAMInfo(ScrnInfoPtr pScrn)
- ULONG
- GetMaxDCLK(ScrnInfoPtr pScrn)
- {
--   ASTRecPtr pAST = ASTPTR(pScrn);
-+   ASTDECL
-    UCHAR jReg;
-    ULONG ulData, ulData2;
-    ULONG ulRefPLL, ulDeNumerator, ulNumerator, ulDivider;
-@@ -251,7 +274,7 @@ GetMaxDCLK(ScrnInfoPtr pScrn)
- void
- GetChipType(ScrnInfoPtr pScrn)
- {
--   ASTRecPtr pAST = ASTPTR(pScrn);
-+   ASTDECL
-    ULONG ulData;
-    UCHAR jReg;
-    
-@@ -295,6 +318,8 @@ GetChipType(ScrnInfoPtr pScrn)
- void
- vSetStartAddressCRT1(ASTRecPtr pAST, ULONG base)
- {
-+    ASTDECL_FD
-+
-     SetIndexReg(CRTC_PORT,0x0D, (UCHAR) (base & 0xFF));
-     SetIndexReg(CRTC_PORT,0x0C, (UCHAR) ((base >> 8) & 0xFF));
-     SetIndexReg(CRTC_PORT,0xAF, (UCHAR) ((base >> 16) & 0xFF));
-@@ -304,6 +329,8 @@ vSetStartAddressCRT1(ASTRecPtr pAST, ULO
- void
- vAST1000DisplayOff(ASTRecPtr pAST)
- {
-+    ASTDECL_FD
-+
-     SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x20);
- 	    
- }
-@@ -312,6 +339,7 @@ vAST1000DisplayOff(ASTRecPtr pAST)
- void
- vAST1000DisplayOn(ASTRecPtr pAST)
- {
-+    ASTDECL_FD
- 	
-     SetIndexRegMask(SEQ_PORT,0x01, 0xDF, 0x00);	
-     
-@@ -319,7 +347,7 @@ vAST1000DisplayOn(ASTRecPtr pAST)
- 
- void ASTBlankScreen(ScrnInfoPtr pScrn, Bool unblack)
- {
--   ASTRecPtr pAST;
-+   ASTDECL
- 
-    pAST = ASTPTR(pScrn);
- 	
-@@ -333,8 +361,7 @@ void
- vASTLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-                VisualPtr pVisual)
- {
--	
--    ASTRecPtr  pAST = ASTPTR(pScrn);
-+    ASTDECL	
-     int     i, j, index;
-     UCHAR DACIndex, DACR, DACG, DACB;
-   
-@@ -397,10 +424,10 @@ vASTLoadPalette(ScrnInfoPtr pScrn, int n
+@@ -445,6 +466,7 @@ vASTLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
  void
  ASTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
  {
--   ASTRecPtr pAST;
-+   ASTDECL
++#if     !defined(__sparc__)
+    ASTRecPtr pAST;
     UCHAR SEQ01, CRB6;
- 
--   pAST = ASTPTR(pScrn);
-+#if     !defined(__sparc__)
-    SEQ01=CRB6=0;
-    
-    vASTOpenKey(pScrn);
-@@ -430,6 +457,7 @@ ASTDisplayPowerManagementSet(ScrnInfoPtr
- 
-    SetIndexRegMask(SEQ_PORT,0x01, 0xDF, SEQ01);
-    SetIndexRegMask(CRTC_PORT,0xB6, 0xFC, CRB6);
+    ULONG ulData, ulTemp;
+@@ -494,6 +516,7 @@ ASTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int fla
+        SetIndexRegMask(SEQ_PORT,0x01, 0xDF, SEQ01);
+        SetIndexRegMask(CRTC_PORT,0xB6, 0xFC, CRB6);
+    }    
 +#endif
  
- 
  }
-@@ -441,7 +469,7 @@ ASTDisplayPowerManagementSet(ScrnInfoPtr
- Bool
- GetVGA2EDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer)
- {
--    ASTRecPtr pAST = ASTPTR(pScrn);
-+    ASTDECL
-     UCHAR *ulI2CBase = pAST->MMIOVirtualAddr + 0x10000 + I2C_OFFSET;
-     ULONG i, ulData;    
-     UCHAR *pjEDID;
-@@ -530,12 +558,12 @@ GetVGA2EDID(ScrnInfoPtr pScrn, unsigned 
- /* Init VGA */
- Bool bIsVGAEnabled(ScrnInfoPtr pScrn)
- {
--    ASTRecPtr pAST;
-+    ASTDECL
-     UCHAR ch;
-    
-     pAST = ASTPTR(pScrn);
  
--    ch = GetReg(pAST->RelocateIO+0x43);
-+    GetReg(pAST->RelocateIO+0x43, ch);
- 
-     if (ch)
-     {
-@@ -552,9 +580,7 @@ Bool bIsVGAEnabled(ScrnInfoPtr pScrn)
- 
- void vEnableVGA(ScrnInfoPtr pScrn)
- {
--    ASTRecPtr pAST;
--   
--    pAST = ASTPTR(pScrn);
-+    ASTDECL
- 
-     SetReg(pAST->RelocateIO+0x43, 0x01);
-     SetReg(pAST->RelocateIO+0x42, 0x01);   
-@@ -577,7 +603,7 @@ UCHAR ExtRegInfo_AST2300[] = {
- 
- void vSetDefExtReg(ScrnInfoPtr pScrn)
- {
--    ASTRecPtr pAST;
-+    ASTDECL
-     UCHAR i, jIndex, *pjExtRegInfo;
-    
-     pAST = ASTPTR(pScrn);
-@@ -698,7 +724,7 @@ AST_DRAMStruct AST1100DRAMTableData[] = 
+@@ -985,7 +1008,7 @@ AST_DRAMStruct AST1100DRAMTableData[] = {
      { 0x0030, 0x00000040 },
      { 0x0028, 0x00000003 },
      { 0x000C, 0x00005a21 },
@@ -1212,7 +759,7 @@
      { 0x0120, 0x00004c41 },
      { 0xffff, 0xffffffff },
  };
-@@ -751,15 +777,15 @@ AST_DRAMStruct AST2100DRAMTableData[] = 
+@@ -1038,7 +1061,7 @@ AST_DRAMStruct AST2100DRAMTableData[] = {
      { 0x0030, 0x00000040 },
      { 0x0028, 0x00000003 },
      { 0x000C, 0x00005a21 },
@@ -1221,25 +768,8 @@
      { 0x0120, 0x00005061 },
      { 0xffff, 0xffffffff },
  };
- 
- void vInitDRAMReg(ScrnInfoPtr pScrn)
- {
-+    ASTDECL
-     AST_DRAMStruct *pjDRAMRegInfo;
--    ASTRecPtr pAST = ASTPTR(pScrn);
-     ULONG i, ulTemp, ulData;
-     UCHAR jReg;
+@@ -2654,9 +2677,11 @@ Bool InitVGA(ScrnInfoPtr pScrn, ULONG Flags)
  
-@@ -858,16 +884,16 @@ void vInitDRAMReg(ScrnInfoPtr pScrn)
- 
- Bool InitVGA(ScrnInfoPtr pScrn)
- {
--   ASTRecPtr pAST;
-+   ASTDECL
-    ULONG ulData;
- 
--   pAST = ASTPTR(pScrn);
--
     {
         /* Enable PCI */
 +#if    !defined(__sparc__)
@@ -1250,275 +780,10 @@
  
         /* Enable VGA */
         vEnableVGA(pScrn);
-@@ -881,3 +907,265 @@ Bool InitVGA(ScrnInfoPtr pScrn)
- 
-    return (TRUE);	
- } /* Init VGA */
-+
-+#if	defined(__sparc__)
-+/* Get EDID */
-+void 
-+I2CWriteClock(ASTRecPtr pAST, UCHAR data)
-+{
-+    UCHAR       ujCRB7, jtemp;
-+    ULONG	i;
-+    ASTDECL_FD
-+       
-+    for (i=0;i<0x10000; i++)
-+    {
-+        ujCRB7 = ((data & 0x01) ? 0:1);			/* low active */
-+        SetIndexRegMask(CRTC_PORT, 0xB7, 0xFE, ujCRB7);
-+        GetIndexRegMask(CRTC_PORT, 0xB7, 0x01, jtemp);
-+        if (ujCRB7 == jtemp) break;
-+    }
-+        
-+}
-+
-+void 
-+I2CWriteData(ASTRecPtr pAST, UCHAR data)
-+{
-+    UCHAR       volatile ujCRB7, jtemp;
-+    ULONG	i;
-+    ASTDECL_FD
-+
-+    for (i=0;i<0x1000; i++)
-+    {        
-+        ujCRB7 = ((data & 0x01) ? 0:1) << 2;		/* low active */
-+        SetIndexRegMask(CRTC_PORT, 0xB7, 0xFB, ujCRB7);
-+        GetIndexRegMask(CRTC_PORT, 0xB7, 0x04, jtemp);
-+        if (ujCRB7 == jtemp) break;        
-+    }
-+    
-+}
-+
-+Bool 
-+I2CReadClock(ASTRecPtr pAST)
-+{	
-+    UCHAR       volatile ujCRB7;
-+    ASTDECL_FD
-+
-+    GetIndexRegMask(CRTC_PORT, 0xB7, 0x10, ujCRB7);
-+    ujCRB7 >>= 4;
-+    
-+    return ((ujCRB7 & 0x01) ? 1:0);
-+}
-+
-+Bool 
-+I2CReadData(ASTRecPtr pAST)
-+{	
-+    UCHAR	volatile ujCRB7;
-+    ASTDECL_FD
-+
-+    GetIndexRegMask(CRTC_PORT, 0xB7, 0x20, ujCRB7);
-+    ujCRB7 >>= 5;
-+    
-+    return ((ujCRB7 & 0x01) ? 1:0);
-+
-+}
-+
-+
-+void
-+I2CDelay(ASTRecPtr pAST)
-+{
-+    ULONG 	i;
-+    UCHAR       jtemp;
-+    ASTDECL_FD
-+
-+    for (i=0;i<150;i++)
-+        GetReg(SEQ_PORT, jtemp);
-+       	
-+}
-+ 
-+void 
-+I2CStart(ASTRecPtr pAST)
-+{    
-+    I2CWriteClock(pAST, 0x00);				/* Set Clk Low */
-+    I2CDelay(pAST);
-+    I2CWriteData(pAST, 0x01);				/* Set Data High */
-+    I2CDelay(pAST);    
-+    I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+    I2CDelay(pAST);    
-+    I2CWriteData(pAST, 0x00);				/* Set Data Low */
-+    I2CDelay(pAST);    
-+    I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+    I2CDelay(pAST);                    
-+}     
-+
-+void 
-+I2CStop(ASTRecPtr pAST)
-+{
-+    I2CWriteClock(pAST, 0x00);				/* Set Clk Low */
-+    I2CDelay(pAST);    
-+    I2CWriteData(pAST, 0x00);				/* Set Data Low */
-+    I2CDelay(pAST);    
-+    I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+    I2CDelay(pAST);    
-+    I2CWriteData(pAST, 0x01);				/* Set Data High */
-+    I2CDelay(pAST);    
-+    I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+    I2CDelay(pAST);                      
-+	
-+}
-+
-+Bool 
-+CheckACK(ASTRecPtr pAST)
-+{
-+    UCHAR Data;
-+
-+    I2CWriteClock(pAST, 0x00);				/* Set Clk Low */
-+    I2CDelay(pAST);    
-+    I2CWriteData(pAST, 0x01);				/* Set Data High */
-+    I2CDelay(pAST);    
-+    I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+    I2CDelay(pAST);    
-+    Data = (UCHAR) I2CReadData(pAST);			/* Set Data High */
-+    
-+    return ((Data & 0x01) ? 0:1);                
-+                
-+}
-+
-+
-+void 
-+SendACK(ASTRecPtr pAST)
-+{
-+
-+    I2CWriteClock(pAST, 0x00);				/* Set Clk Low */
-+    I2CDelay(pAST);    
-+    I2CWriteData(pAST, 0x00);				/* Set Data low */
-+    I2CDelay(pAST);    
-+    I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+    I2CDelay(pAST);    
-+                	
-+}
-+
-+void 
-+SendNACK(ASTRecPtr pAST)
-+{
-+
-+    I2CWriteClock(pAST, 0x00);				/* Set Clk Low */
-+    I2CDelay(pAST);    
-+    I2CWriteData(pAST, 0x01);				/* Set Data high */
-+    I2CDelay(pAST);    
-+    I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+    I2CDelay(pAST);    
-+                		
-+}
-+
-+void 
-+SendI2CDataByte(ASTRecPtr pAST, UCHAR data)
-+{
-+    UCHAR jData;
-+    LONG i;
-+
-+    for (i=7;i>=0;i--)
-+    {
-+        I2CWriteClock(pAST, 0x00);				/* Set Clk Low */
-+        I2CDelay(pAST);     	
-+        
-+    	jData = ((data >> i) & 0x01) ? 1:0;
-+        I2CWriteData(pAST, jData);				/* Set Data Low */
-+        I2CDelay(pAST);     	
-+        
-+        I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+        I2CDelay(pAST);                       	
-+    }                
-+}
-+
-+UCHAR 
-+ReceiveI2CDataByte(ASTRecPtr pAST)
-+{
-+    UCHAR jData=0, jTempData;   
-+    LONG i, j;
-+
-+    for (i=7;i>=0;i--)
-+    {
-+        I2CWriteClock(pAST, 0x00);				/* Set Clk Low */
-+        I2CDelay(pAST);     
-+        	
-+        I2CWriteData(pAST, 0x01);				/* Set Data High */
-+        I2CDelay(pAST);     	
-+        
-+        I2CWriteClock(pAST, 0x01);				/* Set Clk High */
-+        I2CDelay(pAST);           
-+        
-+        for (j=0; j<0x1000; j++)
-+        {   
-+            if (I2CReadClock(pAST)) break;
-+        }    
-+        	        
-+    	jTempData =  I2CReadData(pAST);
-+    	jData |= ((jTempData & 0x01) << i); 
-+
-+        I2CWriteClock(pAST, 0x0);				/* Set Clk Low */
-+        I2CDelay(pAST);                       	
-+    }    
-+    
-+    return ((UCHAR)jData);                              
-+}        
-+
-+Bool
-+GetVGAEDID(ScrnInfoPtr pScrn, unsigned char *pEDIDBuffer)
-+{
-+    ASTDECL
-+    UCHAR *pjDstEDID;
-+    UCHAR jData;
-+    ULONG i;
-+
-+    pjDstEDID = (UCHAR *) pEDIDBuffer;
-+    
-+    /* Force to DDC2 */
-+    I2CWriteClock(pAST, 0x01);				/* Set Clk Low */
-+    I2CDelay(pAST);  
-+    I2CDelay(pAST);     	       	
-+    I2CWriteClock(pAST, 0x00);				/* Set Clk Low */
-+    I2CDelay(pAST);     	
-+                    
-+    I2CStart(pAST);
-+    
-+    SendI2CDataByte(pAST, 0xA0);
-+    if (!CheckACK(pAST))
-+    {
-+	 xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[GetVGAEDID] Check ACK Failed \n");
-+    	 return (FALSE);
-+    }	
-+    
-+    SendI2CDataByte(pAST, 0x00);
-+    if (!CheckACK(pAST))
-+    {
-+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[GetVGAEDID] Check ACK Failed \n");
-+    	return (FALSE);
-+    }	
-+    
-+    I2CStart(pAST);
-+    
-+    SendI2CDataByte(pAST, 0xA1);
-+    if (!CheckACK(pAST))
-+    {
-+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[GetVGAEDID] Check ACK Failed \n");
-+    	return (FALSE);
-+    }	
-+            
-+    for (i=0; i<127; i++)
-+    {
-+        jData = ReceiveI2CDataByte(pAST);
-+        SendACK(pAST);
-+        
-+        *pjDstEDID++ = jData;       
-+    }
-+    
-+    jData = ReceiveI2CDataByte(pAST);
-+    SendNACK(pAST);
-+    *pjDstEDID = jData;       
-+            
-+    I2CStop(pAST);
-+      
-+    return (TRUE);
-+    
-+} /* GetVGAEDID */
-+#endif	/* __sparc__ */
-diff -urp -x '*~' -x '*.orig' src/ast_vgatool.h src/ast_vgatool.h
---- src/ast_vgatool.h	2009-10-29 13:33:38.000000000 -0700
-+++ src/ast_vgatool.h	2010-08-16 13:45:07.715261578 -0700
+diff --git a/src/ast_vgatool.h b/src/ast_vgatool.h
+index 53cb4c7..9f5fa50 100644
+--- a/src/ast_vgatool.h
++++ b/src/ast_vgatool.h
 @@ -20,6 +20,12 @@
   * PERFORMANCE OF THIS SOFTWARE.
   */
@@ -1532,9 +797,9 @@
  /* VRAM Size Definition */
  #define VIDEOMEM_SIZE_08M	0x00800000
  #define VIDEOMEM_SIZE_16M	0x01000000
-@@ -32,6 +38,85 @@
- #define DRAMTYPE_512Mx32	2
- #define DRAMTYPE_1Gx32		3
+@@ -40,6 +46,95 @@
+ #define DRAMTYPE_2Gx16		6
+ #define DRAMTYPE_4Gx16		7
  
 +#if defined(__sparc__)
 +
@@ -1552,115 +817,108 @@
 +#define INPUT_STATUS1_READ  	0x5A
 +#define MISC_PORT_READ      	0x4C
 +
-+#define GetReg(off, val)	{					\
-+			struct vis_io_reg   io_reg;			\
-+			io_reg.offset = off;				\
-+			ioctl(fd, VIS_GETIOREG, &io_reg);		\
-+			val = io_reg.value;				\
-+			}
++static inline uchar_t 
++_GetRegFromFd(uchar_t off, int fd)
++{
++	struct vis_io_reg   io_reg = {
++	       .offset = off
++	};
++	ioctl(fd, VIS_GETIOREG, &io_reg);
++	return io_reg.value;
++}
++
++#define GetReg(off)		_GetRegFromFd(off, pAST->fd)
 +
-+#define SetReg(off,val)	{						\
-+			struct vis_io_reg   io_reg;			\
-+			io_reg.offset = off;				\
-+			io_reg.value = val;				\
-+			ioctl(fd, VIS_SETIOREG, &io_reg);		\
-+			}
++#define SetReg(off, val)	do {					\
++			struct vis_io_reg   io_reg = {			\
++			       .offset = off,				\
++			       .value = val				\
++			};     	       	 				\
++			ioctl(pAST->fd, VIS_SETIOREG, &io_reg);		\
++			} while (0)
 +
-+#define GetIndexReg(off, index,val)	{				\
-+			struct vis_io_reg   io_reg;			\
-+			io_reg.offset = off;				\
-+			io_reg.value = index;				\
-+                        ioctl(fd, VIS_SETIOREG, &io_reg);    		\
++#define GetIndexReg(off, index, val)	do {				\
++			struct vis_io_reg   io_reg = {			\
++			       .offset = off,				\
++			       .value = index				\
++			};     	       	 				\
++			ioctl(pAST->fd, VIS_SETIOREG, &io_reg);		\
 +			io_reg.offset = off+1;				\
-+                        ioctl(fd, VIS_GETIOREG, &io_reg);  		\
++			ioctl(pAST->fd, VIS_GETIOREG, &io_reg);		\
 +			val = io_reg.value;				\
-+			}
++			} while (0)
 +
-+#define SetIndexReg(off, index, val) { 					\
-+			struct vis_io_reg   io_reg;			\
-+			io_reg.offset = off;				\
-+			io_reg.value = index;				\
-+                        ioctl(fd, VIS_SETIOREG, &io_reg);    		\
-+			io_reg.offset = off+1;				\
++#define SetIndexReg(off, index, val) do {				\
++			struct vis_io_reg   io_reg = {			\
++			       .offset = off,				\
++			       .value = index				\
++			};     	       	 				\
++			ioctl(pAST->fd, VIS_SETIOREG, &io_reg);		\
++			io_reg.offset = off+1; 	      			\
 +			io_reg.value = val;				\
-+                        ioctl(fd, VIS_SETIOREG, &io_reg);    		\
-+			}
++			ioctl(pAST->fd, VIS_SETIOREG, &io_reg);		\
++			} while (0)
 +
-+#define GetIndexRegMask(off, index, and, val) {  			\
-+			struct vis_io_reg   io_reg;			\
-+			io_reg.offset = off;				\
-+			io_reg.value = index;				\
-+                        ioctl(fd, VIS_SETIOREG, &io_reg);    		\
++#define GetIndexRegMask(off, index, and, val) do {  			\
++			struct vis_io_reg   io_reg = {			\
++			       .offset = off,				\
++			       .value = index				\
++			};     	       	 				\
++			ioctl(pAST->fd, VIS_SETIOREG, &io_reg);		\
 +			io_reg.offset = off+1;				\
-+                        ioctl(fd, VIS_GETIOREG, &io_reg); 		\
++			ioctl(pAST->fd, VIS_GETIOREG, &io_reg);		\
 +			val = io_reg.value & and;			\
-+			}
++			} while (0)
 +
-+#define SetIndexRegMask(off,index, and, val) { 				\
-+			struct vis_io_reg   io_reg;			\
-+                      	UCHAR __Temp; 					\
-+			io_reg.offset = off;				\
-+			io_reg.value = index;				\
-+               		ioctl(fd, VIS_SETIOREG, &io_reg);		\
++#define SetIndexRegMask(off, index, and, val) do { 			\
++			UCHAR __Temp; 					\
++			struct vis_io_reg   io_reg = {			\
++			       .offset = off,				\
++			       .value = index				\
++			};     	       	 				\
++			ioctl(pAST->fd, VIS_SETIOREG, &io_reg);		\
 +			io_reg.offset = off + 1;			\
-+			ioctl(fd, VIS_GETIOREG, &io_reg);   		\
++			ioctl(pAST->fd, VIS_GETIOREG, &io_reg);		\
 +			__Temp = (io_reg.value & and) | val;      	\
 +			io_reg.offset = off;				\
 +			io_reg.value = index;				\
-+               		ioctl(fd, VIS_SETIOREG, &io_reg);		\
-+			io_reg.offset = off+1;				\
++			ioctl(pAST->fd, VIS_SETIOREG, &io_reg);		\
++			io_reg.offset = off+1;	      			\
 +			io_reg.value = __Temp;				\
-+               		ioctl(fd, VIS_SETIOREG, &io_reg);		\
-+               		}
++			ioctl(pAST->fd, VIS_SETIOREG, &io_reg);		\
++			} while (0)
 +
-+#else
++#else /* !__sparc__ */
 +
  #define AR_PORT_WRITE		(pAST->RelocateIO + 0x40)
  #define MISC_PORT_WRITE		(pAST->RelocateIO + 0x42)
  #define SEQ_PORT 		(pAST->RelocateIO + 0x44)
-@@ -42,7 +127,7 @@
- #define INPUT_STATUS1_READ	(pAST->RelocateIO + 0x5A)
- #define MISC_PORT_READ		(pAST->RelocateIO + 0x4C)
- 
--#define GetReg(base)				inb(base)
-+#define GetReg(base,val)			val = inb(base)
- #define SetReg(base,val)			outb(base,val)
- #define GetIndexReg(base,index,val)			do {			\
-                       				outb(base,index);	\
-@@ -62,15 +147,32 @@
+@@ -71,6 +166,8 @@
                        				SetIndexReg(base,index,__Temp); 	\
                      				} while (0)
  
-+#endif
++#endif /* __sparc__ */
 +
- #define VGA_LOAD_PALETTE_INDEX(index, red, green, blue) \
+ #define VGA_GET_PALETTE_INDEX(index, red, green, blue) \
  { \
     UCHAR __junk;				\
-    SetReg(DAC_INDEX_WRITE,(UCHAR)(index));	\
--   __junk = GetReg(SEQ_PORT);			\
-+   GetReg(SEQ_PORT, __junk);			\
-    SetReg(DAC_DATA,(UCHAR)(red));		\
--   __junk = GetReg(SEQ_PORT);			\
-+   GetReg(SEQ_PORT, __junk);			\
-    SetReg(DAC_DATA,(UCHAR)(green));		\
--   __junk = GetReg(SEQ_PORT);			\
-+   GetReg(SEQ_PORT, __junk);			\
-    SetReg(DAC_DATA,(UCHAR)(blue));		\
--   __junk = GetReg(SEQ_PORT);      		\
-+   GetReg(SEQ_PORT, __junk);      		\
+@@ -162,3 +259,5 @@
+         *(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1;	\
+         *(ULONG *) (pAST->MMIOVirtualAddr + 0x10000 + ((addr) & 0x0000FFFF)) = (data);	\
  }
 +
-+#define VGA_GET_PALETTE_INDEX(index, red, green, blue) \
-+{ \
-+   UCHAR __junk;                                \
-+   SetReg(DAC_INDEX_READ,(UCHAR)(index));       \
-+   GetReg(SEQ_PORT, __junk);			\
-+   GetReg(DAC_DATA, (red));		\
-+   GetReg(SEQ_PORT, __junk);			\
-+   GetReg(DAC_DATA, (green));		\
-+   GetReg(SEQ_PORT, __junk);			\
-+   GetReg(DAC_DATA, (blue));		\
-+   GetReg(SEQ_PORT, __junk);			\
-+}
-+
 +#endif /* ASTVGATOOL_H */
+--- a/src/ast_vgatool.c	Wed Mar 28 14:37:44 2012
++++ b/src/ast_vgatool.c	Wed Mar 28 14:39:46 2012
+@@ -2974,9 +2974,11 @@
+     pAST = ASTPTR(pScrn);    
+ 
+     /* Enable PCI */
++#if    !defined(__sparc__)
+     PCI_READ_LONG(pAST->PciInfo, &ulData, 0x04);
+     ulData |= 0x03;
+     PCI_WRITE_LONG(pAST->PciInfo, ulData, 0x04);       
++#endif
+     	
+     /* init DRAM if no F/W */
+     /* TODO */
--- a/open-src/driver/xf86-video-ast/sun-src/src/ast_sparc_driver.c	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-ast/sun-src/src/ast_sparc_driver.c	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -258,7 +258,7 @@
 void
 ASTSaveHW(ScrnInfoPtr pScrn)
 {
-   ASTDECL
+   ASTRecPtr pAST = ASTPTR(pScrn);
    ASTRegPtr astReg;
    int i, icount=0;
    UCHAR jReg;
@@ -296,7 +296,7 @@
 void
 ASTRestoreHW(ScrnInfoPtr pScrn)
 {
-   ASTDECL
+   ASTRecPtr pAST = ASTPTR(pScrn);
    ASTRegPtr astReg;
    int i, icount=0;
    UCHAR jReg;
--- a/open-src/driver/xf86-video-ati/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-ati/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-ati Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,15 +29,15 @@
 MODULE_NAME=xf86-video-ati
 
 # Version number (used in path names)
-MODULE_VERSION=6.14.1
+MODULE_VERSION=6.14.4
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 395e23ad026e4246dd70bbd2143688b5
-TARBALL_SHA1 = 89b8a64a23fc307646a11cd2c2636a8125fada8f
+TARBALL_MD5   = 17dd4f0bf4dbe9839e5f7d1161994222
+TARBALL_SHA1  = 75ad000bc00599e1797134f2d20d3094cba6af92
+TARBALL_SHA256= 4ffe435ef8fbe0989f6576f04f789e147a2de7fdefc3644e39d5ef626c37ef85
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
-	r6xx-r7xx-UMS.patch,-p1 \
 	mapfiles.patch,-p1 \
 	solaris-dri-drv-port.patch
 
--- a/open-src/driver/xf86-video-ati/mapfiles.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-ati/mapfiles.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,8 +1,8 @@
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 855d99c..5fcb4ec 100644
+index dc77c02..db4fa12 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -171,3 +171,39 @@ EXTRA_DIST = \
+@@ -174,3 +174,39 @@ EXTRA_DIST = \
  	radeon_atombios.h \
  	radeon_dri2.h \
  	drmmode_display.h
--- a/open-src/driver/xf86-video-cirrus/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-cirrus/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-cirrus 1.x Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,12 @@
 MODULE_NAME=xf86-video-cirrus
 
 # Version number (used in path names)
-MODULE_VERSION=1.3.2
+MODULE_VERSION=1.4.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 8195d03ed0be0975c03441e66a9f53b3
-TARBALL_SHA1 = 85bc5833075f9ddadb902f71a40249aa769aa4d1
+TARBALL_MD5   = 1e449789da866f974dbf6cbe3c8cc7bf
+TARBALL_SHA1  = 3f76802415e7dc02058222a5fe44cacd9e3529dd
+TARBALL_SHA256= 2b07fa5d4a86acb277d72c7ae35566ae21b08836645c6a88e7662422af5e962e
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = mapfiles.patch
--- a/open-src/driver/xf86-video-dummy/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-dummy/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-dummy 1.x Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,12 @@
 MODULE_NAME=xf86-video-dummy
 
 # Version number (used in path names)
-MODULE_VERSION=0.3.4
+MODULE_VERSION=0.3.5
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 1cf99415c998994f2e88575f942b364c
-TARBALL_SHA1 = 876ed7165ea2821bbddd73232a1ce0b79c1f14ff
+TARBALL_MD5   = 89701f372eed9ed541cf00d57c78e7ef
+TARBALL_SHA1  = 41cfcaec986ab13e931d260953c5a3f626fd1d2b
+TARBALL_SHA256= d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
--- a/open-src/driver/xf86-video-intel/6538497_6554161.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-diff -urp -x '*~' -x '*.orig' src/i830_common.h src/i830_common.h
---- src/i830_common.h	2009-01-21 14:02:00.000000000 -0800
-+++ src/i830_common.h	2009-05-08 20:47:59.370445000 -0700
-@@ -94,6 +94,7 @@ typedef struct {
-         int pf_current_page;	/* which buffer is being displayed? */
-         int perf_boxes;	        /* performance boxes to be displayed */   
- 	int width, height;      /* screen size in pixels */
-+	int pad0;
- 
- 	drm_handle_t front_handle;
- 	int front_offset;
-diff -urp -x '*~' -x '*.orig' src/i830_dri.h src/i830_dri.h
---- src/i830_dri.h	2009-01-21 14:02:00.000000000 -0800
-+++ src/i830_dri.h	2009-05-08 20:47:59.375897000 -0700
-@@ -22,16 +22,20 @@ typedef struct _I830DRIRec {
-    drm_handle_t unused2; /* backbuffer */
- 
-    drmSize unused3; /* depthbufferSize */
-+   drmSize pad0;
-    drm_handle_t unused4; /* depthbuffer */
- 
--   drmSize unused5; /* rotatedSize /*/
-+   drmSize unused5; /* rotatedSize */
-+   drmSize pad1;
-    drm_handle_t unused6; /* rotatedbuffer */
- 
-    drm_handle_t unused7; /* textures */
-    int unused8; /* textureSize */
-+   drmSize pad2;
- 
-    drm_handle_t unused9; /* agp_buffers */
-    drmSize unused10; /* agp_buf_size */
-+   drmSize pad3;
- 
-    int deviceID;
-    int width;
-diff -urp -x '*~' -x '*.orig' src/modes/xf86RandR12.c src/modes/xf86RandR12.c
---- src/modes/xf86RandR12.c	2009-01-09 17:21:53.000000000 -0800
-+++ src/modes/xf86RandR12.c	2009-05-08 20:47:59.383378000 -0700
-@@ -341,6 +341,11 @@ xf86RandR12SetMode (ScreenPtr	    pScree
-         /* Reset, just so we ensure the drivers SwitchMode is called */
-         scrp->currentMode = NULL;
-     }
-+#if defined (__sun)
-+    else {
-+	currentMode = scrp->currentMode;
-+    }
-+#endif
-     /*
-      * We know that if the driver failed to SwitchMode to the rotated
-      * version, then it should revert back to it's prior mode.
--- a/open-src/driver/xf86-video-intel/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-intel/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-intel Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,20 +29,17 @@
 MODULE_NAME=xf86-video-intel
 
 # Version number (used in path names)
-MODULE_VERSION=2.10.0
+MODULE_VERSION=2.18.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 78309d4f04dd8ae6585d120377042741
-TARBALL_SHA1 = 1683eddf89ed88f109cb2fe46284e3f8f304a0d9
+TARBALL_MD5  = 34f3987ffe86e30c57abc33b7f8030e9
+TARBALL_SHA1 = 77fae98e73414140bf214dca5da32bcf079c4463
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES= \
-	xserver-1.9-list.h.patch \
-	xserver-1.9-abi.patch \
 	build-dri.patch \
-	libraries.patch \
-	pad.patch sandybridge.patch \
-	build-with-Xorg1.10.patch
+	libraries.patch batch.patch \
+	bromolow-chipset.patch
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
@@ -55,12 +52,15 @@
 # but we only want those libraries built in the 32-bit build, not the whole
 # driver (which would overwrite the 64-bit driver)
 BUILD_TARGETS = build-in-subdir $(MODTYPE_ADD_BUILD_TARGETS)
+BUILD_TARGETS_32 = build_legacy_xvmc
+BUILD_TARGETS += $(BUILD_TARGETS_$(BUILD_TYPE))
 BUILD_TARGETS_SET=yes
 subdir_32 = $(SOURCE_DIR)/src/xvmc
 subdir_64 = $(SOURCE_DIR)
 subdir = $(subdir_$(BUILD_TYPE))
 install_subdir_cmd = install
 INSTALL_TARGETS = install-in-subdir $(MODTYPE_ADD_INSTALL_TARGETS)
+INSTALL_TARGETS_32 = install_legacy_xvmc
 INSTALL_TARGETS_64 = install_docs
 INSTALL_TARGETS += $(INSTALL_TARGETS_$(BUILD_TYPE))
 INSTALL_TARGETS_SET=yes
@@ -77,6 +77,11 @@
 # --libdir is needed to set path for XvMC libraries
 MODULE_CONFIG_OPTS=--enable-dri --libdir='$(X11_LIB_DIR)$(ARCHLIBSUBDIR)'
 
+# echo is set to workaround configure/libtool strangeness in 2.15.0 that
+# causes ../../libtool: line 791: X--mode=install: command not found errors
+MODULE_CONFIG_ENV = echo=/usr/gnu/bin/echo
+MODULE_BUILD_ENV += echo=/usr/gnu/bin/echo
+
 # Library paths at build time
 MODULE_LD_OPTIONS= -z ignore \
 	-L$(PROTODIR)$(X11_SERVERMODS_DIR) \
@@ -98,3 +103,12 @@
 
 build-in-subdir: $(BUILD_DEPS)
 install-in-subdir: $(INSTALL_DEPS)
+
+LEGACY_XVMC_SUBDIR = $(SOURCE_DIR)/src/legacy/i810/xvmc
+
+build_legacy_xvmc: $(BUILD_DEPS)
+	$(DEFAULT_BUILD_COMMAND:@DIR@=$(LEGACY_XVMC_SUBDIR)) $(subdir_cmd)
+
+install_legacy_xvmc: $(INSTALL_DEPS)
+	$(DEFAULT_INSTALL_COMMAND:@DIR@=$(LEGACY_XVMC_SUBDIR)) $(subdir_cmd) \
+                $(install_subdir_cmd)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/batch.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,26 @@
+--- src/intel_batchbuffer.h	Wed Apr  6 06:11:55 2011
++++ src/intel_batchbuffer.h	Fri Nov  4 08:28:39 2011
+@@ -30,9 +30,9 @@
+ #ifndef _INTEL_BATCHBUFFER_H
+ #define _INTEL_BATCHBUFFER_H
+ 
+-#define BATCH_RESERVED		16
++#define BATCH_RESERVED4k       4096
++#define BATCH_RESERVED16       16
+ 
+-
+ void intel_batch_init(ScrnInfoPtr scrn);
+ void intel_batch_teardown(ScrnInfoPtr scrn);
+ void intel_batch_emit_flush(ScrnInfoPtr scrn);
+@@ -41,7 +41,10 @@
+ 
+ static inline int intel_batch_space(intel_screen_private *intel)
+ {
+-	return (intel->batch_bo->size - BATCH_RESERVED) - (4*intel->batch_used);
++	if (IS_I865G(intel))
++	    return (intel->batch_bo->size - BATCH_RESERVED16) - (4*intel->batch_used);
++        else
++	    return (intel->batch_bo->size - BATCH_RESERVED4k) - (4*intel->batch_used);
+ }
+ 
+ static inline int intel_vertex_space(intel_screen_private *intel)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-intel/bromolow-chipset.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,32 @@
+Based on upstream commit 	ea36f2c4a3fa9afa8184eeaf944af9924c080368
+
+Add support for Ivy Bridge GT2 Server chipset
+Sometimes known as Bromlow. Signed-off-by: Eugeni Dodonov <[email protected]> Signed-off-by: Chris Wilson <[email protected]> 
+--- src/intel_driver.h	Thu Apr  5 14:24:08 2012
++++ src/intel_driver.h	Thu Apr  5 14:24:58 2012
+@@ -190,6 +190,7 @@
+ #define PCI_CHIP_IVYBRIDGE_D_GT1	0x0152
+ #define PCI_CHIP_IVYBRIDGE_D_GT2	0x0162
+ #define PCI_CHIP_IVYBRIDGE_S_GT1	0x015a
++#define PCI_CHIP_IVYBRIDGE_S_GT2 	0x016a
+ 
+ #endif
+ 
+--- src/intel_module.c	Thu Apr  5 14:25:01 2012
++++ src/intel_module.c	Thu Apr  5 14:25:52 2012
+@@ -142,6 +142,7 @@
+ 	{PCI_CHIP_IVYBRIDGE_D_GT1,		"Ivybridge Desktop (GT1)" },
+ 	{PCI_CHIP_IVYBRIDGE_D_GT2,		"Ivybridge Desktop (GT2)" },
+ 	{PCI_CHIP_IVYBRIDGE_S_GT1,		"Ivybridge Server" },
++	{PCI_CHIP_IVYBRIDGE_S_GT2,              "Ivybridge Server (GT2)" },
+ 	{-1,					NULL}
+ };
+ #define NUM_CHIPSETS (sizeof(_intel_chipsets) / sizeof(_intel_chipsets[0]))
+@@ -210,6 +211,7 @@
+ 	INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_D_GT1, &intel_ivybridge_info ),
+ 	INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_D_GT2, &intel_ivybridge_info ),
+ 	INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_S_GT1, &intel_ivybridge_info ),
++	INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_S_GT2, &intel_ivybridge_info ),
+ 
+ 	{ 0, 0, 0 },
+ };
--- a/open-src/driver/xf86-video-intel/build-dri.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-intel/build-dri.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,15 +1,15 @@
---- configure.ac	Wed Feb 10 11:08:23 2010
-+++ configure.ac	Wed Feb 10 11:09:48 2010
-@@ -97,7 +97,11 @@
-                   HAVE_XEXTPROTO_71="no")
- AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+--- configure.ac	Fri Aug 12 15:56:51 2011
++++ configure.ac	Fri Aug 12 15:59:25 2011
+@@ -108,7 +108,11 @@
+ PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.23])
+ PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
  
 -sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 +AC_ARG_WITH(xorg-sdk-dir,
-+	AC_HELP_STRING([--with-xorg-sdk-dir=DIR],
-+	[Default xorg sdk include directory [[default is taken from pkgconfig]]]),
-+	[sdkdir="$withval"],
-+	[sdkdir=$(pkg-config --variable=sdkdir xorg-server)])
++       AC_HELP_STRING([--with-xorg-sdk-dir=DIR],
++       [Default xorg sdk include directory [[default is taken from pkgconfig]]]),
++       [sdkdir="$withval"],
++       [sdkdir=$(pkg-config --variable=sdkdir xorg-server)])
  
  save_CFLAGS="$CFLAGS"
  CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
--- a/open-src/driver/xf86-video-intel/build-with-Xorg1.10.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- src/i830_driver.c	Tue May  3 12:06:28 2011
-+++ src/i830_driver.c	Tue May  3 12:06:38 2011
-@@ -465,7 +465,6 @@
- 		/* ick. xf86EnableDisableFBAccess smashes the screen pixmap devPrivate,
- 		 * so update the value it uses
- 		 */
--		scrn->pixmapPrivate.ptr = NULL;
- 		xf86DrvMsg(scrn->scrnIndex, X_INFO,
- 			   "New front buffer at 0x%lx\n",
- 			   intel->front_buffer->offset);
--- a/open-src/driver/xf86-video-intel/libraries.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-intel/libraries.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,12 +1,69 @@
---- src/Makefile.am	Wed Apr 21 09:30:36 2010
-+++ src/Makefile.am	Wed Apr 21 09:31:45 2010
+--- src/Makefile.in	Fri Feb 24 13:44:41 2012
++++ src/Makefile.in	Fri Feb 24 13:44:54 2012
+@@ -433,7 +433,7 @@
+ intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ \
+ 	$(am__append_2) $(am__append_4) $(am__append_7) \
+ 	$(am__append_10)
+-NULL := #
++#NULL := #
+ intel_drv_la_SOURCES = intel_list.h intel_module.c $(NULL) \
+ 	$(am__append_5) $(am__append_8) $(am__append_9) \
+ 	$(am__append_11)
+--- src/legacy/Makefile.in	Fri Feb 24 13:45:20 2012
++++ src/legacy/Makefile.in	Fri Feb 24 13:45:38 2012
+@@ -293,7 +293,7 @@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = $(am__append_1)
+ noinst_LTLIBRARIES = liblegacy.la
+-NULL := #
++#NULL := #
+ liblegacy_la_SOURCES = legacy.h $(am__append_2)
+ liblegacy_la_LIBADD = $(am__append_3)
+ EXTRA_DIST = README
+--- src/Makefile.am	Mon Dec  5 14:30:20 2011
++++ src/Makefile.am	Mon Dec  5 14:55:55 2011
 @@ -33,6 +33,9 @@
  intel_drv_la_LDFLAGS = -module -avoid-version
  intel_drv_ladir = @moduledir@/drivers
- intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
+ intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@
 +intel_drv_la_LDFLAGS += -R $(moduledir) -R $(moduledir)/extensions
-+intel_drv_la_LIBADD += -lfb -lextmod -lshadowfb -lXfont \
++intel_drv_la_LIBADD += -lfb -lextmod -lshadowfb -lXfont -lm \
 +	-lvbe -lvgahw -lxaa -lexa -ldri -ldri2 -lglx $(XORG_LIBS)
- intel_drv_la_LIBADD += @PCIACCESS_LIBS@
+ 
+ if SNA
+ SUBDIRS += sna
+@@ -39,7 +42,7 @@
+ intel_drv_la_LIBADD += sna/libsna.la
+ endif
+ 
+-NULL:=#
++#NULL:=#
+ 
+ intel_drv_la_SOURCES = \
+ 	intel_module.c \
+--- src/legacy/Makefile.am	Mon Dec  5 15:01:13 2011
++++ src/legacy/Makefile.am	Mon Dec  5 15:06:04 2011
+@@ -1,10 +1,20 @@
+ SUBDIRS =
+ noinst_LTLIBRARIES = liblegacy.la
  
- INTEL_DRI_SRCS = \
+-NULL:=#
++#NULL:=#
++liblegacy_la_SOURCES = legacy.h \
++                      i810/i810_accel.c \
++                      i810/i810_cursor.c \
++                      i810/i810_dga.c \
++                      i810/i810_dri.c \
++                      i810/i810_driver.c \
++                      i810/i810_hwmc.c \
++                      i810/i810_memory.c \
++                      i810/i810_video.c \
++                      i810/i810_wmark.c
+ 
+-liblegacy_la_SOURCES = legacy.h
+-liblegacy_la_LIBADD =
++AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src
++liblegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
+ 
+ if ! KMS_ONLY
+ SUBDIRS += i810
--- a/open-src/driver/xf86-video-intel/pad.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
---- src/i830_dri.h	Thu May  6 15:35:08 2010
-+++ src/i830_dri.h	Thu May  6 15:38:23 2010
-@@ -21,16 +21,20 @@
- 	drm_handle_t unused2;	/* backbuffer */
- 
- 	drmSize unused3;	/* depthbufferSize */
-+	drmSize pad0;
- 	drm_handle_t unused4;	/* depthbuffer */
- 
- 	drmSize unused5;	/* rotatedSize / */
-+        drmSize pad1;
- 	drm_handle_t unused6;	/* rotatedbuffer */
- 
- 	drm_handle_t unused7;	/* textures */
- 	int unused8;		/* textureSize */
-+        drmSize pad2;
- 
- 	drm_handle_t unused9;	/* agp_buffers */
- 	drmSize unused10;	/* agp_buf_size */
-+        drmSize pad3;
- 
- 	int deviceID;
- 	int width;
---- src/i830_common.h	Thu May  6 15:35:04 2010
-+++ src/i830_common.h	Thu May  6 15:39:11 2010
-@@ -90,6 +90,7 @@
- 	int pf_current_page;	/* which buffer is being displayed? */
- 	int perf_boxes;		/* performance boxes to be displayed */
- 	int width, height;	/* screen size in pixels */
-+        int pad0;
- 
- 	drm_handle_t front_handle;
- 	int front_offset;
-@@ -128,6 +129,8 @@
- 	int pipeB_y;
- 	int pipeB_w;
- 	int pipeB_h;
-+        
-+        int pad1;
- 
- 	/* Triple buffering */
- 	drm_handle_t third_handle;
---- src/i830_batchbuffer.h	Thu May  6 15:37:39 2010
-+++ src/i830_batchbuffer.h	Thu May  6 15:40:34 2010
-@@ -30,9 +30,9 @@
- #ifndef _INTEL_BATCHBUFFER_H
- #define _INTEL_BATCHBUFFER_H
- 
--#define BATCH_RESERVED		16
-+#define BATCH_RESERVED4k       4096
-+#define BATCH_RESERVED16       16
- 
--
- void intel_batch_init(ScrnInfoPtr scrn);
- void intel_batch_teardown(ScrnInfoPtr scrn);
- void intel_batch_emit_flush(ScrnInfoPtr scrn);
-@@ -41,7 +41,10 @@
- 
- static inline int intel_batch_space(intel_screen_private *intel)
- {
--	return (intel->batch_bo->size - BATCH_RESERVED) - (intel->batch_used);
-+	if (IS_I865G(intel))
-+	   return (intel->batch_bo->size - BATCH_RESERVED16) - (intel->batch_used);
-+	else
-+	  return (intel->batch_bo->size - BATCH_RESERVED4k) - (intel->batch_used);
- }
- 
- static inline void
---- src/i830_driver.c	Thu May  6 15:39:02 2010
-+++ src/i830_driver.c	Thu May  6 15:42:54 2010
-@@ -1500,6 +1500,8 @@
- 	if (!i830_bind_all_memory(scrn))
- 		return FALSE;
- 
-+        scrn->vtSema = TRUE;
-+
- 	i830_describe_allocations(scrn, 1, "");
- 
- 	intel_batch_init(scrn);
--- a/open-src/driver/xf86-video-intel/sandybridge.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,220 +0,0 @@
-diff -urpN src/common.h src/common.h
---- src/common.h	2010-12-23 08:53:04.297604253 +0800
-+++ src/common.h	2010-12-23 08:53:39.330356975 +0800
-@@ -325,6 +325,19 @@ extern int I810_DEBUG;
- #define PCI_CHIP_IGDNG_M_G_BRIDGE	0x0044
- #endif
- 
-+#ifndef	PCI_CHIP_SANDYBRIDGE
-+#define PCI_CHIP_SANDYBRIDGE_BRIDGE 0x0100 /* Desktop */
-+#define PCI_CHIP_SANDYBRIDGE_GT1 0x0102
-+#define PCI_CHIP_SANDYBRIDGE_GT2 0x0112
-+#define PCI_CHIP_SANDYBRIDGE_GT2_PLUS 0x0122
-+#define PCI_CHIP_SANDYBRIDGE_BRIDGE_M 0x0104 /* Mobile */
-+#define PCI_CHIP_SANDYBRIDGE_M_GT1 0x0106
-+#define PCI_CHIP_SANDYBRIDGE_M_GT2 0x0116
-+#define PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS 0x0126
-+#define PCI_CHIP_SANDYBRIDGE_BRIDGE_S 0x0108 /* Server */
-+#define PCI_CHIP_SANDYBRIDGE_S_GT 0x010A
-+#endif
-+
- #define I810_MEMBASE(p,n) (p)->regions[(n)].base_addr
- #define VENDOR_ID(p)      (p)->vendor_id
- #define DEVICE_ID(p)      (p)->device_id
-@@ -357,7 +370,7 @@ extern int I810_DEBUG;
- #define IS_IGDNG_D(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGDNG_D_G)
- #define IS_IGDNG_M(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGDNG_M_G)
- #define IS_IGDNG(pI810) (IS_IGDNG_D(pI810) || IS_IGDNG_M(pI810))
--#define IS_I965G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G35_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I946_GZ || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME || IS_G4X(pI810) || IS_IGDNG(pI810))
-+#define IS_I965G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G35_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I946_GZ || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME || IS_G4X(pI810) || IS_IGDNG(pI810) || IS_GEN6(pI810))
- #define IS_G33CLASS(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G33_G ||\
-  			    DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q35_G ||\
- 			    DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q33_G || \
-@@ -365,6 +378,14 @@ extern int I810_DEBUG;
- #define IS_I9XX(pI810) (IS_I915G(pI810) || IS_I915GM(pI810) || IS_I945G(pI810) || IS_I945GM(pI810) || IS_I965G(pI810) || IS_G33CLASS(pI810))
- #define IS_I915(pI810) (IS_I915G(pI810) || IS_I915GM(pI810) || IS_I945G(pI810) || IS_I945GM(pI810) || IS_G33CLASS(pI810))
- 
-+#define IS_GEN6(pI810) ((pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_GT1 || \
-+			(pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_GT2 || \
-+			(pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_GT2_PLUS || \
-+			(pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_M_GT1 ||\
-+			(pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_M_GT2 || \
-+			(pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS ||\
-+			(pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_S_GT)
-+
- #define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810) || IS_I945GM(pI810) || IS_I965GM(pI810) || IS_GM45(pI810) || IS_IGD(pI810) || IS_IGDNG_M(pI810))
- /* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
- #define SUPPORTS_YTILING(pI810) (IS_I965G(intel))
-diff -urpN src/i810_driver.c src/i810_driver.c
---- src/i810_driver.c	2010-12-23 08:53:04.268361075 +0800
-+++ src/i810_driver.c	2010-12-23 08:53:21.594488013 +0800
-@@ -140,6 +140,13 @@ static const struct pci_id_match intel_d
-    INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ),
-    INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ),
-    INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ),
-+   INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT1, 0 ),
-+   INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2, 0 ),
-+   INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2_PLUS, 0 ),
-+   INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT1, 0 ),
-+   INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2, 0 ),
-+   INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, 0 ),
-+   INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_S_GT, 0 ),
-     { 0, 0, 0 },
- };
- 
-@@ -194,6 +201,13 @@ static SymTabRec I810Chipsets[] = {
-    {PCI_CHIP_B43_G,		"B43"},
-    {PCI_CHIP_IGDNG_D_G,		"Clarkdale"},
-    {PCI_CHIP_IGDNG_M_G,		"Arrandale"},
-+   {PCI_CHIP_SANDYBRIDGE_GT1,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_GT2,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_GT2_PLUS,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_M_GT1,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_M_GT2,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_S_GT,	"Sandybridge" },
-    {-1,				NULL}
- };
- 
-@@ -233,6 +247,13 @@ static PciChipsets I810PciChipsets[] = {
-    {PCI_CHIP_B43_G,		PCI_CHIP_B43_G,		NULL},
-    {PCI_CHIP_IGDNG_D_G,		PCI_CHIP_IGDNG_D_G,	NULL},
-    {PCI_CHIP_IGDNG_M_G,		PCI_CHIP_IGDNG_M_G,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_GT1,	PCI_CHIP_SANDYBRIDGE_GT1,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_GT2,	PCI_CHIP_SANDYBRIDGE_GT2,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_GT2_PLUS,	PCI_CHIP_SANDYBRIDGE_GT2_PLUS,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_M_GT1,	PCI_CHIP_SANDYBRIDGE_M_GT1,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_M_GT2,	PCI_CHIP_SANDYBRIDGE_M_GT2,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS,	PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_S_GT,	PCI_CHIP_SANDYBRIDGE_S_GT,	NULL},
-    {-1,				-1, NULL }
- };
- 
-diff -urpN src/i830_driver.c src/i830_driver.c
---- src/i830_driver.c	2010-12-23 08:53:04.263637213 +0800
-+++ src/i830_driver.c	2010-12-23 08:54:12.151058854 +0800
-@@ -118,6 +118,13 @@ static SymTabRec I830Chipsets[] = {
-    {PCI_CHIP_B43_G,		"B43"},
-    {PCI_CHIP_IGDNG_D_G,		"Clarkdale"},
-    {PCI_CHIP_IGDNG_M_G,		"Arrandale"},
-+   {PCI_CHIP_SANDYBRIDGE_GT1,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_GT2,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_GT2_PLUS,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_M_GT1,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_M_GT2,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS,	"Sandybridge" },
-+   {PCI_CHIP_SANDYBRIDGE_S_GT,	"Sandybridge" },
-    {-1,				NULL}
- };
- 
-@@ -151,6 +158,13 @@ static PciChipsets I830PciChipsets[] = {
-    {PCI_CHIP_B43_G,		PCI_CHIP_B43_G,		NULL},
-    {PCI_CHIP_IGDNG_D_G,		PCI_CHIP_IGDNG_D_G,		NULL},
-    {PCI_CHIP_IGDNG_M_G,		PCI_CHIP_IGDNG_M_G,		NULL},
-+   {PCI_CHIP_SANDYBRIDGE_GT1,	PCI_CHIP_SANDYBRIDGE_GT1,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_GT2,	PCI_CHIP_SANDYBRIDGE_GT2,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_GT2_PLUS,	PCI_CHIP_SANDYBRIDGE_GT2_PLUS,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_M_GT1,	PCI_CHIP_SANDYBRIDGE_M_GT1,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_M_GT2,	PCI_CHIP_SANDYBRIDGE_M_GT2,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS,	PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS,	NULL},
-+   {PCI_CHIP_SANDYBRIDGE_S_GT,	PCI_CHIP_SANDYBRIDGE_S_GT,	NULL},
-    {-1,				-1,			NULL}
- };
- 
-@@ -622,6 +636,15 @@ static void i830_detect_chipset(ScrnInfo
- 	case PCI_CHIP_IGDNG_M_G:
- 		chipname = "Arrandale";
- 		break;
-+	case PCI_CHIP_SANDYBRIDGE_GT1:
-+	case PCI_CHIP_SANDYBRIDGE_GT2:
-+	case PCI_CHIP_SANDYBRIDGE_GT2_PLUS:
-+	case PCI_CHIP_SANDYBRIDGE_M_GT1:
-+	case PCI_CHIP_SANDYBRIDGE_M_GT2:
-+	case PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS:
-+	case PCI_CHIP_SANDYBRIDGE_S_GT:
-+		chipname = "Sandybridge";
-+		break;
- 	default:
- 		chipname = "unknown chipset";
- 		break;
-diff -urpN src/i830_uxa.c src/i830_uxa.c
---- src/i830_uxa.c	2010-12-23 08:53:04.293859390 +0800
-+++ src/i830_uxa.c	2010-12-23 08:53:21.595457423 +0800
-@@ -199,6 +199,12 @@ i830_uxa_prepare_solid(PixmapPtr pixmap,
- 		i830_get_pixmap_bo(pixmap),
- 	};
- 
-+	if (IS_GEN6(intel)) {
-+		intel_debug_fallback(scrn,
-+		"Sandybridge BLT engine not supported\n");
-+		return FALSE;
-+	}
-+
- 	if (!UXA_PM_IS_SOLID(&pixmap->drawable, planemask)) {
- 		intel_debug_fallback(scrn, "planemask is not solid\n");
- 		return FALSE;
-@@ -303,6 +309,12 @@ i830_uxa_prepare_copy(PixmapPtr source, 
- 		i830_get_pixmap_bo(dest),
- 	};
- 
-+	if (IS_GEN6(intel)) {
-+		intel_debug_fallback(scrn,
-+		"Sandybridge BLT engine not supported\n");
-+		return FALSE;
-+	}
-+
- 	if (!UXA_PM_IS_SOLID(&source->drawable, planemask)) {
- 		intel_debug_fallback(scrn, "planemask is not solid");
- 		return FALSE;
-diff -urpN src/i965_render.c src/i965_render.c
---- src/i965_render.c	2010-12-23 08:53:04.290963841 +0800
-+++ src/i965_render.c	2010-12-23 08:53:21.596099086 +0800
-@@ -236,8 +236,14 @@ i965_check_composite(int op, PicturePtr 
- 		     PicturePtr dest_picture)
- {
- 	ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
-+	intel_screen_private *intel = intel_get_screen_private(scrn);
- 	uint32_t tmp1;
- 
-+	if (IS_GEN6(intel)) {
-+		intel_debug_fallback(scrn, "Unsupported hardware\n");
-+		return FALSE;
-+	}
-+
- 	/* Check for unsupported compositing operations. */
- 	if (op >= sizeof(i965_blend_op) / sizeof(i965_blend_op[0])) {
- 		intel_debug_fallback(scrn,
-diff -urpN src/common.h src/common.h
---- src/common.h	2010-12-23 09:02:19.224224337 +0800
-+++ src/common.h	2010-12-23 09:06:36.641260370 +0800
-@@ -390,6 +390,8 @@ extern int I810_DEBUG;
- /* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
- #define SUPPORTS_YTILING(pI810) (IS_I965G(intel))
- 
-+#define	ALWAYS_TILING(intel)	(IS_GEN6(intel))
-+
- #define GTT_PAGE_SIZE			KB(4)
- #define ROUND_TO(x, y)			(((x) + (y) - 1) / (y) * (y))
- #define ROUND_DOWN_TO(x, y)		((x) / (y) * (y))
-diff -urpN src/i830_driver.c src/i830_driver.c
---- src/i830_driver.c	2010-12-23 09:02:19.217842847 +0800
-+++ src/i830_driver.c	2010-12-23 09:05:51.154078132 +0800
-@@ -1260,7 +1260,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
- 	intel->tiling = TRUE;
- 
- 	/* Allow user override if they set a value */
--	if (xf86IsOptionSet(intel->Options, OPTION_TILING)) {
-+	if (!ALWAYS_TILING(intel) && xf86IsOptionSet(intel->Options, OPTION_TILING)) {
- 		if (xf86ReturnOptValBool(intel->Options, OPTION_TILING, FALSE))
- 			intel->tiling = TRUE;
- 		else
-@@ -1279,6 +1279,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
- 			intel->swapbuffers_wait = FALSE;
- 	}
- 
-+	if (IS_GEN6(intel))
-+		intel->swapbuffers_wait = FALSE;
-+
- 	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Tiling %sabled\n",
- 		   intel->tiling ? "en" : "dis");
- 	xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "SwapBuffers wait %sabled\n",
--- a/open-src/driver/xf86-video-intel/xserver-1.9-abi.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-Port intel driver 2.10.0 to work with xorg-server-1.9, which removed 
-WindowTable global and redefined ChangeGC & devPrivates.  
-(Later intel drivers removed the i830_fill_colorkey code altogether.)
-
-diff -Nurp -x '*~' -x '*.orig' src/i830_uxa.c src/i830_uxa.c
---- src/i830_uxa.c	2010-01-04 14:09:52.000000000 -0800
-+++ src/i830_uxa.c	2010-07-26 20:18:43.828129652 -0700
-@@ -78,7 +78,11 @@ const int I830PatternROP[16] = {
- 	ROP_1
- };
- 
-+#if HAS_DEVPRIVATEKEYREC
-+DevPrivateKeyRec uxa_pixmap_index;
-+#else
- static int uxa_pixmap_index;
-+#endif
- 
- Bool
- i830_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table,
-@@ -908,7 +912,11 @@ Bool i830_uxa_init(ScreenPtr screen)
- 	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
- 	intel_screen_private *intel = intel_get_screen_private(scrn);
- 
-+#if HAS_DIXREGISTERPRIVATEKEY
-+	if (!dixRegisterPrivateKey(&uxa_pixmap_index, PRIVATE_PIXMAP, 0))
-+#else
- 	if (!dixRequestPrivate(&uxa_pixmap_index, 0))
-+#endif
- 		return FALSE;
- 
- 	intel->uxa_driver = uxa_driver_alloc();
-diff -Nurp -x '*~' -x '*.orig' src/i830_video.c src/i830_video.c
---- src/i830_video.c	2010-01-04 14:09:52.000000000 -0800
-+++ src/i830_video.c	2010-07-26 20:18:43.828590726 -0700
-@@ -1245,8 +1245,13 @@ i830_clip_video_helper(ScrnInfoPtr scrn,
- static void
- i830_fill_colorkey(ScreenPtr screen, uint32_t key, RegionPtr clipboxes)
- {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 8 /* xorg-server 1.9 or later */
-+	DrawablePtr root = &screen->root->drawable;
-+	ChangeGCVal pval[2];
-+#else
- 	DrawablePtr root = &WindowTable[screen->myNum]->drawable;
- 	XID pval[2];
-+#endif
- 	BoxPtr pbox = REGION_RECTS(clipboxes);
- 	int i, nbox = REGION_NUM_RECTS(clipboxes);
- 	xRectangle *rects;
-@@ -1256,9 +1261,15 @@ i830_fill_colorkey(ScreenPtr screen, uin
- 		return;
- 
- 	gc = GetScratchGC(root->depth, screen);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 8 /* xorg-server 1.9 or later */
-+	pval[0].val = key;
-+	pval[1].val = IncludeInferiors;
-+	ChangeGC(NullClient, gc, GCForeground | GCSubwindowMode, pval);
-+#else
- 	pval[0] = key;
- 	pval[1] = IncludeInferiors;
- 	(void)ChangeGC(gc, GCForeground | GCSubwindowMode, pval);
-+#endif
- 	ValidateGC(root, gc);
- 
- 	rects = xalloc(nbox * sizeof(xRectangle));
-
---- uxa/uxa.c	Mon Oct 25 10:27:27 2010
-+++ uxa/uxa.c	Mon Oct 25 10:31:05 2010
-@@ -39,7 +39,11 @@
- #include "dixfontstr.h"
- #include "uxa.h"
- 
-+#if HAS_DEVPRIVATEKEYREC
-+DevPrivateKeyRec uxa_screen_index;
-+#else
- int uxa_screen_index;
-+#endif
- 
- /**
-  * uxa_get_drawable_pixmap() returns a backing pixmap for a given drawable.
-@@ -460,6 +464,12 @@
- 			   "non-NULL\n", screen->myNum);
- 		return FALSE;
- 	}
-+
-+#if HAS_DIXREGISTERPRIVATEKEY
-+        if (!dixRegisterPrivateKey(&uxa_screen_index, PRIVATE_SCREEN, 0))
-+            return FALSE;
-+#endif
-+
- #ifdef RENDER
- 	ps = GetPictureScreenIfSet(screen);
- #endif
---- uxa/uxa-priv.h	Mon Oct 25 10:20:35 2010
-+++ uxa/uxa-priv.h	Mon Oct 25 10:36:28 2010
-@@ -187,11 +187,21 @@
-     (PixmapWidthPaddingInfo[d].padRoundUp+1)))
- #endif
- 
-+#if HAS_DEVPRIVATEKEYREC
-+extern DevPrivateKeyRec uxa_screen_index;
-+#else
- extern int uxa_screen_index;
-+#endif
-+
- static inline uxa_screen_t *uxa_get_screen(ScreenPtr screen)
- {
-+#if HAS_DEVPRIVATEKEYREC
-+	return (uxa_screen_t *) dixGetPrivate(&screen->devPrivates,
-+						 &uxa_screen_index);
-+#else
- 	return (uxa_screen_t *) dixLookupPrivate(&screen->devPrivates,
- 						 &uxa_screen_index);
-+#endif
- }
- 
- /** Align an offset to an arbitrary alignment */
--- a/open-src/driver/xf86-video-intel/xserver-1.9-list.h.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-Backported to 2.10 from these upstream git commits:
-
-From 84d65bace521ad80b9bede4ae9e3e2a8d0668b90 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <[email protected]>
-Date: Mon, 14 Jun 2010 11:31:40 +0100
-Subject: [PATCH] Compile fix for alternate list.h from xserver-1.9
-
-From 2267e5928bd90a6997970584462bd97df447e819 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <[email protected]>
-Date: Tue, 13 Jul 2010 10:36:34 +0100
-Subject: [PATCH] Workaround a broken container_of define in list.h
-
---- src/i830.h
-+++ src/i830.h
-@@ -77,6 +77,15 @@ void i830_uxa_block_handler(ScreenPtr pS
- Bool i830_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table,
- 			     int num_bos);
- 
-+/* XXX
-+ * The X server gained an *almost* identical implementation in 1.9.
-+ *
-+ * Remove this duplicate code either in 2.16 (when we can depend upon 1.9)
-+ * or the drivers are merged back into the xserver tree, whichever happens
-+ * earlier.
-+ */
-+
-+#ifndef _LIST_H_
- /* classic doubly-link circular list */
- struct list {
- 	struct list *next, *prev;
-@@ -124,17 +133,25 @@ list_is_empty(struct list *head)
- {
- 	return head->next == head;
- }
-+#endif
-+ 
-+/* XXX work around a broken define in list.h currently [ickle 20100713] */
-+#undef container_of
- 
- #ifndef container_of
- #define container_of(ptr, type, member) \
- 	(type *)((char *)(ptr) - (char *) &((type *)0)->member)
- #endif
- 
-+#ifndef list_entry
- #define list_entry(ptr, type, member) \
- 	container_of(ptr, type, member)
-+#endif
- 
-+#ifndef list_first_entry
- #define list_first_entry(ptr, type, member) \
- 	list_entry((ptr)->next, type, member)
-+#endif
- 
- struct intel_pixmap {
- 	dri_bo *bo;
--- a/open-src/driver/xf86-video-mach64/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-mach64/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-mach64 Makefile
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,12 @@
 MODULE_NAME=xf86-video-mach64
 
 # Version number (used in path names)
-MODULE_VERSION=6.9.0
+MODULE_VERSION=6.9.1
 
 # Checksums for upstream tarball
-TARBALL_MD5  = ae62936e11af4fc0fac9f2db601a844f
-TARBALL_SHA1 = 95a7ec9761fe11dadbcd9078c55148198a91b2f1
+TARBALL_MD5   = 8484c18f08e77564a56ccbf226694038
+TARBALL_SHA1  = 7129cf61a1c70d923a370fea66686d7a13be8fe8
+TARBALL_SHA256= 9f6ad49f07c8785a64caac6f4aaf58fc7746a24b718491d047c45bc1ee9e834e
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 6205248.patch,-p1
--- a/open-src/driver/xf86-video-mga/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-mga/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -29,20 +29,17 @@
 MODULE_NAME=xf86-video-mga
 
 # Version number (used in path names)
-MODULE_VERSION=1.4.13
+MODULE_VERSION=1.5.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = f967fb3e655f6f68aa3f495eaadcaac2
-TARBALL_SHA1 = 55aa185cf381def4b5905c8b93694b8dfbd5c378
+TARBALL_MD5   = ff7a9d63978f538a7d5ff5dafe431562
+TARBALL_SHA1  = de82e4dc8d05fe1306498e3067f9e65479cfa5a1
+TARBALL_SHA256= ca983d780dd90115c0599980a7a83425b5e4eeb16f2e8c7fed15823fcbe7830e
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = no-hal.patch \
-		7027761.patch,-p1 \
-		g200se_pilot3_memory_bandwidth.patch \
-		g200se_pilot3_offscreen.patch \
-		sparc.patch \
-		g200se_pilot3_memory_sizing.patch \
-		7150315.patch
+SOURCE_PATCHES = \
+		g200se_pilot3_offscreen.patch,-p1 \
+		sparc.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-video-mga/g200se_pilot3_offscreen.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-mga/g200se_pilot3_offscreen.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,11 +1,12 @@
---- src/mga_storm.c.    Wed Jan 11 12:42:02 2012
-+++ src/mga_storm.c     Wed Jan 11 12:42:23 2012
-@@ -786,7 +786,6 @@
+diff --git a/src/mga_storm.c b/src/mga_storm.c
+index 7ac3ae0..96bb6b9 100644
+--- a/src/mga_storm.c
++++ b/src/mga_storm.c
+@@ -786,7 +786,6 @@ Bool mgaAccelInit( ScreenPtr pScreen )
      }
-
+ 
      switch (pMga->Chipset) {
 -    case PCI_CHIP_MGAG200_SE_A_PCI:
      case PCI_CHIP_MGAG200_SE_B_PCI:
-        maxlines = (min(pMga->FbUsableSize, 1*1024*1024)) /
-                   (pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel / 8);
-
+ 	maxlines = (min(pMga->FbUsableSize, 1*1024*1024)) /
+ 		   (pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel / 8);
--- a/open-src/driver/xf86-video-mga/sparc.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-mga/sparc.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,8 +1,9 @@
-diff -ur old/src/mga.h new/src/mga.h
---- src/mga.h	Wed Jan  4 18:11:17 2012
-+++ src/mga.h	Wed Jan  4 18:12:40 2012
-@@ -47,6 +47,10 @@
- #include "client.h"
+diff --git a/src/mga.h b/src/mga.h
+index 77406f1..25dcf53 100644
+--- a/src/mga.h
++++ b/src/mga.h
+@@ -46,6 +46,10 @@
+ #include "mga_dri.h"
  #endif
  
 +#ifdef __sparc__
@@ -12,7 +13,7 @@
  typedef enum {
      OPTION_SW_CURSOR,
      OPTION_HW_CURSOR,
-@@ -201,6 +205,28 @@
+@@ -200,6 +204,28 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
  #define MGA_MODULE_DATA mgaModuleData
  #define MGA_DRIVER_NAME "mga"
  
@@ -41,7 +42,7 @@
  typedef struct {
      unsigned char	ExtVga[6];
      unsigned char 	DacClk[6];
-@@ -682,6 +708,9 @@
+@@ -667,6 +693,9 @@ typedef struct {
                                         if in merged mode */
  /* End of Merged Framebuffer Data */
    int			HALGranularityOffX, HALGranularityOffY;
@@ -51,10 +52,11 @@
  } MGARec, *MGAPtr;
  
  extern CARD32 MGAAtype[16];
-diff -ur old/src/mga_dacG.c new/src/mga_dacG.c
---- src/mga_dacG.c	Wed Jan  4 18:11:17 2012
-+++ src/mga_dacG.c	Thu Jan 19 11:54:04 2012
-@@ -1753,11 +1753,35 @@
+diff --git a/src/mga_dacG.c b/src/mga_dacG.c
+index b489dea..e549f6c 100644
+--- a/src/mga_dacG.c
++++ b/src/mga_dacG.c
+@@ -1711,11 +1711,35 @@ MGAGLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
      MGAPtr pMga = MGAPTR(pScrn);
      CARD32 *dst = (CARD32*)(pMga->FbBase + pMga->FbCursorOffset);
      int i = 128;
@@ -92,10 +94,11 @@
          src += 8;
      }
  }
-diff -ur old/src/mga_driver.c new/src/mga_driver.c
---- src/mga_driver.c	Wed Jan  4 18:11:17 2012
-+++ src/mga_driver.c	Wed Jan 11 12:45:12 2012
-@@ -104,6 +104,11 @@
+diff --git a/src/mga_driver.c b/src/mga_driver.c
+index af005f1..ae4a005 100644
+--- a/src/mga_driver.c
++++ b/src/mga_driver.c
+@@ -107,6 +107,11 @@
  
  #include <unistd.h>
  
@@ -107,7 +110,7 @@
  /*
   * Forward definitions for the functions that make up the driver.
   */
-@@ -153,6 +158,10 @@
+@@ -156,6 +161,10 @@ static Bool	MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
  static void 	MGABlockHandler(int, pointer, pointer, pointer);
  static void	MGAG100BlackMagic(ScrnInfoPtr pScrn);
  
@@ -118,7 +121,7 @@
  static int MGAEntityIndex = -1;
  
  #include "mga_merge.h"
-@@ -452,7 +461,16 @@
+@@ -455,6 +464,15 @@ static const struct pci_id_match mga_device_match[] = {
  
      { 0, 0, 0 },
  };
@@ -130,12 +133,11 @@
 +    const char * device_string;
 +};
 +#define DEV_PATH(dev)    (((struct mga_device_private *) (dev))->device_string)
++#endif
  #endif
-+#endif
  
  /* Supported chipsets */
- static SymTabRec MGAChipsets[] = {
-@@ -1295,9 +1316,11 @@
+@@ -1296,9 +1314,11 @@ MGAdoDDC(ScrnInfoPtr pScrn)
  
      /* Map the VGA memory when the primary video */
      if (pMga->Primary) {
@@ -147,7 +149,7 @@
      } else {
  	/* XXX Need to write an MGA mode ddc1SetSpeed */
  	if (pMga->DDC1SetSpeed == vgaHWddc1SetSpeedWeak()) {
-@@ -1340,6 +1363,7 @@
+@@ -1341,6 +1361,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
  					  pMga->ddc1Read ) ;
  		from = "DDC1";
  	    }
@@ -155,7 +157,7 @@
  	if (!MonInfo){
  	    vbeInfoPtr pVbe;
  	    if (xf86LoadSubModule(pScrn, "vbe")) {
-@@ -1349,6 +1373,7 @@
+@@ -1350,6 +1371,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
  		from = "VBE";
  	    }
  	}
@@ -163,7 +165,7 @@
      }
  
      if (MonInfo) {
-@@ -1574,7 +1599,21 @@
+@@ -1571,6 +1593,20 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
      pMga->PciInfo = xf86GetPciInfoForEntity(pMga->pEnt->index);
      pMga->PciTag = pciTag(pMga->PciInfo->bus, pMga->PciInfo->device,
  			  pMga->PciInfo->func);
@@ -180,12 +182,11 @@
 +	if ((pMga->fd = open(dev, O_RDWR)) < 0)
 +	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot open device %s\n", dev);
 +    }
++#endif
  #endif
-+#endif
  
      pMga->Primary = xf86IsPrimaryPci(pMga->PciInfo);
- 
-@@ -1960,7 +1999,7 @@
+@@ -1922,7 +1958,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
          xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Enabling KVM\n");
      }
      
@@ -194,7 +195,7 @@
      pMga->softbooted = FALSE;
      Default = (pMga->chip_attribs->dual_head_possible
  	       && !pMga->Primary && !pMga->SecondCrtc);
-@@ -3012,7 +3051,11 @@
+@@ -2838,7 +2874,11 @@ MGASave(ScrnInfoPtr pScrn)
      /* Could call it dac2Saved */
  
      /* Only save text mode fonts/text for the primary card */
@@ -205,8 +206,8 @@
 +#endif
  }
  
- #ifdef USEMGAHAL
-@@ -3370,6 +3413,10 @@
+ /*
+@@ -2996,6 +3036,10 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
  #ifdef DEBUG
     MGAG450PrintPLL(pScrn);
  #endif
@@ -217,19 +218,19 @@
      return TRUE;
  }
  
-@@ -3467,7 +3514,11 @@
- 	    }
- 	    );	/* MGA_HAL */
- #endif
+@@ -3085,7 +3129,11 @@ MGARestore(ScrnInfoPtr pScrn)
+ 	vgaHWProtect(pScrn, TRUE);
+     }
+     if (pMga->Primary) {
 +#ifdef __sparc__
-+	(*pMga->Restore)(pScrn, vgaReg, mgaReg, FALSE);
++        (*pMga->Restore)(pScrn, vgaReg, mgaReg, FALSE);
 +#else
          (*pMga->Restore)(pScrn, vgaReg, mgaReg, TRUE);
 +#endif
      } else {
          vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
      }
-@@ -3658,9 +3709,11 @@
+@@ -3215,9 +3263,11 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
      /* Map the VGA memory when the primary video */
      if (!pMga->FBDev) {
  	if (pMga->Primary) {
@@ -241,7 +242,7 @@
  	}
  
  	/* Save the current state */
-@@ -3916,6 +3969,10 @@
+@@ -3473,6 +3523,10 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
  
      MGAInitVideo(pScreen);
  
@@ -249,22 +250,24 @@
 +    MGANotifyModeChanged(pScrn);
 +#endif
 +
- #ifdef XF86DRI
+ #ifdef MGADRI
      if (pMga->directRenderingEnabled) {
         /* Now that mi, drm and others have done their thing,
-@@ -4352,6 +4409,11 @@
-     if (pMga->ScratchBuffer)
- 	xfree(pMga->ScratchBuffer);
+@@ -3792,6 +3846,13 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
+     free(pMga->portPrivate);
+     free(pMga->ScratchBuffer);
  
 +#ifdef __sparc__
++    MGANotifyModeChanged(pScrn);
++
 +    if (pMga->fd)
 +	close(pMga->fd);
 +#endif
 +
      pScrn->vtSema = FALSE;
  
-     if (xf86IsPc98())
-@@ -4757,3 +4819,21 @@
+     xf86ClearPrimInitDone(pScrn->entityList[0]);
+@@ -4194,3 +4253,21 @@ MGAG100BlackMagic(ScrnInfoPtr pScrn)
      usleep(10);
  }
  
@@ -286,10 +289,11 @@
 +
 +}
 +#endif
-diff -ur old/src/mga_storm.c new/src/mga_storm.c
---- src/mga_storm.c	Wed Jan  4 18:11:17 2012
-+++ src/mga_storm.c	Wed Jan 11 12:41:33 2012
-@@ -989,7 +989,12 @@
+diff --git a/src/mga_storm.c b/src/mga_storm.c
+index 96bb6b9..57fdba5 100644
+--- a/src/mga_storm.c
++++ b/src/mga_storm.c
+@@ -989,7 +989,12 @@ static void mgaRestoreAccelState(ScrnInfoPtr pScrn)
  #if X_BYTE_ORDER == X_LITTLE_ENDIAN
     OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT );
  #else
@@ -303,7 +307,7 @@
  #endif
     OUTREG(MGAREG_CXBNDRY, 0xFFFF0000); /* (maxX << 16) | minX */
     OUTREG(MGAREG_YTOP, 0x00000000);    /* minPixelPointer */
-@@ -1077,9 +1082,9 @@
+@@ -1077,9 +1082,9 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn )
          maccess |= (1 << 31);
      }
  
--- a/open-src/driver/xf86-video-openchrome/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-openchrome/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-openchrome Makefile
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -34,11 +34,11 @@
 UPSTREAM_SET    = yes
 
 # Version number (used in path names)
-MODULE_VERSION=0.2.904
+MODULE_VERSION=0.2.905
 
 # Checksums for upstream tarball
-TARBALL_MD5  = f2481d98ef54febf5bffbb88a2a2426d
-TARBALL_SHA1 = 23225057d5b75d6aac3e7a710cbc067b2eb29228
+TARBALL_MD5  = 51871431a4a9204ab8ec79335c0cc041
+TARBALL_SHA1 = bbd64f258e69b29498e5f68d5a28e5253d252dd1
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = manpage-sections.patch,-p1
--- a/open-src/driver/xf86-video-r128/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-r128/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-r128 Makefile
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,12 @@
 MODULE_NAME=xf86-video-r128
 
 # Version number (used in path names)
-MODULE_VERSION=6.8.1
+MODULE_VERSION=6.8.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 2b90854a62a4d45d652062f582dc8d13
-TARBALL_SHA1 = 14f33cbd248dfd1584ee14949475ab3bb922da17
+TARBALL_MD5   = 31e0358b5d1189e3f30f5b11e9b86865
+TARBALL_SHA1  = bb01cbdc173dbb53070c4ac06f3eeb3ad2645164
+TARBALL_SHA256= 7b41135c3d177e61644573e5c16e35fd9eff98b4d6685c9c6de9e33401e904b1
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
@@ -62,5 +63,5 @@
 include ../Makefile.inc
 
 install_docs: $(INSTALL_DEPS)
-	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/README.r128 \
+	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/README \
 		$(PROTODIR)$(X11_DOC_DIR)/README.r128
--- a/open-src/driver/xf86-video-trident/6452329.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-trident/6452329.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,7 +1,8 @@
-diff -ur old/src/trident_driver.c new/src/trident_driver.c
---- src/trident_driver.c	Thu Feb 25 16:56:47 2010
-+++ src/trident_driver.c	Thu Feb 25 16:56:57 2010
-@@ -213,7 +213,6 @@
+diff --git a/src/trident_driver.c b/src/trident_driver.c
+index 4cf7e24..0d829bb 100644
+--- a/src/trident_driver.c
++++ b/src/trident_driver.c
+@@ -214,7 +214,6 @@ static PciChipsets TRIDENTPciChipsets[] = {
      { CYBER9385,	PCI_CHIP_9660,	RES_SHARED_VGA },
      { IMAGE975,		PCI_CHIP_9750,	RES_SHARED_VGA },
      { IMAGE985,		PCI_CHIP_9850,	RES_SHARED_VGA },
--- a/open-src/driver/xf86-video-trident/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-trident/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-trident 1.x Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,14 +29,15 @@
 MODULE_NAME=xf86-video-trident
 
 # Version number (used in path names)
-MODULE_VERSION=1.3.4
+MODULE_VERSION=1.3.5
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 7a646ba7033dd4eb10d38dca8682b391
-TARBALL_SHA1 = 7c40f5c02bddf399862782b708941e79302318af
+TARBALL_MD5   = 5ca073f0ca52b83e51def3115e6cae4a
+TARBALL_SHA1  = d4ef8112eeabb7a7e31e287172425e3540bb34fd
+TARBALL_SHA256= 4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6452329.patch
+SOURCE_PATCHES = 6452329.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-video-vesa/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-vesa/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-vesa Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,14 +29,14 @@
 MODULE_NAME=xf86-video-vesa
 
 # Version number (used in path names)
-MODULE_VERSION=2.3.0
+MODULE_VERSION=2.3.1
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 07fa32958aff9b463dd3af5481ef6626
-TARBALL_SHA1 = 4689b7c295d7a8d7326302dafecb812739617134
+TARBALL_MD5   = 02e6eacc2d1e07ac893b62481905d6f0
+TARBALL_SHA1  = acb4f8104f16476d46ceb366aa932783c3644ead
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = vesa_xorg72.patch
+SOURCE_PATCHES = vesa_xorg72.patch,-p1
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/driver/xf86-video-vesa/vesa_xorg72.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-vesa/vesa_xorg72.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,10 +1,11 @@
 Fixes Sun bug 6526933: Matrox MGA chip (embedded in ServerEngines "Pilot" BSC)
 does not work with vesa driver
 
-diff -urp -x '*~' -x '*.orig' src/vesa.c src/vesa.c
---- src/vesa.c	2008-12-21 18:34:59.000000000 -0800
-+++ src/vesa.c	2009-01-11 10:09:13.986045000 -0800
-@@ -1450,19 +1450,19 @@ SaveFonts(ScrnInfoPtr pScrn)
+diff --git a/src/vesa.c b/src/vesa.c
+index 23d9e14..709d791 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -1488,19 +1488,19 @@ SaveFonts(ScrnInfoPtr pScrn)
      WriteGr(0x06, 0x05);	/* set graphics */
      slowbcopy_frombus(pVesa->VGAbase, pVesa->fonts + 8192, 8192);
  
@@ -31,7 +32,7 @@
  }
  
  static void
-@@ -1519,11 +1519,6 @@ RestoreFonts(ScrnInfoPtr pScrn)
+@@ -1557,11 +1557,6 @@ RestoreFonts(ScrnInfoPtr pScrn)
      WriteGr(0x06, 0x05);    /* set graphics */
      slowbcopy_tobus(pVesa->fonts + 8192, pVesa->VGAbase, 8192);
  
@@ -43,7 +44,7 @@
      /* restore the registers that were changed */
      WriteMiscOut(miscOut);
      WriteAttr(pVesa, 0x10, attr10);
-@@ -1535,6 +1530,11 @@ RestoreFonts(ScrnInfoPtr pScrn)
+@@ -1573,6 +1568,11 @@ RestoreFonts(ScrnInfoPtr pScrn)
      WriteGr(0x08, gr8);
      WriteSeq(0x02, seq2);
      WriteSeq(0x04, seq4);
--- a/open-src/driver/xf86-video-vmware/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/driver/xf86-video-vmware/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # xf86-video-vmware Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,14 +29,15 @@
 MODULE_NAME=xf86-video-vmware
 
 # Version number (used in path names)
-MODULE_VERSION=11.0.3
+MODULE_VERSION=12.0.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 579bee487309b1bdc8329bf627d43413
-TARBALL_SHA1 = 8aa23618a3dfa91f88094a4d1dc45c878f386f69
+TARBALL_MD5   = 0743ec7c479603fba60d118858fd5783
+TARBALL_SHA1  = efa47f365d88da245804a9934719ff860ed04f95
+TARBALL_SHA256= c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = 6370961.patch 
+SOURCE_PATCHES =
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES=man/*.man
--- a/open-src/font/util/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/font/util/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -35,11 +35,12 @@
 MODULE_PKGCLASS_SET=yes
 
 # Version number (used in path names)
-MODULE_VERSION = 1.2.0
+MODULE_VERSION = 1.3.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 1bdd8ed070e02b2165d7b0f0ed93280b
-TARBALL_SHA1 = 011fa9c8fe08d9f6f848df570374ed1cb7488146
+TARBALL_MD5   = ddfc8a89d597651408369d940d03d06b
+TARBALL_SHA1  = a015f4c5a35d98af72835797293697e0eb9cd506
+TARBALL_SHA256= dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195
 
 # Set encoding directory path used during build in fontutil.pc
 FIX_PC_FILES = fontutil.pc.in
--- a/open-src/lib/libX11/1234757.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/1234757.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -34,9 +34,10 @@
 make the call to XInitThreads, even if the client has already made
 other Xlib calls.
 
-diff -urp -x '*~' -x '*.orig' include/X11/Xlibint.h include/X11/Xlibint.h
---- include/X11/Xlibint.h	2010-10-04 18:02:06.000000000 -0700
-+++ include/X11/Xlibint.h	2010-11-21 18:47:51.771637018 -0800
+diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
+index 80edeec..fbade18 100644
+--- a/include/X11/Xlibint.h
++++ b/include/X11/Xlibint.h
 @@ -199,6 +199,10 @@ struct _XDisplay
  	void *cookiejar;  /* cookie events returned but not claimed */
  };
@@ -48,10 +49,11 @@
  #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
  
  /*
-diff -urp -x '*~' -x '*.orig' src/OpenDis.c src/OpenDis.c
---- src/OpenDis.c	2010-09-21 18:25:24.000000000 -0700
-+++ src/OpenDis.c	2010-11-21 18:47:51.772360199 -0800
-@@ -38,6 +38,21 @@ in this Software without prior written a
+diff --git a/src/OpenDis.c b/src/OpenDis.c
+index 9379fec..6d6111e 100644
+--- a/src/OpenDis.c
++++ b/src/OpenDis.c
+@@ -38,6 +38,21 @@ in this Software without prior written authorization from The Open Group.
  #include "XKBlib.h"
  #endif /* XKB */
  
@@ -73,7 +75,7 @@
  #ifdef XTHREADS
  #include "locking.h"
  int  (*_XInitDisplayLock_fn)(Display *dpy) = NULL;
-@@ -227,6 +232,13 @@ fallback_success:
+@@ -208,6 +223,13 @@ XOpenDisplay (
  		return(NULL);
  	}
  
@@ -87,7 +89,7 @@
  	if (!_XPollfdCacheInit(dpy)) {
  	        OutOfMemory (dpy);
  		return(NULL);
-@@ -600,6 +612,10 @@ fallback_success:
+@@ -581,6 +603,10 @@ XOpenDisplay (
  
  void _XFreeDisplayStructure(Display *dpy)
  {
@@ -98,7 +100,7 @@
  	/* move all cookies in the EQ to the jar, then free them. */
  	if (dpy->qfree) {
  	    _XQEvent *qelt = dpy->qfree;
-@@ -728,6 +744,105 @@ void _XFreeDisplayStructure(Display *dpy
+@@ -709,6 +735,105 @@ void _XFreeDisplayStructure(Display *dpy)
  	Xfree ((char *)dpy);
  }
  
@@ -204,10 +206,11 @@
  /* OutOfMemory is called if malloc fails.  XOpenDisplay returns NULL
     after this returns. */
  
-diff -urp -x '*~' -x '*.orig' src/locking.c src/locking.c
---- src/locking.c	2010-09-03 22:52:39.000000000 -0700
-+++ src/locking.c	2010-11-21 18:47:51.772597162 -0800
-@@ -612,6 +612,11 @@ Status XInitThreads(void)
+diff --git a/src/locking.c b/src/locking.c
+index b3dfb3b..9f340c9 100644
+--- a/src/locking.c
++++ b/src/locking.c
+@@ -614,6 +614,11 @@ Status XInitThreads(void)
  #endif
  #endif
  
--- a/open-src/lib/libX11/6714036.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/6714036.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,7 +1,8 @@
-diff -urp -x '*~' -x '*.orig' modules/lc/gen/lcGenConv.c modules/lc/gen/lcGenConv.c
---- modules/lc/gen/lcGenConv.c	2010-09-03 22:52:38.000000000 -0700
-+++ modules/lc/gen/lcGenConv.c	2010-11-21 18:47:57.083531216 -0800
-@@ -1784,9 +1784,6 @@ mbtocs(
+diff --git a/modules/lc/gen/lcGenConv.c b/modules/lc/gen/lcGenConv.c
+index 42d63c5..c8708fa 100644
+--- a/modules/lc/gen/lcGenConv.c
++++ b/modules/lc/gen/lcGenConv.c
+@@ -1666,9 +1666,6 @@ mbstostr(
          return( 0 );
      }
  
--- a/open-src/lib/libX11/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -27,23 +27,23 @@
 MODULE_NAME=libX11
 
 # Version number (used in path names)
-MODULE_VERSION = 1.4.4
+MODULE_VERSION = 1.4.99.901
 
 # Checksums for upstream tarball
-TARBALL_MD5  = ed7c382cbf8c13425b6a66bcac0ca5d9
-TARBALL_SHA1 = 2d9d38bfd7003ec60eea0b1999ab72cfd5fa3b90
-TARBALL_SHA256 = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
+TARBALL_MD5   = 520376557363da2df412beec9b4be749
+TARBALL_SHA1  = af10b064c1c64ee9e7daae0a7f1f9719eb7e965a
+TARBALL_SHA256= bf238569e07e459651265735e093103322478e4d07265ad9eb55aba4d9db26db
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
-	1234757.patch \
+	1234757.patch,-p1 \
 	4010755.patch \
 	4614834.patch \
 	5039226.patch \
 	solaris-abi.patch,-p1 \
 	solaris-kbd.patch,-p1 \
-	SolarisIA.patch \
-	6714036.patch \
+	SolarisIA.patch,-p1 \
+	6714036.patch,-p1 \
 	6789219.patch,-p1 \
 	im-suneu-greek.patch \
 	im-ximcp.patch \
@@ -57,21 +57,21 @@
 	compose-iso8859-2.patch \
 	compose-iso8859-5.patch \
 	compose-iso8859-6.patch \
-	compose-iso8859-7.patch \
+	compose-iso8859-7.patch,-p1 \
 	compose-iso8859-8.patch \
 	compose-iso8859-9.patch \
 	compose-iso8859-13.patch \
 	compose-iso8859-15.patch \
 	compose-el_GR.UTF-8.patch \
-	compose-en_US.UTF-8.patch \
+	compose-en_US.UTF-8.patch,-p1 \
 	compose-ja_JP.UTF-8.patch \
 	compose-ko_KR.UTF-8.patch \
-	compose-pt_BR.UTF-8.patch \
+	compose-pt_BR.UTF-8.patch,-p1 \
 	compose-th_TH.UTF-8.patch \
 	compose-zh_CN.UTF-8.patch \
 	compose-zh_HK.UTF-8.patch \
 	compose-zh_TW.UTF-8.patch \
-	locale.aliases.patch \
+	locale.aliases.patch,-p1 \
 	locale.dir.patch \
 	locale.paths.patch,-p1 \
 	locale-C.patch \
--- a/open-src/lib/libX11/SolarisIA.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/SolarisIA.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -20,10 +20,12 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
-diff -Nurp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am	2011-04-06 13:52:16.515334675 -0700
-+++ src/Makefile.am	2011-04-06 13:52:17.726885350 -0700
-@@ -352,6 +352,9 @@ libX11_xcb_la_SOURCES = x11_xcb.c Xxcbin
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a825bb9..263b493 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -352,6 +352,9 @@ libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
  libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
  libX11_xcb_la_LIBADD = libX11.la
  
@@ -33,10 +35,11 @@
  #
  # Figure out which sub-libraries to link into Xlib
  #
-diff -Nurp -x '*~' -x '*.orig' src/OpenDis.c src/OpenDis.c
---- src/OpenDis.c	2011-04-06 13:52:16.502368856 -0700
-+++ src/OpenDis.c	2011-04-06 13:52:17.727406866 -0700
-@@ -38,6 +38,12 @@ in this Software without prior written a
+diff --git a/src/OpenDis.c b/src/OpenDis.c
+index 6d6111e..ff717f9 100644
+--- a/src/OpenDis.c
++++ b/src/OpenDis.c
+@@ -38,6 +38,12 @@ in this Software without prior written authorization from The Open Group.
  #include "XKBlib.h"
  #endif /* XKB */
  
@@ -49,7 +52,7 @@
  #if defined(XTHREADS) && defined(SUNSOFT)
  struct _DisplayPtrLink {
      Display *dpy;
-@@ -605,6 +611,21 @@ fallback_success:
+@@ -586,6 +592,21 @@ XOpenDisplay (
  #ifdef XKB
  	XkbUseExtension(dpy,NULL,NULL);
  #endif
--- a/open-src/lib/libX11/compose-el_GR.UTF-8.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-el_GR.UTF-8.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 diff -urp -x '*~' -x '*.orig' nls/el_GR.UTF-8/Compose.pre nls/el_GR.UTF-8/Compose.pre
 --- nls/el_GR.UTF-8/Compose.pre	2010-01-14 17:11:36.000000000 -0800
 +++ nls/el_GR.UTF-8/Compose.pre	2010-06-07 15:49:35.703893203 -0700
-@@ -1,1981 +1,2694 @@
+@@ -1,1981 +1,2680 @@
  XCOMM
 +XCOMM Copyright 1996, 2002, Oracle and/or its affiliates. All rights reserved.
  XCOMM
@@ -1116,8 +1116,6 @@
 +<Byelorussian_SHORTU>   : "\xd0\x8e"    Byelorussian_SHORTU
 +<Byelorussian_shortu>   : "\xd1\x9e"    Byelorussian_shortu
 +XCOMM Cyrillic keysyms:
-+<Zabovedot>             : "\xc5\xbb"    Zabovedot
-+<zabovedot>             : "\xc5\xbc"    zabovedot
 +<Gabovedot>             : "\xc4\xa0"    Gabovedot
 +<gabovedot>             : "\xc4\xa1"    gabovedot
 +<Cabovedot>             : "\xc4\x8a"    Cabovedot
@@ -1699,7 +1697,6 @@
 +<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
 +<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
 +<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
-+<diaeresis>			: "\xc2\xa8"	diaeresis
 +<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
 +<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
 +<Multi_key> <v> <S>		: "\xc5\xa0"	Scaron
@@ -3503,16 +3500,6 @@
 +Ctrl<T> <i> <underscore>	: "\xc4\xab"	imacron
 +Ctrl<T> <underscore> <i> 	: "\xc4\xab"	imacron
 +XCOMM
-+XCOMM Latin-9 input sequences:
-+<Multi_key> <o> <e> 		: "\xc5\x93"
-+<Multi_key> <O> <E> 		: "\xc5\x92"
-+<Multi_key> <Y> <quotedbl> 	: "\xc5\xb8"
-+<Multi_key> <quotedbl> <Y> 	: "\xc5\xb8"
-+Ctrl<T> <o> <e> 		: "\xc5\x93"
-+Ctrl<T> <O> <E> 		: "\xc5\x92"
-+Ctrl<T> <Y> <quotedbl> 		: "\xc5\xb8"
-+Ctrl<T> <quotedbl> <Y>		: "\xc5\xb8"
-+XCOMM
 +XCOMM Rules for SunXK_FA_* keysyms:
 +<SunFA_Acute> <apostrophe>	: "\xc2\xb4"
 +<SunFA_Acute> <A>		: "\xc3\x81"
@@ -3601,7 +3588,6 @@
 +<SunFA_Diaeresis> <U>		: "\xc3\x9c"
 +<SunFA_Diaeresis> <u>		: "\xc3\xbc"
 +<SunFA_Diaeresis> <y>		: "\xc3\xbf"
-+<SunFA_Diaeresis> <Y>		: "\xc5\xb8"
 +<SunFA_Grave> <A>		: "\xc3\x80"
 +<SunFA_Grave> <a>		: "\xc3\xa0"
 +<SunFA_Grave> <E>		: "\xc3\x88"
--- a/open-src/lib/libX11/compose-en_US.UTF-8.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-en_US.UTF-8.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,13 +21,14 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-diff -urp -x '*~' -x '*.orig' nls/en_US.UTF-8/Compose.pre nls/en_US.UTF-8/Compose.pre
---- nls/en_US.UTF-8/Compose.pre	2010-09-21 18:25:24.000000000 -0700
-+++ nls/en_US.UTF-8/Compose.pre	2010-11-21 18:48:20.433248840 -0800
-@@ -1,8 +1,69 @@
+diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
+index 2eae912..3c73a1f 100644
+--- a/nls/en_US.UTF-8/Compose.pre
++++ b/nls/en_US.UTF-8/Compose.pre
+@@ -1,7 +1,70 @@
 -XCOMM UTF-8 (Unicode) compose sequence
 +XCOMM
-+XCOMM Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
++XCOMM Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 +XCOMM
 +XCOMM Permission is hereby granted, free of charge, to any person obtaining a
 +XCOMM copy of this software and associated documentation files (the
@@ -38,7 +39,7 @@
 +XCOMM copyright notice(s) and this permission notice appear in all copies of
 +XCOMM the Software and that both the above copyright notice(s) and this
 +XCOMM permission notice appear in supporting documentation.
-+XCOMM 
++XCOMM
 +XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 +XCOMM OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 +XCOMM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
@@ -48,7 +49,7 @@
 +XCOMM FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
 +XCOMM NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 +XCOMM WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+XCOMM 
++XCOMM
 +XCOMM Except as contained in this notice, the name of a copyright holder
 +XCOMM shall not be used in advertising or otherwise to promote the sale, use
 +XCOMM or other dealings in this Software without prior written authorization
@@ -56,11 +57,10 @@
 +XCOMM
 +XCOMM
 +XCOMM Compose table for Solaris Unicode locales.
-+XCOMM Partially merged with X.Org UTF-8 (Unicode) compose sequence from
++XCOMM Merged with X.Org UTF-8 (Unicode) compose sequence from
  XCOMM [email protected]
  XCOMM
  
--XCOMM Part 1 - Manual definitions
 +STATE "[ English/European ]"
 +<Multi_key> <c> <c>	: SWITCH_STATE_TO "[ Cyrillic ]"
 +<Multi_key> <g> <g>	: SWITCH_STATE_TO "[ Greek ]"
@@ -93,94 +93,27 @@
 +Ctrl<T> <s> <c>		: SWITCH_STATE_TO "[ S-Chinese ]"
 +Ctrl<T> <t> <c>		: SWITCH_STATE_TO "[ T-Chinese ]"
 +Ctrl<T> <h> <k>		: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
++
+ XCOMM Part 1 - Manual definitions
  
  XCOMM Spacing versions of dead accents
- <dead_tilde> <space>             	: "~"   asciitilde # TILDE
-@@ -22,7 +83,7 @@ XCOMM Spacing versions of dead accents
- <dead_abovedot> <space>          	: "˙"   abovedot # DOT ABOVE
- <dead_abovedot> <dead_abovedot>  	: "˙"   abovedot # DOT ABOVE
- <dead_diaeresis> <dead_diaeresis> 	: "¨"   diaeresis # DIAERESIS
--<dead_diaeresis> <space>         	: "\""   quotedbl # REVERSE SOLIDUS
-+XCOMM <dead_diaeresis> <space>         	: "\""   quotedbl # REVERSE SOLIDUS
- <dead_doubleacute> <space>       	: "˝"   U2dd # DOUBLE ACUTE ACCENT
- <dead_doubleacute> <dead_doubleacute> 	: "˝"   U2dd # DOUBLE ACUTE ACCENT
- <dead_caron> <space>             	: "ˇ"   caron # CARON
-@@ -92,7 +153,7 @@ XCOMM Spaces
- 
- <Multi_key> <period> <greater>   	: "›"   U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
- <Multi_key> <period> <less>      	: "‹"   U2039 # SINGLE LEFT-POINTING ANGLE QUOTATION MARK
--<Multi_key> <period> <period>    	: "…"   ellipsis # HORIZONTAL ELLIPSIS
-+XCOMM <Multi_key> <period> <period>    	: "…"   ellipsis # HORIZONTAL ELLIPSIS
- <Multi_key> <period> <minus>    	: "·"   periodcentered # MIDDLE DOT
- <Multi_key> <period> <equal>    	: "•"   enfilledcircbullet # BULLET
- <Multi_key> <exclam> <asciicircum> 	: "¦"   brokenbar # BROKEN BAR
-@@ -101,13 +162,13 @@ XCOMM Spaces
- <Multi_key> <P> <exclam>         	: "¶"   paragraph # PILCROW SIGN
- <Multi_key> <plus> <minus>       	: "±"   plusminus # PLUS-MINUS SIGN
- <Multi_key> <question> <question> 	: "¿"   questiondown # INVERTED QUESTION MARK
--<Multi_key> <minus> <d>          	: "đ"   dstroke # LATIN SMALL LETTER D WITH STROKE
--<Multi_key> <minus> <D>          	: "Đ"   Dstroke # LATIN CAPITAL LETTER D WITH STROKE
-+XCOMM <Multi_key> <minus> <d>          	: "đ"   dstroke # LATIN SMALL LETTER D WITH STROKE
-+XCOMM <Multi_key> <minus> <D>          	: "Đ"   Dstroke # LATIN CAPITAL LETTER D WITH STROKE
- <Multi_key> <s> <s>              	: "ß"   ssharp # LATIN SMALL LETTER SHARP S
- <Multi_key> <S> <S>              	: "ẞ"   Ssharp # LATIN CAPITAL LETTER SHARP S
- 
--<Multi_key> <o> <e>              	: "œ"   oe # LATIN SMALL LIGATURE OE
--<Multi_key> <O> <E>              	: "Œ"   OE # LATIN CAPITAL LIGATURE OE
-+XCOMM <Multi_key> <o> <e>              	: "œ"   oe # LATIN SMALL LIGATURE OE
-+XCOMM <Multi_key> <O> <E>              	: "Œ"   OE # LATIN CAPITAL LIGATURE OE
- <Multi_key> <a> <e>              	: "æ"   ae # LATIN SMALL LETTER AE
- <Multi_key> <A> <E>              	: "Æ"   AE # LATIN CAPITAL LETTER AE
- 
-@@ -136,12 +197,12 @@ XCOMM Per xxx
+@@ -863,7 +926,8 @@ XCOMM Part 3
+ <Multi_key> <period> <c>         	: "ċ"   U010B # LATIN SMALL LETTER C WITH DOT ABOVE
+ <Multi_key> <c> <period> 		: "ċ"   U010B # LATIN SMALL LETTER C WITH DOT ABOVE
+ <dead_caron> <C>                 	: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
+-<Multi_key> <c> <C>              	: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
++XCOMM Conflicts with: <Multi_key> <c> <c> : SWITCH_STATE_TO "[ Cyrillic ]"
++XCOMM <Multi_key> <c> <C>              	: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
+ <Multi_key> <less> <C> 			: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
+ <Multi_key> <C> <less> 			: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
+ <dead_caron> <c>                 	: "č"   U010D # LATIN SMALL LETTER C WITH CARON
+@@ -5830,3 +5894,2320 @@ XCOMM
+ <Multi_key> <asciicircum> <Cyrillic_ER>		: "Р̂"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
  
- XCOMM Currencies
- <Multi_key> <C> <E>              	: "₠"   U20a0 # EURO-CURRENCY SIGN
--<Multi_key> <C> <slash>          	: "₡"   U20a1 # COLON SIGN
--<Multi_key> <slash> <C>          	: "₡"   U20a1 # COLON SIGN
-+XCOMM <Multi_key> <C> <slash>          	: "₡"   U20a1 # COLON SIGN
-+XCOMM <Multi_key> <slash> <C>          	: "₡"   U20a1 # COLON SIGN
- <Multi_key> <C> <r>              	: "₢"   U20a2 # CRUZEIRO SIGN
- <Multi_key> <F> <r>              	: "₣"   U20a3 # FRENCH FRANC SIGN
--<Multi_key> <L> <equal>          	: "₤"   U20a4 # LIRA SIGN
--<Multi_key> <equal> <L>          	: "₤"   U20a4 # LIRA SIGN
-+XCOMM <Multi_key> <L> <equal>          	: "₤"   U20a4 # LIRA SIGN
-+XCOMM <Multi_key> <equal> <L>          	: "₤"   U20a4 # LIRA SIGN
- <Multi_key> <m> <slash>          	: "₥"   U20a5 # MILL SIGN
- <Multi_key> <slash> <m>          	: "₥"   U20a5 # MILL SIGN
- <Multi_key> <N> <equal>          	: "₦"   U20a6 # NAIRA SIGN
-@@ -151,7 +212,7 @@ XCOMM Currencies
- <Multi_key> <W> <equal>          	: "₩"   U20a9 # WON SIGN
- <Multi_key> <equal> <W>          	: "₩"   U20a9 # WON SIGN
- XCOMM "₪" U20aa NEW SHEQEL SIGN
--<Multi_key> <d> <minus>          	: "₫"   U20ab # DONG SIGN
-+XCOMM <Multi_key> <d> <minus>          	: "₫"   U20ab # DONG SIGN
- <Multi_key> <C> <equal>          	: "€"   EuroSign # EURO SIGN
- <Multi_key> <equal> <C>          	: "€"   EuroSign # EURO SIGN
- <Multi_key> <c> <equal>          	: "€"   EuroSign # EURO SIGN
-@@ -189,8 +250,8 @@ XCOMM Long S
- <Multi_key> <f> <S>              	: "ſ"   U017f # LATIN SMALL LETTER LONG S
- 
- XCOMM Dashes
--<Multi_key> <minus> <minus> <period> 	: "–"   U2013 # EN DASH
--<Multi_key> <minus> <minus> <minus> 	: "—"   U2014 # EM DASH
-+XCOMM <Multi_key> <minus> <minus> <period> 	: "–"   U2013 # EN DASH
-+XCOMM <Multi_key> <minus> <minus> <minus> 	: "—"   U2014 # EM DASH
- 
- XCOMM Musical alterations
- <Multi_key> <numbersign> <b>     	: "♭"   U266d # MUSIC FLAT SIGN
-@@ -222,5161 +283,2607 @@ XCOMM Other symbols
- <Multi_key> <colon> <parenright>        : "☺"   U263A # WHITE SMILING FACE
- <Multi_key> <colon> <parenleft>         : "☹"   U2639 # WHITE FROWNING FACE
- 
--XCOMM Part 2
+ <Multi_key> <backslash> <o> <slash>		: "🙌"		# PERSON RAISING BOTH HANDS IN CELEBRATION
++
 +XCOMM ---- Solaris added key sequences
- 
--XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos  automatically
--XCOMM generated  from UnicodeData-2.0.14.txt at
--XCOMM    ftp://ftp.unicode.org/Public/2.0-Update/UnicodeData-2.0.14.txt
--XCOMM   by Jungshik Shin <[email protected]>  2002-10-17
--XCOMM There are some conflicts among sequences, but I left them alone.
++
 +XCOMM Rules to compose Euro Currency Symbol
 +AltGraph<e>		: "\xe2\x82\xac"
 +AltGraph<E>		: "\xe2\x82\xac"
@@ -203,36 +136,17 @@
 +
 +<Multi_key> <C> <acute> 		: "\xc4\x86"	Cacute
 +<Multi_key> <c> <acute> 		: "\xc4\x87"	cacute
-+<Multi_key> <acute> <C>			: "\xc4\x86"	Cacute
-+<Multi_key> <acute> <c>			: "\xc4\x87"	cacute
-+<Multi_key> <C> <slash>			: "\xc2\xa2"	cent
-+<Multi_key> <slash> <C>			: "\xc2\xa2"	cent
-+<Multi_key> <C> <bar>			: "\xc2\xa2"	cent
-+<Multi_key> <bar> <C>			: "\xc2\xa2"	cent
-+<Multi_key> <acute> <L>			: "\xc4\xb9"	Lacute
 +<Multi_key> <L> <acute> 		: "\xc4\xb9"	Lacute
-+<Multi_key> <acute> <l>			: "\xc4\xba"	lacute
 +<Multi_key> <l> <acute> 		: "\xc4\xba"	lacute
-+<Multi_key> <l> <minus>			: "\xc2\xa3"	sterling
-+<Multi_key> <minus> <l>			: "\xc2\xa3"	sterling
 +<Multi_key> <l> <equal>			: "\xc2\xa3"	sterling
 +<Multi_key> <equal> <l>			: "\xc2\xa3"	sterling
-+<Multi_key> <L> <equal>			: "\xc2\xa3"	sterling
-+<Multi_key> <equal> <L>			: "\xc2\xa3"	sterling
-+<Multi_key> <acute> <N>			: "\xc5\x83"	Nacute
 +<Multi_key> <N> <acute> 		: "\xc5\x83"	Nacute
 +<Multi_key> <y> <minus>			: "\xc2\xa5"	yen
 +<Multi_key> <minus> <y>			: "\xc2\xa5"	yen
 +<Multi_key> <Y> <minus>			: "\xc2\xa5"	yen
 +<Multi_key> <minus> <Y>			: "\xc2\xa5"	yen
-+<Multi_key> <y> <equal>			: "\xc2\xa5"	yen
-+<Multi_key> <equal> <y>			: "\xc2\xa5"	yen
 +<Multi_key> <S> <O>			: "\xc2\xa7"	section
 +<Multi_key> <O> <S>			: "\xc2\xa7"	section
-+<Multi_key> <S> <exclam>		: "\xc2\xa7"	section
-+<Multi_key> <exclam> <S>		: "\xc2\xa7"	section
-+<Multi_key> <s> <exclam>		: "\xc2\xa7"	section
-+<Multi_key> <exclam> <s>		: "\xc2\xa7"	section
 +<Multi_key> <S> <0>			: "\xc2\xa7"	section
 +<Multi_key> <0> <S>			: "\xc2\xa7"	section
 +<Multi_key> <s> <0>			: "\xc2\xa7"	section
@@ -247,9 +161,7 @@
 +<Multi_key> <0> <x>			: "\xc2\xa4"	currency
 +<Multi_key> <X> <0>			: "\xc2\xa4"	currency
 +<Multi_key> <0> <X>			: "\xc2\xa4"	currency
-+<Multi_key> <c> <o>			: "\xc2\xa9"	copyright
 +<Multi_key> <C> <O>			: "\xc2\xa9"	copyright
-+<Multi_key> <c> <O>			: "\xc2\xa9"	copyright
 +<Multi_key> <C> <o>			: "\xc2\xa9"	copyright
 +<Multi_key> <c> <0>			: "\xc2\xa9"	copyright
 +<Multi_key> <0> <c>			: "\xc2\xa9"	copyright
@@ -264,7 +176,6 @@
 +<Multi_key> <O> <minus>			: "\xc2\xba"	masculine
 +<Multi_key> <minus> <O>			: "\xc2\xba"	masculine
 +<Multi_key> <0> <asciicircum>		: "\xc2\xb0"	degree
-+<Multi_key> <asciicircum> <0>		: "\xc2\xb0"	degree
 +<Multi_key> <0> <asterisk>		: "\xc2\xb0"	degree
 +<Multi_key> <asterisk> <0>		: "\xc2\xb0"	degree
 +<Multi_key> <minus> <plus>		: "\xc2\xb1"	plusminus
@@ -273,19 +184,16 @@
 +<Multi_key> <slash> <U>			: "\xc2\xb5"	mu
 +<Multi_key> <U> <slash>			: "\xc2\xb5"	mu
 +<Multi_key> <1> <asciicircum>		: "\xc2\xb9"	onesuperior
-+<Multi_key> <asciicircum> <1>		: "\xc2\xb9"	onesuperior
 +<Multi_key> <S> <1>			: "\xc2\xb9"	onesuperior
 +<Multi_key> <1> <S>			: "\xc2\xb9"	onesuperior
 +<Multi_key> <s> <1>			: "\xc2\xb9"	onesuperior
 +<Multi_key> <1> <s>			: "\xc2\xb9"	onesuperior
 +<Multi_key> <2> <asciicircum>		: "\xc2\xb2"	twosuperior
-+<Multi_key> <asciicircum> <2>		: "\xc2\xb2"	twosuperior
 +<Multi_key> <S> <2>			: "\xc2\xb2"	twosuperior
 +<Multi_key> <2> <S>			: "\xc2\xb2"	twosuperior
 +<Multi_key> <s> <2>			: "\xc2\xb2"	twosuperior
 +<Multi_key> <2> <s>			: "\xc2\xb2"	twosuperior
 +<Multi_key> <3> <asciicircum>		: "\xc2\xb3"	threesuperior
-+<Multi_key> <asciicircum> <3>		: "\xc2\xb3"	threesuperior
 +<Multi_key> <S> <3>			: "\xc2\xb3"	threesuperior
 +<Multi_key> <3> <S>			: "\xc2\xb3"	threesuperior
 +<Multi_key> <s> <3>			: "\xc2\xb3"	threesuperior
@@ -295,196 +203,112 @@
 +<Multi_key> <period> <asciicircum>	: "\xc2\xb7"	periodcentered
 +<Multi_key> <asciicircum> <period>	: "\xc2\xb7"	periodcentered
 +
-+<Multi_key> <1> <4>			: "\xc2\xbc"	onequarter
-+<Multi_key> <1> <2>			: "\xc2\xbd"	onehalf
-+<Multi_key> <3> <4>			: "\xc2\xbe"	threequarters
 +<Multi_key> <bar> <bar>			: "\xc2\xa6"	brokenbar
-+<Multi_key> <asciicircum> <exclam>	: "\xc2\xa6"	brokenbar
 +<Multi_key> <V> <B>			: "\xc2\xa6"	brokenbar
 +<Multi_key> <B> <V>			: "\xc2\xa6"	brokenbar
 +<Multi_key> <v> <b>			: "\xc2\xa6"	brokenbar
 +<Multi_key> <b> <v>			: "\xc2\xa6"	brokenbar
-+<Multi_key> <minus> <comma>		: "\xc2\xac"	notsign
-+<Multi_key> <comma> <minus>		: "\xc2\xac"	notsign
-+<Multi_key> <minus> <minus>		: "\xc2\xad"	hyphen
 +<Multi_key> <R> <O>			: "\xc2\xae"	registered
 +<Multi_key> <minus> <asciicircum>	: "\xc2\xaf"	macron
 +<Multi_key> <asciicircum> <minus>	: "\xc2\xaf"	macron
 +<Multi_key> <underscore> <asciicircum>	: "\xc2\xaf"	macron
-+<Multi_key> <asciicircum> <underscore>	: "\xc2\xaf"	macron
 +<Multi_key> <underscore> <underscore>	: "\xc2\xaf"	macron
-+<Multi_key> <minus> <colon>		: "\xc3\xb7"	division
-+<Multi_key> <colon> <minus>		: "\xc3\xb7"	division
-+<Multi_key> <x> <x>			: "\xc3\x97"	multiply
 +<Multi_key> <apostrophe> <apostrophe>	: "\xc2\xb4"	acute
 +<Multi_key> <comma> <comma>		: "\xc2\xb8"	cedilla
 +<Multi_key> <quotedbl> <quotedbl>	: "\xc2\xa8"	diaeresis
 +<Multi_key> <A> <grave>			: "\xc3\x80"	Agrave
-+<Multi_key> <grave> <A>			: "\xc3\x80"	Agrave
 +<Multi_key> <A> <acute>			: "\xc3\x81"	Aacute
-+<Multi_key> <acute> <A>			: "\xc3\x81"	Aacute
 +<Multi_key> <A> <apostrophe>		: "\xc3\x81"	Aacute
-+<Multi_key> <apostrophe> <A>		: "\xc3\x81"	Aacute
 +<Multi_key> <A> <asciicircum>		: "\xc3\x82"	Acircumflex
-+<Multi_key> <asciicircum> <A>		: "\xc3\x82"	Acircumflex
 +<Multi_key> <A> <greater>		: "\xc3\x82"	Acircumflex
 +<Multi_key> <greater> <A>		: "\xc3\x82"	Acircumflex
 +<Multi_key> <A> <asciitilde>		: "\xc3\x83"	Atilde
-+<Multi_key> <asciitilde> <A>		: "\xc3\x83"	Atilde
 +<Multi_key> <A> <quotedbl>		: "\xc3\x84"	Adiaeresis
-+<Multi_key> <quotedbl> <A>		: "\xc3\x84"	Adiaeresis
 +<Multi_key> <A> <asterisk>		: "\xc3\x85"	Aring
 +<Multi_key> <asterisk> <A>		: "\xc3\x85"	Aring
 +<Multi_key> <a> <grave>			: "\xc3\xa0"	agrave
-+<Multi_key> <grave> <a>			: "\xc3\xa0"	agrave
 +<Multi_key> <a> <acute>			: "\xc3\xa1"	aacute
-+<Multi_key> <acute> <a>			: "\xc3\xa1"	aacute
 +<Multi_key> <a> <apostrophe>		: "\xc3\xa1"	aacute
-+<Multi_key> <apostrophe> <a>		: "\xc3\xa1"	aacute
 +<Multi_key> <a> <asciicircum>		: "\xc3\xa2"	acircumflex
-+<Multi_key> <asciicircum> <a>		: "\xc3\xa2"	acircumflex
 +<Multi_key> <a> <greater>		: "\xc3\xa2"	acircumflex
 +<Multi_key> <greater> <a>		: "\xc3\xa2"	acircumflex
 +<Multi_key> <a> <asciitilde>		: "\xc3\xa3"	atilde
-+<Multi_key> <asciitilde> <a>		: "\xc3\xa3"	atilde
 +<Multi_key> <a> <quotedbl>		: "\xc3\xa4"	adiaeresis
-+<Multi_key> <quotedbl> <a>		: "\xc3\xa4"	adiaeresis
 +<Multi_key> <a> <asterisk>		: "\xc3\xa5"	aring
 +<Multi_key> <asterisk> <a>		: "\xc3\xa5"	aring
 +<Multi_key> <C> <comma>			: "\xc3\x87"	Ccedilla
-+<Multi_key> <comma> <C>			: "\xc3\x87"	Ccedilla
 +<Multi_key> <c> <comma>			: "\xc3\xa7"	ccedilla
-+<Multi_key> <comma> <c>			: "\xc3\xa7"	ccedilla
-+XCOMM<Multi_key> <minus> <D>		: "\xc3\x90"	ETH
-+XCOMM<Multi_key> <minus> <d>		: "\xc3\xb0"	eth
 +<Multi_key> <D> <minus>			: "\xc3\x90"	ETH
-+<Multi_key> <d> <minus>			: "\xc3\xb0"	eth
-+<Multi_key> <slash> <D>			: "\xc4\x90"	Dstroke
-+<Multi_key> <slash> <d>			: "\xc4\x91"	dstroke
++XCOMM <Multi_key> <d> <minus>			: "\xc3\xb0"	eth
 +<Multi_key> <E> <grave>			: "\xc3\x88"	Egrave
-+<Multi_key> <grave> <E>			: "\xc3\x88"	Egrave
 +<Multi_key> <E> <acute>			: "\xc3\x89"	Eacute
-+<Multi_key> <acute> <E>			: "\xc3\x89"	Eacute
 +<Multi_key> <E> <apostrophe>		: "\xc3\x89"	Eacute
-+<Multi_key> <apostrophe> <E>		: "\xc3\x89"	Eacute
 +<Multi_key> <E> <asciicircum>		: "\xc3\x8a"	Ecircumflex
-+<Multi_key> <asciicircum> <E>		: "\xc3\x8a"	Ecircumflex
 +<Multi_key> <E> <greater>		: "\xc3\x8a"	Ecircumflex
 +<Multi_key> <greater> <E>		: "\xc3\x8a"	Ecircumflex
 +<Multi_key> <E> <quotedbl>		: "\xc3\x8b"	Ediaeresis
-+<Multi_key> <quotedbl> <E>		: "\xc3\x8b"	Ediaeresis
 +<Multi_key> <e> <grave>			: "\xc3\xa8"	egrave
-+<Multi_key> <grave> <e>			: "\xc3\xa8"	egrave
 +<Multi_key> <e> <acute>			: "\xc3\xa9"	eacute
-+<Multi_key> <acute> <e>			: "\xc3\xa9"	eacute
 +<Multi_key> <e> <apostrophe>		: "\xc3\xa9"	eacute
-+<Multi_key> <apostrophe> <e>		: "\xc3\xa9"	eacute
 +<Multi_key> <e> <asciicircum>		: "\xc3\xaa"	ecircumflex
-+<Multi_key> <asciicircum> <e>		: "\xc3\xaa"	ecircumflex
 +<Multi_key> <e> <greater>		: "\xc3\xaa"	ecircumflex
 +<Multi_key> <greater> <e>		: "\xc3\xaa"	ecircumflex
 +<Multi_key> <e> <quotedbl>		: "\xc3\xab"	ediaeresis
-+<Multi_key> <quotedbl> <e>		: "\xc3\xab"	ediaeresis
 +<Multi_key> <I> <grave>			: "\xc3\x8c"	Igrave
-+<Multi_key> <grave> <I>			: "\xc3\x8c"	Igrave
 +<Multi_key> <I> <acute>			: "\xc3\x8d"	Iacute
-+<Multi_key> <acute> <I>			: "\xc3\x8d"	Iacute
 +<Multi_key> <I> <apostrophe>		: "\xc3\x8d"	Iacute
-+<Multi_key> <apostrophe> <I>		: "\xc3\x8d"	Iacute
 +<Multi_key> <I> <asciicircum>		: "\xc3\x8e"	Icircumflex
-+<Multi_key> <asciicircum> <I>		: "\xc3\x8e"	Icircumflex
 +<Multi_key> <I> <greater>		: "\xc3\x8e"	Icircumflex
 +<Multi_key> <greater> <I>		: "\xc3\x8e"	Icircumflex
 +<Multi_key> <I> <quotedbl>		: "\xc3\x8f"	Idiaeresis
-+<Multi_key> <quotedbl> <I>		: "\xc3\x8f"	Idiaeresis
 +<Multi_key> <i> <grave>			: "\xc3\xac"	igrave
-+<Multi_key> <grave> <i>			: "\xc3\xac"	igrave
 +<Multi_key> <i> <acute>			: "\xc3\xad"	iacute
-+<Multi_key> <acute> <i>			: "\xc3\xad"	iacute
 +<Multi_key> <i> <apostrophe>		: "\xc3\xad"	iacute
-+<Multi_key> <apostrophe> <i>		: "\xc3\xad"	iacute
 +<Multi_key> <i> <asciicircum>		: "\xc3\xae"	icircumflex
-+<Multi_key> <asciicircum> <i>		: "\xc3\xae"	icircumflex
 +<Multi_key> <i> <greater>		: "\xc3\xae"	icircumflex
 +<Multi_key> <greater> <i>		: "\xc3\xae"	icircumflex
 +<Multi_key> <i> <quotedbl>		: "\xc3\xaf"	idiaeresis
-+<Multi_key> <quotedbl> <i>		: "\xc3\xaf"	idiaeresis
 +<Multi_key> <N> <asciitilde>		: "\xc3\x91"	Ntilde
-+<Multi_key> <asciitilde> <N>		: "\xc3\x91"	Ntilde
 +<Multi_key> <N> <minus>			: "\xc3\x91"	Ntilde
 +<Multi_key> <minus> <N>			: "\xc3\x91"	Ntilde
 +<Multi_key> <n> <asciitilde>		: "\xc3\xb1"	ntilde
-+<Multi_key> <asciitilde> <n>		: "\xc3\xb1"	ntilde
 +<Multi_key> <n> <minus>			: "\xc3\xb1"	ntilde
 +<Multi_key> <minus> <n>			: "\xc3\xb1"	ntilde
 +<Multi_key> <O> <grave>			: "\xc3\x92"	Ograve
-+<Multi_key> <grave> <O>			: "\xc3\x92"	Ograve
 +<Multi_key> <O> <acute>			: "\xc3\x93"	Oacute
-+<Multi_key> <acute> <O>			: "\xc3\x93"	Oacute
 +<Multi_key> <O> <apostrophe>		: "\xc3\x93"	Oacute
-+<Multi_key> <apostrophe> <O>		: "\xc3\x93"	Oacute
 +<Multi_key> <O> <asciicircum>		: "\xc3\x94"	Ocircumflex
-+<Multi_key> <asciicircum> <O>		: "\xc3\x94"	Ocircumflex
 +<Multi_key> <O> <greater>		: "\xc3\x94"	Ocircumflex
 +<Multi_key> <greater> <O>		: "\xc3\x94"	Ocircumflex
 +<Multi_key> <O> <asciitilde>		: "\xc3\x95"	Otilde
-+<Multi_key> <asciitilde> <O>		: "\xc3\x95"	Otilde
 +<Multi_key> <O> <quotedbl>		: "\xc3\x96"	Odiaeresis
-+<Multi_key> <quotedbl> <O>		: "\xc3\x96"	Odiaeresis
 +<Multi_key> <O> <slash>			: "\xc3\x98"	Ooblique
-+<Multi_key> <slash> <O>			: "\xc3\x98"	Ooblique
 +<Multi_key> <o> <grave>			: "\xc3\xb2"	ograve
-+<Multi_key> <grave> <o>			: "\xc3\xb2"	ograve
 +<Multi_key> <o> <acute>			: "\xc3\xb3"	oacute
-+<Multi_key> <acute> <o>			: "\xc3\xb3"	oacute
-+<Multi_key> <o> <apostrophe>		: "\xc3\xb3"	oacute
-+<Multi_key> <apostrophe> <o>		: "\xc3\xb3"	oacute
 +<Multi_key> <o> <asciicircum>		: "\xc3\xb4"	ocircumflex
-+<Multi_key> <asciicircum> <o>		: "\xc3\xb4"	ocircumflex
 +<Multi_key> <o> <greater>		: "\xc3\xb4"	ocircumflex
 +<Multi_key> <greater> <o>		: "\xc3\xb4"	ocircumflex
 +<Multi_key> <o> <asciitilde>		: "\xc3\xb5"	otilde
-+<Multi_key> <asciitilde> <o>		: "\xc3\xb5"	otilde
 +<Multi_key> <o> <quotedbl>		: "\xc3\xb6"	odiaeresis
-+<Multi_key> <quotedbl> <o>		: "\xc3\xb6"	odiaeresis
 +<Multi_key> <o> <slash>			: "\xc3\xb8"	oslash
-+<Multi_key> <slash> <o>			: "\xc3\xb8"	oslash
 +<Multi_key> <U> <grave>			: "\xc3\x99"	Ugrave
-+<Multi_key> <grave> <U>			: "\xc3\x99"	Ugrave
 +<Multi_key> <U> <acute>			: "\xc3\x9a"	Uacute
-+<Multi_key> <acute> <U>			: "\xc3\x9a"	Uacute
 +<Multi_key> <U> <apostrophe>		: "\xc3\x9a"	Uacute
-+<Multi_key> <apostrophe> <U>		: "\xc3\x9a"	Uacute
 +<Multi_key> <U> <asciicircum>		: "\xc3\x9b"	Ucircumflex
-+<Multi_key> <asciicircum> <U>		: "\xc3\x9b"	Ucircumflex
 +<Multi_key> <U> <greater>		: "\xc3\x9b"	Ucircumflex
 +<Multi_key> <greater> <U>		: "\xc3\x9b"	Ucircumflex
 +<Multi_key> <U> <quotedbl>		: "\xc3\x9c"	Udiaeresis
-+<Multi_key> <quotedbl> <U>		: "\xc3\x9c"	Udiaeresis
 +<Multi_key> <u> <grave>			: "\xc3\xb9"	ugrave
-+<Multi_key> <grave> <u>			: "\xc3\xb9"	ugrave
 +<Multi_key> <u> <acute>			: "\xc3\xba"	uacute
-+<Multi_key> <acute> <u>			: "\xc3\xba"	uacute
 +<Multi_key> <u> <apostrophe>		: "\xc3\xba"	uacute
-+<Multi_key> <apostrophe> <u>		: "\xc3\xba"	uacute
 +<Multi_key> <u> <asciicircum>		: "\xc3\xbb"	ucircumflex
-+<Multi_key> <asciicircum> <u>		: "\xc3\xbb"	ucircumflex
 +<Multi_key> <u> <greater>		: "\xc3\xbb"	ucircumflex
 +<Multi_key> <greater> <u>		: "\xc3\xbb"	ucircumflex
 +<Multi_key> <u> <quotedbl>		: "\xc3\xbc"	udiaeresis
-+<Multi_key> <quotedbl> <u>		: "\xc3\xbc"	udiaeresis
-+<Multi_key> <T> <H>			: "\xc3\x9e"	THORN
-+<Multi_key> <t> <h>			: "\xc3\xbe"	thorn
-+<Multi_key> <Y> <acute>			: "\xc3\x9d"	Yacute
-+<Multi_key> <acute> <Y>			: "\xc3\x9d"	Yacute
 +<Multi_key> <Y> <apostrophe>		: "\xc3\x9d"	Yacute
-+<Multi_key> <apostrophe> <Y>		: "\xc3\x9d"	Yacute
 +<Multi_key> <y> <acute>			: "\xc3\xbd"	yacute
-+<Multi_key> <acute> <y>			: "\xc3\xbd"	yacute
 +<Multi_key> <y> <apostrophe>		: "\xc3\xbd"	yacute
-+<Multi_key> <apostrophe> <y>		: "\xc3\xbd"	yacute
 +<Multi_key> <y> <quotedbl>		: "\xc3\xbf"	ydiaeresis
-+<Multi_key> <quotedbl> <y>		: "\xc3\xbf"	ydiaeresis
 +
 +<ecaron>	: "\xc4\x9b"	ecaron
 +<scaron>	: "\xc5\xa1"	scaron
@@ -528,71 +352,13 @@
 +<Udoubleacute>	: "\xc5\xb0"	Udoubleacute
 +<Iacute>	: "\xc3\x8d"	Iacute
 +<dead_circumflex> <slash>	: "\x7c"	bar
-+<dead_diaeresis> <space>	: "\xc2\xa8"	diaeresis
-+<dead_circumflex> <0>		: "\xc2\xb0"	degree
-+<dead_circumflex> <1>		: "\xc2\xb9"	onesuperior
-+<dead_circumflex> <2>		: "\xc2\xb2"	twosuperior
-+<dead_circumflex> <3>		: "\xc2\xb3"	threesuperior
 +<dead_circumflex> <period>	: "\xc2\xb7"	periodcentered
 +<dead_circumflex> <exclam>	: "\xc2\xa6"	brokenbar
 +<dead_cedilla> <minus>		: "\xc2\xac"	notsign
-+<dead_circumflex> <minus>	: "\xc2\xaf"	macron
 +<dead_circumflex> <underscore>	: "\xc2\xaf"	macron
 +<dead_acute> <apostrophe>	: "\xc2\xb4"	acute
 +<dead_cedilla> <comma>		: "\xc2\xb8"	cedilla
 +<dead_diaeresis> <quotedbl>	: "\xc2\xa8"	diaeresis
-+<dead_grave> <A>		: "\xc3\x80"	Agrave
-+<dead_acute> <A>		: "\xc3\x81"	Aacute
-+<dead_circumflex> <A>		: "\xc3\x82"	Acircumflex
-+<dead_tilde> <A>		: "\xc3\x83"	Atilde
-+<dead_diaeresis> <A>		: "\xc3\x84"	Adiaeresis
-+<dead_grave> <a>		: "\xc3\xa0"	agrave
-+<dead_acute> <a>		: "\xc3\xa1"	aacute
-+<dead_circumflex> <a>		: "\xc3\xa2"	acircumflex
-+<dead_tilde> <a>		: "\xc3\xa3"	atilde
-+<dead_diaeresis> <a>		: "\xc3\xa4"	adiaeresis
-+<dead_cedilla> <C>		: "\xc3\x87"	Ccedilla
-+<dead_cedilla> <c>		: "\xc3\xa7"	ccedilla
-+<dead_grave> <E>		: "\xc3\x88"	Egrave
-+<dead_acute> <E>		: "\xc3\x89"	Eacute
-+<dead_circumflex> <E>		: "\xc3\x8a"	Ecircumflex
-+<dead_diaeresis> <E>		: "\xc3\x8b"	Ediaeresis
-+<dead_grave> <e>		: "\xc3\xa8"	egrave
-+<dead_acute> <e>		: "\xc3\xa9"	eacute
-+<dead_circumflex> <e>		: "\xc3\xaa"	ecircumflex
-+<dead_diaeresis> <e>		: "\xc3\xab"	ediaeresis
-+<dead_grave> <I>		: "\xc3\x8c"	Igrave
-+<dead_acute> <I>		: "\xc3\x8d"	Iacute
-+<dead_circumflex> <I>		: "\xc3\x8e"	Icircumflex
-+<dead_diaeresis> <I>		: "\xc3\x8f"	Idiaeresis
-+<dead_grave> <i>		: "\xc3\xac"	igrave
-+<dead_acute> <i>		: "\xc3\xad"	iacute
-+<dead_circumflex> <i>		: "\xc3\xae"	icircumflex
-+<dead_diaeresis> <i>		: "\xc3\xaf"	idiaeresis
-+<dead_tilde> <N>		: "\xc3\x91"	Ntilde
-+<dead_tilde> <n>		: "\xc3\xb1"	ntilde
-+<dead_grave> <O>		: "\xc3\x92"	Ograve
-+<dead_acute> <O>		: "\xc3\x93"	Oacute
-+<dead_circumflex> <O>		: "\xc3\x94"	Ocircumflex
-+<dead_tilde> <O>		: "\xc3\x95"	Otilde
-+<dead_diaeresis> <O>		: "\xc3\x96"	Odiaeresis
-+<dead_grave> <o>		: "\xc3\xb2"	ograve
-+<dead_acute> <o>		: "\xc3\xb3"	oacute
-+<dead_circumflex> <o>		: "\xc3\xb4"	ocircumflex
-+<dead_tilde> <o>		: "\xc3\xb5"	otilde
-+<dead_diaeresis> <o>		: "\xc3\xb6"	odiaeresis
-+<dead_cedilla> <S>		: "\xc5\x9e"	Scedilla
-+<dead_cedilla> <s>		: "\xc5\x9f"	scedilla
-+<dead_grave> <U>		: "\xc3\x99"	Ugrave
-+<dead_acute> <U>		: "\xc3\x9a"	Uacute
-+<dead_circumflex> <U>		: "\xc3\x9b"	Ucircumflex
-+<dead_diaeresis> <U>		: "\xc3\x9c"	Udiaeresis
-+<dead_grave> <u>		: "\xc3\xb9"	ugrave
-+<dead_acute> <u>		: "\xc3\xba"	uacute
-+<dead_circumflex> <u>		: "\xc3\xbb"	ucircumflex
-+<dead_diaeresis> <u>		: "\xc3\xbc"	udiaeresis
-+<dead_acute> <Y>		: "\xc3\x9d"	Yacute
-+<dead_acute> <y>		: "\xc3\xbd"	yacute
 +<Multi_key> <caron> <Z>		: "\xc5\xbd"	Zcaron
 +<Multi_key> <Z> <caron> 	: "\xc5\xbd"	Zcaron
 +<Multi_key> <v> <Z>		: "\xc5\xbd"	Zcaron
@@ -602,7 +368,6 @@
 +<Multi_key> <z> <caron> 	: "\xc5\xbe"	zcaron
 +<Multi_key> <z> <v>		: "\xc5\xbe"	zcaron
 +<Multi_key> <v> <z>		: "\xc5\xbe"	zcaron
-+<dead_diaeresis> <y>		: "\xc3\xbf"	ydiaeresis
 +Ctrl<T> <plus> <plus>		: "\x23"	numbersign
 +Ctrl<T> <apostrophe> <space>	: "\x27"	apostrophe
 +Ctrl<T> <space> <apostrophe>	: "\x27"	apostrophe
@@ -635,8 +400,8 @@
 +Ctrl<T> <exclam> <exclam>	: "\xc2\xa1"	exclamdown
 +Ctrl<T> <c> <slash>		: "\xc2\xa2"	cent
 +Ctrl<T> <slash> <c>		: "\xc2\xa2"	cent
-+Ctrl<T> <C> <slash>		: "\xc2\xa2"	cent
-+Ctrl<T> <slash> <C>		: "\xc2\xa2"	cent
++Ctrl<T> <C> <slash>		: "\xc2\x82\xa1"	U20a1 # COLON SIGN
++Ctrl<T> <slash> <C>		: "\xc2\x82\xa1"	U20a1 # COLON SIGN
 +Ctrl<T> <C> <bar>		: "\xc2\xa2"	cent
 +Ctrl<T> <bar> <C>		: "\xc2\xa2"	cent
 +Ctrl<T> <c> <bar>		: "\xc2\xa2"	cent
@@ -741,7 +506,7 @@
 +Ctrl<T> <exclam> <P>		: "\xc2\xb6"	paragraph
 +Ctrl<T> <period> <asciicircum>	: "\xc2\xb7"	periodcentered
 +Ctrl<T> <asciicircum> <period>	: "\xc2\xb7"	periodcentered
-+Ctrl<T> <period> <period>	: "\xc2\xb7"	periodcentered
++Ctrl<T> <period> <minus>	: "\xc2\xb7"	periodcentered
 +Ctrl<T> <1> <4>			: "\xc2\xbc"	onequarter
 +Ctrl<T> <1> <2>			: "\xc2\xbd"	onehalf
 +Ctrl<T> <3> <4>			: "\xc2\xbe"	threequarters
@@ -756,7 +521,6 @@
 +Ctrl<T> <b> <v>			: "\xc2\xa6"	brokenbar
 +Ctrl<T> <minus> <comma>		: "\xc2\xac"	notsign
 +Ctrl<T> <comma> <minus>		: "\xc2\xac"	notsign
-+Ctrl<T> <minus> <minus>		: "\xc2\xad"	hyphen
 +Ctrl<T> <R> <O>			: "\xc2\xae"	registered
 +Ctrl<T> <O> <R>			: "\xc2\xae"	registered
 +Ctrl<T> <minus> <asciicircum>	: "\xc2\xaf"	macron
@@ -951,22 +715,6 @@
 +<Multi_key> <g> <u>		: "\xc4\x9f"	gbreve
 +<Multi_key> <u> <g>		: "\xc4\x9f"	gbreve
 +<Multi_key> <I> <period>	: "\xc4\xb0"	Iabovedot
-+<Multi_key> <period> <I>	: "\xc4\xb0"	Iabovedot
-+<Multi_key> <i> <period>	: "\xc4\xb1"	idotless
-+<Multi_key> <period> <i>	: "\xc4\xb1"	idotless
-+XCOMM slovak
-+<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
-+<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
-+<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
-+<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
 +XCOMM polish
 +<Multi_key> <space> <breve>	: "\xcb\x98"	breve
 +<Multi_key> <space> <degree>	: "\xc2\xb0"	degree
@@ -990,28 +738,17 @@
 +<Multi_key> <o> <diaeresis> 	: "\xc3\xb6"	odiaeresis
 +<Multi_key> <diaeresis> <u>	: "\xc3\xbc"	udiaeresis
 +<Multi_key> <u> <diaeresis> 	: "\xc3\xbc"	udiaeresis
-+<Multi_key> <acute> <R>		: "\xc5\x94"	Racute
 +<Multi_key> <R> <acute> 	: "\xc5\x94"	Racute
-+<Multi_key> <acute> <S>		: "\xc5\x9a"	Sacute
 +<Multi_key> <S> <acute> 	: "\xc5\x9a"	Sacute
-+<Multi_key> <acute> <Z>		: "\xc4\xbe"	Zacute
 +<Multi_key> <Z> <acute> 	: "\xc4\xbe"	Zacute
-+<Multi_key> <acute> <n>		: "\xc5\x84"	nacute
 +<Multi_key> <n> <acute> 	: "\xc5\x84"	nacute
-+<Multi_key> <acute> <r>		: "\xc5\x95"	racute
 +<Multi_key> <r> <acute> 	: "\xc5\x95"	racute
-+<Multi_key> <acute> <s>		: "\xc5\x9b"	sacute
 +<Multi_key> <s> <acute> 	: "\xc5\x9b"	sacute
-+<Multi_key> <acute> <z>		: "\xc5\xba"	zacute
 +<Multi_key> <z> <acute> 	: "\xc5\xba"	zacute
 +<Multi_key> <0> <O>		: "\xc2\xb0"	degree
-+<Multi_key> <comma> <S>		: "\xc5\x9e"	Scedilla
 +<Multi_key> <S> <comma> 	: "\xc5\x9e"	Scedilla
-+<Multi_key> <comma> <T>		: "\xc5\xa2"	Tcedilla
 +<Multi_key> <T> <comma> 	: "\xc5\xa2"	Tcedilla
-+<Multi_key> <comma> <s>		: "\xc5\x9f"	scedilla
 +<Multi_key> <s> <comma> 	: "\xc5\x9f"	scedilla
-+<Multi_key> <comma> <t>		: "\xc5\xa3"	tcedilla
 +<Multi_key> <t> <comma> 	: "\xc5\xa3"	tcedilla
 +<Multi_key> <caron> <C>		: "\xc4\x8c"	Ccaron
 +<Multi_key> <C> <caron> 	: "\xc4\x8c"	Ccaron
@@ -1103,9 +840,7 @@
 +<Multi_key> <U> <period> 	: "\xc5\xae"	Uring
 +<Multi_key> <period> <u>	: "\xc5\xaf"	uring
 +<Multi_key> <u> <period> 	: "\xc5\xaf"	uring
-+<Multi_key> <period> <z>	: "\xc5\xbc"	zabovedot
 +<Multi_key> <z> <period> 	: "\xc5\xbc"	zabovedot
-+<Multi_key> <period> <Z>	: "\xc5\xbb"	Zabovedot
 +<Multi_key> <Z> <period> 	: "\xc5\xbb"	Zabovedot
 +<acute> <A>		: "\xc3\x81"	Aacute
 +<acute> <C>		: "\xc4\x86"	Cacute
@@ -1139,4539 +874,7 @@
 +<diaeresis> <e>		: "\xc3\xab"	ediaeresis
 +<diaeresis> <o>		: "\xc3\xb6"	odiaeresis
 +<diaeresis> <u>		: "\xc3\xbc"	udiaeresis
- 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
-- */
--<Multi_key> <U1100> <U1100> 	: "ᄁ"   U1101 # HANGUL CHOSEONG SSANGKIYEOK
--<Multi_key> <U1103> <U1103> 	: "ᄄ"   U1104 # HANGUL CHOSEONG SSANGTIKEUT
--<Multi_key> <U1107> <U1107> 	: "ᄈ"   U1108 # HANGUL CHOSEONG SSANGPIEUP
--<Multi_key> <U1109> <U1109> 	: "ᄊ"   U110a # HANGUL CHOSEONG SSANGSIOS
--<Multi_key> <U110C> <U110C> 	: "ᄍ"   U110d # HANGUL CHOSEONG SSANGCIEUC
--<Multi_key> <U1102> <U1100> 	: "ᄓ"   U1113 # HANGUL CHOSEONG NIEUN-KIYEOK
--<Multi_key> <U1102> <U1102> 	: "ᄔ"   U1114 # HANGUL CHOSEONG SSANGNIEUN
--<Multi_key> <U1102> <U1103> 	: "ᄕ"   U1115 # HANGUL CHOSEONG NIEUN-TIKEUT
--<Multi_key> <U1102> <U1107> 	: "ᄖ"   U1116 # HANGUL CHOSEONG NIEUN-PIEUP
--<Multi_key> <U1103> <U1100> 	: "ᄗ"   U1117 # HANGUL CHOSEONG TIKEUT-KIYEOK
--<Multi_key> <U1105> <U1102> 	: "ᄘ"   U1118 # HANGUL CHOSEONG RIEUL-NIEUN
--<Multi_key> <U1105> <U1105> 	: "ᄙ"   U1119 # HANGUL CHOSEONG SSANGRIEUL
--<Multi_key> <U1105> <U1112> 	: "ᄚ"   U111a # HANGUL CHOSEONG RIEUL-HIEUH
--<Multi_key> <U1105> <U110B> 	: "ᄛ"   U111b # HANGUL CHOSEONG KAPYEOUNRIEUL
--<Multi_key> <U1106> <U1107> 	: "ᄜ"   U111c # HANGUL CHOSEONG MIEUM-PIEUP
--<Multi_key> <U1106> <U110B> 	: "ᄝ"   U111d # HANGUL CHOSEONG KAPYEOUNMIEUM
--<Multi_key> <U1107> <U1100> 	: "ᄞ"   U111e # HANGUL CHOSEONG PIEUP-KIYEOK
--<Multi_key> <U1107> <U1102> 	: "ᄟ"   U111f # HANGUL CHOSEONG PIEUP-NIEUN
--<Multi_key> <U1107> <U1103> 	: "ᄠ"   U1120 # HANGUL CHOSEONG PIEUP-TIKEUT
--<Multi_key> <U1107> <U1109> 	: "ᄡ"   U1121 # HANGUL CHOSEONG PIEUP-SIOS
--<Multi_key> <U1107> <U110C> 	: "ᄧ"   U1127 # HANGUL CHOSEONG PIEUP-CIEUC
--<Multi_key> <U1107> <U110E> 	: "ᄨ"   U1128 # HANGUL CHOSEONG PIEUP-CHIEUCH
--<Multi_key> <U1107> <U1110> 	: "ᄩ"   U1129 # HANGUL CHOSEONG PIEUP-THIEUTH
--<Multi_key> <U1107> <U1111> 	: "ᄪ"   U112a # HANGUL CHOSEONG PIEUP-PHIEUPH
--<Multi_key> <U1107> <U110B> 	: "ᄫ"   U112b # HANGUL CHOSEONG KAPYEOUNPIEUP
--<Multi_key> <U1109> <U1100> 	: "ᄭ"   U112d # HANGUL CHOSEONG SIOS-KIYEOK
--<Multi_key> <U1109> <U1102> 	: "ᄮ"   U112e # HANGUL CHOSEONG SIOS-NIEUN
--<Multi_key> <U1109> <U1103> 	: "ᄯ"   U112f # HANGUL CHOSEONG SIOS-TIKEUT
--<Multi_key> <U1109> <U1105> 	: "ᄰ"   U1130 # HANGUL CHOSEONG SIOS-RIEUL
--<Multi_key> <U1109> <U1106> 	: "ᄱ"   U1131 # HANGUL CHOSEONG SIOS-MIEUM
--<Multi_key> <U1109> <U1107> 	: "ᄲ"   U1132 # HANGUL CHOSEONG SIOS-PIEUP
--<Multi_key> <U1109> <U110B> 	: "ᄵ"   U1135 # HANGUL CHOSEONG SIOS-IEUNG
--<Multi_key> <U1109> <U110C> 	: "ᄶ"   U1136 # HANGUL CHOSEONG SIOS-CIEUC
--<Multi_key> <U1109> <U110E> 	: "ᄷ"   U1137 # HANGUL CHOSEONG SIOS-CHIEUCH
--<Multi_key> <U1109> <U110F> 	: "ᄸ"   U1138 # HANGUL CHOSEONG SIOS-KHIEUKH
--<Multi_key> <U1109> <U1110> 	: "ᄹ"   U1139 # HANGUL CHOSEONG SIOS-THIEUTH
--<Multi_key> <U1109> <U1111> 	: "ᄺ"   U113a # HANGUL CHOSEONG SIOS-PHIEUPH
--<Multi_key> <U1109> <U1112> 	: "ᄻ"   U113b # HANGUL CHOSEONG SIOS-HIEUH
--<Multi_key> <U113C> <U113C> 	: "ᄽ"   U113d # HANGUL CHOSEONG CHITUEUMSSANGSIOS
--<Multi_key> <U113E> <U113E> 	: "ᄿ"   U113f # HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS
--<Multi_key> <U110B> <U1100> 	: "ᅁ"   U1141 # HANGUL CHOSEONG IEUNG-KIYEOK
--<Multi_key> <U110B> <U1103> 	: "ᅂ"   U1142 # HANGUL CHOSEONG IEUNG-TIKEUT
--<Multi_key> <U110B> <U1106> 	: "ᅃ"   U1143 # HANGUL CHOSEONG IEUNG-MIEUM
--<Multi_key> <U110B> <U1107> 	: "ᅄ"   U1144 # HANGUL CHOSEONG IEUNG-PIEUP
--<Multi_key> <U110B> <U1109> 	: "ᅅ"   U1145 # HANGUL CHOSEONG IEUNG-SIOS
--<Multi_key> <U110B> <U1140> 	: "ᅆ"   U1146 # HANGUL CHOSEONG IEUNG-PANSIOS
--<Multi_key> <U110B> <U110B> 	: "ᅇ"   U1147 # HANGUL CHOSEONG SSANGIEUNG
--<Multi_key> <U110B> <U110C> 	: "ᅈ"   U1148 # HANGUL CHOSEONG IEUNG-CIEUC
--<Multi_key> <U110B> <U110E> 	: "ᅉ"   U1149 # HANGUL CHOSEONG IEUNG-CHIEUCH
--<Multi_key> <U110B> <U1110> 	: "ᅊ"   U114a # HANGUL CHOSEONG IEUNG-THIEUTH
--<Multi_key> <U110B> <U1111> 	: "ᅋ"   U114b # HANGUL CHOSEONG IEUNG-PHIEUPH
--<Multi_key> <U110C> <U110B> 	: "ᅍ"   U114d # HANGUL CHOSEONG CIEUC-IEUNG
--<Multi_key> <U114E> <U114E> 	: "ᅏ"   U114f # HANGUL CHOSEONG CHITUEUMSSANGCIEUC
--<Multi_key> <U1150> <U1150> 	: "ᅑ"   U1151 # HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC
--<Multi_key> <U110E> <U110F> 	: "ᅒ"   U1152 # HANGUL CHOSEONG CHIEUCH-KHIEUKH
--<Multi_key> <U110E> <U1112> 	: "ᅓ"   U1153 # HANGUL CHOSEONG CHIEUCH-HIEUH
--<Multi_key> <U1111> <U1107> 	: "ᅖ"   U1156 # HANGUL CHOSEONG PHIEUPH-PIEUP
--<Multi_key> <U1111> <U110B> 	: "ᅗ"   U1157 # HANGUL CHOSEONG KAPYEOUNPHIEUPH
--<Multi_key> <U1112> <U1112> 	: "ᅘ"   U1158 # HANGUL CHOSEONG SSANGHIEUH
--<Multi_key> <U1161> <U1175> 	: "ᅢ"   U1162 # HANGUL JUNGSEONG AE
--<Multi_key> <U1163> <U1175> 	: "ᅤ"   U1164 # HANGUL JUNGSEONG YAE
--<Multi_key> <U1165> <U1175> 	: "ᅦ"   U1166 # HANGUL JUNGSEONG E
--<Multi_key> <U1167> <U1175> 	: "ᅨ"   U1168 # HANGUL JUNGSEONG YE
--<Multi_key> <U1169> <U1161> 	: "ᅪ"   U116a # HANGUL JUNGSEONG WA
--<Multi_key> <U1169> <U1175> 	: "ᅬ"   U116c # HANGUL JUNGSEONG OE
--<Multi_key> <U116E> <U1165> 	: "ᅯ"   U116f # HANGUL JUNGSEONG WEO
--<Multi_key> <U116E> <U1175> 	: "ᅱ"   U1171 # HANGUL JUNGSEONG WI
--<Multi_key> <U1173> <U1175> 	: "ᅴ"   U1174 # HANGUL JUNGSEONG YI
--<Multi_key> <U1161> <U1169> 	: "ᅶ"   U1176 # HANGUL JUNGSEONG A-O
--<Multi_key> <U1161> <U116E> 	: "ᅷ"   U1177 # HANGUL JUNGSEONG A-U
--<Multi_key> <U1163> <U1169> 	: "ᅸ"   U1178 # HANGUL JUNGSEONG YA-O
--<Multi_key> <U1163> <U116D> 	: "ᅹ"   U1179 # HANGUL JUNGSEONG YA-YO
--<Multi_key> <U1165> <U1169> 	: "ᅺ"   U117a # HANGUL JUNGSEONG EO-O
--<Multi_key> <U1165> <U116E> 	: "ᅻ"   U117b # HANGUL JUNGSEONG EO-U
--<Multi_key> <U1165> <U1173> 	: "ᅼ"   U117c # HANGUL JUNGSEONG EO-EU
--<Multi_key> <U1167> <U1169> 	: "ᅽ"   U117d # HANGUL JUNGSEONG YEO-O
--<Multi_key> <U1167> <U116E> 	: "ᅾ"   U117e # HANGUL JUNGSEONG YEO-U
--<Multi_key> <U1169> <U1165> 	: "ᅿ"   U117f # HANGUL JUNGSEONG O-EO
--<Multi_key> <U1169> <U1166> 	: "ᆀ"   U1180 # HANGUL JUNGSEONG O-E
--<Multi_key> <U1169> <U1168> 	: "ᆁ"   U1181 # HANGUL JUNGSEONG O-YE
--<Multi_key> <U1169> <U1169> 	: "ᆂ"   U1182 # HANGUL JUNGSEONG O-O
--<Multi_key> <U1169> <U116E> 	: "ᆃ"   U1183 # HANGUL JUNGSEONG O-U
--<Multi_key> <U116D> <U1163> 	: "ᆄ"   U1184 # HANGUL JUNGSEONG YO-YA
--<Multi_key> <U116D> <U1164> 	: "ᆅ"   U1185 # HANGUL JUNGSEONG YO-YAE
--<Multi_key> <U116D> <U1167> 	: "ᆆ"   U1186 # HANGUL JUNGSEONG YO-YEO
--<Multi_key> <U116D> <U1169> 	: "ᆇ"   U1187 # HANGUL JUNGSEONG YO-O
--<Multi_key> <U116D> <U1175> 	: "ᆈ"   U1188 # HANGUL JUNGSEONG YO-I
--<Multi_key> <U116E> <U1161> 	: "ᆉ"   U1189 # HANGUL JUNGSEONG U-A
--<Multi_key> <U116E> <U1162> 	: "ᆊ"   U118a # HANGUL JUNGSEONG U-AE
--<Multi_key> <U116E> <U1168> 	: "ᆌ"   U118c # HANGUL JUNGSEONG U-YE
--<Multi_key> <U116E> <U116E> 	: "ᆍ"   U118d # HANGUL JUNGSEONG U-U
--<Multi_key> <U1172> <U1161> 	: "ᆎ"   U118e # HANGUL JUNGSEONG YU-A
--<Multi_key> <U1172> <U1165> 	: "ᆏ"   U118f # HANGUL JUNGSEONG YU-EO
--<Multi_key> <U1172> <U1166> 	: "ᆐ"   U1190 # HANGUL JUNGSEONG YU-E
--<Multi_key> <U1172> <U1167> 	: "ᆑ"   U1191 # HANGUL JUNGSEONG YU-YEO
--<Multi_key> <U1172> <U1168> 	: "ᆒ"   U1192 # HANGUL JUNGSEONG YU-YE
--<Multi_key> <U1172> <U116E> 	: "ᆓ"   U1193 # HANGUL JUNGSEONG YU-U
--<Multi_key> <U1172> <U1175> 	: "ᆔ"   U1194 # HANGUL JUNGSEONG YU-I
--<Multi_key> <U1173> <U116E> 	: "ᆕ"   U1195 # HANGUL JUNGSEONG EU-U
--<Multi_key> <U1173> <U1173> 	: "ᆖ"   U1196 # HANGUL JUNGSEONG EU-EU
--<Multi_key> <U1174> <U116E> 	: "ᆗ"   U1197 # HANGUL JUNGSEONG YI-U
--<Multi_key> <U1175> <U1161> 	: "ᆘ"   U1198 # HANGUL JUNGSEONG I-A
--<Multi_key> <U1175> <U1163> 	: "ᆙ"   U1199 # HANGUL JUNGSEONG I-YA
--<Multi_key> <U1175> <U1169> 	: "ᆚ"   U119a # HANGUL JUNGSEONG I-O
--<Multi_key> <U1175> <U116E> 	: "ᆛ"   U119b # HANGUL JUNGSEONG I-U
--<Multi_key> <U1175> <U1173> 	: "ᆜ"   U119c # HANGUL JUNGSEONG I-EU
--<Multi_key> <U1175> <U119E> 	: "ᆝ"   U119d # HANGUL JUNGSEONG I-ARAEA
--<Multi_key> <U119E> <U1165> 	: "ᆟ"   U119f # HANGUL JUNGSEONG ARAEA-EO
--<Multi_key> <U119E> <U116E> 	: "ᆠ"   U11a0 # HANGUL JUNGSEONG ARAEA-U
--<Multi_key> <U119E> <U1175> 	: "ᆡ"   U11a1 # HANGUL JUNGSEONG ARAEA-I
--<Multi_key> <U119E> <U119E> 	: "ᆢ"   U11a2 # HANGUL JUNGSEONG SSANGARAEA
--<Multi_key> <U11A8> <U11A8> 	: "ᆩ"   U11a9 # HANGUL JONGSEONG SSANGKIYEOK
--<Multi_key> <U11A8> <U11BA> 	: "ᆪ"   U11aa # HANGUL JONGSEONG KIYEOK-SIOS
--<Multi_key> <U11AB> <U11BD> 	: "ᆬ"   U11ac # HANGUL JONGSEONG NIEUN-CIEUC
--<Multi_key> <U11AB> <U11C2> 	: "ᆭ"   U11ad # HANGUL JONGSEONG NIEUN-HIEUH
--<Multi_key> <U11AF> <U11A8> 	: "ᆰ"   U11b0 # HANGUL JONGSEONG RIEUL-KIYEOK
--<Multi_key> <U11AF> <U11B7> 	: "ᆱ"   U11b1 # HANGUL JONGSEONG RIEUL-MIEUM
--<Multi_key> <U11AF> <U11B8> 	: "ᆲ"   U11b2 # HANGUL JONGSEONG RIEUL-PIEUP
--<Multi_key> <U11AF> <U11BA> 	: "ᆳ"   U11b3 # HANGUL JONGSEONG RIEUL-SIOS
--<Multi_key> <U11AF> <U11C0> 	: "ᆴ"   U11b4 # HANGUL JONGSEONG RIEUL-THIEUTH
--<Multi_key> <U11AF> <U11C1> 	: "ᆵ"   U11b5 # HANGUL JONGSEONG RIEUL-PHIEUPH
--<Multi_key> <U11AF> <U11C2> 	: "ᆶ"   U11b6 # HANGUL JONGSEONG RIEUL-HIEUH
--<Multi_key> <U11B8> <U11BA> 	: "ᆹ"   U11b9 # HANGUL JONGSEONG PIEUP-SIOS
--<Multi_key> <U11BA> <U11BA> 	: "ᆻ"   U11bb # HANGUL JONGSEONG SSANGSIOS
--<Multi_key> <U11A8> <U11AF> 	: "ᇃ"   U11c3 # HANGUL JONGSEONG KIYEOK-RIEUL
--<Multi_key> <U11AB> <U11A8> 	: "ᇅ"   U11c5 # HANGUL JONGSEONG NIEUN-KIYEOK
--<Multi_key> <U11AB> <U11AE> 	: "ᇆ"   U11c6 # HANGUL JONGSEONG NIEUN-TIKEUT
--<Multi_key> <U11AB> <U11BA> 	: "ᇇ"   U11c7 # HANGUL JONGSEONG NIEUN-SIOS
--<Multi_key> <U11AB> <U11EB> 	: "ᇈ"   U11c8 # HANGUL JONGSEONG NIEUN-PANSIOS
--<Multi_key> <U11AB> <U11C0> 	: "ᇉ"   U11c9 # HANGUL JONGSEONG NIEUN-THIEUTH
--<Multi_key> <U11AE> <U11A8> 	: "ᇊ"   U11ca # HANGUL JONGSEONG TIKEUT-KIYEOK
--<Multi_key> <U11AE> <U11AF> 	: "ᇋ"   U11cb # HANGUL JONGSEONG TIKEUT-RIEUL
--<Multi_key> <U11AF> <U11AB> 	: "ᇍ"   U11cd # HANGUL JONGSEONG RIEUL-NIEUN
--<Multi_key> <U11AF> <U11AE> 	: "ᇎ"   U11ce # HANGUL JONGSEONG RIEUL-TIKEUT
--<Multi_key> <U11AF> <U11AF> 	: "ᇐ"   U11d0 # HANGUL JONGSEONG SSANGRIEUL
--<Multi_key> <U11AF> <U11EB> 	: "ᇗ"   U11d7 # HANGUL JONGSEONG RIEUL-PANSIOS
--<Multi_key> <U11AF> <U11BF> 	: "ᇘ"   U11d8 # HANGUL JONGSEONG RIEUL-KHIEUKH
--<Multi_key> <U11AF> <U11F9> 	: "ᇙ"   U11d9 # HANGUL JONGSEONG RIEUL-YEORINHIEUH
--<Multi_key> <U11B7> <U11A8> 	: "ᇚ"   U11da # HANGUL JONGSEONG MIEUM-KIYEOK
--<Multi_key> <U11B7> <U11AF> 	: "ᇛ"   U11db # HANGUL JONGSEONG MIEUM-RIEUL
--<Multi_key> <U11B7> <U11B8> 	: "ᇜ"   U11dc # HANGUL JONGSEONG MIEUM-PIEUP
--<Multi_key> <U11B7> <U11BA> 	: "ᇝ"   U11dd # HANGUL JONGSEONG MIEUM-SIOS
--<Multi_key> <U11B7> <U11EB> 	: "ᇟ"   U11df # HANGUL JONGSEONG MIEUM-PANSIOS
--<Multi_key> <U11B7> <U11BE> 	: "ᇠ"   U11e0 # HANGUL JONGSEONG MIEUM-CHIEUCH
--<Multi_key> <U11B7> <U11C2> 	: "ᇡ"   U11e1 # HANGUL JONGSEONG MIEUM-HIEUH
--<Multi_key> <U11B7> <U11BC> 	: "ᇢ"   U11e2 # HANGUL JONGSEONG KAPYEOUNMIEUM
--<Multi_key> <U11B8> <U11AF> 	: "ᇣ"   U11e3 # HANGUL JONGSEONG PIEUP-RIEUL
--<Multi_key> <U11B8> <U11C1> 	: "ᇤ"   U11e4 # HANGUL JONGSEONG PIEUP-PHIEUPH
--<Multi_key> <U11B8> <U11C2> 	: "ᇥ"   U11e5 # HANGUL JONGSEONG PIEUP-HIEUH
--<Multi_key> <U11B8> <U11BC> 	: "ᇦ"   U11e6 # HANGUL JONGSEONG KAPYEOUNPIEUP
--<Multi_key> <U11BA> <U11A8> 	: "ᇧ"   U11e7 # HANGUL JONGSEONG SIOS-KIYEOK
--<Multi_key> <U11BA> <U11AE> 	: "ᇨ"   U11e8 # HANGUL JONGSEONG SIOS-TIKEUT
--<Multi_key> <U11BA> <U11AF> 	: "ᇩ"   U11e9 # HANGUL JONGSEONG SIOS-RIEUL
--<Multi_key> <U11BA> <U11B8> 	: "ᇪ"   U11ea # HANGUL JONGSEONG SIOS-PIEUP
--<Multi_key> <U11BC> <U11A8> 	: "ᇬ"   U11ec # HANGUL JONGSEONG IEUNG-KIYEOK
--<Multi_key> <U11BC> <U11BC> 	: "ᇮ"   U11ee # HANGUL JONGSEONG SSANGIEUNG
--<Multi_key> <U11BC> <U11BF> 	: "ᇯ"   U11ef # HANGUL JONGSEONG IEUNG-KHIEUKH
--<Multi_key> <U11F0> <U11BA> 	: "ᇱ"   U11f1 # HANGUL JONGSEONG YESIEUNG-SIOS
--<Multi_key> <U11F0> <U11EB> 	: "ᇲ"   U11f2 # HANGUL JONGSEONG YESIEUNG-PANSIOS
--<Multi_key> <U11C1> <U11B8> 	: "ᇳ"   U11f3 # HANGUL JONGSEONG PHIEUPH-PIEUP
--<Multi_key> <U11C1> <U11BC> 	: "ᇴ"   U11f4 # HANGUL JONGSEONG KAPYEOUNPHIEUPH
--<Multi_key> <U11C2> <U11AB> 	: "ᇵ"   U11f5 # HANGUL JONGSEONG HIEUH-NIEUN
--<Multi_key> <U11C2> <U11AF> 	: "ᇶ"   U11f6 # HANGUL JONGSEONG HIEUH-RIEUL
--<Multi_key> <U11C2> <U11B7> 	: "ᇷ"   U11f7 # HANGUL JONGSEONG HIEUH-MIEUM
--<Multi_key> <U11C2> <U11B8> 	: "ᇸ"   U11f8 # HANGUL JONGSEONG HIEUH-PIEUP
--<Multi_key> <U1121> <U1100> 	: "ᄢ"   U1122 # HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
--<Multi_key> <U1121> <U1103> 	: "ᄣ"   U1123 # HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
--<Multi_key> <U1121> <U1107> 	: "ᄤ"   U1124 # HANGUL CHOSEONG PIEUP-SIOS-PIEUP
--<Multi_key> <U1121> <U1109> 	: "ᄥ"   U1125 # HANGUL CHOSEONG PIEUP-SSANGSIOS
--<Multi_key> <U1121> <U110C> 	: "ᄦ"   U1126 # HANGUL CHOSEONG PIEUP-SIOS-CIEUC
--<Multi_key> <U1108> <U110B> 	: "ᄬ"   U112c # HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
--<Multi_key> <U1132> <U1100> 	: "ᄳ"   U1133 # HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
--<Multi_key> <U110A> <U1109> 	: "ᄴ"   U1134 # HANGUL CHOSEONG SIOS-SSANGSIOS
--<Multi_key> <U116A> <U1175> 	: "ᅫ"   U116b # HANGUL JUNGSEONG WAE
--<Multi_key> <U116F> <U1175> 	: "ᅰ"   U1170 # HANGUL JUNGSEONG WE
--<Multi_key> <U116F> <U1173> 	: "ᆋ"   U118b # HANGUL JUNGSEONG U-EO-EU
--<Multi_key> <U11AA> <U11A8> 	: "ᇄ"   U11c4 # HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
--<Multi_key> <U11B0> <U11BA> 	: "ᇌ"   U11cc # HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
--<Multi_key> <U11CE> <U11C2> 	: "ᇏ"   U11cf # HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH
--<Multi_key> <U11B1> <U11A8> 	: "ᇑ"   U11d1 # HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
--<Multi_key> <U11B1> <U11BA> 	: "ᇒ"   U11d2 # HANGUL JONGSEONG RIEUL-MIEUM-SIOS
--<Multi_key> <U11B2> <U11BA> 	: "ᇓ"   U11d3 # HANGUL JONGSEONG RIEUL-PIEUP-SIOS
--<Multi_key> <U11B2> <U11C2> 	: "ᇔ"   U11d4 # HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
--<Multi_key> <U11B2> <U11BC> 	: "ᇕ"   U11d5 # HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
--<Multi_key> <U11B3> <U11BA> 	: "ᇖ"   U11d6 # HANGUL JONGSEONG RIEUL-SSANGSIOS
--<Multi_key> <U11DD> <U11BA> 	: "ᇞ"   U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
--<Multi_key> <U11EC> <U11A8> 	: "ᇭ"   U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
--<Multi_key> <U1107> <U112D> 	: "ᄢ"   U1122 # HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
--<Multi_key> <U1107> <U112F> 	: "ᄣ"   U1123 # HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
--<Multi_key> <U1107> <U1132> 	: "ᄤ"   U1124 # HANGUL CHOSEONG PIEUP-SIOS-PIEUP
--<Multi_key> <U1107> <U110A> 	: "ᄥ"   U1125 # HANGUL CHOSEONG PIEUP-SSANGSIOS
--<Multi_key> <U1107> <U1136> 	: "ᄦ"   U1126 # HANGUL CHOSEONG PIEUP-SIOS-CIEUC
--<Multi_key> <U1107> <U112B> 	: "ᄬ"   U112c # HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
--<Multi_key> <U1109> <U111E> 	: "ᄳ"   U1133 # HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
--<Multi_key> <U1109> <U110A> 	: "ᄴ"   U1134 # HANGUL CHOSEONG SIOS-SSANGSIOS
--<Multi_key> <U1169> <U1162> 	: "ᅫ"   U116b # HANGUL JUNGSEONG WAE
--<Multi_key> <U116E> <U1166> 	: "ᅰ"   U1170 # HANGUL JUNGSEONG WE
--<Multi_key> <U116E> <U117C> 	: "ᆋ"   U118b # HANGUL JUNGSEONG U-EO-EU
--<Multi_key> <U11A8> <U11E7> 	: "ᇄ"   U11c4 # HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
--<Multi_key> <U11AF> <U11AA> 	: "ᇌ"   U11cc # HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
--<Multi_key> <U11AF> <U11DA> 	: "ᇑ"   U11d1 # HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
--<Multi_key> <U11AF> <U11DD> 	: "ᇒ"   U11d2 # HANGUL JONGSEONG RIEUL-MIEUM-SIOS
--<Multi_key> <U11AF> <U11B9> 	: "ᇓ"   U11d3 # HANGUL JONGSEONG RIEUL-PIEUP-SIOS
--<Multi_key> <U11AF> <U11E5> 	: "ᇔ"   U11d4 # HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
--<Multi_key> <U11AF> <U11E6> 	: "ᇕ"   U11d5 # HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
--<Multi_key> <U11AF> <U11BB> 	: "ᇖ"   U11d6 # HANGUL JONGSEONG RIEUL-SSANGSIOS
--<Multi_key> <U11B7> <U11BB> 	: "ᇞ"   U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
--<Multi_key> <U11BC> <U11A9> 	: "ᇭ"   U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
--
--XCOMM Part 3
--<Multi_key> <comma> <minus>      	: "¬"   notsign # NOT SIGN
--<Multi_key> <minus> <comma>      	: "¬"   notsign # NOT SIGN
--<dead_circumflex> <Multi_key> <underscore> <a> 	: "ª"   ordfeminine # FEMININE ORDINAL INDICATOR
--<Multi_key> <asciicircum> <underscore> <a> 	: "ª"   ordfeminine # FEMININE ORDINAL INDICATOR
--<dead_circumflex> <Multi_key> <underbar> <a> 	: "ª"   ordfeminine # FEMININE ORDINAL INDICATOR
--<Multi_key> <asciicircum> <underbar> <a> 	: "ª"   ordfeminine # FEMININE ORDINAL INDICATOR
--<dead_circumflex> <2>            	: "²"   twosuperior # SUPERSCRIPT TWO
--<Multi_key> <asciicircum> <2>    	: "²"   twosuperior # SUPERSCRIPT TWO
--<dead_circumflex> <KP_Space>     	: "²"   twosuperior # SUPERSCRIPT TWO
--<Multi_key> <asciicircum> <KP_Space> 	: "²"   twosuperior # SUPERSCRIPT TWO
--<dead_circumflex> <KP_2>         	: "²"   twosuperior # SUPERSCRIPT TWO
--<Multi_key> <asciicircum> <KP_2> 	: "²"   twosuperior # SUPERSCRIPT TWO
--<dead_circumflex> <3>            	: "³"   threesuperior # SUPERSCRIPT THREE
--<Multi_key> <asciicircum> <3>    	: "³"   threesuperior # SUPERSCRIPT THREE
--<dead_circumflex> <KP_3>         	: "³"   threesuperior # SUPERSCRIPT THREE
--<Multi_key> <asciicircum> <KP_3> 	: "³"   threesuperior # SUPERSCRIPT THREE
--<Multi_key> <m> <u>              	: "µ"   mu # MICRO SIGN
--<dead_circumflex> <1>            	: "¹"   onesuperior # SUPERSCRIPT ONE
--<Multi_key> <asciicircum> <1>    	: "¹"   onesuperior # SUPERSCRIPT ONE
--<dead_circumflex> <KP_1>         	: "¹"   onesuperior # SUPERSCRIPT ONE
--<Multi_key> <asciicircum> <KP_1> 	: "¹"   onesuperior # SUPERSCRIPT ONE
--<dead_circumflex> <Multi_key> <underscore> <o> 	: "º"   masculine # MASCULINE ORDINAL INDICATOR
--<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
--<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
--<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
--<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
--<Multi_key> <o> <A>              	: "Å"   Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
--<dead_cedilla> <C>               	: "Ç"   Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
--<Multi_key> <comma> <C>          	: "Ç"   Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
--<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
--<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
--<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
--<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
--<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
--<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
--<dead_grave> <O>                 	: "Ò"   Ograve # LATIN CAPITAL LETTER O WITH GRAVE
--<Multi_key> <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
--<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
--<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
--<dead_stroke> <O>               	: "Ø"   Oslash # LATIN CAPITAL LETTER O WITH STROKE
--<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
--<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
--<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
--<Multi_key> <quotedbl> <U>       	: "Ü"   Udiaeresis # LATIN CAPITAL LETTER U WITH DIAERESIS
--<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
--<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
--<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
--<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
--<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
--<Multi_key> <o> <a>              	: "å"   aring # LATIN SMALL LETTER A WITH RING ABOVE
--<dead_cedilla> <c>               	: "ç"   ccedilla # LATIN SMALL LETTER C WITH CEDILLA
--<Multi_key> <comma> <c>          	: "ç"   ccedilla # LATIN SMALL LETTER C WITH CEDILLA
--<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
--<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
--<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
--<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
--<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
--<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
--<dead_grave> <o>                 	: "ò"   ograve # LATIN SMALL LETTER O WITH GRAVE
--<Multi_key> <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
--<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
--<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
--<Multi_key> <minus> <colon>      	: "÷"   division # DIVISION SIGN
--<dead_stroke> <o>               	: "ø"   oslash # LATIN SMALL LETTER O WITH STROKE
--<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
--<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
--<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
--<Multi_key> <quotedbl> <u>       	: "ü"   udiaeresis # LATIN SMALL LETTER U WITH DIAERESIS
--<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
--<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
--<dead_macron> <A>                	: "Ā"   U0100 # LATIN CAPITAL LETTER A WITH MACRON
--<Multi_key> <macron> <A>         	: "Ā"   U0100 # LATIN CAPITAL LETTER A WITH MACRON
--<Multi_key> <underscore> <A>     	: "Ā"   U0100 # LATIN CAPITAL LETTER A WITH MACRON
--<dead_macron> <a>                	: "ā"   U0101 # LATIN SMALL LETTER A WITH MACRON
--<Multi_key> <macron> <a>         	: "ā"   U0101 # LATIN SMALL LETTER A WITH MACRON
--<Multi_key> <underscore> <a>     	: "ā"   U0101 # LATIN SMALL LETTER A WITH MACRON
--<dead_breve> <A>                 	: "Ă"   U0102 # LATIN CAPITAL LETTER A WITH BREVE
--<Multi_key> <U> <A>              	: "Ă"   U0102 # LATIN CAPITAL LETTER A WITH BREVE
--<Multi_key> <b> <A>              	: "Ă"   U0102 # LATIN CAPITAL LETTER A WITH BREVE
--<dead_breve> <a>                 	: "ă"   U0103 # LATIN SMALL LETTER A WITH BREVE
--<Multi_key> <U> <a>              	: "ă"   U0103 # LATIN SMALL LETTER A WITH BREVE
--<Multi_key> <b> <a>              	: "ă"   U0103 # LATIN SMALL LETTER A WITH BREVE
--<dead_ogonek> <A>                	: "Ą"   U0104 # LATIN CAPITAL LETTER A WITH OGONEK
--<Multi_key> <semicolon> <A>      	: "Ą"   U0104 # LATIN CAPITAL LETTER A WITH OGONEK
--<Multi_key> <comma> <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
--<Multi_key> <comma> <a>         	: "ą"   U0105 # LATIN SMALL LETTER A WITH OGONEK
--<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
--<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
--<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
--<Multi_key> <asciicircum> <c>    	: "ĉ"   U0109 # LATIN SMALL LETTER C WITH CIRCUMFLEX
--<dead_abovedot> <C>              	: "Ċ"   U010A # LATIN CAPITAL LETTER C WITH DOT ABOVE
--<Multi_key> <period> <C>         	: "Ċ"   U010A # LATIN CAPITAL LETTER C WITH DOT ABOVE
--<dead_abovedot> <c>              	: "ċ"   U010B # LATIN SMALL LETTER C WITH DOT ABOVE
--<Multi_key> <period> <c>         	: "ċ"   U010B # LATIN SMALL LETTER C WITH DOT ABOVE
--<dead_caron> <C>                 	: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
--<Multi_key> <c> <C>              	: "Č"   U010C # LATIN CAPITAL LETTER C WITH CARON
--<dead_caron> <c>                 	: "č"   U010D # LATIN SMALL LETTER C WITH CARON
--<Multi_key> <c> <c>              	: "č"   U010D # LATIN SMALL LETTER C WITH CARON
--<dead_caron> <D>                 	: "Ď"   U010E # LATIN CAPITAL LETTER D WITH CARON
--<Multi_key> <c> <D>              	: "Ď"   U010E # LATIN CAPITAL LETTER D WITH CARON
--<dead_caron> <d>                 	: "ď"   U010F # LATIN SMALL LETTER D WITH CARON
--<Multi_key> <c> <d>              	: "ď"   U010F # LATIN SMALL LETTER D WITH CARON
--<dead_stroke> <D>               	: "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
--<Multi_key> <slash> <D>          	: "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
--<Multi_key> <KP_Divide> <D>      	: "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
--<dead_stroke> <d>               	: "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE
--<Multi_key> <slash> <d>          	: "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE
--<Multi_key> <KP_Divide> <d>      	: "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE
--<dead_macron> <E>                	: "Ē"   U0112 # LATIN CAPITAL LETTER E WITH MACRON
--<Multi_key> <macron> <E>         	: "Ē"   U0112 # LATIN CAPITAL LETTER E WITH MACRON
--<Multi_key> <underscore> <E>     	: "Ē"   U0112 # LATIN CAPITAL LETTER E WITH MACRON
--<dead_macron> <e>                	: "ē"   U0113 # LATIN SMALL LETTER E WITH MACRON
--<Multi_key> <macron> <e>         	: "ē"   U0113 # LATIN SMALL LETTER E WITH MACRON
--<Multi_key> <underscore> <e>     	: "ē"   U0113 # LATIN SMALL LETTER E WITH MACRON
--<dead_breve> <E>                 	: "Ĕ"   U0114 # LATIN CAPITAL LETTER E WITH BREVE
--<Multi_key> <U> <E>              	: "Ĕ"   U0114 # LATIN CAPITAL LETTER E WITH BREVE
--<Multi_key> <b> <E>              	: "Ĕ"   U0114 # LATIN CAPITAL LETTER E WITH BREVE
--<dead_breve> <e>                 	: "ĕ"   U0115 # LATIN SMALL LETTER E WITH BREVE
--<Multi_key> <U> <e>              	: "ĕ"   U0115 # LATIN SMALL LETTER E WITH BREVE
--<Multi_key> <b> <e>              	: "ĕ"   U0115 # LATIN SMALL LETTER E WITH BREVE
--<dead_abovedot> <E>              	: "Ė"   U0116 # LATIN CAPITAL LETTER E WITH DOT ABOVE
--<Multi_key> <period> <E>         	: "Ė"   U0116 # LATIN CAPITAL LETTER E WITH DOT ABOVE
--<dead_abovedot> <e>              	: "ė"   U0117 # LATIN SMALL LETTER E WITH DOT ABOVE
--<Multi_key> <period> <e>         	: "ė"   U0117 # LATIN SMALL LETTER E WITH DOT ABOVE
--<dead_ogonek> <E>                	: "Ę"   U0118 # LATIN CAPITAL LETTER E WITH OGONEK
--<Multi_key> <semicolon> <E>      	: "Ę"   U0118 # LATIN CAPITAL LETTER E WITH OGONEK
--<Multi_key> <comma> <E>          	: "Ę"   U0118 # LATIN CAPITAL LETTER E WITH OGONEK
--<dead_ogonek> <e>                	: "ę"   U0119 # LATIN SMALL LETTER E WITH OGONEK
--<Multi_key> <semicolon> <e>      	: "ę"   U0119 # LATIN SMALL LETTER E WITH OGONEK
--<Multi_key> <comma> <e>          	: "ę"   U0119 # LATIN SMALL LETTER E WITH OGONEK
--<dead_caron> <E>                 	: "Ě"   U011A # LATIN CAPITAL LETTER E WITH CARON
--<Multi_key> <c> <E>              	: "Ě"   U011A # LATIN CAPITAL LETTER E WITH CARON
--<dead_caron> <e>                 	: "ě"   U011B # LATIN SMALL LETTER E WITH CARON
--<Multi_key> <c> <e>              	: "ě"   U011B # LATIN SMALL LETTER E WITH CARON
--<dead_circumflex> <G>            	: "Ĝ"   U011C # LATIN CAPITAL LETTER G WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <G>    	: "Ĝ"   U011C # LATIN CAPITAL LETTER G WITH CIRCUMFLEX
--<dead_circumflex> <g>            	: "ĝ"   U011D # LATIN SMALL LETTER G WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <g>    	: "ĝ"   U011D # LATIN SMALL LETTER G WITH CIRCUMFLEX
--<dead_breve> <G>                 	: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
--<Multi_key> <U> <G>              	: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
--<Multi_key> <b> <G>              	: "Ğ"   U011E # LATIN CAPITAL LETTER G WITH BREVE
--<dead_breve> <g>                 	: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
--<Multi_key> <U> <g>              	: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
--<Multi_key> <b> <g>              	: "ğ"   U011F # LATIN SMALL LETTER G WITH BREVE
--<dead_abovedot> <G>              	: "Ġ"   U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE
--<Multi_key> <period> <G>         	: "Ġ"   U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE
--<dead_abovedot> <g>              	: "ġ"   U0121 # LATIN SMALL LETTER G WITH DOT ABOVE
--<Multi_key> <period> <g>         	: "ġ"   U0121 # LATIN SMALL LETTER G WITH DOT ABOVE
--<dead_cedilla> <G>               	: "Ģ"   U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
--<Multi_key> <comma> <G>          	: "Ģ"   U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
--<Multi_key> <cedilla> <G>          	: "Ģ"   U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
--<dead_cedilla> <g>               	: "ģ"   U0123 # LATIN SMALL LETTER G WITH CEDILLA
--<Multi_key> <comma> <g>          	: "ģ"   U0123 # LATIN SMALL LETTER G WITH CEDILLA
--<Multi_key> <cedilla> <g>          	: "ģ"   U0123 # LATIN SMALL LETTER G WITH CEDILLA
--<dead_circumflex> <H>            	: "Ĥ"   U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <H>    	: "Ĥ"   U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
--<dead_circumflex> <h>            	: "ĥ"   U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <h>    	: "ĥ"   U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
--<dead_stroke> <H>               	: "Ħ"   U0126 # LATIN CAPITAL LETTER H WITH STROKE
--<Multi_key> <slash> <H>          	: "Ħ"   U0126 # LATIN CAPITAL LETTER H WITH STROKE
--<Multi_key> <KP_Divide> <H>      	: "Ħ"   U0126 # LATIN CAPITAL LETTER H WITH STROKE
--<dead_stroke> <h>               	: "ħ"   U0127 # LATIN SMALL LETTER H WITH STROKE
--<Multi_key> <slash> <h>          	: "ħ"   U0127 # LATIN SMALL LETTER H WITH STROKE
--<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
--<dead_tilde> <i>                 	: "ĩ"   U0129 # LATIN SMALL LETTER I WITH TILDE
--<Multi_key> <asciitilde> <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
--<dead_macron> <i>                	: "ī"   U012B # LATIN SMALL LETTER I WITH MACRON
--<Multi_key> <macron> <i>         	: "ī"   U012B # LATIN SMALL LETTER I WITH MACRON
--<Multi_key> <underscore> <i>     	: "ī"   U012B # LATIN SMALL LETTER I WITH MACRON
--<dead_breve> <I>                 	: "Ĭ"   U012C # LATIN CAPITAL LETTER I WITH BREVE
--<Multi_key> <U> <I>              	: "Ĭ"   U012C # LATIN CAPITAL LETTER I WITH BREVE
--<Multi_key> <b> <I>              	: "Ĭ"   U012C # LATIN CAPITAL LETTER I WITH BREVE
--<dead_breve> <i>                 	: "ĭ"   U012D # LATIN SMALL LETTER I WITH BREVE
--<Multi_key> <U> <i>              	: "ĭ"   U012D # LATIN SMALL LETTER I WITH BREVE
--<Multi_key> <b> <i>              	: "ĭ"   U012D # LATIN SMALL LETTER I WITH BREVE
--<dead_ogonek> <I>                	: "Į"   U012E # LATIN CAPITAL LETTER I WITH OGONEK
--<Multi_key> <semicolon> <I>      	: "Į"   U012E # LATIN CAPITAL LETTER I WITH OGONEK
--<Multi_key> <comma> <I>         	: "Į"   U012E # LATIN CAPITAL LETTER I WITH OGONEK
--<dead_ogonek> <i>                	: "į"   U012F # LATIN SMALL LETTER I WITH OGONEK
--<Multi_key> <semicolon> <i>      	: "į"   U012F # LATIN SMALL LETTER I WITH OGONEK
--<Multi_key> <comma> <i>         	: "į"   U012F # LATIN SMALL LETTER I WITH OGONEK
--<dead_abovedot> <I>              	: "İ"   U0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE
--<Multi_key> <period> <I>         	: "İ"   U0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE
--<dead_abovedot> <i>              	: "ı"   U0131 # LATIN SMALL LETTER DOTLESS I
--<Multi_key> <i> <period>         	: "ı"   U0131 # LATIN SMALL LETTER DOTLESS I
--<dead_circumflex> <J>            	: "Ĵ"   U0134 # LATIN CAPITAL LETTER J WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <J>    	: "Ĵ"   U0134 # LATIN CAPITAL LETTER J WITH CIRCUMFLEX
--<dead_circumflex> <j>            	: "ĵ"   U0135 # LATIN SMALL LETTER J WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <j>    	: "ĵ"   U0135 # LATIN SMALL LETTER J WITH CIRCUMFLEX
--<dead_cedilla> <K>               	: "Ķ"   U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
--<Multi_key> <comma> <K>          	: "Ķ"   U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
--<Multi_key> <cedilla> <K>          	: "Ķ"   U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
--<dead_cedilla> <k>               	: "ķ"   U0137 # LATIN SMALL LETTER K WITH CEDILLA
--<Multi_key> <comma> <k>          	: "ķ"   U0137 # LATIN SMALL LETTER K WITH CEDILLA
--<Multi_key> <cedilla> <k>          	: "ķ"   U0137 # LATIN SMALL LETTER K WITH CEDILLA
--<Multi_key> <k> <k>              	: "ĸ"   U0138 # LATIN SMALL LETTER KRA
--<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
--<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
--<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
--<dead_cedilla> <l>               	: "ļ"   U013C # LATIN SMALL LETTER L WITH CEDILLA
--<Multi_key> <comma> <l>          	: "ļ"   U013C # LATIN SMALL LETTER L WITH CEDILLA
--<Multi_key> <cedilla> <l>          	: "ļ"   U013C # LATIN SMALL LETTER L WITH CEDILLA
--<dead_caron> <L>                 	: "Ľ"   U013D # LATIN CAPITAL LETTER L WITH CARON
--<Multi_key> <c> <L>              	: "Ľ"   U013D # LATIN CAPITAL LETTER L WITH CARON
--<dead_caron> <l>                 	: "ľ"   U013E # LATIN SMALL LETTER L WITH CARON
--<Multi_key> <c> <l>              	: "ľ"   U013E # LATIN SMALL LETTER L WITH CARON
--<dead_stroke> <L>               	: "Ł"   U0141 # LATIN CAPITAL LETTER L WITH STROKE
--<Multi_key> <slash> <L>          	: "Ł"   U0141 # LATIN CAPITAL LETTER L WITH STROKE
--<Multi_key> <KP_Divide> <L>      	: "Ł"   U0141 # LATIN CAPITAL LETTER L WITH STROKE
--<dead_stroke> <l>               	: "ł"   U0142 # LATIN SMALL LETTER L WITH STROKE
--<Multi_key> <slash> <l>          	: "ł"   U0142 # LATIN SMALL LETTER L WITH STROKE
--<Multi_key> <KP_Divide> <l>      	: "ł"   U0142 # LATIN SMALL LETTER L WITH STROKE
--<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
--<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
--<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
--<dead_cedilla> <n>               	: "ņ"   U0146 # LATIN SMALL LETTER N WITH CEDILLA
--<Multi_key> <comma> <n>          	: "ņ"   U0146 # LATIN SMALL LETTER N WITH CEDILLA
--<Multi_key> <cedilla> <n>          	: "ņ"   U0146 # LATIN SMALL LETTER N WITH CEDILLA
--<dead_caron> <N>                 	: "Ň"   U0147 # LATIN CAPITAL LETTER N WITH CARON
--<Multi_key> <c> <N>              	: "Ň"   U0147 # LATIN CAPITAL LETTER N WITH CARON
--<dead_caron> <n>                 	: "ň"   U0148 # LATIN SMALL LETTER N WITH CARON
--<Multi_key> <c> <n>              	: "ň"   U0148 # LATIN SMALL LETTER N WITH CARON
--<Multi_key> <N> <G>              	: "Ŋ"   U014A # LATIN CAPITAL LETTER ENG
--<Multi_key> <n> <g>              	: "ŋ"   U014B # LATIN SMALL LETTER ENG
--<dead_macron> <O>                	: "Ō"   U014C # LATIN CAPITAL LETTER O WITH MACRON
--<Multi_key> <macron> <O>         	: "Ō"   U014C # LATIN CAPITAL LETTER O WITH MACRON
--<Multi_key> <underscore> <O>     	: "Ō"   U014C # LATIN CAPITAL LETTER O WITH MACRON
--<dead_macron> <o>                	: "ō"   U014D # LATIN SMALL LETTER O WITH MACRON
--<Multi_key> <macron> <o>         	: "ō"   U014D # LATIN SMALL LETTER O WITH MACRON
--<Multi_key> <underscore> <o>     	: "ō"   U014D # LATIN SMALL LETTER O WITH MACRON
--<dead_breve> <O>                 	: "Ŏ"   U014E # LATIN CAPITAL LETTER O WITH BREVE
--<Multi_key> <U> <O>              	: "Ŏ"   U014E # LATIN CAPITAL LETTER O WITH BREVE
--<Multi_key> <b> <O>              	: "Ŏ"   U014E # LATIN CAPITAL LETTER O WITH BREVE
--<dead_breve> <o>                 	: "ŏ"   U014F # LATIN SMALL LETTER O WITH BREVE
--<Multi_key> <U> <o>              	: "ŏ"   U014F # LATIN SMALL LETTER O WITH BREVE
--<Multi_key> <b> <o>              	: "ŏ"   U014F # LATIN SMALL LETTER O WITH BREVE
--<dead_doubleacute> <O>           	: "Ő"   U0150 # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
--<Multi_key> <equal> <O>          	: "Ő"   U0150 # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
--<dead_doubleacute> <o>           	: "ő"   U0151 # LATIN SMALL LETTER O WITH DOUBLE ACUTE
--<Multi_key> <equal> <o>          	: "ő"   U0151 # LATIN SMALL LETTER O WITH DOUBLE ACUTE
--<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
--<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
--<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
--<dead_cedilla> <r>               	: "ŗ"   U0157 # LATIN SMALL LETTER R WITH CEDILLA
--<Multi_key> <comma> <r>          	: "ŗ"   U0157 # LATIN SMALL LETTER R WITH CEDILLA
--<Multi_key> <cedilla> <r>          	: "ŗ"   U0157 # LATIN SMALL LETTER R WITH CEDILLA
--<dead_caron> <R>                 	: "Ř"   U0158 # LATIN CAPITAL LETTER R WITH CARON
--<Multi_key> <c> <R>              	: "Ř"   U0158 # LATIN CAPITAL LETTER R WITH CARON
--<dead_caron> <r>                 	: "ř"   U0159 # LATIN SMALL LETTER R WITH CARON
--<Multi_key> <c> <r>              	: "ř"   U0159 # LATIN SMALL LETTER R WITH CARON
--<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
--<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
--<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
--<Multi_key> <asciicircum> <s>    	: "ŝ"   U015D # LATIN SMALL LETTER S WITH CIRCUMFLEX
--<dead_cedilla> <S>               	: "Ş"   U015E # LATIN CAPITAL LETTER S WITH CEDILLA
--<Multi_key> <comma> <S>          	: "Ş"   U015E # LATIN CAPITAL LETTER S WITH CEDILLA
--<Multi_key> <cedilla> <S>          	: "Ş"   U015E # LATIN CAPITAL LETTER S WITH CEDILLA
--<dead_cedilla> <s>               	: "ş"   U015F # LATIN SMALL LETTER S WITH CEDILLA
--<Multi_key> <comma> <s>          	: "ş"   U015F # LATIN SMALL LETTER S WITH CEDILLA
--<Multi_key> <cedilla> <s>          	: "ş"   U015F # LATIN SMALL LETTER S WITH CEDILLA
--<dead_caron> <S>                 	: "Š"   U0160 # LATIN CAPITAL LETTER S WITH CARON
--<Multi_key> <c> <S>              	: "Š"   U0160 # LATIN CAPITAL LETTER S WITH CARON
--<dead_caron> <s>                 	: "š"   U0161 # LATIN SMALL LETTER S WITH CARON
--<Multi_key> <c> <s>              	: "š"   U0161 # LATIN SMALL LETTER S WITH CARON
--<dead_cedilla> <T>               	: "Ţ"   U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
--<Multi_key> <comma> <T>          	: "Ţ"   U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
--<Multi_key> <cedilla> <T>          	: "Ţ"   U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
--<dead_cedilla> <t>               	: "ţ"   U0163 # LATIN SMALL LETTER T WITH CEDILLA
--<Multi_key> <comma> <t>          	: "ţ"   U0163 # LATIN SMALL LETTER T WITH CEDILLA
--<Multi_key> <cedilla> <t>          	: "ţ"   U0163 # LATIN SMALL LETTER T WITH CEDILLA
--<dead_caron> <T>                 	: "Ť"   U0164 # LATIN CAPITAL LETTER T WITH CARON
--<Multi_key> <c> <T>              	: "Ť"   U0164 # LATIN CAPITAL LETTER T WITH CARON
--<dead_caron> <t>                 	: "ť"   U0165 # LATIN SMALL LETTER T WITH CARON
--<Multi_key> <c> <t>              	: "ť"   U0165 # LATIN SMALL LETTER T WITH CARON
--<dead_stroke> <T>               	: "Ŧ"   U0166 # LATIN CAPITAL LETTER T WITH STROKE
--<Multi_key> <slash> <T>          	: "Ŧ"   U0166 # LATIN CAPITAL LETTER T WITH STROKE
--<Multi_key> <KP_Divide> <T>      	: "Ŧ"   U0166 # LATIN CAPITAL LETTER T WITH STROKE
--<dead_stroke> <t>               	: "ŧ"   U0167 # LATIN SMALL LETTER T WITH STROKE
--<Multi_key> <slash> <t>          	: "ŧ"   U0167 # LATIN SMALL LETTER T WITH STROKE
--<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
--<dead_tilde> <u>                 	: "ũ"   U0169 # LATIN SMALL LETTER U WITH TILDE
--<Multi_key> <asciitilde> <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
--<dead_macron> <u>                	: "ū"   U016B # LATIN SMALL LETTER U WITH MACRON
--<Multi_key> <macron> <u>         	: "ū"   U016B # LATIN SMALL LETTER U WITH MACRON
--<Multi_key> <underscore> <u>     	: "ū"   U016B # LATIN SMALL LETTER U WITH MACRON
--<dead_breve> <U>                 	: "Ŭ"   U016C # LATIN CAPITAL LETTER U WITH BREVE
--<Multi_key> <U> <U>              	: "Ŭ"   U016C # LATIN CAPITAL LETTER U WITH BREVE
--<Multi_key> <b> <U>              	: "Ŭ"   U016C # LATIN CAPITAL LETTER U WITH BREVE
--<dead_breve> <u>                 	: "ŭ"   U016D # LATIN SMALL LETTER U WITH BREVE
--<Multi_key> <U> <u>              	: "ŭ"   U016D # LATIN SMALL LETTER U WITH BREVE
--<Multi_key> <u> <u>              	: "ŭ"   U016D # LATIN SMALL LETTER U WITH BREVE
--<Multi_key> <b> <u>              	: "ŭ"   U016D # LATIN SMALL LETTER U WITH BREVE
--<dead_abovering> <U>             	: "Ů"   U016E # LATIN CAPITAL LETTER U WITH RING ABOVE
--<Multi_key> <o> <U>              	: "Ů"   U016E # LATIN CAPITAL LETTER U WITH RING ABOVE
--<dead_abovering> <u>             	: "ů"   U016F # LATIN SMALL LETTER U WITH RING ABOVE
--<Multi_key> <o> <u>              	: "ů"   U016F # LATIN SMALL LETTER U WITH RING ABOVE
--<dead_doubleacute> <U>           	: "Ű"   U0170 # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
--<Multi_key> <equal> <U>          	: "Ű"   U0170 # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
--<dead_doubleacute> <u>           	: "ű"   U0171 # LATIN SMALL LETTER U WITH DOUBLE ACUTE
--<Multi_key> <equal> <u>          	: "ű"   U0171 # LATIN SMALL LETTER U WITH DOUBLE ACUTE
--<dead_ogonek> <U>                	: "Ų"   U0172 # LATIN CAPITAL LETTER U WITH OGONEK
--<Multi_key> <semicolon> <U>      	: "Ų"   U0172 # LATIN CAPITAL LETTER U WITH OGONEK
--<Multi_key> <comma> <U>         	: "Ų"   U0172 # LATIN CAPITAL LETTER U WITH OGONEK
--<dead_ogonek> <u>                	: "ų"   U0173 # LATIN SMALL LETTER U WITH OGONEK
--<Multi_key> <semicolon> <u>      	: "ų"   U0173 # LATIN SMALL LETTER U WITH OGONEK
--<Multi_key> <comma> <u>         	: "ų"   U0173 # LATIN SMALL LETTER U WITH OGONEK
--<dead_circumflex> <W>            	: "Ŵ"   U0174 # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <W>    	: "Ŵ"   U0174 # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
--<dead_circumflex> <w>            	: "ŵ"   U0175 # LATIN SMALL LETTER W WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <w>    	: "ŵ"   U0175 # LATIN SMALL LETTER W WITH CIRCUMFLEX
--<dead_circumflex> <Y>            	: "Ŷ"   U0176 # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <Y>    	: "Ŷ"   U0176 # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
--<dead_circumflex> <y>            	: "ŷ"   U0177 # LATIN SMALL LETTER Y WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <y>    	: "ŷ"   U0177 # LATIN SMALL LETTER Y WITH CIRCUMFLEX
--<dead_diaeresis> <Y>             	: "Ÿ"   U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS
--<Multi_key> <quotedbl> <Y>       	: "Ÿ"   U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS
--<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
--<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
--<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
--<Multi_key> <period> <z>         	: "ż"   U017C # LATIN SMALL LETTER Z WITH DOT ABOVE
--<dead_caron> <Z>                 	: "Ž"   U017D # LATIN CAPITAL LETTER Z WITH CARON
--<Multi_key> <c> <Z>              	: "Ž"   U017D # LATIN CAPITAL LETTER Z WITH CARON
--<dead_caron> <z>                 	: "ž"   U017E # LATIN SMALL LETTER Z WITH CARON
--<Multi_key> <c> <z>              	: "ž"   U017E # LATIN SMALL LETTER Z WITH CARON
--<dead_stroke> <b>               	: "ƀ"   U0180 # LATIN SMALL LETTER B WITH STROKE
--<Multi_key> <slash> <b>          	: "ƀ"   U0180 # LATIN SMALL LETTER B WITH STROKE
--<Multi_key> <KP_Divide> <b>      	: "ƀ"   U0180 # LATIN SMALL LETTER B WITH STROKE
--<dead_stroke> <I>               	: "Ɨ"   U0197 # LATIN CAPITAL LETTER I WITH STROKE
--<Multi_key> <slash> <I>          	: "Ɨ"   U0197 # LATIN CAPITAL LETTER I WITH STROKE
--<Multi_key> <KP_Divide> <I>      	: "Ɨ"   U0197 # LATIN CAPITAL LETTER I WITH STROKE
--<dead_horn> <O>                  	: "Ơ"   U01A0 # LATIN CAPITAL LETTER O WITH HORN
--<Multi_key> <plus> <O>           	: "Ơ"   U01A0 # LATIN CAPITAL LETTER O WITH HORN
--<dead_horn> <o>                  	: "ơ"   U01A1 # LATIN SMALL LETTER O WITH HORN
--<Multi_key> <plus> <o>           	: "ơ"   U01A1 # LATIN SMALL LETTER O WITH HORN
--<dead_horn> <U>                  	: "Ư"   U01AF # LATIN CAPITAL LETTER U WITH HORN
--<Multi_key> <plus> <U>           	: "Ư"   U01AF # LATIN CAPITAL LETTER U WITH HORN
--<dead_horn> <u>                  	: "ư"   U01B0 # LATIN SMALL LETTER U WITH HORN
--<Multi_key> <plus> <u>           	: "ư"   U01B0 # LATIN SMALL LETTER U WITH HORN
--<dead_stroke> <Z>               	: "Ƶ"   U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
--<Multi_key> <slash> <Z>          	: "Ƶ"   U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
--<Multi_key> <KP_Divide> <Z>      	: "Ƶ"   U01B5 # LATIN CAPITAL LETTER Z WITH STROKE
--<dead_stroke> <z>               	: "ƶ"   U01B6 # LATIN SMALL LETTER Z WITH STROKE
--<Multi_key> <slash> <z>          	: "ƶ"   U01B6 # LATIN SMALL LETTER Z WITH STROKE
--<Multi_key> <KP_Divide> <z>      	: "ƶ"   U01B6 # LATIN SMALL LETTER Z WITH STROKE
--<dead_caron> <A>                 	: "Ǎ"   U01CD # LATIN CAPITAL LETTER A WITH CARON
--<Multi_key> <c> <A>              	: "Ǎ"   U01CD # LATIN CAPITAL LETTER A WITH CARON
--<dead_caron> <a>                 	: "ǎ"   U01CE # LATIN SMALL LETTER A WITH CARON
--<Multi_key> <c> <a>              	: "ǎ"   U01CE # LATIN SMALL LETTER A WITH CARON
--<dead_caron> <I>                 	: "Ǐ"   U01CF # LATIN CAPITAL LETTER I WITH CARON
--<Multi_key> <c> <I>              	: "Ǐ"   U01CF # LATIN CAPITAL LETTER I WITH CARON
--<dead_caron> <i>                 	: "ǐ"   U01D0 # LATIN SMALL LETTER I WITH CARON
--<Multi_key> <c> <i>              	: "ǐ"   U01D0 # LATIN SMALL LETTER I WITH CARON
--<dead_caron> <O>                 	: "Ǒ"   U01D1 # LATIN CAPITAL LETTER O WITH CARON
--<Multi_key> <c> <O>              	: "Ǒ"   U01D1 # LATIN CAPITAL LETTER O WITH CARON
--<dead_caron> <o>                 	: "ǒ"   U01D2 # LATIN SMALL LETTER O WITH CARON
--<Multi_key> <c> <o>              	: "ǒ"   U01D2 # LATIN SMALL LETTER O WITH CARON
--<dead_caron> <U>                 	: "Ǔ"   U01D3 # LATIN CAPITAL LETTER U WITH CARON
--<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> <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
--<Multi_key> <macron> <quotedbl> <U> 	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <dead_diaeresis> <U> 	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <quotedbl> <U> 	: "Ǖ"   U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
--<dead_macron> <udiaeresis>       	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <udiaeresis> 	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <udiaeresis> 	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
--<dead_macron> <dead_diaeresis> <u> 	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
--<dead_macron> <Multi_key> <quotedbl> <u> 	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <dead_diaeresis> <u> 	: "ǖ"   U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
--<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> <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
--<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
--<dead_acute> <dead_diaeresis> <u> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
--<dead_acute> <Multi_key> <quotedbl> <u> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
--<Multi_key> <acute> <dead_diaeresis> <u> 	: "ǘ"   U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
--<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
--<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
--<Multi_key> <c> <quotedbl> <U>   	: "Ǚ"   U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
--<dead_caron> <udiaeresis>        	: "ǚ"   U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
--<Multi_key> <c> <udiaeresis>     	: "ǚ"   U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
--<dead_caron> <dead_diaeresis> <u> 	: "ǚ"   U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
--<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> <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
--<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
--<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
--<dead_macron> <dead_diaeresis> <A> 	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
--<dead_macron> <Multi_key> <quotedbl> <A> 	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <dead_diaeresis> <A> 	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <quotedbl> <A> 	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <dead_diaeresis> <A> 	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <quotedbl> <A> 	: "Ǟ"   U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
--<dead_macron> <adiaeresis>       	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <adiaeresis> 	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <adiaeresis> 	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<dead_macron> <dead_diaeresis> <a> 	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<dead_macron> <Multi_key> <quotedbl> <a> 	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <dead_diaeresis> <a> 	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <quotedbl> <a> 	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <dead_diaeresis> <a> 	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <quotedbl> <a> 	: "ǟ"   U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
--<dead_macron> <U0226>           	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <U0226>    	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <U0226> 	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<dead_macron> <dead_abovedot> <A> 	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<dead_macron> <Multi_key> <period> <A> 	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <dead_abovedot> <A> 	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <period> <A> 	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <dead_abovedot> <A> 	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <period> <A> 	: "Ǡ"   U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
--<dead_macron> <U0227>           	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <U0227>    	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <U0227> 	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<dead_macron> <dead_abovedot> <a> 	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<dead_macron> <Multi_key> <period> <a> 	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <dead_abovedot> <a> 	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <period> <a> 	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <dead_abovedot> <a> 	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <period> <a> 	: "ǡ"   U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
--<dead_macron> <AE>               	: "Ǣ"   U01E2 # LATIN CAPITAL LETTER AE WITH MACRON
--<Multi_key> <macron> <AE>        	: "Ǣ"   U01E2 # LATIN CAPITAL LETTER AE WITH MACRON
--<Multi_key> <underscore> <AE>    	: "Ǣ"   U01E2 # LATIN CAPITAL LETTER AE WITH MACRON
--<dead_macron> <ae>               	: "ǣ"   U01E3 # LATIN SMALL LETTER AE WITH MACRON
--<Multi_key> <macron> <ae>        	: "ǣ"   U01E3 # LATIN SMALL LETTER AE WITH MACRON
--<Multi_key> <underscore> <ae>    	: "ǣ"   U01E3 # LATIN SMALL LETTER AE WITH MACRON
--<dead_stroke> <G>               	: "Ǥ"   U01E4 # LATIN CAPITAL LETTER G WITH STROKE
--<Multi_key> <slash> <G>          	: "Ǥ"   U01E4 # LATIN CAPITAL LETTER G WITH STROKE
--<Multi_key> <KP_Divide> <G>      	: "Ǥ"   U01E4 # LATIN CAPITAL LETTER G WITH STROKE
--<dead_stroke> <g>               	: "ǥ"   U01E5 # LATIN SMALL LETTER G WITH STROKE
--<Multi_key> <slash> <g>          	: "ǥ"   U01E5 # LATIN SMALL LETTER G WITH STROKE
--<Multi_key> <KP_Divide> <g>      	: "ǥ"   U01E5 # LATIN SMALL LETTER G WITH STROKE
--<dead_caron> <G>                 	: "Ǧ"   U01E6 # LATIN CAPITAL LETTER G WITH CARON
--<Multi_key> <c> <G>              	: "Ǧ"   U01E6 # LATIN CAPITAL LETTER G WITH CARON
--<dead_caron> <g>                 	: "ǧ"   U01E7 # LATIN SMALL LETTER G WITH CARON
--<Multi_key> <c> <g>              	: "ǧ"   U01E7 # LATIN SMALL LETTER G WITH CARON
--<dead_caron> <K>                 	: "Ǩ"   U01E8 # LATIN CAPITAL LETTER K WITH CARON
--<Multi_key> <c> <K>              	: "Ǩ"   U01E8 # LATIN CAPITAL LETTER K WITH CARON
--<dead_caron> <k>                 	: "ǩ"   U01E9 # LATIN SMALL LETTER K WITH CARON
--<Multi_key> <c> <k>              	: "ǩ"   U01E9 # LATIN SMALL LETTER K WITH CARON
--<dead_ogonek> <O>                	: "Ǫ"   U01EA # LATIN CAPITAL LETTER O WITH OGONEK
--<Multi_key> <semicolon> <O>      	: "Ǫ"   U01EA # LATIN CAPITAL LETTER O WITH OGONEK
--<dead_ogonek> <o>                	: "ǫ"   U01EB # LATIN SMALL LETTER O WITH OGONEK
--<Multi_key> <semicolon> <o>      	: "ǫ"   U01EB # LATIN SMALL LETTER O WITH OGONEK
--<dead_macron> <U01EA>        	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <macron> <U01EA> 	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <underscore> <U01EA> 	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<dead_macron> <dead_ogonek> <O>  	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<dead_macron> <Multi_key> <semicolon> <O> 	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <macron> <dead_ogonek> <O> 	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <macron> <semicolon> <O> 	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <underscore> <dead_ogonek> <O> 	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <underscore> <semicolon> <O> 	: "Ǭ"   U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
--<dead_macron> <U01EB>        	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <macron> <U01EB> 	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <underscore> <U01EB> 	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<dead_macron> <dead_ogonek> <o>  	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<dead_macron> <Multi_key> <semicolon> <o> 	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <macron> <dead_ogonek> <o> 	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <macron> <semicolon> <o> 	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <underscore> <dead_ogonek> <o> 	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<Multi_key> <underscore> <semicolon> <o> 	: "ǭ"   U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<dead_caron> <U01B7>         	: "Ǯ"   U01EE # LATIN CAPITAL LETTER EZH WITH CARON
--<Multi_key> <c> <U01B7>      	: "Ǯ"   U01EE # LATIN CAPITAL LETTER EZH WITH CARON
--<dead_caron> <U0292>         	: "ǯ"   U01EF # LATIN SMALL LETTER EZH WITH CARON
--<Multi_key> <c> <U0292>      	: "ǯ"   U01EF # LATIN SMALL LETTER EZH WITH CARON
--<dead_caron> <j>                 	: "ǰ"   U01F0 # LATIN SMALL LETTER J WITH CARON
--<Multi_key> <c> <j>              	: "ǰ"   U01F0 # LATIN SMALL LETTER J WITH CARON
--<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
--<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
--<dead_grave> <N>                 	: "Ǹ"   U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
--<Multi_key> <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
--<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
--<dead_acute> <dead_abovering> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
--<dead_acute> <Multi_key> <o> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
--<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
--<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
--<dead_acute> <dead_abovering> <a> 	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
--<dead_acute> <Multi_key> <o> <a> 	: "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
--<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
--<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
--<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
--<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
--<dead_acute> <dead_stroke> <O>  	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
--<dead_acute> <Multi_key> <slash> <O> 	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
--<Multi_key> <acute> <slash> <O>  	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
--<Multi_key> <apostrophe> <slash> <O> 	: "Ǿ"   U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
--<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
--<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
--<Multi_key> <apostrophe> <oslash> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<dead_acute> <dead_stroke> <o>  	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<dead_acute> <Multi_key> <slash> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<Multi_key> <acute> <slash> <o>  	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<Multi_key> <apostrophe> <slash> <o> 	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<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
--<dead_stroke> <dead_acute> <o>  	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<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
--<Multi_key> <c> <h>              	: "ȟ"   U021F # LATIN SMALL LETTER H WITH CARON
--<dead_abovedot> <A>              	: "Ȧ"   U0226 # LATIN CAPITAL LETTER A WITH DOT ABOVE
--<Multi_key> <period> <A>         	: "Ȧ"   U0226 # LATIN CAPITAL LETTER A WITH DOT ABOVE
--<dead_abovedot> <a>              	: "ȧ"   U0227 # LATIN SMALL LETTER A WITH DOT ABOVE
--<Multi_key> <period> <a>         	: "ȧ"   U0227 # LATIN SMALL LETTER A WITH DOT ABOVE
--<dead_cedilla> <E>               	: "Ȩ"   U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
--<Multi_key> <cedilla> <E>          	: "Ȩ"   U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
--<dead_cedilla> <e>               	: "ȩ"   U0229 # LATIN SMALL LETTER E WITH CEDILLA
--<Multi_key> <cedilla> <e>          	: "ȩ"   U0229 # LATIN SMALL LETTER E WITH CEDILLA
--<dead_macron> <Odiaeresis>       	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <Odiaeresis> 	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <Odiaeresis> 	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<dead_macron> <dead_diaeresis> <O> 	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<dead_macron> <Multi_key> <quotedbl> <O> 	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <dead_diaeresis> <O> 	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <quotedbl> <O> 	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <dead_diaeresis> <O> 	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <quotedbl> <O> 	: "Ȫ"   U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
--<dead_macron> <odiaeresis>       	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <odiaeresis> 	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <odiaeresis> 	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<dead_macron> <dead_diaeresis> <o> 	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<dead_macron> <Multi_key> <quotedbl> <o> 	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <dead_diaeresis> <o> 	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <macron> <quotedbl> <o> 	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <dead_diaeresis> <o> 	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<Multi_key> <underscore> <quotedbl> <o> 	: "ȫ"   U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
--<dead_macron> <Otilde>           	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<Multi_key> <macron> <Otilde>    	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<Multi_key> <underscore> <Otilde> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<dead_macron> <dead_tilde> <O>   	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<dead_macron> <Multi_key> <asciitilde> <O> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<Multi_key> <macron> <dead_tilde> <O> 	: "Ȭ"   U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<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> <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
--<dead_macron> <dead_tilde> <o>   	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
--<dead_macron> <Multi_key> <asciitilde> <o> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
--<Multi_key> <macron> <dead_tilde> <o> 	: "ȭ"   U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
--<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_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
--<Multi_key> <period> <o>         	: "ȯ"   U022F # LATIN SMALL LETTER O WITH DOT ABOVE
--<dead_macron> <U022E>        	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <U022E> 	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <U022E> 	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<dead_macron> <dead_abovedot> <O> 	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<dead_macron> <Multi_key> <period> <O> 	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <dead_abovedot> <O> 	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <period> <O> 	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <dead_abovedot> <O> 	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <period> <O> 	: "Ȱ"   U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
--<dead_macron> <U022F>        	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <U022F> 	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <U022F> 	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<dead_macron> <dead_abovedot> <o> 	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<dead_macron> <Multi_key> <period> <o> 	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <dead_abovedot> <o> 	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <macron> <period> <o> 	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <dead_abovedot> <o> 	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<Multi_key> <underscore> <period> <o> 	: "ȱ"   U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
--<dead_macron> <Y>                	: "Ȳ"   U0232 # LATIN CAPITAL LETTER Y WITH MACRON
--<Multi_key> <macron> <Y>         	: "Ȳ"   U0232 # LATIN CAPITAL LETTER Y WITH MACRON
--<Multi_key> <underscore> <Y>     	: "Ȳ"   U0232 # LATIN CAPITAL LETTER Y WITH MACRON
--<dead_macron> <y>                	: "ȳ"   U0233 # LATIN SMALL LETTER Y WITH MACRON
--<Multi_key> <macron> <y>         	: "ȳ"   U0233 # LATIN SMALL LETTER Y WITH MACRON
--<Multi_key> <underscore> <y>     	: "ȳ"   U0233 # LATIN SMALL LETTER Y WITH MACRON
--<Multi_key> <e> <e>              	: "ə"   U0259 # LATIN SMALL LETTER SCHWA
--<dead_stroke> <i>               	: "ɨ"   U0268 # LATIN SMALL LETTER I WITH STROKE
--<Multi_key> <slash> <i>          	: "ɨ"   U0268 # LATIN SMALL LETTER I WITH STROKE
--<Multi_key> <KP_Divide> <i>      	: "ɨ"   U0268 # LATIN SMALL LETTER I WITH STROKE
--<Multi_key> <slash> <U0294>  	: "ʡ"   U02A1 # LATIN LETTER GLOTTAL STOP WITH STROKE
--<Multi_key> <KP_Divide> <U0294> 	: "ʡ"   U02A1 # LATIN LETTER GLOTTAL STOP WITH STROKE
--<dead_circumflex> <Multi_key> <underscore> <h> 	: "ʰ"   U02B0 # MODIFIER LETTER SMALL H
--<Multi_key> <asciicircum> <underscore> <h> 	: "ʰ"   U02B0 # MODIFIER LETTER SMALL H
--<dead_circumflex> <Multi_key> <underbar> <h> 	: "ʰ"   U02B0 # MODIFIER LETTER SMALL H
--<Multi_key> <asciicircum> <underbar> <h> 	: "ʰ"   U02B0 # MODIFIER LETTER SMALL H
--<dead_circumflex> <Multi_key> <underscore> <U0266> 	: "ʱ"   U02B1 # MODIFIER LETTER SMALL H WITH HOOK
--<Multi_key> <asciicircum> <underscore> <U0266> 	: "ʱ"   U02B1 # MODIFIER LETTER SMALL H WITH HOOK
--<dead_circumflex> <Multi_key> <underbar> <U0266> 	: "ʱ"   U02B1 # MODIFIER LETTER SMALL H WITH HOOK
--<Multi_key> <asciicircum> <underbar> <U0266> 	: "ʱ"   U02B1 # MODIFIER LETTER SMALL H WITH HOOK
--<dead_circumflex> <Multi_key> <underscore> <j> 	: "ʲ"   U02B2 # MODIFIER LETTER SMALL J
--<Multi_key> <asciicircum> <underscore> <j> 	: "ʲ"   U02B2 # MODIFIER LETTER SMALL J
--<dead_circumflex> <Multi_key> <underbar> <j> 	: "ʲ"   U02B2 # MODIFIER LETTER SMALL J
--<Multi_key> <asciicircum> <underbar> <j> 	: "ʲ"   U02B2 # MODIFIER LETTER SMALL J
--<dead_circumflex> <Multi_key> <underscore> <r> 	: "ʳ"   U02B3 # MODIFIER LETTER SMALL R
--<Multi_key> <asciicircum> <underscore> <r> 	: "ʳ"   U02B3 # MODIFIER LETTER SMALL R
--<dead_circumflex> <Multi_key> <underbar> <r> 	: "ʳ"   U02B3 # MODIFIER LETTER SMALL R
--<Multi_key> <asciicircum> <underbar> <r> 	: "ʳ"   U02B3 # MODIFIER LETTER SMALL R
--<dead_circumflex> <Multi_key> <underscore> <U0279> 	: "ʴ"   U02B4 # MODIFIER LETTER SMALL TURNED R
--<Multi_key> <asciicircum> <underscore> <U0279> 	: "ʴ"   U02B4 # MODIFIER LETTER SMALL TURNED R
--<dead_circumflex> <Multi_key> <underbar> <U0279> 	: "ʴ"   U02B4 # MODIFIER LETTER SMALL TURNED R
--<Multi_key> <asciicircum> <underbar> <U0279> 	: "ʴ"   U02B4 # MODIFIER LETTER SMALL TURNED R
--<dead_circumflex> <Multi_key> <underscore> <U027B> 	: "ʵ"   U02B5 # MODIFIER LETTER SMALL TURNED R WITH HOOK
--<Multi_key> <asciicircum> <underscore> <U027B> 	: "ʵ"   U02B5 # MODIFIER LETTER SMALL TURNED R WITH HOOK
--<dead_circumflex> <Multi_key> <underbar> <U027B> 	: "ʵ"   U02B5 # MODIFIER LETTER SMALL TURNED R WITH HOOK
--<Multi_key> <asciicircum> <underbar> <U027B> 	: "ʵ"   U02B5 # MODIFIER LETTER SMALL TURNED R WITH HOOK
--<dead_circumflex> <Multi_key> <underscore> <U0281> 	: "ʶ"   U02B6 # MODIFIER LETTER SMALL CAPITAL INVERTED R
--<Multi_key> <asciicircum> <underscore> <U0281> 	: "ʶ"   U02B6 # MODIFIER LETTER SMALL CAPITAL INVERTED R
--<dead_circumflex> <Multi_key> <underbar> <U0281> 	: "ʶ"   U02B6 # MODIFIER LETTER SMALL CAPITAL INVERTED R
--<Multi_key> <asciicircum> <underbar> <U0281> 	: "ʶ"   U02B6 # MODIFIER LETTER SMALL CAPITAL INVERTED R
--<dead_circumflex> <Multi_key> <underscore> <w> 	: "ʷ"   U02B7 # MODIFIER LETTER SMALL W
--<Multi_key> <asciicircum> <underscore> <w> 	: "ʷ"   U02B7 # MODIFIER LETTER SMALL W
--<dead_circumflex> <Multi_key> <underbar> <w> 	: "ʷ"   U02B7 # MODIFIER LETTER SMALL W
--<Multi_key> <asciicircum> <underbar> <w> 	: "ʷ"   U02B7 # MODIFIER LETTER SMALL W
--<dead_circumflex> <Multi_key> <underscore> <y> 	: "ʸ"   U02B8 # MODIFIER LETTER SMALL Y
--<Multi_key> <asciicircum> <underscore> <y> 	: "ʸ"   U02B8 # MODIFIER LETTER SMALL Y
--<dead_circumflex> <Multi_key> <underbar> <y> 	: "ʸ"   U02B8 # MODIFIER LETTER SMALL Y
--<Multi_key> <asciicircum> <underbar> <y> 	: "ʸ"   U02B8 # MODIFIER LETTER SMALL Y
--<dead_circumflex> <Multi_key> <underscore> <U0263> 	: "ˠ"   U02E0 # MODIFIER LETTER SMALL GAMMA
--<Multi_key> <asciicircum> <underscore> <U0263> 	: "ˠ"   U02E0 # MODIFIER LETTER SMALL GAMMA
--<dead_circumflex> <Multi_key> <underbar> <U0263> 	: "ˠ"   U02E0 # MODIFIER LETTER SMALL GAMMA
--<Multi_key> <asciicircum> <underbar> <U0263> 	: "ˠ"   U02E0 # MODIFIER LETTER SMALL GAMMA
--<dead_circumflex> <Multi_key> <underscore> <l> 	: "ˡ"   U02E1 # MODIFIER LETTER SMALL L
--<Multi_key> <asciicircum> <underscore> <l> 	: "ˡ"   U02E1 # MODIFIER LETTER SMALL L
--<dead_circumflex> <Multi_key> <underbar> <l> 	: "ˡ"   U02E1 # MODIFIER LETTER SMALL L
--<Multi_key> <asciicircum> <underbar> <l> 	: "ˡ"   U02E1 # MODIFIER LETTER SMALL L
--<dead_circumflex> <Multi_key> <underscore> <s> 	: "ˢ"   U02E2 # MODIFIER LETTER SMALL S
--<Multi_key> <asciicircum> <underscore> <s> 	: "ˢ"   U02E2 # MODIFIER LETTER SMALL S
--<dead_circumflex> <Multi_key> <underbar> <s> 	: "ˢ"   U02E2 # MODIFIER LETTER SMALL S
--<Multi_key> <asciicircum> <underbar> <s> 	: "ˢ"   U02E2 # MODIFIER LETTER SMALL S
--<dead_circumflex> <Multi_key> <underscore> <x> 	: "ˣ"   U02E3 # MODIFIER LETTER SMALL X
--<Multi_key> <asciicircum> <underscore> <x> 	: "ˣ"   U02E3 # MODIFIER LETTER SMALL X
--<dead_circumflex> <Multi_key> <underbar> <x> 	: "ˣ"   U02E3 # MODIFIER LETTER SMALL X
--<Multi_key> <asciicircum> <underbar> <x> 	: "ˣ"   U02E3 # MODIFIER LETTER SMALL X
--<dead_circumflex> <Multi_key> <underscore> <U0295> 	: "ˤ"   U02E4 # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
--<Multi_key> <asciicircum> <underscore> <U0295> 	: "ˤ"   U02E4 # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
--<dead_circumflex> <Multi_key> <underbar> <U0295> 	: "ˤ"   U02E4 # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
--<Multi_key> <asciicircum> <underbar> <U0295> 	: "ˤ"   U02E4 # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
--<dead_diaeresis> <acute>         	: "̈́"   U0344 # COMBINING GREEK DIALYTIKA TONOS
--<dead_diaeresis> <apostrophe>    	: "̈́"   U0344 # COMBINING GREEK DIALYTIKA TONOS
--<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> <diaeresis> <dead_acute> 	: "΅"   U0385 # GREEK DIALYTIKA TONOS
--<Multi_key> <diaeresis> <acute>  	: "΅"   U0385 # GREEK DIALYTIKA TONOS
--<Multi_key> <diaeresis> <apostrophe> 	: "΅"   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
--<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
--<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
--<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
--<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
--<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
--<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
--<dead_acute> <Greek_iotadieresis> 	: "ΐ"   U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<Multi_key> <acute> <Greek_iotadieresis> 	: "ΐ"   U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<Multi_key> <apostrophe> <Greek_iotadieresis> 	: "ΐ"   U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<dead_acute> <dead_diaeresis> <Greek_iota> 	: "ΐ"   U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<dead_acute> <Multi_key> <quotedbl> <Greek_iota> 	: "ΐ"   U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<Multi_key> <acute> <dead_diaeresis> <Greek_iota> 	: "ΐ"   U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<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
--<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
--<Multi_key> <quotedbl> <Greek_UPSILON> 	: "Ϋ"   U03AB # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
--<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
--<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
--<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
--<dead_acute> <Greek_iota>        	: "ί"   U03AF # GREEK SMALL LETTER IOTA WITH TONOS
--<Multi_key> <acute> <Greek_iota> 	: "ί"   U03AF # GREEK SMALL LETTER IOTA WITH TONOS
--<Multi_key> <apostrophe> <Greek_iota> 	: "ί"   U03AF # GREEK SMALL LETTER IOTA WITH TONOS
--<dead_acute> <Greek_upsilondieresis> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
--<Multi_key> <acute> <Greek_upsilondieresis> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
--<Multi_key> <apostrophe> <Greek_upsilondieresis> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
--<dead_acute> <dead_diaeresis> <Greek_upsilon> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
--<dead_acute> <Multi_key> <quotedbl> <Greek_upsilon> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
--<Multi_key> <acute> <dead_diaeresis> <Greek_upsilon> 	: "ΰ"   U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
--<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
--<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
--<Multi_key> <quotedbl> <Greek_upsilon> 	: "ϋ"   U03CB # GREEK SMALL LETTER UPSILON WITH DIALYTIKA
--<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
--<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
--<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
--<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
--<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
--<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
--<dead_grave> <Cyrillic_I>        	: "Ѝ"   U040D # CYRILLIC CAPITAL LETTER I WITH GRAVE
--<Multi_key> <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
--<dead_breve> <Cyrillic_I>        	: "Й"   U0419 # CYRILLIC CAPITAL LETTER SHORT I
--<Multi_key> <U> <Cyrillic_I>     	: "Й"   U0419 # CYRILLIC CAPITAL LETTER SHORT I
--<Multi_key> <b> <Cyrillic_I>     	: "Й"   U0419 # CYRILLIC CAPITAL LETTER SHORT I
--<dead_breve> <Cyrillic_i>        	: "й"   U0439 # CYRILLIC SMALL LETTER SHORT I
--<Multi_key> <U> <Cyrillic_i>     	: "й"   U0439 # CYRILLIC SMALL LETTER SHORT I
--<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
--<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
--<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
--<dead_grave> <Cyrillic_i>        	: "ѝ"   U045D # CYRILLIC SMALL LETTER I WITH GRAVE
--<Multi_key> <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
--<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
--<Multi_key> <KP_Divide> <Cyrillic_ghe> 	: "ғ"   U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE
--<Multi_key> <slash> <Cyrillic_KA> 	: "Ҟ"   U049E # CYRILLIC CAPITAL LETTER KA WITH STROKE
--<Multi_key> <KP_Divide> <Cyrillic_KA> 	: "Ҟ"   U049E # CYRILLIC CAPITAL LETTER KA WITH STROKE
--<Multi_key> <slash> <Cyrillic_ka> 	: "ҟ"   U049F # CYRILLIC SMALL LETTER KA WITH STROKE
--<Multi_key> <KP_Divide> <Cyrillic_ka> 	: "ҟ"   U049F # CYRILLIC SMALL LETTER KA WITH STROKE
--<Multi_key> <slash> <U04AE>  	: "Ұ"   U04B0 # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
--<Multi_key> <KP_Divide> <U04AE> 	: "Ұ"   U04B0 # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
--<Multi_key> <slash> <U04AF>  	: "ұ"   U04B1 # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
--<Multi_key> <KP_Divide> <U04AF> 	: "ұ"   U04B1 # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
--<dead_breve> <Cyrillic_ZHE>      	: "Ӂ"   U04C1 # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
--<Multi_key> <U> <Cyrillic_ZHE>   	: "Ӂ"   U04C1 # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
--<Multi_key> <b> <Cyrillic_ZHE>   	: "Ӂ"   U04C1 # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
--<dead_breve> <Cyrillic_zhe>      	: "ӂ"   U04C2 # CYRILLIC SMALL LETTER ZHE WITH BREVE
--<Multi_key> <U> <Cyrillic_zhe>   	: "ӂ"   U04C2 # CYRILLIC SMALL LETTER ZHE WITH BREVE
--<Multi_key> <b> <Cyrillic_zhe>   	: "ӂ"   U04C2 # CYRILLIC SMALL LETTER ZHE WITH BREVE
--<dead_breve> <Cyrillic_A>        	: "Ӑ"   U04D0 # CYRILLIC CAPITAL LETTER A WITH BREVE
--<Multi_key> <U> <Cyrillic_A>     	: "Ӑ"   U04D0 # CYRILLIC CAPITAL LETTER A WITH BREVE
--<Multi_key> <b> <Cyrillic_A>     	: "Ӑ"   U04D0 # CYRILLIC CAPITAL LETTER A WITH BREVE
--<dead_breve> <Cyrillic_a>        	: "ӑ"   U04D1 # CYRILLIC SMALL LETTER A WITH BREVE
--<Multi_key> <U> <Cyrillic_a>     	: "ӑ"   U04D1 # CYRILLIC SMALL LETTER A WITH BREVE
--<Multi_key> <b> <Cyrillic_a>     	: "ӑ"   U04D1 # CYRILLIC SMALL LETTER A WITH BREVE
--<dead_diaeresis> <Cyrillic_A>    	: "Ӓ"   U04D2 # CYRILLIC CAPITAL LETTER A WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_A> 	: "Ӓ"   U04D2 # CYRILLIC CAPITAL LETTER A WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_a>    	: "ӓ"   U04D3 # CYRILLIC SMALL LETTER A WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_a> 	: "ӓ"   U04D3 # CYRILLIC SMALL LETTER A WITH DIAERESIS
--<dead_breve> <Cyrillic_IE>       	: "Ӗ"   U04D6 # CYRILLIC CAPITAL LETTER IE WITH BREVE
--<Multi_key> <U> <Cyrillic_IE>    	: "Ӗ"   U04D6 # CYRILLIC CAPITAL LETTER IE WITH BREVE
--<Multi_key> <b> <Cyrillic_IE>    	: "Ӗ"   U04D6 # CYRILLIC CAPITAL LETTER IE WITH BREVE
--<dead_breve> <Cyrillic_ie>       	: "ӗ"   U04D7 # CYRILLIC SMALL LETTER IE WITH BREVE
--<Multi_key> <U> <Cyrillic_ie>    	: "ӗ"   U04D7 # CYRILLIC SMALL LETTER IE WITH BREVE
--<Multi_key> <b> <Cyrillic_ie>    	: "ӗ"   U04D7 # CYRILLIC SMALL LETTER IE WITH BREVE
--<dead_diaeresis> <U04D8>     	: "Ӛ"   U04DA # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
--<Multi_key> <quotedbl> <U04D8> 	: "Ӛ"   U04DA # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
--<dead_diaeresis> <U04D9>     	: "ӛ"   U04DB # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
--<Multi_key> <quotedbl> <U04D9> 	: "ӛ"   U04DB # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_ZHE>  	: "Ӝ"   U04DC # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_ZHE> 	: "Ӝ"   U04DC # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_zhe>  	: "ӝ"   U04DD # CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_zhe> 	: "ӝ"   U04DD # CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_ZE>   	: "Ӟ"   U04DE # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_ZE> 	: "Ӟ"   U04DE # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_ze>   	: "ӟ"   U04DF # CYRILLIC SMALL LETTER ZE WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_ze> 	: "ӟ"   U04DF # CYRILLIC SMALL LETTER ZE WITH DIAERESIS
--<dead_macron> <Cyrillic_I>       	: "Ӣ"   U04E2 # CYRILLIC CAPITAL LETTER I WITH MACRON
--<Multi_key> <macron> <Cyrillic_I> 	: "Ӣ"   U04E2 # CYRILLIC CAPITAL LETTER I WITH MACRON
--<Multi_key> <underscore> <Cyrillic_I> 	: "Ӣ"   U04E2 # CYRILLIC CAPITAL LETTER I WITH MACRON
--<dead_macron> <Cyrillic_i>       	: "ӣ"   U04E3 # CYRILLIC SMALL LETTER I WITH MACRON
--<Multi_key> <macron> <Cyrillic_i> 	: "ӣ"   U04E3 # CYRILLIC SMALL LETTER I WITH MACRON
--<Multi_key> <underscore> <Cyrillic_i> 	: "ӣ"   U04E3 # CYRILLIC SMALL LETTER I WITH MACRON
--<dead_diaeresis> <Cyrillic_I>    	: "Ӥ"   U04E4 # CYRILLIC CAPITAL LETTER I WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_I> 	: "Ӥ"   U04E4 # CYRILLIC CAPITAL LETTER I WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_i>    	: "ӥ"   U04E5 # CYRILLIC SMALL LETTER I WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_i> 	: "ӥ"   U04E5 # CYRILLIC SMALL LETTER I WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_O>    	: "Ӧ"   U04E6 # CYRILLIC CAPITAL LETTER O WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_O> 	: "Ӧ"   U04E6 # CYRILLIC CAPITAL LETTER O WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_o>    	: "ӧ"   U04E7 # CYRILLIC SMALL LETTER O WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_o> 	: "ӧ"   U04E7 # CYRILLIC SMALL LETTER O WITH DIAERESIS
--<dead_diaeresis> <U04E8>     	: "Ӫ"   U04EA # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
--<Multi_key> <quotedbl> <U04E8> 	: "Ӫ"   U04EA # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
--<dead_diaeresis> <U04E9>     	: "ӫ"   U04EB # CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
--<Multi_key> <quotedbl> <U04E9> 	: "ӫ"   U04EB # CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_E>    	: "Ӭ"   U04EC # CYRILLIC CAPITAL LETTER E WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_E> 	: "Ӭ"   U04EC # CYRILLIC CAPITAL LETTER E WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_e>    	: "ӭ"   U04ED # CYRILLIC SMALL LETTER E WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_e> 	: "ӭ"   U04ED # CYRILLIC SMALL LETTER E WITH DIAERESIS
--<dead_macron> <Cyrillic_U>       	: "Ӯ"   U04EE # CYRILLIC CAPITAL LETTER U WITH MACRON
--<Multi_key> <macron> <Cyrillic_U> 	: "Ӯ"   U04EE # CYRILLIC CAPITAL LETTER U WITH MACRON
--<Multi_key> <underscore> <Cyrillic_U> 	: "Ӯ"   U04EE # CYRILLIC CAPITAL LETTER U WITH MACRON
--<dead_macron> <Cyrillic_u>       	: "ӯ"   U04EF # CYRILLIC SMALL LETTER U WITH MACRON
--<Multi_key> <macron> <Cyrillic_u> 	: "ӯ"   U04EF # CYRILLIC SMALL LETTER U WITH MACRON
--<Multi_key> <underscore> <Cyrillic_u> 	: "ӯ"   U04EF # CYRILLIC SMALL LETTER U WITH MACRON
--<dead_diaeresis> <Cyrillic_U>    	: "Ӱ"   U04F0 # CYRILLIC CAPITAL LETTER U WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_U> 	: "Ӱ"   U04F0 # CYRILLIC CAPITAL LETTER U WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_u>    	: "ӱ"   U04F1 # CYRILLIC SMALL LETTER U WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_u> 	: "ӱ"   U04F1 # CYRILLIC SMALL LETTER U WITH DIAERESIS
--<dead_doubleacute> <Cyrillic_U>  	: "Ӳ"   U04F2 # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
--<Multi_key> <equal> <Cyrillic_U> 	: "Ӳ"   U04F2 # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
--<dead_doubleacute> <Cyrillic_u>  	: "ӳ"   U04F3 # CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
--<Multi_key> <equal> <Cyrillic_u> 	: "ӳ"   U04F3 # CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
--<dead_diaeresis> <Cyrillic_CHE>  	: "Ӵ"   U04F4 # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_CHE> 	: "Ӵ"   U04F4 # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_che>  	: "ӵ"   U04F5 # CYRILLIC SMALL LETTER CHE WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_che> 	: "ӵ"   U04F5 # CYRILLIC SMALL LETTER CHE WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_YERU> 	: "Ӹ"   U04F8 # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_YERU> 	: "Ӹ"   U04F8 # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
--<dead_diaeresis> <Cyrillic_yeru> 	: "ӹ"   U04F9 # CYRILLIC SMALL LETTER YERU WITH DIAERESIS
--<Multi_key> <quotedbl> <Cyrillic_yeru> 	: "ӹ"   U04F9 # CYRILLIC SMALL LETTER YERU WITH DIAERESIS
--<Multi_key> <U0653> <Arabic_alef> 	: "آ"   U0622 # ARABIC LETTER ALEF WITH MADDA ABOVE
--<Multi_key> <U0654> <Arabic_alef> 	: "أ"   U0623 # ARABIC LETTER ALEF WITH HAMZA ABOVE
--<Multi_key> <U0654> <Arabic_waw> 	: "ؤ"   U0624 # ARABIC LETTER WAW WITH HAMZA ABOVE
--<Multi_key> <U0655> <Arabic_alef> 	: "إ"   U0625 # ARABIC LETTER ALEF WITH HAMZA BELOW
--<Multi_key> <U0654> <Arabic_yeh> 	: "ئ"   U0626 # ARABIC LETTER YEH WITH HAMZA ABOVE
--<Multi_key> <U0654> <U06D5> 	: "ۀ"   U06C0 # ARABIC LETTER HEH WITH YEH ABOVE
--<Multi_key> <U0654> <U06C1> 	: "ۂ"   U06C2 # ARABIC LETTER HEH GOAL WITH HAMZA ABOVE
--<Multi_key> <U0654> <U06D2> 	: "ۓ"   U06D3 # ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
--<Multi_key> <U093C> <U0928> 	: "ऩ"   U0929 # DEVANAGARI LETTER NNNA
--<Multi_key> <U093C> <U0930> 	: "ऱ"   U0931 # DEVANAGARI LETTER RRA
--<Multi_key> <U093C> <U0933> 	: "ऴ"   U0934 # DEVANAGARI LETTER LLLA
--<Multi_key> <U093C> <U0915> 	: "क़"   U0958 # DEVANAGARI LETTER QA
--<Multi_key> <U093C> <U0916> 	: "ख़"   U0959 # DEVANAGARI LETTER KHHA
--<Multi_key> <U093C> <U0917> 	: "ग़"   U095A # DEVANAGARI LETTER GHHA
--<Multi_key> <U093C> <U091C> 	: "ज़"   U095B # DEVANAGARI LETTER ZA
--<Multi_key> <U093C> <U0921> 	: "ड़"   U095C # DEVANAGARI LETTER DDDHA
--<Multi_key> <U093C> <U0922> 	: "ढ़"   U095D # DEVANAGARI LETTER RHA
--<Multi_key> <U093C> <U092B> 	: "फ़"   U095E # DEVANAGARI LETTER FA
--<Multi_key> <U093C> <U092F> 	: "य़"   U095F # DEVANAGARI LETTER YYA
--<Multi_key> <U09C7> <U09BE> 	: "ো"   U09CB # BENGALI VOWEL SIGN O
--<Multi_key> <U09C7> <U09D7> 	: "ৌ"   U09CC # BENGALI VOWEL SIGN AU
--<Multi_key> <U09BC> <U09A1> 	: "ড়"   U09DC # BENGALI LETTER RRA
--<Multi_key> <U09BC> <U09A2> 	: "ঢ়"   U09DD # BENGALI LETTER RHA
--<Multi_key> <U09BC> <U09AF> 	: "য়"   U09DF # BENGALI LETTER YYA
--<Multi_key> <U0A3C> <U0A32> 	: "ਲ਼"   U0A33 # GURMUKHI LETTER LLA
--<Multi_key> <U0A3C> <U0A38> 	: "ਸ਼"   U0A36 # GURMUKHI LETTER SHA
--<Multi_key> <U0A3C> <U0A16> 	: "ਖ਼"   U0A59 # GURMUKHI LETTER KHHA
--<Multi_key> <U0A3C> <U0A17> 	: "ਗ਼"   U0A5A # GURMUKHI LETTER GHHA
--<Multi_key> <U0A3C> <U0A1C> 	: "ਜ਼"   U0A5B # GURMUKHI LETTER ZA
--<Multi_key> <U0A3C> <U0A2B> 	: "ਫ਼"   U0A5E # GURMUKHI LETTER FA
--<Multi_key> <U0B47> <U0B56> 	: "ୈ"   U0B48 # ORIYA VOWEL SIGN AI
--<Multi_key> <U0B47> <U0B3E> 	: "ୋ"   U0B4B # ORIYA VOWEL SIGN O
--<Multi_key> <U0B47> <U0B57> 	: "ୌ"   U0B4C # ORIYA VOWEL SIGN AU
--<Multi_key> <U0B3C> <U0B21> 	: "ଡ଼"   U0B5C # ORIYA LETTER RRA
--<Multi_key> <U0B3C> <U0B22> 	: "ଢ଼"   U0B5D # ORIYA LETTER RHA
--<Multi_key> <U0BD7> <U0B92> 	: "ஔ"   U0B94 # TAMIL LETTER AU
--<Multi_key> <U0BC6> <U0BBE> 	: "ொ"   U0BCA # TAMIL VOWEL SIGN O
--<Multi_key> <U0BC7> <U0BBE> 	: "ோ"   U0BCB # TAMIL VOWEL SIGN OO
--<Multi_key> <U0BC6> <U0BD7> 	: "ௌ"   U0BCC # TAMIL VOWEL SIGN AU
--<Multi_key> <U0C46> <U0C56> 	: "ై"   U0C48 # TELUGU VOWEL SIGN AI
--<Multi_key> <U0CBF> <U0CD5> 	: "ೀ"   U0CC0 # KANNADA VOWEL SIGN II
--<Multi_key> <U0CC6> <U0CD5> 	: "ೇ"   U0CC7 # KANNADA VOWEL SIGN EE
--<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> <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> <U0DDF> 	: "ෞ"   U0DDE # SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA
--<Multi_key> <U0FB7> <U0F42> 	: "གྷ"   U0F43 # TIBETAN LETTER GHA
--<Multi_key> <U0FB7> <U0F4C> 	: "ཌྷ"   U0F4D # TIBETAN LETTER DDHA
--<Multi_key> <U0FB7> <U0F51> 	: "དྷ"   U0F52 # TIBETAN LETTER DHA
--<Multi_key> <U0FB7> <U0F56> 	: "བྷ"   U0F57 # TIBETAN LETTER BHA
--<Multi_key> <U0FB7> <U0F5B> 	: "ཛྷ"   U0F5C # TIBETAN LETTER DZHA
--<Multi_key> <U0FB5> <U0F40> 	: "ཀྵ"   U0F69 # TIBETAN LETTER KSSA
--<Multi_key> <U0F71> <U0F72> 	: "ཱི"   U0F73 # TIBETAN VOWEL SIGN II
--<Multi_key> <U0F71> <U0F74> 	: "ཱུ"   U0F75 # TIBETAN VOWEL SIGN UU
--<Multi_key> <U0FB2> <U0F80> 	: "ྲྀ"   U0F76 # TIBETAN VOWEL SIGN VOCALIC R
--<Multi_key> <U0FB3> <U0F80> 	: "ླྀ"   U0F78 # TIBETAN VOWEL SIGN VOCALIC L
--<Multi_key> <U0F71> <U0F80> 	: "ཱྀ"   U0F81 # TIBETAN VOWEL SIGN REVERSED II
--<Multi_key> <U0F92> <U0FB7> 	: "ྒྷ"   U0F93 # TIBETAN SUBJOINED LETTER GHA
--<Multi_key> <U0F9C> <U0FB7> 	: "ྜྷ"   U0F9D # TIBETAN SUBJOINED LETTER DDHA
--<Multi_key> <U0FA1> <U0FB7> 	: "ྡྷ"   U0FA2 # TIBETAN SUBJOINED LETTER DHA
--<Multi_key> <U0FA6> <U0FB7> 	: "ྦྷ"   U0FA7 # TIBETAN SUBJOINED LETTER BHA
--<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
--<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
--<dead_belowdot> <b>              	: "ḅ"   U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
--<Multi_key> <exclam> <b>         	: "ḅ"   U1E05 # LATIN SMALL LETTER B WITH DOT 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
--<dead_acute> <dead_cedilla> <C>  	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
--<dead_acute> <Multi_key> <comma> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
--<dead_acute> <Multi_key> <cedilla> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
--<Multi_key> <acute> <dead_cedilla> <C> 	: "Ḉ"   U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
--<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> <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
--<dead_acute> <dead_cedilla> <c>  	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
--<dead_acute> <Multi_key> <comma> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
--<dead_acute> <Multi_key> <cedilla> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
--<Multi_key> <acute> <dead_cedilla> <c> 	: "ḉ"   U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
--<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> <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
--<dead_belowdot> <d>              	: "ḍ"   U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
--<Multi_key> <exclam> <d>         	: "ḍ"   U1E0D # LATIN SMALL LETTER D WITH DOT 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
--<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
--<dead_grave> <Multi_key> <macron> <E> 	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
--<dead_grave> <Multi_key> <underscore> <E> 	: "Ḕ"   U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
--<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
--<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
--<dead_grave> <Multi_key> <macron> <e> 	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
--<dead_grave> <Multi_key> <underscore> <e> 	: "ḕ"   U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
--<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
--<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
--<dead_acute> <dead_macron> <E>   	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
--<dead_acute> <Multi_key> <macron> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
--<dead_acute> <Multi_key> <underscore> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
--<Multi_key> <acute> <dead_macron> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
--<Multi_key> <acute> <macron> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
--<Multi_key> <acute> <underscore> <E> 	: "Ḗ"   U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
--<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
--<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
--<dead_acute> <dead_macron> <e>   	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
--<dead_acute> <Multi_key> <macron> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
--<dead_acute> <Multi_key> <underscore> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
--<Multi_key> <acute> <dead_macron> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
--<Multi_key> <acute> <macron> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
--<Multi_key> <acute> <underscore> <e> 	: "ḗ"   U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
--<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
--<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
--<dead_breve> <dead_cedilla> <E>  	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<dead_breve> <Multi_key> <comma> <E> 	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<dead_breve> <Multi_key> <cedilla> <E> 	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <U> <dead_cedilla> <E> 	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <U> <comma> <E>      	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <U> <cedilla> <E>      	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <b> <dead_cedilla> <E> 	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <b> <comma> <E>      	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <b> <cedilla> <E>      	: "Ḝ"   U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
--<dead_breve> <U0229>         	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <U> <U0229>      	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <b> <U0229>      	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<dead_breve> <dead_cedilla> <e>  	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<dead_breve> <Multi_key> <comma> <e> 	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<dead_breve> <Multi_key> <cedilla> <e> 	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <U> <dead_cedilla> <e> 	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <U> <comma> <e>      	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <U> <cedilla> <e>      	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <b> <dead_cedilla> <e> 	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <b> <comma> <e>      	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<Multi_key> <b> <cedilla> <e>      	: "ḝ"   U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
--<dead_abovedot> <F>              	: "Ḟ"   U1E1E # LATIN CAPITAL LETTER F WITH DOT ABOVE
--<Multi_key> <period> <F>         	: "Ḟ"   U1E1E # LATIN CAPITAL LETTER F WITH DOT ABOVE
--<dead_abovedot> <f>              	: "ḟ"   U1E1F # LATIN SMALL LETTER F WITH DOT ABOVE
--<Multi_key> <period> <f>         	: "ḟ"   U1E1F # LATIN SMALL LETTER F WITH DOT ABOVE
--<dead_macron> <G>                	: "Ḡ"   U1E20 # LATIN CAPITAL LETTER G WITH MACRON
--<Multi_key> <macron> <G>         	: "Ḡ"   U1E20 # LATIN CAPITAL LETTER G WITH MACRON
--<Multi_key> <underscore> <G>     	: "Ḡ"   U1E20 # LATIN CAPITAL LETTER G WITH MACRON
--<dead_macron> <g>                	: "ḡ"   U1E21 # LATIN SMALL LETTER G WITH MACRON
--<Multi_key> <macron> <g>         	: "ḡ"   U1E21 # LATIN SMALL LETTER G WITH MACRON
--<Multi_key> <underscore> <g>     	: "ḡ"   U1E21 # LATIN SMALL LETTER G WITH MACRON
--<dead_abovedot> <H>              	: "Ḣ"   U1E22 # LATIN CAPITAL LETTER H WITH DOT ABOVE
--<Multi_key> <period> <H>         	: "Ḣ"   U1E22 # LATIN CAPITAL LETTER H WITH DOT ABOVE
--<dead_abovedot> <h>              	: "ḣ"   U1E23 # LATIN SMALL LETTER H WITH DOT ABOVE
--<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
--<dead_belowdot> <h>              	: "ḥ"   U1E25 # LATIN SMALL LETTER H WITH DOT BELOW
--<Multi_key> <exclam> <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
--<Multi_key> <quotedbl> <h>       	: "ḧ"   U1E27 # LATIN SMALL LETTER H WITH DIAERESIS
--<dead_cedilla> <H>               	: "Ḩ"   U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
--<Multi_key> <comma> <H>          	: "Ḩ"   U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
--<Multi_key> <cedilla> <H>          	: "Ḩ"   U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
--<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
--<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
--<dead_acute> <dead_diaeresis> <I> 	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
--<dead_acute> <Multi_key> <quotedbl> <I> 	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
--<Multi_key> <acute> <dead_diaeresis> <I> 	: "Ḯ"   U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
--<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
--<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
--<dead_acute> <dead_diaeresis> <i> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
--<dead_acute> <Multi_key> <quotedbl> <i> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
--<Multi_key> <acute> <dead_diaeresis> <i> 	: "ḯ"   U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
--<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
--<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
--<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
--<dead_belowdot> <K>              	: "Ḳ"   U1E32 # LATIN CAPITAL LETTER K WITH DOT BELOW
--<Multi_key> <exclam> <K>         	: "Ḳ"   U1E32 # LATIN CAPITAL LETTER K WITH DOT BELOW
--<dead_belowdot> <k>              	: "ḳ"   U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
--<Multi_key> <exclam> <k>         	: "ḳ"   U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
--<dead_belowmacron> <K>                  	: "Ḵ"   U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
--<dead_belowmacron> <k>                  	: "ḵ"   U1E35 # LATIN SMALL LETTER K WITH LINE BELOW
--<dead_belowdot> <L>              	: "Ḷ"   U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
--<Multi_key> <exclam> <L>         	: "Ḷ"   U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
--<dead_belowdot> <l>              	: "ḷ"   U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_macron> <dead_belowdot> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
--<dead_macron> <Multi_key> <exclam> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
--<Multi_key> <macron> <dead_belowdot> <L> 	: "Ḹ"   U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
--<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> <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
--<dead_macron> <dead_belowdot> <l> 	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
--<dead_macron> <Multi_key> <exclam> <l> 	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
--<Multi_key> <macron> <dead_belowdot> <l> 	: "ḹ"   U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
--<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_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
--<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
--<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
--<dead_belowdot> <m>              	: "ṃ"   U1E43 # LATIN SMALL LETTER M WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_belowdot> <n>              	: "ṇ"   U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
--<Multi_key> <exclam> <n>         	: "ṇ"   U1E47 # LATIN SMALL LETTER N WITH DOT 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
--<dead_acute> <dead_tilde> <O>    	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
--<dead_acute> <Multi_key> <asciitilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
--<Multi_key> <acute> <dead_tilde> <O> 	: "Ṍ"   U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
--<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> <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
--<dead_acute> <dead_tilde> <o>    	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
--<dead_acute> <Multi_key> <asciitilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
--<Multi_key> <acute> <dead_tilde> <o> 	: "ṍ"   U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
--<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_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> <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_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
--<dead_grave> <Multi_key> <macron> <O> 	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
--<dead_grave> <Multi_key> <underscore> <O> 	: "Ṑ"   U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
--<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
--<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
--<dead_grave> <Multi_key> <macron> <o> 	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
--<dead_grave> <Multi_key> <underscore> <o> 	: "ṑ"   U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
--<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
--<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
--<dead_acute> <dead_macron> <O>   	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
--<dead_acute> <Multi_key> <macron> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
--<dead_acute> <Multi_key> <underscore> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
--<Multi_key> <acute> <dead_macron> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
--<Multi_key> <acute> <macron> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
--<Multi_key> <acute> <underscore> <O> 	: "Ṓ"   U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
--<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
--<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
--<dead_acute> <dead_macron> <o>   	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
--<dead_acute> <Multi_key> <macron> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
--<dead_acute> <Multi_key> <underscore> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
--<Multi_key> <acute> <dead_macron> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
--<Multi_key> <acute> <macron> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
--<Multi_key> <acute> <underscore> <o> 	: "ṓ"   U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
--<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
--<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
--<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
--<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
--<Multi_key> <period> <p>         	: "ṗ"   U1E57 # LATIN SMALL LETTER P WITH DOT ABOVE
--<dead_abovedot> <R>              	: "Ṙ"   U1E58 # LATIN CAPITAL LETTER R WITH DOT ABOVE
--<Multi_key> <period> <R>         	: "Ṙ"   U1E58 # LATIN CAPITAL LETTER R WITH DOT ABOVE
--<dead_abovedot> <r>              	: "ṙ"   U1E59 # LATIN SMALL LETTER R WITH DOT ABOVE
--<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
--<dead_belowdot> <r>              	: "ṛ"   U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_macron> <dead_belowdot> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
--<dead_macron> <Multi_key> <exclam> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
--<Multi_key> <macron> <dead_belowdot> <R> 	: "Ṝ"   U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
--<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> <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
--<dead_macron> <dead_belowdot> <r> 	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
--<dead_macron> <Multi_key> <exclam> <r> 	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
--<Multi_key> <macron> <dead_belowdot> <r> 	: "ṝ"   U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
--<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_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
--<dead_belowdot> <s>              	: "ṣ"   U1E63 # LATIN SMALL LETTER S WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_abovedot> <Multi_key> <acute> <S> 	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
--<dead_abovedot> <Multi_key> <apostrophe> <S> 	: "Ṥ"   U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
--<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> <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
--<dead_abovedot> <Multi_key> <acute> <s> 	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
--<dead_abovedot> <Multi_key> <apostrophe> <s> 	: "ṥ"   U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
--<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> <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
--<dead_abovedot> <Multi_key> <c> <S> 	: "Ṧ"   U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
--<Multi_key> <period> <dead_caron> <S> 	: "Ṧ"   U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
--<dead_abovedot> <scaron>         	: "ṧ"   U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
--<Multi_key> <period> <scaron>    	: "ṧ"   U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
--<dead_abovedot> <dead_caron> <s> 	: "ṧ"   U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
--<dead_abovedot> <Multi_key> <c> <s> 	: "ṧ"   U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
--<Multi_key> <period> <dead_caron> <s> 	: "ṧ"   U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
--<dead_abovedot> <U1E62>      	: "Ṩ"   U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
--<Multi_key> <period> <U1E62> 	: "Ṩ"   U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
--<dead_abovedot> <dead_belowdot> <S> 	: "Ṩ"   U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
--<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> <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> <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
--<dead_belowdot> <t>              	: "ṭ"   U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
--<Multi_key> <exclam> <t>         	: "ṭ"   U1E6D # LATIN SMALL LETTER T WITH DOT 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
--<dead_acute> <dead_tilde> <U>    	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
--<dead_acute> <Multi_key> <asciitilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
--<Multi_key> <acute> <dead_tilde> <U> 	: "Ṹ"   U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
--<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> <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
--<dead_acute> <dead_tilde> <u>    	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
--<dead_acute> <Multi_key> <asciitilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
--<Multi_key> <acute> <dead_tilde> <u> 	: "ṹ"   U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
--<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_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
--<dead_diaeresis> <Multi_key> <macron> <U> 	: "Ṻ"   U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
--<dead_diaeresis> <Multi_key> <underscore> <U> 	: "Ṻ"   U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
--<Multi_key> <quotedbl> <dead_macron> <U> 	: "Ṻ"   U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
--<Multi_key> <quotedbl> <macron> <U> 	: "Ṻ"   U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
--<Multi_key> <quotedbl> <underscore> <U> 	: "Ṻ"   U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
--<dead_diaeresis> <umacron>       	: "ṻ"   U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
--<Multi_key> <quotedbl> <umacron> 	: "ṻ"   U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
--<dead_diaeresis> <dead_macron> <u> 	: "ṻ"   U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
--<dead_diaeresis> <Multi_key> <macron> <u> 	: "ṻ"   U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
--<dead_diaeresis> <Multi_key> <underscore> <u> 	: "ṻ"   U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
--<Multi_key> <quotedbl> <dead_macron> <u> 	: "ṻ"   U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
--<Multi_key> <quotedbl> <macron> <u> 	: "ṻ"   U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
--<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
--<dead_tilde> <v>                 	: "ṽ"   U1E7D # LATIN SMALL LETTER V WITH TILDE
--<Multi_key> <asciitilde> <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
--<dead_belowdot> <v>              	: "ṿ"   U1E7F # LATIN SMALL LETTER V WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_grave> <w>                 	: "ẁ"   U1E81 # LATIN SMALL LETTER W WITH GRAVE
--<Multi_key> <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
--<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
--<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
--<Multi_key> <quotedbl> <w>       	: "ẅ"   U1E85 # LATIN SMALL LETTER W WITH DIAERESIS
--<dead_abovedot> <W>              	: "Ẇ"   U1E86 # LATIN CAPITAL LETTER W WITH DOT ABOVE
--<Multi_key> <period> <W>         	: "Ẇ"   U1E86 # LATIN CAPITAL LETTER W WITH DOT ABOVE
--<dead_abovedot> <w>              	: "ẇ"   U1E87 # LATIN SMALL LETTER W WITH DOT ABOVE
--<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
--<dead_belowdot> <w>              	: "ẉ"   U1E89 # LATIN SMALL LETTER W WITH DOT BELOW
--<Multi_key> <exclam> <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
--<Multi_key> <period> <x>         	: "ẋ"   U1E8B # LATIN SMALL LETTER X WITH DOT ABOVE
--<dead_diaeresis> <X>             	: "Ẍ"   U1E8C # LATIN CAPITAL LETTER X WITH DIAERESIS
--<Multi_key> <quotedbl> <X>       	: "Ẍ"   U1E8C # LATIN CAPITAL LETTER X WITH DIAERESIS
--<dead_diaeresis> <x>             	: "ẍ"   U1E8D # LATIN SMALL LETTER X WITH DIAERESIS
--<Multi_key> <quotedbl> <x>       	: "ẍ"   U1E8D # LATIN SMALL LETTER X WITH DIAERESIS
--<dead_abovedot> <Y>              	: "Ẏ"   U1E8E # LATIN CAPITAL LETTER Y WITH DOT ABOVE
--<Multi_key> <period> <Y>         	: "Ẏ"   U1E8E # LATIN CAPITAL LETTER Y WITH DOT ABOVE
--<dead_abovedot> <y>              	: "ẏ"   U1E8F # LATIN SMALL LETTER Y WITH DOT ABOVE
--<Multi_key> <period> <y>         	: "ẏ"   U1E8F # LATIN SMALL LETTER Y WITH DOT ABOVE
--<dead_circumflex> <Z>            	: "Ẑ"   U1E90 # LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
--<Multi_key> <asciicircum> <Z>    	: "Ẑ"   U1E90 # LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
--<dead_circumflex> <z>            	: "ẑ"   U1E91 # LATIN SMALL LETTER Z WITH CIRCUMFLEX
--<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
--<dead_belowdot> <z>              	: "ẓ"   U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
--<Multi_key> <exclam> <z>         	: "ẓ"   U1E93 # LATIN SMALL LETTER Z WITH DOT 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
--<Multi_key> <o> <w>              	: "ẘ"   U1E98 # LATIN SMALL LETTER W WITH RING ABOVE
--<dead_abovering> <y>             	: "ẙ"   U1E99 # LATIN SMALL LETTER Y WITH RING ABOVE
--<Multi_key> <o> <y>              	: "ẙ"   U1E99 # LATIN SMALL LETTER Y WITH RING ABOVE
--<dead_abovedot> <U017F>      	: "ẛ"   U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE
--<Multi_key> <period> <U017F> 	: "ẛ"   U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE
--<dead_belowdot> <A>              	: "Ạ"   U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW
--<Multi_key> <exclam> <A>         	: "Ạ"   U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW
--<dead_belowdot> <a>              	: "ạ"   U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_hook> <a>                  	: "ả"   U1EA3 # LATIN SMALL LETTER A WITH HOOK ABOVE
--<Multi_key> <question> <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
--<dead_acute> <dead_circumflex> <A> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
--<dead_acute> <Multi_key> <asciicircum> <A> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
--<Multi_key> <acute> <dead_circumflex> <A> 	: "Ấ"   U1EA4 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
--<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
--<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
--<dead_acute> <dead_circumflex> <a> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
--<dead_acute> <Multi_key> <asciicircum> <a> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
--<Multi_key> <acute> <dead_circumflex> <a> 	: "ấ"   U1EA5 # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<dead_circumflex> <U1EA0>    	: "Ậ"   U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<Multi_key> <asciicircum> <U1EA0> 	: "Ậ"   U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<dead_circumflex> <dead_belowdot> <A> 	: "Ậ"   U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<dead_circumflex> <Multi_key> <exclam> <A> 	: "Ậ"   U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<Multi_key> <asciicircum> <dead_belowdot> <A> 	: "Ậ"   U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<Multi_key> <asciicircum> <exclam> <A> 	: "Ậ"   U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<dead_belowdot> <Acircumflex>    	: "Ậ"   U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<dead_circumflex> <U1EA1>    	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<Multi_key> <asciicircum> <U1EA1> 	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<dead_circumflex> <dead_belowdot> <a> 	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<dead_circumflex> <Multi_key> <exclam> <a> 	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<Multi_key> <asciicircum> <dead_belowdot> <a> 	: "ậ"   U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
--<Multi_key> <asciicircum> <exclam> <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
--<Multi_key> <apostrophe> <Abreve> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
--<dead_acute> <dead_breve> <A>    	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
--<dead_acute> <Multi_key> <U> <A> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
--<dead_acute> <Multi_key> <b> <A> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
--<Multi_key> <acute> <dead_breve> <A> 	: "Ắ"   U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
--<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
--<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
--<dead_acute> <dead_breve> <a>    	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
--<dead_acute> <Multi_key> <U> <a> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
--<dead_acute> <Multi_key> <b> <a> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
--<Multi_key> <acute> <dead_breve> <a> 	: "ắ"   U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
--<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
--<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
--<dead_grave> <Multi_key> <U> <A> 	: "Ằ"   U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
--<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
--<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
--<dead_grave> <Multi_key> <U> <a> 	: "ằ"   U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
--<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
--<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
--<dead_hook> <Multi_key> <U> <A>  	: "Ẳ"   U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
--<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
--<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
--<dead_hook> <Multi_key> <U> <a>  	: "ẳ"   U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
--<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
--<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
--<dead_tilde> <Multi_key> <U> <A> 	: "Ẵ"   U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
--<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
--<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
--<dead_tilde> <Multi_key> <U> <a> 	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
--<dead_tilde> <Multi_key> <b> <a> 	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
--<Multi_key> <asciitilde> <dead_breve> <a> 	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
--<Multi_key> <asciitilde> <b> <a> 	: "ẵ"   U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
--<dead_breve> <U1EA0>         	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
--<Multi_key> <U> <U1EA0>      	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
--<Multi_key> <b> <U1EA0>      	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
--<dead_breve> <dead_belowdot> <A> 	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
--<dead_breve> <Multi_key> <exclam> <A> 	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
--<Multi_key> <U> <dead_belowdot> <A> 	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
--<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_belowdot> <Abreve>         	: "Ặ"   U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
--<dead_breve> <U1EA1>         	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
--<Multi_key> <U> <U1EA1>      	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
--<Multi_key> <b> <U1EA1>      	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
--<dead_breve> <dead_belowdot> <a> 	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
--<dead_breve> <Multi_key> <exclam> <a> 	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
--<Multi_key> <U> <dead_belowdot> <a> 	: "ặ"   U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
--<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_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
--<dead_belowdot> <e>              	: "ẹ"   U1EB9 # LATIN SMALL LETTER E WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_hook> <e>                  	: "ẻ"   U1EBB # LATIN SMALL LETTER E WITH HOOK ABOVE
--<Multi_key> <question> <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
--<dead_tilde> <e>                 	: "ẽ"   U1EBD # LATIN SMALL LETTER E WITH TILDE
--<Multi_key> <asciitilde> <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
--<dead_acute> <dead_circumflex> <E> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
--<dead_acute> <Multi_key> <asciicircum> <E> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
--<Multi_key> <acute> <dead_circumflex> <E> 	: "Ế"   U1EBE # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
--<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
--<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
--<dead_acute> <dead_circumflex> <e> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
--<dead_acute> <Multi_key> <asciicircum> <e> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
--<Multi_key> <acute> <dead_circumflex> <e> 	: "ế"   U1EBF # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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_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
--<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_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
--<dead_hook> <i>                  	: "ỉ"   U1EC9 # LATIN SMALL LETTER I WITH HOOK ABOVE
--<Multi_key> <question> <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
--<dead_belowdot> <i>              	: "ị"   U1ECB # LATIN SMALL LETTER I WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_belowdot> <o>              	: "ọ"   U1ECD # LATIN SMALL LETTER O WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_hook> <o>                  	: "ỏ"   U1ECF # LATIN SMALL LETTER O WITH HOOK ABOVE
--<Multi_key> <question> <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
--<dead_acute> <dead_circumflex> <O> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
--<dead_acute> <Multi_key> <asciicircum> <O> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
--<Multi_key> <acute> <dead_circumflex> <O> 	: "Ố"   U1ED0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
--<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
--<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
--<dead_acute> <dead_circumflex> <o> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
--<dead_acute> <Multi_key> <asciicircum> <o> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
--<Multi_key> <acute> <dead_circumflex> <o> 	: "ố"   U1ED1 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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_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
--<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_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
--<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
--<dead_acute> <dead_horn> <O>     	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
--<dead_acute> <Multi_key> <plus> <O> 	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
--<Multi_key> <acute> <dead_horn> <O> 	: "Ớ"   U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
--<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
--<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
--<Multi_key> <apostrophe> <ohorn> 	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
--<dead_acute> <dead_horn> <o>     	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
--<dead_acute> <Multi_key> <plus> <o> 	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
--<Multi_key> <acute> <dead_horn> <o> 	: "ớ"   U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<dead_belowdot> <U>              	: "Ụ"   U1EE4 # LATIN CAPITAL LETTER U WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_hook> <U>                  	: "Ủ"   U1EE6 # LATIN CAPITAL LETTER U WITH HOOK ABOVE
--<Multi_key> <question> <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
--<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
--<Multi_key> <apostrophe> <Uhorn> 	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
--<dead_acute> <dead_horn> <U>     	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
--<dead_acute> <Multi_key> <plus> <U> 	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
--<Multi_key> <acute> <dead_horn> <U> 	: "Ứ"   U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
--<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
--<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
--<Multi_key> <apostrophe> <uhorn> 	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
--<dead_acute> <dead_horn> <u>     	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
--<dead_acute> <Multi_key> <plus> <u> 	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
--<Multi_key> <acute> <dead_horn> <u> 	: "ứ"   U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<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
--<dead_grave> <Y>                 	: "Ỳ"   U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
--<Multi_key> <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
--<dead_belowdot> <Y>              	: "Ỵ"   U1EF4 # LATIN CAPITAL LETTER Y WITH DOT BELOW
--<Multi_key> <exclam> <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
--<dead_hook> <Y>                  	: "Ỷ"   U1EF6 # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
--<Multi_key> <question> <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
--<dead_tilde> <Y>                 	: "Ỹ"   U1EF8 # LATIN CAPITAL LETTER Y WITH TILDE
--<Multi_key> <asciitilde> <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
--<dead_psili> <Greek_alpha>        	: "ἀ"   U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
--<Multi_key> <parenright> <Greek_alpha> 	: "ἀ"   U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
--<dead_dasia> <Greek_alpha>        	: "ἁ"   U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
--<Multi_key> <parenleft> <Greek_alpha> 	: "ἁ"   U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
--<dead_grave> <U1F00>         	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F00>  	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_alpha> 	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_alpha> 	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_alpha> 	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_alpha> 	: "ἂ"   U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
--<dead_grave> <U1F01>         	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F01>  	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_alpha> 	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_alpha> 	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_alpha> 	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_alpha> 	: "ἃ"   U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
--<dead_acute> <U1F00>         	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F00>  	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F00> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_alpha> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_alpha> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_alpha> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_alpha> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_alpha> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_alpha> 	: "ἄ"   U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
--<dead_acute> <U1F01>         	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F01>  	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F01> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_alpha> 	: "ἅ"   U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
--<dead_tilde> <U1F00>         	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F00> 	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_alpha> 	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_alpha> 	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_alpha> 	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_alpha> 	: "ἆ"   U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F01>         	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F01> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_alpha> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_alpha> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_alpha> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_alpha> 	: "ἇ"   U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<dead_psili> <Greek_ALPHA>        	: "Ἀ"   U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
--<Multi_key> <parenright> <Greek_ALPHA> 	: "Ἀ"   U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
--<dead_dasia> <Greek_ALPHA>        	: "Ἁ"   U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
--<Multi_key> <parenleft> <Greek_ALPHA> 	: "Ἁ"   U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
--<dead_grave> <U1F08>         	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F08>  	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_ALPHA> 	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_ALPHA> 	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_ALPHA> 	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_ALPHA> 	: "Ἂ"   U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
--<dead_grave> <U1F09>         	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F09>  	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_ALPHA> 	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_ALPHA> 	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_ALPHA> 	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_ALPHA> 	: "Ἃ"   U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
--<dead_acute> <U1F08>         	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F08>  	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F08> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_ALPHA> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_ALPHA> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_ALPHA> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_ALPHA> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_ALPHA> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_ALPHA> 	: "Ἄ"   U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
--<dead_acute> <U1F09>         	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F09>  	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F09> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_ALPHA> 	: "Ἅ"   U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
--<dead_tilde> <U1F08>         	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F08> 	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_ALPHA> 	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_ALPHA> 	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_ALPHA> 	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_ALPHA> 	: "Ἆ"   U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F09>         	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F09> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_ALPHA> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_ALPHA> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_ALPHA> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_ALPHA> 	: "Ἇ"   U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
--<dead_psili> <Greek_epsilon>      	: "ἐ"   U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
--<Multi_key> <parenright> <Greek_epsilon> 	: "ἐ"   U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
--<dead_dasia> <Greek_epsilon>      	: "ἑ"   U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
--<Multi_key> <parenleft> <Greek_epsilon> 	: "ἑ"   U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
--<dead_grave> <U1F10>         	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F10>  	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_epsilon> 	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_epsilon> 	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_epsilon> 	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_epsilon> 	: "ἒ"   U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
--<dead_grave> <U1F11>         	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F11>  	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_epsilon> 	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_epsilon> 	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_epsilon> 	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_epsilon> 	: "ἓ"   U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
--<dead_acute> <U1F10>         	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F10>  	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F10> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_epsilon> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_epsilon> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_epsilon> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_epsilon> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_epsilon> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_epsilon> 	: "ἔ"   U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
--<dead_acute> <U1F11>         	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F11>  	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F11> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_epsilon> 	: "ἕ"   U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <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
--<dead_psili> <Greek_EPSILON>      	: "Ἐ"   U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
--<Multi_key> <parenright> <Greek_EPSILON> 	: "Ἐ"   U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
--<dead_dasia> <Greek_EPSILON>      	: "Ἑ"   U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
--<Multi_key> <parenleft> <Greek_EPSILON> 	: "Ἑ"   U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
--<dead_grave> <U1F18>         	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F18>  	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_EPSILON> 	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_EPSILON> 	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_EPSILON> 	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_EPSILON> 	: "Ἒ"   U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
--<dead_grave> <U1F19>         	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F19>  	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_EPSILON> 	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_EPSILON> 	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_EPSILON> 	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_EPSILON> 	: "Ἓ"   U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
--<dead_acute> <U1F18>         	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F18>  	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F18> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_EPSILON> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_EPSILON> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_EPSILON> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_EPSILON> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_EPSILON> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_EPSILON> 	: "Ἔ"   U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
--<dead_acute> <U1F19>         	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F19>  	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F19> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_EPSILON> 	: "Ἕ"   U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <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
--<dead_psili> <Greek_eta>          	: "ἠ"   U1F20 # GREEK SMALL LETTER ETA WITH PSILI
--<Multi_key> <parenright> <Greek_eta> 	: "ἠ"   U1F20 # GREEK SMALL LETTER ETA WITH PSILI
--<dead_dasia> <Greek_eta>          	: "ἡ"   U1F21 # GREEK SMALL LETTER ETA WITH DASIA
--<Multi_key> <parenleft> <Greek_eta> 	: "ἡ"   U1F21 # GREEK SMALL LETTER ETA WITH DASIA
--<dead_grave> <U1F20>         	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F20>  	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_eta> 	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_eta> 	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_eta> 	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_eta> 	: "ἢ"   U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
--<dead_grave> <U1F21>         	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F21>  	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_eta> 	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_eta> 	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_eta> 	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_eta> 	: "ἣ"   U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
--<dead_acute> <U1F20>         	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F20>  	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F20> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_eta> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_eta> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_eta> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_eta> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_eta> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_eta> 	: "ἤ"   U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
--<dead_acute> <U1F21>         	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F21>  	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F21> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_eta> 	: "ἥ"   U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
--<dead_tilde> <U1F20>         	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F20> 	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_eta> 	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_eta> 	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_eta> 	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_eta> 	: "ἦ"   U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F21>         	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F21> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_eta> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_eta> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_eta> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_eta> 	: "ἧ"   U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
--<dead_psili> <Greek_ETA>          	: "Ἠ"   U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
--<Multi_key> <parenright> <Greek_ETA> 	: "Ἠ"   U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
--<dead_dasia> <Greek_ETA>          	: "Ἡ"   U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
--<Multi_key> <parenleft> <Greek_ETA> 	: "Ἡ"   U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
--<dead_grave> <U1F28>         	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F28>  	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_ETA> 	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_ETA> 	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_ETA> 	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_ETA> 	: "Ἢ"   U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
--<dead_grave> <U1F29>         	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F29>  	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_ETA> 	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_ETA> 	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_ETA> 	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_ETA> 	: "Ἣ"   U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
--<dead_acute> <U1F28>         	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F28>  	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F28> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_ETA> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_ETA> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_ETA> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_ETA> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_ETA> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_ETA> 	: "Ἤ"   U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
--<dead_acute> <U1F29>         	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F29>  	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F29> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_ETA> 	: "Ἥ"   U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
--<dead_tilde> <U1F28>         	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F28> 	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_ETA> 	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_ETA> 	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_ETA> 	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_ETA> 	: "Ἦ"   U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F29>         	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F29> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_ETA> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_ETA> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_ETA> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_ETA> 	: "Ἧ"   U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
--<dead_psili> <Greek_iota>         	: "ἰ"   U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
--<Multi_key> <parenright> <Greek_iota> 	: "ἰ"   U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
--<dead_dasia> <Greek_iota>         	: "ἱ"   U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
--<Multi_key> <parenleft> <Greek_iota> 	: "ἱ"   U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
--<dead_grave> <U1F30>         	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F30>  	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_iota> 	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_iota> 	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_iota> 	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_iota> 	: "ἲ"   U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
--<dead_grave> <U1F31>         	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F31>  	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_iota> 	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_iota> 	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_iota> 	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_iota> 	: "ἳ"   U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
--<dead_acute> <U1F30>         	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F30>  	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F30> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_iota> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_iota> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_iota> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_iota> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_iota> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_iota> 	: "ἴ"   U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
--<dead_acute> <U1F31>         	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F31>  	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F31> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_iota> 	: "ἵ"   U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
--<dead_tilde> <U1F30>         	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F30> 	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_iota> 	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_iota> 	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_iota> 	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_iota> 	: "ἶ"   U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F31>         	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F31> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_iota> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_iota> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_iota> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_iota> 	: "ἷ"   U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
--<dead_psili> <Greek_IOTA>         	: "Ἰ"   U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
--<Multi_key> <parenright> <Greek_IOTA> 	: "Ἰ"   U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
--<dead_dasia> <Greek_IOTA>         	: "Ἱ"   U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
--<Multi_key> <parenleft> <Greek_IOTA> 	: "Ἱ"   U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
--<dead_grave> <U1F38>         	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F38>  	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_IOTA> 	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_IOTA> 	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_IOTA> 	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_IOTA> 	: "Ἲ"   U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
--<dead_grave> <U1F39>         	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F39>  	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_IOTA> 	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_IOTA> 	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_IOTA> 	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_IOTA> 	: "Ἳ"   U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
--<dead_acute> <U1F38>         	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F38>  	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F38> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_IOTA> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_IOTA> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_IOTA> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_IOTA> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_IOTA> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_IOTA> 	: "Ἴ"   U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
--<dead_acute> <U1F39>         	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F39>  	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F39> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_IOTA> 	: "Ἵ"   U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
--<dead_tilde> <U1F38>         	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F38> 	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_IOTA> 	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_IOTA> 	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_IOTA> 	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_IOTA> 	: "Ἶ"   U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F39>         	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F39> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_IOTA> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_IOTA> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_IOTA> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_IOTA> 	: "Ἷ"   U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
--<dead_psili> <Greek_omicron>      	: "ὀ"   U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
--<Multi_key> <parenright> <Greek_omicron> 	: "ὀ"   U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
--<dead_dasia> <Greek_omicron>      	: "ὁ"   U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
--<Multi_key> <parenleft> <Greek_omicron> 	: "ὁ"   U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
--<dead_grave> <U1F40>         	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F40>  	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_omicron> 	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_omicron> 	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_omicron> 	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_omicron> 	: "ὂ"   U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
--<dead_grave> <U1F41>         	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F41>  	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_omicron> 	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_omicron> 	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_omicron> 	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_omicron> 	: "ὃ"   U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
--<dead_acute> <U1F40>         	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F40>  	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F40> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_omicron> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_omicron> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_omicron> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_omicron> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_omicron> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_omicron> 	: "ὄ"   U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
--<dead_acute> <U1F41>         	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F41>  	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F41> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_omicron> 	: "ὅ"   U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <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
--<dead_psili> <Greek_OMICRON>      	: "Ὀ"   U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
--<Multi_key> <parenright> <Greek_OMICRON> 	: "Ὀ"   U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
--<dead_dasia> <Greek_OMICRON>      	: "Ὁ"   U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
--<Multi_key> <parenleft> <Greek_OMICRON> 	: "Ὁ"   U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
--<dead_grave> <U1F48>         	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F48>  	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_OMICRON> 	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_OMICRON> 	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_OMICRON> 	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_OMICRON> 	: "Ὂ"   U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
--<dead_grave> <U1F49>         	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F49>  	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_OMICRON> 	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_OMICRON> 	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_OMICRON> 	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_OMICRON> 	: "Ὃ"   U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
--<dead_acute> <U1F48>         	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F48>  	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F48> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_OMICRON> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_OMICRON> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_OMICRON> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_OMICRON> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_OMICRON> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_OMICRON> 	: "Ὄ"   U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
--<dead_acute> <U1F49>         	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F49>  	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F49> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_OMICRON> 	: "Ὅ"   U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <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
--<dead_psili> <Greek_upsilon>      	: "ὐ"   U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
--<Multi_key> <parenright> <Greek_upsilon> 	: "ὐ"   U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
--<dead_dasia> <Greek_upsilon>      	: "ὑ"   U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
--<Multi_key> <parenleft> <Greek_upsilon> 	: "ὑ"   U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
--<dead_grave> <U1F50>         	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F50>  	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_upsilon> 	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_upsilon> 	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_upsilon> 	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_upsilon> 	: "ὒ"   U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
--<dead_grave> <U1F51>         	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F51>  	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_upsilon> 	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_upsilon> 	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_upsilon> 	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_upsilon> 	: "ὓ"   U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
--<dead_acute> <U1F50>         	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F50>  	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F50> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_upsilon> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_upsilon> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_upsilon> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_upsilon> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_upsilon> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_upsilon> 	: "ὔ"   U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
--<dead_acute> <U1F51>         	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F51>  	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F51> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_upsilon> 	: "ὕ"   U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
--<dead_tilde> <U1F50>         	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F50> 	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_upsilon> 	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_upsilon> 	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_upsilon> 	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_upsilon> 	: "ὖ"   U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F51>         	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F51> 	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_upsilon> 	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_upsilon> 	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_upsilon> 	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_upsilon> 	: "ὗ"   U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<dead_dasia> <Greek_UPSILON>      	: "Ὑ"   U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
--<Multi_key> <parenleft> <Greek_UPSILON> 	: "Ὑ"   U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
--<dead_grave> <U1F59>         	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F59>  	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_UPSILON> 	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_UPSILON> 	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_UPSILON> 	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_UPSILON> 	: "Ὓ"   U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
--<dead_acute> <U1F59>         	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F59>  	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F59> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_UPSILON> 	: "Ὕ"   U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
--<dead_tilde> <U1F59>         	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F59> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_UPSILON> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_UPSILON> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_UPSILON> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_UPSILON> 	: "Ὗ"   U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
--<dead_psili> <Greek_omega>        	: "ὠ"   U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
--<Multi_key> <parenright> <Greek_omega> 	: "ὠ"   U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
--<dead_dasia> <Greek_omega>        	: "ὡ"   U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
--<Multi_key> <parenleft> <Greek_omega> 	: "ὡ"   U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
--<dead_grave> <U1F60>         	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F60>  	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_omega> 	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_omega> 	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_omega> 	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_omega> 	: "ὢ"   U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
--<dead_grave> <U1F61>         	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F61>  	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_omega> 	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_omega> 	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_omega> 	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_omega> 	: "ὣ"   U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
--<dead_acute> <U1F60>         	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F60>  	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F60> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_omega> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_omega> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_omega> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_omega> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_omega> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_omega> 	: "ὤ"   U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
--<dead_acute> <U1F61>         	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F61>  	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F61> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_omega> 	: "ὥ"   U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
--<dead_tilde> <U1F60>         	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F60> 	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_omega> 	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_omega> 	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_omega> 	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_omega> 	: "ὦ"   U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F61>         	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F61> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_omega> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_omega> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_omega> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <parenleft> <Greek_omega> 	: "ὧ"   U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<dead_psili> <Greek_OMEGA>        	: "Ὠ"   U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
--<Multi_key> <parenright> <Greek_OMEGA> 	: "Ὠ"   U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
--<dead_dasia> <Greek_OMEGA>        	: "Ὡ"   U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
--<Multi_key> <parenleft> <Greek_OMEGA> 	: "Ὡ"   U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
--<dead_grave> <U1F68>         	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
--<Multi_key> <grave> <U1F68>  	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
--<dead_grave> <dead_psili> <Greek_OMEGA> 	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
--<dead_grave> <Multi_key> <parenright> <Greek_OMEGA> 	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
--<Multi_key> <grave> <dead_psili> <Greek_OMEGA> 	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
--<Multi_key> <grave> <parenright> <Greek_OMEGA> 	: "Ὢ"   U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
--<dead_grave> <U1F69>         	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
--<Multi_key> <grave> <U1F69>  	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
--<dead_grave> <dead_dasia> <Greek_OMEGA> 	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
--<dead_grave> <Multi_key> <parenleft> <Greek_OMEGA> 	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
--<Multi_key> <grave> <dead_dasia> <Greek_OMEGA> 	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
--<Multi_key> <grave> <parenleft> <Greek_OMEGA> 	: "Ὣ"   U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
--<dead_acute> <U1F68>         	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <acute> <U1F68>  	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <U1F68> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<dead_acute> <dead_psili> <Greek_OMEGA> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<dead_acute> <Multi_key> <parenright> <Greek_OMEGA> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <acute> <dead_psili> <Greek_OMEGA> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <acute> <parenright> <Greek_OMEGA> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <dead_psili> <Greek_OMEGA> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<Multi_key> <apostrophe> <parenright> <Greek_OMEGA> 	: "Ὤ"   U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
--<dead_acute> <U1F69>         	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <acute> <U1F69>  	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <U1F69> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<dead_acute> <dead_dasia> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<dead_acute> <Multi_key> <parenleft> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <acute> <dead_dasia> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <acute> <parenleft> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <dead_dasia> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<Multi_key> <apostrophe> <parenleft> <Greek_OMEGA> 	: "Ὥ"   U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
--<dead_tilde> <U1F68>         	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F68> 	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<dead_tilde> <dead_psili> <Greek_OMEGA> 	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenright> <Greek_OMEGA> 	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_psili> <Greek_OMEGA> 	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<Multi_key> <asciitilde> <parenright> <Greek_OMEGA> 	: "Ὦ"   U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
--<dead_tilde> <U1F69>         	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <U1F69> 	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<dead_tilde> <dead_dasia> <Greek_OMEGA> 	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<dead_tilde> <Multi_key> <parenleft> <Greek_OMEGA> 	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_dasia> <Greek_OMEGA> 	: "Ὧ"   U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
--<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
--<dead_grave> <Greek_epsilon>     	: "ὲ"   U1F72 # GREEK SMALL LETTER EPSILON WITH VARIA
--<Multi_key> <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
--<dead_grave> <Greek_iota>        	: "ὶ"   U1F76 # GREEK SMALL LETTER IOTA WITH VARIA
--<Multi_key> <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
--<dead_grave> <Greek_upsilon>     	: "ὺ"   U1F7A # GREEK SMALL LETTER UPSILON WITH VARIA
--<Multi_key> <grave> <Greek_upsilon> 	: "ὺ"   U1F7A # GREEK SMALL LETTER UPSILON WITH VARIA
--<dead_grave> <Greek_omega>       	: "ὼ"   U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA
--<Multi_key> <grave> <Greek_omega> 	: "ὼ"   U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA
--<dead_iota> <U1F00>          	: "ᾀ"   U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F00> 	: "ᾀ"   U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <dead_psili> <Greek_alpha> 	: "ᾀ"   U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <parenright> <Greek_alpha> 	: "ᾀ"   U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_psili> <Greek_alpha> 	: "ᾀ"   U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <parenright> <Greek_alpha> 	: "ᾀ"   U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <U1F01>          	: "ᾁ"   U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F01> 	: "ᾁ"   U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <dead_dasia> <Greek_alpha> 	: "ᾁ"   U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <parenleft> <Greek_alpha> 	: "ᾁ"   U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_dasia> <Greek_alpha> 	: "ᾁ"   U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <parenleft> <Greek_alpha> 	: "ᾁ"   U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <U1F02>          	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F02> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <U1F00> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F00> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F00> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F00> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <dead_psili> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<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> <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> <dead_psili> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenright> <Greek_alpha> 	: "ᾂ"   U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <U1F03>          	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F03> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <U1F01> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F01> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F01> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F01> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <dead_dasia> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_alpha> 	: "ᾃ"   U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <U1F04>          	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F04> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <U1F00> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F00> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F00> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F00> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F00> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F00> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <dead_psili> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenright> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<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> <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> <dead_psili> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_alpha> 	: "ᾄ"   U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <U1F05>          	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F05> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <U1F01> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F01> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F01> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F01> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F01> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F01> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <dead_dasia> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenleft> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_alpha> 	: "ᾅ"   U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <U1F06>          	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F06> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F00> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F00> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F00> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F00> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_psili> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenright> <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> <dead_psili> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_alpha> 	: "ᾆ"   U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <U1F07>          	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F07> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F01> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F01> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F01> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F01> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_dasia> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenleft> <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> <dead_dasia> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_alpha> 	: "ᾇ"   U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <U1F08>          	: "ᾈ"   U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F08> 	: "ᾈ"   U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <dead_psili> <Greek_ALPHA> 	: "ᾈ"   U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <parenright> <Greek_ALPHA> 	: "ᾈ"   U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_psili> <Greek_ALPHA> 	: "ᾈ"   U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <parenright> <Greek_ALPHA> 	: "ᾈ"   U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <U1F09>          	: "ᾉ"   U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F09> 	: "ᾉ"   U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <dead_dasia> <Greek_ALPHA> 	: "ᾉ"   U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <parenleft> <Greek_ALPHA> 	: "ᾉ"   U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_dasia> <Greek_ALPHA> 	: "ᾉ"   U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <parenleft> <Greek_ALPHA> 	: "ᾉ"   U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <U1F0A>          	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F0A> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <U1F08> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F08> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F08> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F08> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <dead_psili> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<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> <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> <dead_psili> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenright> <Greek_ALPHA> 	: "ᾊ"   U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <U1F0B>          	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F0B> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <U1F09> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F09> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F09> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F09> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <dead_dasia> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_ALPHA> 	: "ᾋ"   U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <U1F0C>          	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F0C> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <U1F08> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F08> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F08> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F08> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F08> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F08> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <dead_psili> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenright> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<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> <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> <dead_psili> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_ALPHA> 	: "ᾌ"   U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <U1F0D>          	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F0D> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <U1F09> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F09> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F09> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F09> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F09> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F09> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <dead_dasia> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenleft> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_ALPHA> 	: "ᾍ"   U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <U1F0E>          	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F0E> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F08> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F08> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F08> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F08> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_psili> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenright> <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> <dead_psili> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_ALPHA> 	: "ᾎ"   U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <U1F0F>          	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F0F> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F09> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F09> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F09> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F09> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_dasia> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenleft> <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> <dead_dasia> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_ALPHA> 	: "ᾏ"   U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <U1F20>          	: "ᾐ"   U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F20> 	: "ᾐ"   U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <dead_psili> <Greek_eta> 	: "ᾐ"   U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <parenright> <Greek_eta> 	: "ᾐ"   U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_psili> <Greek_eta> 	: "ᾐ"   U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <parenright> <Greek_eta> 	: "ᾐ"   U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <U1F21>          	: "ᾑ"   U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F21> 	: "ᾑ"   U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <dead_dasia> <Greek_eta> 	: "ᾑ"   U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <parenleft> <Greek_eta> 	: "ᾑ"   U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_dasia> <Greek_eta> 	: "ᾑ"   U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <parenleft> <Greek_eta> 	: "ᾑ"   U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <U1F22>          	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F22> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <U1F20> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F20> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F20> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F20> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <dead_psili> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<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> <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> <dead_psili> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenright> <Greek_eta> 	: "ᾒ"   U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <U1F23>          	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F23> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <U1F21> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F21> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F21> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F21> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <dead_dasia> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_eta> 	: "ᾓ"   U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <U1F24>          	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F24> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <U1F20> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F20> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F20> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F20> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F20> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F20> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <dead_psili> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenright> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<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> <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> <dead_psili> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_eta> 	: "ᾔ"   U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <U1F25>          	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F25> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <U1F21> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F21> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F21> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F21> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F21> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F21> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <dead_dasia> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenleft> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_eta> 	: "ᾕ"   U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <U1F26>          	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F26> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F20> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F20> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F20> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F20> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_psili> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenright> <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> <dead_psili> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_eta> 	: "ᾖ"   U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <U1F27>          	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F27> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F21> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F21> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F21> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F21> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_dasia> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenleft> <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> <dead_dasia> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_eta> 	: "ᾗ"   U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <U1F28>          	: "ᾘ"   U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F28> 	: "ᾘ"   U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <dead_psili> <Greek_ETA> 	: "ᾘ"   U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <parenright> <Greek_ETA> 	: "ᾘ"   U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_psili> <Greek_ETA> 	: "ᾘ"   U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <parenright> <Greek_ETA> 	: "ᾘ"   U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <U1F29>          	: "ᾙ"   U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F29> 	: "ᾙ"   U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <dead_dasia> <Greek_ETA> 	: "ᾙ"   U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <parenleft> <Greek_ETA> 	: "ᾙ"   U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_dasia> <Greek_ETA> 	: "ᾙ"   U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <parenleft> <Greek_ETA> 	: "ᾙ"   U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <U1F2A>          	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F2A> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <U1F28> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F28> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F28> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F28> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <dead_psili> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<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> <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> <dead_psili> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenright> <Greek_ETA> 	: "ᾚ"   U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <U1F2B>          	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F2B> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <U1F29> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F29> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F29> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F29> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <dead_dasia> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_ETA> 	: "ᾛ"   U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <U1F2C>          	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F2C> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <U1F28> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F28> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F28> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F28> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F28> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F28> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <dead_psili> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenright> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<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> <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> <dead_psili> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_ETA> 	: "ᾜ"   U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <U1F2D>          	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F2D> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <U1F29> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F29> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F29> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F29> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F29> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F29> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <dead_dasia> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenleft> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_ETA> 	: "ᾝ"   U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <U1F2E>          	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F2E> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F28> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F28> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F28> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F28> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_psili> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenright> <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> <dead_psili> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_ETA> 	: "ᾞ"   U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <U1F2F>          	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F2F> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F29> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F29> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F29> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F29> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_dasia> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenleft> <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> <dead_dasia> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_ETA> 	: "ᾟ"   U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <U1F60>          	: "ᾠ"   U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F60> 	: "ᾠ"   U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <dead_psili> <Greek_omega> 	: "ᾠ"   U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <parenright> <Greek_omega> 	: "ᾠ"   U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_psili> <Greek_omega> 	: "ᾠ"   U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <parenright> <Greek_omega> 	: "ᾠ"   U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
--<dead_iota> <U1F61>          	: "ᾡ"   U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F61> 	: "ᾡ"   U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <dead_dasia> <Greek_omega> 	: "ᾡ"   U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <parenleft> <Greek_omega> 	: "ᾡ"   U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_dasia> <Greek_omega> 	: "ᾡ"   U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <parenleft> <Greek_omega> 	: "ᾡ"   U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
--<dead_iota> <U1F62>          	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F62> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <U1F60> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F60> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F60> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F60> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <dead_psili> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<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> <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> <dead_psili> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenright> <Greek_omega> 	: "ᾢ"   U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <U1F63>          	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F63> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <U1F61> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F61> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F61> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F61> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <dead_dasia> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_omega> 	: "ᾣ"   U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
--<dead_iota> <U1F64>          	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F64> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <U1F60> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F60> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F60> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F60> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F60> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F60> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <dead_psili> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenright> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<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> <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> <dead_psili> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_omega> 	: "ᾤ"   U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <U1F65>          	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F65> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <U1F61> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F61> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F61> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F61> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F61> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F61> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <dead_dasia> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenleft> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_omega> 	: "ᾥ"   U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
--<dead_iota> <U1F66>          	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F66> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F60> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F60> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F60> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F60> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_psili> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenright> <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> <dead_psili> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_omega> 	: "ᾦ"   U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <U1F67>          	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F67> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F61> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F61> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F61> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F61> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_dasia> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenleft> <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> <dead_dasia> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_omega> 	: "ᾧ"   U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <U1F68>          	: "ᾨ"   U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F68> 	: "ᾨ"   U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <dead_psili> <Greek_OMEGA> 	: "ᾨ"   U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <parenright> <Greek_OMEGA> 	: "ᾨ"   U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_psili> <Greek_OMEGA> 	: "ᾨ"   U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <parenright> <Greek_OMEGA> 	: "ᾨ"   U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
--<dead_iota> <U1F69>          	: "ᾩ"   U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F69> 	: "ᾩ"   U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <dead_dasia> <Greek_OMEGA> 	: "ᾩ"   U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <parenleft> <Greek_OMEGA> 	: "ᾩ"   U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_dasia> <Greek_OMEGA> 	: "ᾩ"   U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <parenleft> <Greek_OMEGA> 	: "ᾩ"   U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
--<dead_iota> <U1F6A>          	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F6A> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <U1F68> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F68> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F68> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F68> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <dead_psili> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<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> <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> <dead_psili> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenright> <Greek_OMEGA> 	: "ᾪ"   U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <U1F6B>          	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F6B> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <U1F69> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <U1F69> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <U1F69> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <U1F69> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <dead_dasia> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_OMEGA> 	: "ᾫ"   U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
--<dead_iota> <U1F6C>          	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F6C> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <U1F68> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F68> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F68> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F68> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F68> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F68> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <dead_psili> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenright> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<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> <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> <dead_psili> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_OMEGA> 	: "ᾬ"   U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <U1F6D>          	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F6D> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <U1F69> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <U1F69> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <U1F69> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <U1F69> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <U1F69> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <U1F69> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <dead_dasia> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <parenleft> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<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> <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> <dead_dasia> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_OMEGA> 	: "ᾭ"   U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
--<dead_iota> <U1F6E>          	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F6E> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F68> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F68> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F68> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F68> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_psili> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenright> <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> <dead_psili> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_OMEGA> 	: "ᾮ"   U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <U1F6F>          	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F6F> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <U1F69> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <U1F69> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <U1F69> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <asciitilde> <U1F69> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <dead_dasia> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_OMEGA> 	: "ᾯ"   U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <parenleft> <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> <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
--<Multi_key> <U> <Greek_alpha>    	: "ᾰ"   U1FB0 # GREEK SMALL LETTER ALPHA WITH VRACHY
--<Multi_key> <b> <Greek_alpha>    	: "ᾰ"   U1FB0 # GREEK SMALL LETTER ALPHA WITH VRACHY
--<dead_macron> <Greek_alpha>      	: "ᾱ"   U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON
--<Multi_key> <macron> <Greek_alpha> 	: "ᾱ"   U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON
--<Multi_key> <underscore> <Greek_alpha> 	: "ᾱ"   U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON
--<dead_iota> <U1F70>          	: "ᾲ"   U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F70> 	: "ᾲ"   U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Greek_alpha> 	: "ᾲ"   U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <Greek_alpha> 	: "ᾲ"   U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <Greek_alpha> 	: "ᾲ"   U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <Greek_alpha> 	: "ᾲ"   U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <Greek_alpha>        	: "ᾳ"   U1FB3 # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <Greek_alpha> 	: "ᾳ"   U1FB3 # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
--<dead_iota> <Greek_alphaaccent>  	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <Greek_alphaaccent> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Greek_alpha> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <Greek_alpha> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <Greek_alpha> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <Greek_alpha> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <Greek_alpha> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <Greek_alpha> 	: "ᾴ"   U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
--<dead_tilde> <Greek_alpha>       	: "ᾶ"   U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
--<Multi_key> <asciitilde> <Greek_alpha> 	: "ᾶ"   U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
--<dead_iota> <U1FB6>          	: "ᾷ"   U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1FB6> 	: "ᾷ"   U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Greek_alpha> 	: "ᾷ"   U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <Greek_alpha> 	: "ᾷ"   U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <Greek_alpha> 	: "ᾷ"   U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
--<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
--<Multi_key> <U> <Greek_ALPHA>    	: "Ᾰ"   U1FB8 # GREEK CAPITAL LETTER ALPHA WITH VRACHY
--<Multi_key> <b> <Greek_ALPHA>    	: "Ᾰ"   U1FB8 # GREEK CAPITAL LETTER ALPHA WITH VRACHY
--<dead_macron> <Greek_ALPHA>      	: "Ᾱ"   U1FB9 # GREEK CAPITAL LETTER ALPHA WITH MACRON
--<Multi_key> <macron> <Greek_ALPHA> 	: "Ᾱ"   U1FB9 # GREEK CAPITAL LETTER ALPHA WITH MACRON
--<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
--<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> <dead_tilde> 	: "῁"   U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
--<Multi_key> <diaeresis> <asciitilde> 	: "῁"   U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
--<dead_iota> <U1F74>          	: "ῂ"   U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F74> 	: "ῂ"   U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Greek_eta> 	: "ῂ"   U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <Greek_eta> 	: "ῂ"   U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <Greek_eta> 	: "ῂ"   U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <Greek_eta> 	: "ῂ"   U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <Greek_eta>          	: "ῃ"   U1FC3 # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <Greek_eta> 	: "ῃ"   U1FC3 # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
--<dead_iota> <Greek_etaaccent>    	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <Greek_etaaccent> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Greek_eta> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <Greek_eta> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <Greek_eta> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <Greek_eta> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <Greek_eta> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <Greek_eta> 	: "ῄ"   U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
--<dead_tilde> <Greek_eta>         	: "ῆ"   U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
--<Multi_key> <asciitilde> <Greek_eta> 	: "ῆ"   U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
--<dead_iota> <U1FC6>          	: "ῇ"   U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1FC6> 	: "ῇ"   U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Greek_eta> 	: "ῇ"   U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <Greek_eta> 	: "ῇ"   U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <Greek_eta> 	: "ῇ"   U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
--<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
--<dead_grave> <Greek_ETA>         	: "Ὴ"   U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA
--<Multi_key> <grave> <Greek_ETA>  	: "Ὴ"   U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA
--<dead_iota> <Greek_ETA>          	: "ῌ"   U1FCC # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
--<Multi_key> <Greek_iota> <Greek_ETA> 	: "ῌ"   U1FCC # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
--<Multi_key> <U1FBF> <dead_grave> 	: "῍"   U1FCD # GREEK PSILI AND VARIA
--<Multi_key> <U1FBF> <grave>  	: "῍"   U1FCD # GREEK PSILI AND VARIA
--<Multi_key> <U1FBF> <dead_acute> 	: "῎"   U1FCE # GREEK PSILI AND OXIA
--<Multi_key> <U1FBF> <acute>  	: "῎"   U1FCE # GREEK PSILI AND OXIA
--<Multi_key> <U1FBF> <apostrophe> 	: "῎"   U1FCE # GREEK PSILI AND OXIA
--<Multi_key> <U1FBF> <dead_tilde> 	: "῏"   U1FCF # GREEK PSILI AND PERISPOMENI
--<Multi_key> <U1FBF> <asciitilde> 	: "῏"   U1FCF # GREEK PSILI AND PERISPOMENI
--<dead_breve> <Greek_iota>        	: "ῐ"   U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
--<Multi_key> <U> <Greek_iota>     	: "ῐ"   U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
--<Multi_key> <b> <Greek_iota>     	: "ῐ"   U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
--<dead_macron> <Greek_iota>       	: "ῑ"   U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON
--<Multi_key> <macron> <Greek_iota> 	: "ῑ"   U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON
--<Multi_key> <underscore> <Greek_iota> 	: "ῑ"   U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON
--<dead_grave> <Greek_iotadieresis> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
--<Multi_key> <grave> <Greek_iotadieresis> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
--<dead_grave> <dead_diaeresis> <Greek_iota> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
--<dead_grave> <Multi_key> <quotedbl> <Greek_iota> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
--<Multi_key> <grave> <dead_diaeresis> <Greek_iota> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
--<Multi_key> <grave> <quotedbl> <Greek_iota> 	: "ῒ"   U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
--<dead_tilde> <Greek_iota>        	: "ῖ"   U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
--<Multi_key> <asciitilde> <Greek_iota> 	: "ῖ"   U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
--<dead_tilde> <Greek_iotadieresis> 	: "ῗ"   U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
--<Multi_key> <asciitilde> <Greek_iotadieresis> 	: "ῗ"   U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
--<dead_tilde> <dead_diaeresis> <Greek_iota> 	: "ῗ"   U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
--<dead_tilde> <Multi_key> <quotedbl> <Greek_iota> 	: "ῗ"   U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_diaeresis> <Greek_iota> 	: "ῗ"   U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
--<Multi_key> <asciitilde> <quotedbl> <Greek_iota> 	: "ῗ"   U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
--<dead_breve> <Greek_IOTA>        	: "Ῐ"   U1FD8 # GREEK CAPITAL LETTER IOTA WITH VRACHY
--<Multi_key> <U> <Greek_IOTA>     	: "Ῐ"   U1FD8 # GREEK CAPITAL LETTER IOTA WITH VRACHY
--<Multi_key> <b> <Greek_IOTA>     	: "Ῐ"   U1FD8 # GREEK CAPITAL LETTER IOTA WITH VRACHY
--<dead_macron> <Greek_IOTA>       	: "Ῑ"   U1FD9 # GREEK CAPITAL LETTER IOTA WITH MACRON
--<Multi_key> <macron> <Greek_IOTA> 	: "Ῑ"   U1FD9 # GREEK CAPITAL LETTER IOTA WITH MACRON
--<Multi_key> <underscore> <Greek_IOTA> 	: "Ῑ"   U1FD9 # GREEK CAPITAL LETTER IOTA WITH MACRON
--<dead_grave> <Greek_IOTA>        	: "Ὶ"   U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA
--<Multi_key> <grave> <Greek_IOTA> 	: "Ὶ"   U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA
--<Multi_key> <U1FFE> <dead_grave> 	: "῝"   U1FDD # GREEK DASIA AND VARIA
--<Multi_key> <U1FFE> <grave>  	: "῝"   U1FDD # GREEK DASIA AND VARIA
--<Multi_key> <U1FFE> <dead_acute> 	: "῞"   U1FDE # GREEK DASIA AND OXIA
--<Multi_key> <U1FFE> <acute>  	: "῞"   U1FDE # GREEK DASIA AND OXIA
--<Multi_key> <U1FFE> <apostrophe> 	: "῞"   U1FDE # GREEK DASIA AND OXIA
--<Multi_key> <U1FFE> <dead_tilde> 	: "῟"   U1FDF # GREEK DASIA AND PERISPOMENI
--<Multi_key> <U1FFE> <asciitilde> 	: "῟"   U1FDF # GREEK DASIA AND PERISPOMENI
--<dead_breve> <Greek_upsilon>     	: "ῠ"   U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
--<Multi_key> <U> <Greek_upsilon>  	: "ῠ"   U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
--<Multi_key> <b> <Greek_upsilon>  	: "ῠ"   U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
--<dead_macron> <Greek_upsilon>    	: "ῡ"   U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON
--<Multi_key> <macron> <Greek_upsilon> 	: "ῡ"   U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON
--<Multi_key> <underscore> <Greek_upsilon> 	: "ῡ"   U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON
--<dead_grave> <Greek_upsilondieresis> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
--<Multi_key> <grave> <Greek_upsilondieresis> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
--<dead_grave> <dead_diaeresis> <Greek_upsilon> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
--<dead_grave> <Multi_key> <quotedbl> <Greek_upsilon> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
--<Multi_key> <grave> <dead_diaeresis> <Greek_upsilon> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
--<Multi_key> <grave> <quotedbl> <Greek_upsilon> 	: "ῢ"   U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
--<dead_psili> <Greek_rho>          	: "ῤ"   U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
--<Multi_key> <parenright> <Greek_rho> 	: "ῤ"   U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
--<dead_dasia> <Greek_rho>          	: "ῥ"   U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
--<Multi_key> <parenleft> <Greek_rho> 	: "ῥ"   U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
--<dead_tilde> <Greek_upsilon>     	: "ῦ"   U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
--<Multi_key> <asciitilde> <Greek_upsilon> 	: "ῦ"   U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
--<dead_tilde> <Greek_upsilondieresis> 	: "ῧ"   U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
--<Multi_key> <asciitilde> <Greek_upsilondieresis> 	: "ῧ"   U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
--<dead_tilde> <dead_diaeresis> <Greek_upsilon> 	: "ῧ"   U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
--<dead_tilde> <Multi_key> <quotedbl> <Greek_upsilon> 	: "ῧ"   U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
--<Multi_key> <asciitilde> <dead_diaeresis> <Greek_upsilon> 	: "ῧ"   U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
--<Multi_key> <asciitilde> <quotedbl> <Greek_upsilon> 	: "ῧ"   U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
--<dead_breve> <Greek_UPSILON>     	: "Ῠ"   U1FE8 # GREEK CAPITAL LETTER UPSILON WITH VRACHY
--<Multi_key> <U> <Greek_UPSILON>  	: "Ῠ"   U1FE8 # GREEK CAPITAL LETTER UPSILON WITH VRACHY
--<Multi_key> <b> <Greek_UPSILON>  	: "Ῠ"   U1FE8 # GREEK CAPITAL LETTER UPSILON WITH VRACHY
--<dead_macron> <Greek_UPSILON>    	: "Ῡ"   U1FE9 # GREEK CAPITAL LETTER UPSILON WITH MACRON
--<Multi_key> <macron> <Greek_UPSILON> 	: "Ῡ"   U1FE9 # GREEK CAPITAL LETTER UPSILON WITH MACRON
--<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
--<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
--<dead_iota> <U1F7C>          	: "ῲ"   U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1F7C> 	: "ῲ"   U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <dead_grave> <Greek_omega> 	: "ῲ"   U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <grave> <Greek_omega> 	: "ῲ"   U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_grave> <Greek_omega> 	: "ῲ"   U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <grave> <Greek_omega> 	: "ῲ"   U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
--<dead_iota> <Greek_omega>        	: "ῳ"   U1FF3 # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <Greek_omega> 	: "ῳ"   U1FF3 # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
--<dead_iota> <Greek_omegaaccent>  	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <Greek_omegaaccent> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <dead_acute> <Greek_omega> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <acute> <Greek_omega> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <apostrophe> <Greek_omega> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_acute> <Greek_omega> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <acute> <Greek_omega> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <apostrophe> <Greek_omega> 	: "ῴ"   U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--<dead_tilde> <Greek_omega>       	: "ῶ"   U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
--<Multi_key> <asciitilde> <Greek_omega> 	: "ῶ"   U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
--<dead_iota> <U1FF6>          	: "ῷ"   U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <U1FF6> 	: "ῷ"   U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <dead_tilde> <Greek_omega> 	: "ῷ"   U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
--<dead_iota> <Multi_key> <asciitilde> <Greek_omega> 	: "ῷ"   U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
--<Multi_key> <Greek_iota> <dead_tilde> <Greek_omega> 	: "ῷ"   U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
--<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
--<dead_grave> <Greek_OMEGA>       	: "Ὼ"   U1FFA # GREEK CAPITAL LETTER OMEGA WITH VARIA
--<Multi_key> <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
--<Multi_key> <asciicircum> <0>    	: "⁰"   U2070 # SUPERSCRIPT ZERO
--<dead_circumflex> <KP_0>         	: "⁰"   U2070 # SUPERSCRIPT ZERO
--<Multi_key> <asciicircum> <KP_0> 	: "⁰"   U2070 # SUPERSCRIPT ZERO
--<dead_circumflex> <Multi_key> <underscore> <i> 	: "ⁱ"   U2071 # SUPERSCRIPT LATIN SMALL LETTER I
--<Multi_key> <asciicircum> <underscore> <i> 	: "ⁱ"   U2071 # SUPERSCRIPT LATIN SMALL LETTER I
--<dead_circumflex> <Multi_key> <underbar> <i> 	: "ⁱ"   U2071 # SUPERSCRIPT LATIN SMALL LETTER I
--<Multi_key> <asciicircum> <underbar> <i> 	: "ⁱ"   U2071 # SUPERSCRIPT LATIN SMALL LETTER I
--<dead_circumflex> <4>            	: "⁴"   U2074 # SUPERSCRIPT FOUR
--<Multi_key> <asciicircum> <4>    	: "⁴"   U2074 # SUPERSCRIPT FOUR
--<dead_circumflex> <KP_4>         	: "⁴"   U2074 # SUPERSCRIPT FOUR
--<Multi_key> <asciicircum> <KP_4> 	: "⁴"   U2074 # SUPERSCRIPT FOUR
--<dead_circumflex> <5>            	: "⁵"   U2075 # SUPERSCRIPT FIVE
--<Multi_key> <asciicircum> <5>    	: "⁵"   U2075 # SUPERSCRIPT FIVE
--<dead_circumflex> <KP_5>         	: "⁵"   U2075 # SUPERSCRIPT FIVE
--<Multi_key> <asciicircum> <KP_5> 	: "⁵"   U2075 # SUPERSCRIPT FIVE
--<dead_circumflex> <6>            	: "⁶"   U2076 # SUPERSCRIPT SIX
--<Multi_key> <asciicircum> <6>    	: "⁶"   U2076 # SUPERSCRIPT SIX
--<dead_circumflex> <KP_6>         	: "⁶"   U2076 # SUPERSCRIPT SIX
--<Multi_key> <asciicircum> <KP_6> 	: "⁶"   U2076 # SUPERSCRIPT SIX
--<dead_circumflex> <7>            	: "⁷"   U2077 # SUPERSCRIPT SEVEN
--<Multi_key> <asciicircum> <7>    	: "⁷"   U2077 # SUPERSCRIPT SEVEN
--<dead_circumflex> <KP_7>         	: "⁷"   U2077 # SUPERSCRIPT SEVEN
--<Multi_key> <asciicircum> <KP_7> 	: "⁷"   U2077 # SUPERSCRIPT SEVEN
--<dead_circumflex> <8>            	: "⁸"   U2078 # SUPERSCRIPT EIGHT
--<Multi_key> <asciicircum> <8>    	: "⁸"   U2078 # SUPERSCRIPT EIGHT
--<dead_circumflex> <KP_8>         	: "⁸"   U2078 # SUPERSCRIPT EIGHT
--<Multi_key> <asciicircum> <KP_8> 	: "⁸"   U2078 # SUPERSCRIPT EIGHT
--<dead_circumflex> <9>            	: "⁹"   U2079 # SUPERSCRIPT NINE
--<Multi_key> <asciicircum> <9>    	: "⁹"   U2079 # SUPERSCRIPT NINE
--<dead_circumflex> <KP_9>         	: "⁹"   U2079 # SUPERSCRIPT NINE
--<Multi_key> <asciicircum> <KP_9> 	: "⁹"   U2079 # SUPERSCRIPT NINE
--<dead_circumflex> <plus>         	: "⁺"   U207A # SUPERSCRIPT PLUS SIGN
--<Multi_key> <asciicircum> <plus> 	: "⁺"   U207A # SUPERSCRIPT PLUS SIGN
--<dead_circumflex> <KP_Add>       	: "⁺"   U207A # SUPERSCRIPT PLUS SIGN
--<Multi_key> <asciicircum> <KP_Add> 	: "⁺"   U207A # SUPERSCRIPT PLUS SIGN
--<dead_circumflex> <U2212>    	: "⁻"   U207B # SUPERSCRIPT MINUS
--<Multi_key> <asciicircum> <U2212> 	: "⁻"   U207B # SUPERSCRIPT MINUS
--<dead_circumflex> <equal>        	: "⁼"   U207C # SUPERSCRIPT EQUALS SIGN
--<Multi_key> <asciicircum> <equal> 	: "⁼"   U207C # SUPERSCRIPT EQUALS SIGN
--<dead_circumflex> <KP_Equal>     	: "⁼"   U207C # SUPERSCRIPT EQUALS SIGN
--<Multi_key> <asciicircum> <KP_Equal> 	: "⁼"   U207C # SUPERSCRIPT EQUALS SIGN
--<dead_circumflex> <parenleft>    	: "⁽"   U207D # SUPERSCRIPT LEFT PARENTHESIS
--<Multi_key> <asciicircum> <parenleft> 	: "⁽"   U207D # SUPERSCRIPT LEFT PARENTHESIS
--<dead_circumflex> <parenright>   	: "⁾"   U207E # SUPERSCRIPT RIGHT PARENTHESIS
--<Multi_key> <asciicircum> <parenright> 	: "⁾"   U207E # SUPERSCRIPT RIGHT PARENTHESIS
--<dead_circumflex> <Multi_key> <underscore> <n> 	: "ⁿ"   U207F # SUPERSCRIPT LATIN SMALL LETTER N
--<Multi_key> <asciicircum> <underscore> <n> 	: "ⁿ"   U207F # SUPERSCRIPT LATIN SMALL LETTER N
--<dead_circumflex> <Multi_key> <underbar> <n> 	: "ⁿ"   U207F # SUPERSCRIPT LATIN SMALL LETTER N
--<Multi_key> <asciicircum> <underbar> <n> 	: "ⁿ"   U207F # SUPERSCRIPT LATIN SMALL LETTER N
--<Multi_key> <underscore> <0>     	: "₀"   U2080 # SUBSCRIPT ZERO
--<Multi_key> <underscore> <KP_0>  	: "₀"   U2080 # SUBSCRIPT ZERO
--<Multi_key> <underbar> <0>       	: "₀"   U2080 # SUBSCRIPT ZERO
--<Multi_key> <underbar> <KP_0>    	: "₀"   U2080 # SUBSCRIPT ZERO
--<Multi_key> <underscore> <1>     	: "₁"   U2081 # SUBSCRIPT ONE
--<Multi_key> <underscore> <KP_1>  	: "₁"   U2081 # SUBSCRIPT ONE
--<Multi_key> <underbar> <1>       	: "₁"   U2081 # SUBSCRIPT ONE
--<Multi_key> <underbar> <KP_1>    	: "₁"   U2081 # SUBSCRIPT ONE
--<Multi_key> <underscore> <2>     	: "₂"   U2082 # SUBSCRIPT TWO
--<Multi_key> <underscore> <KP_Space> 	: "₂"   U2082 # SUBSCRIPT TWO
--<Multi_key> <underscore> <KP_2>  	: "₂"   U2082 # SUBSCRIPT TWO
--<Multi_key> <underbar> <2>       	: "₂"   U2082 # SUBSCRIPT TWO
--<Multi_key> <underbar> <KP_Space> 	: "₂"   U2082 # SUBSCRIPT TWO
--<Multi_key> <underbar> <KP_2>    	: "₂"   U2082 # SUBSCRIPT TWO
--<Multi_key> <underscore> <3>     	: "₃"   U2083 # SUBSCRIPT THREE
--<Multi_key> <underscore> <KP_3>  	: "₃"   U2083 # SUBSCRIPT THREE
--<Multi_key> <underbar> <3>       	: "₃"   U2083 # SUBSCRIPT THREE
--<Multi_key> <underbar> <KP_3>    	: "₃"   U2083 # SUBSCRIPT THREE
--<Multi_key> <underscore> <4>     	: "₄"   U2084 # SUBSCRIPT FOUR
--<Multi_key> <underscore> <KP_4>  	: "₄"   U2084 # SUBSCRIPT FOUR
--<Multi_key> <underbar> <4>       	: "₄"   U2084 # SUBSCRIPT FOUR
--<Multi_key> <underbar> <KP_4>    	: "₄"   U2084 # SUBSCRIPT FOUR
--<Multi_key> <underscore> <5>     	: "₅"   U2085 # SUBSCRIPT FIVE
--<Multi_key> <underscore> <KP_5>  	: "₅"   U2085 # SUBSCRIPT FIVE
--<Multi_key> <underbar> <5>       	: "₅"   U2085 # SUBSCRIPT FIVE
--<Multi_key> <underbar> <KP_5>    	: "₅"   U2085 # SUBSCRIPT FIVE
--<Multi_key> <underscore> <6>     	: "₆"   U2086 # SUBSCRIPT SIX
--<Multi_key> <underscore> <KP_6>  	: "₆"   U2086 # SUBSCRIPT SIX
--<Multi_key> <underbar> <6>       	: "₆"   U2086 # SUBSCRIPT SIX
--<Multi_key> <underbar> <KP_6>    	: "₆"   U2086 # SUBSCRIPT SIX
--<Multi_key> <underscore> <7>     	: "₇"   U2087 # SUBSCRIPT SEVEN
--<Multi_key> <underscore> <KP_7>  	: "₇"   U2087 # SUBSCRIPT SEVEN
--<Multi_key> <underbar> <7>       	: "₇"   U2087 # SUBSCRIPT SEVEN
--<Multi_key> <underbar> <KP_7>    	: "₇"   U2087 # SUBSCRIPT SEVEN
--<Multi_key> <underscore> <8>     	: "₈"   U2088 # SUBSCRIPT EIGHT
--<Multi_key> <underscore> <KP_8>  	: "₈"   U2088 # SUBSCRIPT EIGHT
--<Multi_key> <underbar> <8>       	: "₈"   U2088 # SUBSCRIPT EIGHT
--<Multi_key> <underbar> <KP_8>    	: "₈"   U2088 # SUBSCRIPT EIGHT
--<Multi_key> <underscore> <9>     	: "₉"   U2089 # SUBSCRIPT NINE
--<Multi_key> <underscore> <KP_9>  	: "₉"   U2089 # SUBSCRIPT NINE
--<Multi_key> <underbar> <9>       	: "₉"   U2089 # SUBSCRIPT NINE
--<Multi_key> <underbar> <KP_9>    	: "₉"   U2089 # SUBSCRIPT NINE
--<Multi_key> <underscore> <plus>  	: "₊"   U208A # SUBSCRIPT PLUS SIGN
--<Multi_key> <underscore> <KP_Add> 	: "₊"   U208A # SUBSCRIPT PLUS SIGN
--<Multi_key> <underbar> <plus>    	: "₊"   U208A # SUBSCRIPT PLUS SIGN
--<Multi_key> <underbar> <KP_Add>  	: "₊"   U208A # SUBSCRIPT PLUS SIGN
--<Multi_key> <underscore> <U2212> 	: "₋"   U208B # SUBSCRIPT MINUS
--<Multi_key> <underbar> <U2212> 	: "₋"   U208B # SUBSCRIPT MINUS
--<Multi_key> <underscore> <equal> 	: "₌"   U208C # SUBSCRIPT EQUALS SIGN
--<Multi_key> <underscore> <KP_Equal> 	: "₌"   U208C # SUBSCRIPT EQUALS SIGN
--<Multi_key> <underbar> <equal>   	: "₌"   U208C # SUBSCRIPT EQUALS SIGN
--<Multi_key> <underbar> <KP_Equal> 	: "₌"   U208C # SUBSCRIPT EQUALS SIGN
--<Multi_key> <underscore> <parenleft> 	: "₍"   U208D # SUBSCRIPT LEFT PARENTHESIS
--<Multi_key> <underbar> <parenleft> 	: "₍"   U208D # SUBSCRIPT LEFT PARENTHESIS
--<Multi_key> <underscore> <parenright> 	: "₎"   U208E # SUBSCRIPT RIGHT PARENTHESIS
--<Multi_key> <underbar> <parenright> 	: "₎"   U208E # SUBSCRIPT RIGHT PARENTHESIS
--<dead_circumflex> <Multi_key> <S> <M> 	: "℠"   U2120 # SERVICE MARK
--<Multi_key> <S> <M>		 	: "℠"   U2120 # SERVICE MARK
--<dead_circumflex> <Multi_key> <s> <M> 	: "℠"   U2120 # SERVICE MARK
--<Multi_key> <s> <M>		 	: "℠"   U2120 # SERVICE MARK
--<dead_circumflex> <Multi_key> <S> <m> 	: "℠"   U2120 # SERVICE MARK
--<Multi_key> <S> <m>		 	: "℠"   U2120 # SERVICE MARK
--<dead_circumflex> <Multi_key> <s> <m> 	: "℠"   U2120 # SERVICE MARK
--<Multi_key> <s> <m>		 	: "℠"   U2120 # SERVICE MARK
--<dead_circumflex> <Multi_key> <T> <M> 	: "™"   U2122 # TRADE MARK SIGN
--<Multi_key> <T> <M>		 	: "™"   U2122 # TRADE MARK SIGN
--<dead_circumflex> <Multi_key> <t> <M> 	: "™"   U2122 # TRADE MARK SIGN
--<Multi_key> <t> <M>		 	: "™"   U2122 # TRADE MARK SIGN
--<dead_circumflex> <Multi_key> <T> <m> 	: "™"   U2122 # TRADE MARK SIGN
--<Multi_key> <T> <m>		 	: "™"   U2122 # TRADE MARK SIGN
--<dead_circumflex> <Multi_key> <t> <m> 	: "™"   U2122 # TRADE MARK SIGN
--<Multi_key> <t> <m>		 	: "™"   U2122 # TRADE MARK SIGN
--<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
--<Multi_key> <KP_Divide> <rightarrow> 	: "↛"   U219B # RIGHTWARDS ARROW WITH STROKE
--<Multi_key> <slash> <U2194>  	: "↮"   U21AE # LEFT RIGHT ARROW WITH STROKE
--<Multi_key> <KP_Divide> <U2194> 	: "↮"   U21AE # LEFT RIGHT ARROW WITH STROKE
--<Multi_key> <less> <minus> 	: "←" U2190 # LEFTWARDS ARROW
--<Multi_key> <minus> <greater> 	: "→" U2192 # RIGHTWARDS ARROW
--<Multi_key> <U2203> <U0338> 	: "∄"   U2204 # THERE DOES NOT EXIST
--<Multi_key> <U2208> <U0338> 	: "∉"   U2209 # NOT AN ELEMENT OF
--<Multi_key> <U220B> <U0338> 	: "∌"   U220C # DOES NOT CONTAIN AS MEMBER
--<Multi_key> <U2223> <U0338> 	: "∤"   U2224 # DOES NOT DIVIDE
--<Multi_key> <U2225> <U0338> 	: "∦"   U2226 # NOT PARALLEL TO
--<Multi_key> <U223C> <U0338> 	: "≁"   U2241 # NOT TILDE
--<Multi_key> <U2243> <U0338> 	: "≄"   U2244 # NOT ASYMPTOTICALLY EQUAL TO
--<Multi_key> <approximate> <U0338> 	: "≇"   U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO
--<Multi_key> <U2248> <U0338> 	: "≉"   U2249 # NOT ALMOST EQUAL TO
--<Multi_key> <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
--<Multi_key> <greater> <U0338> 	: "≯"   U226F # NOT GREATER-THAN
--<Multi_key> <rightcaret> <U0338> 	: "≯"   U226F # NOT GREATER-THAN
--<Multi_key> <lessthanequal> <U0338> 	: "≰"   U2270 # NEITHER LESS-THAN NOR EQUAL TO
--<Multi_key> <greaterthanequal> <U0338> 	: "≱"   U2271 # NEITHER GREATER-THAN NOR EQUAL TO
--<Multi_key> <U2272> <U0338> 	: "≴"   U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO
--<Multi_key> <U2273> <U0338> 	: "≵"   U2275 # NEITHER GREATER-THAN NOR EQUIVALENT TO
--<Multi_key> <U2276> <U0338> 	: "≸"   U2278 # NEITHER LESS-THAN NOR GREATER-THAN
--<Multi_key> <U2277> <U0338> 	: "≹"   U2279 # NEITHER GREATER-THAN NOR LESS-THAN
--<Multi_key> <U227A> <U0338> 	: "⊀"   U2280 # DOES NOT PRECEDE
--<Multi_key> <U227B> <U0338> 	: "⊁"   U2281 # DOES NOT SUCCEED
--<Multi_key> <includedin> <U0338> 	: "⊄"   U2284 # NOT A SUBSET OF
--<Multi_key> <leftshoe> <U0338> 	: "⊄"   U2284 # NOT A SUBSET OF
--<Multi_key> <includes> <U0338> 	: "⊅"   U2285 # NOT A SUPERSET OF
--<Multi_key> <rightshoe> <U0338> 	: "⊅"   U2285 # NOT A SUPERSET OF
--<Multi_key> <U2286> <U0338> 	: "⊈"   U2288 # NEITHER A SUBSET OF NOR EQUAL TO
--<Multi_key> <U2287> <U0338> 	: "⊉"   U2289 # NEITHER A SUPERSET OF NOR EQUAL TO
--<Multi_key> <righttack> <U0338> 	: "⊬"   U22AC # DOES NOT PROVE
--<Multi_key> <U22A8> <U0338> 	: "⊭"   U22AD # NOT TRUE
--<Multi_key> <U22A9> <U0338> 	: "⊮"   U22AE # DOES NOT FORCE
--<Multi_key> <U22AB> <U0338> 	: "⊯"   U22AF # NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
--<Multi_key> <U227C> <U0338> 	: "⋠"   U22E0 # DOES NOT PRECEDE OR EQUAL
--<Multi_key> <U227D> <U0338> 	: "⋡"   U22E1 # DOES NOT SUCCEED OR EQUAL
--<Multi_key> <U2291> <U0338> 	: "⋢"   U22E2 # NOT SQUARE IMAGE OF OR EQUAL TO
--<Multi_key> <U2292> <U0338> 	: "⋣"   U22E3 # NOT SQUARE ORIGINAL OF OR EQUAL TO
--<Multi_key> <U22B2> <U0338> 	: "⋪"   U22EA # NOT NORMAL SUBGROUP OF
--<Multi_key> <U22B3> <U0338> 	: "⋫"   U22EB # DOES NOT CONTAIN AS NORMAL SUBGROUP
--<Multi_key> <U22B4> <U0338> 	: "⋬"   U22EC # NOT NORMAL SUBGROUP OF OR EQUAL TO
--<Multi_key> <U22B5> <U0338> 	: "⋭"   U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL
--<Multi_key> <parenleft> <1> <parenright> 	: "①"   U2460 # CIRCLED DIGIT ONE
--<Multi_key> <parenleft> <KP_1> <parenright> 	: "①"   U2460 # CIRCLED DIGIT ONE
--<Multi_key> <parenleft> <2> <parenright> 	: "②"   U2461 # CIRCLED DIGIT TWO
--<Multi_key> <parenleft> <KP_Space> <parenright> 	: "②"   U2461 # CIRCLED DIGIT TWO
--<Multi_key> <parenleft> <KP_2> <parenright> 	: "②"   U2461 # CIRCLED DIGIT TWO
--<Multi_key> <parenleft> <3> <parenright> 	: "③"   U2462 # CIRCLED DIGIT THREE
--<Multi_key> <parenleft> <KP_3> <parenright> 	: "③"   U2462 # CIRCLED DIGIT THREE
--<Multi_key> <parenleft> <4> <parenright> 	: "④"   U2463 # CIRCLED DIGIT FOUR
--<Multi_key> <parenleft> <KP_4> <parenright> 	: "④"   U2463 # CIRCLED DIGIT FOUR
--<Multi_key> <parenleft> <5> <parenright> 	: "⑤"   U2464 # CIRCLED DIGIT FIVE
--<Multi_key> <parenleft> <KP_5> <parenright> 	: "⑤"   U2464 # CIRCLED DIGIT FIVE
--<Multi_key> <parenleft> <6> <parenright> 	: "⑥"   U2465 # CIRCLED DIGIT SIX
--<Multi_key> <parenleft> <KP_6> <parenright> 	: "⑥"   U2465 # CIRCLED DIGIT SIX
--<Multi_key> <parenleft> <7> <parenright> 	: "⑦"   U2466 # CIRCLED DIGIT SEVEN
--<Multi_key> <parenleft> <KP_7> <parenright> 	: "⑦"   U2466 # CIRCLED DIGIT SEVEN
--<Multi_key> <parenleft> <8> <parenright> 	: "⑧"   U2467 # CIRCLED DIGIT EIGHT
--<Multi_key> <parenleft> <KP_8> <parenright> 	: "⑧"   U2467 # CIRCLED DIGIT EIGHT
--<Multi_key> <parenleft> <9> <parenright> 	: "⑨"   U2468 # CIRCLED DIGIT NINE
--<Multi_key> <parenleft> <KP_9> <parenright> 	: "⑨"   U2468 # CIRCLED DIGIT NINE
--<Multi_key> <parenleft> <1> <0> <parenright> 	: "⑩"   U2469 # CIRCLED NUMBER TEN
--<Multi_key> <parenleft> <1> <KP_0> <parenright> 	: "⑩"   U2469 # CIRCLED NUMBER TEN
--<Multi_key> <parenleft> <KP_1> <0> <parenright> 	: "⑩"   U2469 # CIRCLED NUMBER TEN
--<Multi_key> <parenleft> <KP_1> <KP_0> <parenright> 	: "⑩"   U2469 # CIRCLED NUMBER TEN
--<Multi_key> <parenleft> <1> <1> <parenright> 	: "⑪"   U246A # CIRCLED NUMBER ELEVEN
--<Multi_key> <parenleft> <1> <KP_1> <parenright> 	: "⑪"   U246A # CIRCLED NUMBER ELEVEN
--<Multi_key> <parenleft> <KP_1> <1> <parenright> 	: "⑪"   U246A # CIRCLED NUMBER ELEVEN
--<Multi_key> <parenleft> <KP_1> <KP_1> <parenright> 	: "⑪"   U246A # CIRCLED NUMBER ELEVEN
--<Multi_key> <parenleft> <1> <2> <parenright> 	: "⑫"   U246B # CIRCLED NUMBER TWELVE
--<Multi_key> <parenleft> <1> <KP_Space> <parenright> 	: "⑫"   U246B # CIRCLED NUMBER TWELVE
--<Multi_key> <parenleft> <1> <KP_2> <parenright> 	: "⑫"   U246B # CIRCLED NUMBER TWELVE
--<Multi_key> <parenleft> <KP_1> <2> <parenright> 	: "⑫"   U246B # CIRCLED NUMBER TWELVE
--<Multi_key> <parenleft> <KP_1> <KP_Space> <parenright> 	: "⑫"   U246B # CIRCLED NUMBER TWELVE
--<Multi_key> <parenleft> <KP_1> <KP_2> <parenright> 	: "⑫"   U246B # CIRCLED NUMBER TWELVE
--<Multi_key> <parenleft> <1> <3> <parenright> 	: "⑬"   U246C # CIRCLED NUMBER THIRTEEN
--<Multi_key> <parenleft> <1> <KP_3> <parenright> 	: "⑬"   U246C # CIRCLED NUMBER THIRTEEN
--<Multi_key> <parenleft> <KP_1> <3> <parenright> 	: "⑬"   U246C # CIRCLED NUMBER THIRTEEN
--<Multi_key> <parenleft> <KP_1> <KP_3> <parenright> 	: "⑬"   U246C # CIRCLED NUMBER THIRTEEN
--<Multi_key> <parenleft> <1> <4> <parenright> 	: "⑭"   U246D # CIRCLED NUMBER FOURTEEN
--<Multi_key> <parenleft> <1> <KP_4> <parenright> 	: "⑭"   U246D # CIRCLED NUMBER FOURTEEN
--<Multi_key> <parenleft> <KP_1> <4> <parenright> 	: "⑭"   U246D # CIRCLED NUMBER FOURTEEN
--<Multi_key> <parenleft> <KP_1> <KP_4> <parenright> 	: "⑭"   U246D # CIRCLED NUMBER FOURTEEN
--<Multi_key> <parenleft> <1> <5> <parenright> 	: "⑮"   U246E # CIRCLED NUMBER FIFTEEN
--<Multi_key> <parenleft> <1> <KP_5> <parenright> 	: "⑮"   U246E # CIRCLED NUMBER FIFTEEN
--<Multi_key> <parenleft> <KP_1> <5> <parenright> 	: "⑮"   U246E # CIRCLED NUMBER FIFTEEN
--<Multi_key> <parenleft> <KP_1> <KP_5> <parenright> 	: "⑮"   U246E # CIRCLED NUMBER FIFTEEN
--<Multi_key> <parenleft> <1> <6> <parenright> 	: "⑯"   U246F # CIRCLED NUMBER SIXTEEN
--<Multi_key> <parenleft> <1> <KP_6> <parenright> 	: "⑯"   U246F # CIRCLED NUMBER SIXTEEN
--<Multi_key> <parenleft> <KP_1> <6> <parenright> 	: "⑯"   U246F # CIRCLED NUMBER SIXTEEN
--<Multi_key> <parenleft> <KP_1> <KP_6> <parenright> 	: "⑯"   U246F # CIRCLED NUMBER SIXTEEN
--<Multi_key> <parenleft> <1> <7> <parenright> 	: "⑰"   U2470 # CIRCLED NUMBER SEVENTEEN
--<Multi_key> <parenleft> <1> <KP_7> <parenright> 	: "⑰"   U2470 # CIRCLED NUMBER SEVENTEEN
--<Multi_key> <parenleft> <KP_1> <7> <parenright> 	: "⑰"   U2470 # CIRCLED NUMBER SEVENTEEN
--<Multi_key> <parenleft> <KP_1> <KP_7> <parenright> 	: "⑰"   U2470 # CIRCLED NUMBER SEVENTEEN
--<Multi_key> <parenleft> <1> <8> <parenright> 	: "⑱"   U2471 # CIRCLED NUMBER EIGHTEEN
--<Multi_key> <parenleft> <1> <KP_8> <parenright> 	: "⑱"   U2471 # CIRCLED NUMBER EIGHTEEN
--<Multi_key> <parenleft> <KP_1> <8> <parenright> 	: "⑱"   U2471 # CIRCLED NUMBER EIGHTEEN
--<Multi_key> <parenleft> <KP_1> <KP_8> <parenright> 	: "⑱"   U2471 # CIRCLED NUMBER EIGHTEEN
--<Multi_key> <parenleft> <1> <9> <parenright> 	: "⑲"   U2472 # CIRCLED NUMBER NINETEEN
--<Multi_key> <parenleft> <1> <KP_9> <parenright> 	: "⑲"   U2472 # CIRCLED NUMBER NINETEEN
--<Multi_key> <parenleft> <KP_1> <9> <parenright> 	: "⑲"   U2472 # CIRCLED NUMBER NINETEEN
--<Multi_key> <parenleft> <KP_1> <KP_9> <parenright> 	: "⑲"   U2472 # CIRCLED NUMBER NINETEEN
--<Multi_key> <parenleft> <2> <0> <parenright> 	: "⑳"   U2473 # CIRCLED NUMBER TWENTY
--<Multi_key> <parenleft> <2> <KP_0> <parenright> 	: "⑳"   U2473 # CIRCLED NUMBER TWENTY
--<Multi_key> <parenleft> <KP_Space> <0> <parenright> 	: "⑳"   U2473 # CIRCLED NUMBER TWENTY
--<Multi_key> <parenleft> <KP_Space> <KP_0> <parenright> 	: "⑳"   U2473 # CIRCLED NUMBER TWENTY
--<Multi_key> <parenleft> <KP_2> <0> <parenright> 	: "⑳"   U2473 # CIRCLED NUMBER TWENTY
--<Multi_key> <parenleft> <KP_2> <KP_0> <parenright> 	: "⑳"   U2473 # CIRCLED NUMBER TWENTY
--<Multi_key> <parenleft> <A> <parenright> 	: "Ⓐ"   U24B6 # CIRCLED LATIN CAPITAL LETTER A
--<Multi_key> <parenleft> <B> <parenright> 	: "Ⓑ"   U24B7 # CIRCLED LATIN CAPITAL LETTER B
--<Multi_key> <parenleft> <C> <parenright> 	: "Ⓒ"   U24B8 # CIRCLED LATIN CAPITAL LETTER C
--<Multi_key> <parenleft> <D> <parenright> 	: "Ⓓ"   U24B9 # CIRCLED LATIN CAPITAL LETTER D
--<Multi_key> <parenleft> <E> <parenright> 	: "Ⓔ"   U24BA # CIRCLED LATIN CAPITAL LETTER E
--<Multi_key> <parenleft> <F> <parenright> 	: "Ⓕ"   U24BB # CIRCLED LATIN CAPITAL LETTER F
--<Multi_key> <parenleft> <G> <parenright> 	: "Ⓖ"   U24BC # CIRCLED LATIN CAPITAL LETTER G
--<Multi_key> <parenleft> <H> <parenright> 	: "Ⓗ"   U24BD # CIRCLED LATIN CAPITAL LETTER H
--<Multi_key> <parenleft> <I> <parenright> 	: "Ⓘ"   U24BE # CIRCLED LATIN CAPITAL LETTER I
--<Multi_key> <parenleft> <J> <parenright> 	: "Ⓙ"   U24BF # CIRCLED LATIN CAPITAL LETTER J
--<Multi_key> <parenleft> <K> <parenright> 	: "Ⓚ"   U24C0 # CIRCLED LATIN CAPITAL LETTER K
--<Multi_key> <parenleft> <L> <parenright> 	: "Ⓛ"   U24C1 # CIRCLED LATIN CAPITAL LETTER L
--<Multi_key> <parenleft> <M> <parenright> 	: "Ⓜ"   U24C2 # CIRCLED LATIN CAPITAL LETTER M
--<Multi_key> <parenleft> <N> <parenright> 	: "Ⓝ"   U24C3 # CIRCLED LATIN CAPITAL LETTER N
--<Multi_key> <parenleft> <O> <parenright> 	: "Ⓞ"   U24C4 # CIRCLED LATIN CAPITAL LETTER O
--<Multi_key> <parenleft> <P> <parenright> 	: "Ⓟ"   U24C5 # CIRCLED LATIN CAPITAL LETTER P
--<Multi_key> <parenleft> <Q> <parenright> 	: "Ⓠ"   U24C6 # CIRCLED LATIN CAPITAL LETTER Q
--<Multi_key> <parenleft> <R> <parenright> 	: "Ⓡ"   U24C7 # CIRCLED LATIN CAPITAL LETTER R
--<Multi_key> <parenleft> <S> <parenright> 	: "Ⓢ"   U24C8 # CIRCLED LATIN CAPITAL LETTER S
--<Multi_key> <parenleft> <T> <parenright> 	: "Ⓣ"   U24C9 # CIRCLED LATIN CAPITAL LETTER T
--<Multi_key> <parenleft> <U> <parenright> 	: "Ⓤ"   U24CA # CIRCLED LATIN CAPITAL LETTER U
--<Multi_key> <parenleft> <V> <parenright> 	: "Ⓥ"   U24CB # CIRCLED LATIN CAPITAL LETTER V
--<Multi_key> <parenleft> <W> <parenright> 	: "Ⓦ"   U24CC # CIRCLED LATIN CAPITAL LETTER W
--<Multi_key> <parenleft> <X> <parenright> 	: "Ⓧ"   U24CD # CIRCLED LATIN CAPITAL LETTER X
--<Multi_key> <parenleft> <Y> <parenright> 	: "Ⓨ"   U24CE # CIRCLED LATIN CAPITAL LETTER Y
--<Multi_key> <parenleft> <Z> <parenright> 	: "Ⓩ"   U24CF # CIRCLED LATIN CAPITAL LETTER Z
--<Multi_key> <parenleft> <a> <parenright> 	: "ⓐ"   U24D0 # CIRCLED LATIN SMALL LETTER A
--<Multi_key> <parenleft> <b> <parenright> 	: "ⓑ"   U24D1 # CIRCLED LATIN SMALL LETTER B
--<Multi_key> <parenleft> <c> <parenright> 	: "ⓒ"   U24D2 # CIRCLED LATIN SMALL LETTER C
--<Multi_key> <parenleft> <d> <parenright> 	: "ⓓ"   U24D3 # CIRCLED LATIN SMALL LETTER D
--<Multi_key> <parenleft> <e> <parenright> 	: "ⓔ"   U24D4 # CIRCLED LATIN SMALL LETTER E
--<Multi_key> <parenleft> <f> <parenright> 	: "ⓕ"   U24D5 # CIRCLED LATIN SMALL LETTER F
--<Multi_key> <parenleft> <g> <parenright> 	: "ⓖ"   U24D6 # CIRCLED LATIN SMALL LETTER G
--<Multi_key> <parenleft> <h> <parenright> 	: "ⓗ"   U24D7 # CIRCLED LATIN SMALL LETTER H
--<Multi_key> <parenleft> <i> <parenright> 	: "ⓘ"   U24D8 # CIRCLED LATIN SMALL LETTER I
--<Multi_key> <parenleft> <j> <parenright> 	: "ⓙ"   U24D9 # CIRCLED LATIN SMALL LETTER J
--<Multi_key> <parenleft> <k> <parenright> 	: "ⓚ"   U24DA # CIRCLED LATIN SMALL LETTER K
--<Multi_key> <parenleft> <l> <parenright> 	: "ⓛ"   U24DB # CIRCLED LATIN SMALL LETTER L
--<Multi_key> <parenleft> <m> <parenright> 	: "ⓜ"   U24DC # CIRCLED LATIN SMALL LETTER M
--<Multi_key> <parenleft> <n> <parenright> 	: "ⓝ"   U24DD # CIRCLED LATIN SMALL LETTER N
--<Multi_key> <parenleft> <o> <parenright> 	: "ⓞ"   U24DE # CIRCLED LATIN SMALL LETTER O
--<Multi_key> <parenleft> <p> <parenright> 	: "ⓟ"   U24DF # CIRCLED LATIN SMALL LETTER P
--<Multi_key> <parenleft> <q> <parenright> 	: "ⓠ"   U24E0 # CIRCLED LATIN SMALL LETTER Q
--<Multi_key> <parenleft> <r> <parenright> 	: "ⓡ"   U24E1 # CIRCLED LATIN SMALL LETTER R
--<Multi_key> <parenleft> <s> <parenright> 	: "ⓢ"   U24E2 # CIRCLED LATIN SMALL LETTER S
--<Multi_key> <parenleft> <t> <parenright> 	: "ⓣ"   U24E3 # CIRCLED LATIN SMALL LETTER T
--<Multi_key> <parenleft> <u> <parenright> 	: "ⓤ"   U24E4 # CIRCLED LATIN SMALL LETTER U
--<Multi_key> <parenleft> <v> <parenright> 	: "ⓥ"   U24E5 # CIRCLED LATIN SMALL LETTER V
--<Multi_key> <parenleft> <w> <parenright> 	: "ⓦ"   U24E6 # CIRCLED LATIN SMALL LETTER W
--<Multi_key> <parenleft> <x> <parenright> 	: "ⓧ"   U24E7 # CIRCLED LATIN SMALL LETTER X
--<Multi_key> <parenleft> <y> <parenright> 	: "ⓨ"   U24E8 # CIRCLED LATIN SMALL LETTER Y
--<Multi_key> <parenleft> <z> <parenright> 	: "ⓩ"   U24E9 # CIRCLED LATIN SMALL LETTER Z
--<Multi_key> <parenleft> <0> <parenright> 	: "⓪"   U24EA # CIRCLED DIGIT ZERO
--<Multi_key> <parenleft> <KP_0> <parenright> 	: "⓪"   U24EA # CIRCLED DIGIT ZERO
--<dead_belowdot> <plus>                  : "⨥"   U2A25 # PLUS SIGN WITH DOT BELOW
--<dead_belowtilde> <plus>                : "⨦"   U2A26 # PLUS SIGN WITH TILDE BELOW
--<dead_belowdot> <minus>                 : "⨪"   U2A2A # MINUS SIGN WITH DOT BELOW
--<dead_belowdot> <equal>                 : "⩦"   U2A66 # EQUALS SIGN WITH DOT BELOW
--<dead_diaeresis> <dead_belowdiaeresis> <equal> : "⩷"   U2A77 # EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW
--<dead_belowdiaeresis> <dead_diaeresis> <equal> : "⩷"   U2A77 # EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW
--<Multi_key> <U2ADD> <U0338> 	: "⫝̸"   U2ADC # FORKING
--<dead_belowring> <bar>                  : "⫰"   U2AF0 # VERTICAL LINE WITH CIRCLE BELOW
--<dead_voiced_sound> <U304B>  	: "が"   U304C # HIRAGANA LETTER GA
--<dead_voiced_sound> <U304D>  	: "ぎ"   U304E # HIRAGANA LETTER GI
--<dead_voiced_sound> <U304F>  	: "ぐ"   U3050 # HIRAGANA LETTER GU
--<dead_voiced_sound> <U3051>  	: "げ"   U3052 # HIRAGANA LETTER GE
--<dead_voiced_sound> <U3053>  	: "ご"   U3054 # HIRAGANA LETTER GO
--<dead_voiced_sound> <U3055>  	: "ざ"   U3056 # HIRAGANA LETTER ZA
--<dead_voiced_sound> <U3057>  	: "じ"   U3058 # HIRAGANA LETTER ZI
--<dead_voiced_sound> <U3059>  	: "ず"   U305A # HIRAGANA LETTER ZU
--<dead_voiced_sound> <U305B>  	: "ぜ"   U305C # HIRAGANA LETTER ZE
--<dead_voiced_sound> <U305D>  	: "ぞ"   U305E # HIRAGANA LETTER ZO
--<dead_voiced_sound> <U305F>  	: "だ"   U3060 # HIRAGANA LETTER DA
--<dead_voiced_sound> <U3061>  	: "ぢ"   U3062 # HIRAGANA LETTER DI
--<dead_voiced_sound> <U3064>  	: "づ"   U3065 # HIRAGANA LETTER DU
--<dead_voiced_sound> <U3066>  	: "で"   U3067 # HIRAGANA LETTER DE
--<dead_voiced_sound> <U3068>  	: "ど"   U3069 # HIRAGANA LETTER DO
--<dead_voiced_sound> <U306F>  	: "ば"   U3070 # HIRAGANA LETTER BA
--<dead_semivoiced_sound> <U306F> 	: "ぱ"   U3071 # HIRAGANA LETTER PA
--<dead_voiced_sound> <U3072>  	: "び"   U3073 # HIRAGANA LETTER BI
--<dead_semivoiced_sound> <U3072> 	: "ぴ"   U3074 # HIRAGANA LETTER PI
--<dead_voiced_sound> <U3075>  	: "ぶ"   U3076 # HIRAGANA LETTER BU
--<dead_semivoiced_sound> <U3075> 	: "ぷ"   U3077 # HIRAGANA LETTER PU
--<dead_voiced_sound> <U3078>  	: "べ"   U3079 # HIRAGANA LETTER BE
--<dead_semivoiced_sound> <U3078> 	: "ぺ"   U307A # HIRAGANA LETTER PE
--<dead_voiced_sound> <U307B>  	: "ぼ"   U307C # HIRAGANA LETTER BO
--<dead_semivoiced_sound> <U307B> 	: "ぽ"   U307D # HIRAGANA LETTER PO
--<dead_voiced_sound> <U3046>  	: "ゔ"   U3094 # HIRAGANA LETTER VU
--<dead_voiced_sound> <U309D>  	: "ゞ"   U309E # HIRAGANA VOICED ITERATION MARK
--<dead_voiced_sound> <kana_KA>    	: "ガ"   U30AC # KATAKANA LETTER GA
--<dead_voiced_sound> <kana_KI>    	: "ギ"   U30AE # KATAKANA LETTER GI
--<dead_voiced_sound> <kana_KU>    	: "グ"   U30B0 # KATAKANA LETTER GU
--<dead_voiced_sound> <kana_KE>    	: "ゲ"   U30B2 # KATAKANA LETTER GE
--<dead_voiced_sound> <kana_KO>    	: "ゴ"   U30B4 # KATAKANA LETTER GO
--<dead_voiced_sound> <kana_SA>    	: "ザ"   U30B6 # KATAKANA LETTER ZA
--<dead_voiced_sound> <kana_SHI>   	: "ジ"   U30B8 # KATAKANA LETTER ZI
--<dead_voiced_sound> <kana_SU>    	: "ズ"   U30BA # KATAKANA LETTER ZU
--<dead_voiced_sound> <kana_SE>    	: "ゼ"   U30BC # KATAKANA LETTER ZE
--<dead_voiced_sound> <kana_SO>    	: "ゾ"   U30BE # KATAKANA LETTER ZO
--<dead_voiced_sound> <kana_TA>    	: "ダ"   U30C0 # KATAKANA LETTER DA
--<dead_voiced_sound> <kana_CHI>   	: "ヂ"   U30C2 # KATAKANA LETTER DI
--<dead_voiced_sound> <kana_TSU>   	: "ヅ"   U30C5 # KATAKANA LETTER DU
--<dead_voiced_sound> <kana_TE>    	: "デ"   U30C7 # KATAKANA LETTER DE
--<dead_voiced_sound> <kana_TO>    	: "ド"   U30C9 # KATAKANA LETTER DO
--<dead_voiced_sound> <kana_HA>    	: "バ"   U30D0 # KATAKANA LETTER BA
--<dead_semivoiced_sound> <kana_HA> 	: "パ"   U30D1 # KATAKANA LETTER PA
--<dead_voiced_sound> <kana_HI>    	: "ビ"   U30D3 # KATAKANA LETTER BI
--<dead_semivoiced_sound> <kana_HI> 	: "ピ"   U30D4 # KATAKANA LETTER PI
--<dead_voiced_sound> <kana_FU>    	: "ブ"   U30D6 # KATAKANA LETTER BU
--<dead_semivoiced_sound> <kana_FU> 	: "プ"   U30D7 # KATAKANA LETTER PU
--<dead_voiced_sound> <kana_HE>    	: "ベ"   U30D9 # KATAKANA LETTER BE
--<dead_semivoiced_sound> <kana_HE> 	: "ペ"   U30DA # KATAKANA LETTER PE
--<dead_voiced_sound> <kana_HO>    	: "ボ"   U30DC # KATAKANA LETTER BO
--<dead_semivoiced_sound> <kana_HO> 	: "ポ"   U30DD # KATAKANA LETTER PO
--<dead_voiced_sound> <kana_U>     	: "ヴ"   U30F4 # KATAKANA LETTER VU
--<dead_voiced_sound> <kana_WA>    	: "ヷ"   U30F7 # KATAKANA LETTER VA
--<dead_voiced_sound> <U30F0>  	: "ヸ"   U30F8 # KATAKANA LETTER VI
--<dead_voiced_sound> <U30F1>  	: "ヹ"   U30F9 # KATAKANA LETTER VE
--<dead_voiced_sound> <kana_WO>    	: "ヺ"   U30FA # KATAKANA LETTER VO
--<dead_voiced_sound> <U30FD>  	: "ヾ"   U30FE # KATAKANA VOICED ITERATION MARK
--<dead_circumflex> <U4E00>    	: "㆒"   U3192 # IDEOGRAPHIC ANNOTATION ONE MARK
--<Multi_key> <asciicircum> <U4E00> 	: "㆒"   U3192 # IDEOGRAPHIC ANNOTATION ONE MARK
--<dead_circumflex> <U4E8C>    	: "㆓"   U3193 # IDEOGRAPHIC ANNOTATION TWO MARK
--<Multi_key> <asciicircum> <U4E8C> 	: "㆓"   U3193 # IDEOGRAPHIC ANNOTATION TWO MARK
--<dead_circumflex> <U4E09>    	: "㆔"   U3194 # IDEOGRAPHIC ANNOTATION THREE MARK
--<Multi_key> <asciicircum> <U4E09> 	: "㆔"   U3194 # IDEOGRAPHIC ANNOTATION THREE MARK
--<dead_circumflex> <U56DB>    	: "㆕"   U3195 # IDEOGRAPHIC ANNOTATION FOUR MARK
--<Multi_key> <asciicircum> <U56DB> 	: "㆕"   U3195 # IDEOGRAPHIC ANNOTATION FOUR MARK
--<dead_circumflex> <U4E0A>    	: "㆖"   U3196 # IDEOGRAPHIC ANNOTATION TOP MARK
--<Multi_key> <asciicircum> <U4E0A> 	: "㆖"   U3196 # IDEOGRAPHIC ANNOTATION TOP MARK
--<dead_circumflex> <U4E2D>    	: "㆗"   U3197 # IDEOGRAPHIC ANNOTATION MIDDLE MARK
--<Multi_key> <asciicircum> <U4E2D> 	: "㆗"   U3197 # IDEOGRAPHIC ANNOTATION MIDDLE MARK
--<dead_circumflex> <U4E0B>    	: "㆘"   U3198 # IDEOGRAPHIC ANNOTATION BOTTOM MARK
--<Multi_key> <asciicircum> <U4E0B> 	: "㆘"   U3198 # IDEOGRAPHIC ANNOTATION BOTTOM MARK
--<dead_circumflex> <U7532>    	: "㆙"   U3199 # IDEOGRAPHIC ANNOTATION FIRST MARK
--<Multi_key> <asciicircum> <U7532> 	: "㆙"   U3199 # IDEOGRAPHIC ANNOTATION FIRST MARK
--<dead_circumflex> <U4E59>    	: "㆚"   U319A # IDEOGRAPHIC ANNOTATION SECOND MARK
--<Multi_key> <asciicircum> <U4E59> 	: "㆚"   U319A # IDEOGRAPHIC ANNOTATION SECOND MARK
--<dead_circumflex> <U4E19>    	: "㆛"   U319B # IDEOGRAPHIC ANNOTATION THIRD MARK
--<Multi_key> <asciicircum> <U4E19> 	: "㆛"   U319B # IDEOGRAPHIC ANNOTATION THIRD MARK
--<dead_circumflex> <U4E01>    	: "㆜"   U319C # IDEOGRAPHIC ANNOTATION FOURTH MARK
--<Multi_key> <asciicircum> <U4E01> 	: "㆜"   U319C # IDEOGRAPHIC ANNOTATION FOURTH MARK
--<dead_circumflex> <U5929>    	: "㆝"   U319D # IDEOGRAPHIC ANNOTATION HEAVEN MARK
--<Multi_key> <asciicircum> <U5929> 	: "㆝"   U319D # IDEOGRAPHIC ANNOTATION HEAVEN MARK
--<dead_circumflex> <U5730>    	: "㆞"   U319E # IDEOGRAPHIC ANNOTATION EARTH MARK
--<Multi_key> <asciicircum> <U5730> 	: "㆞"   U319E # IDEOGRAPHIC ANNOTATION EARTH MARK
--<dead_circumflex> <U4EBA>    	: "㆟"   U319F # IDEOGRAPHIC ANNOTATION MAN MARK
--<Multi_key> <asciicircum> <U4EBA> 	: "㆟"   U319F # IDEOGRAPHIC ANNOTATION MAN MARK
--<Multi_key> <parenleft> <2> <1> <parenright> 	: "㉑"   U3251 # CIRCLED NUMBER TWENTY ONE
--<Multi_key> <parenleft> <2> <KP_1> <parenright> 	: "㉑"   U3251 # CIRCLED NUMBER TWENTY ONE
--<Multi_key> <parenleft> <KP_Space> <1> <parenright> 	: "㉑"   U3251 # CIRCLED NUMBER TWENTY ONE
--<Multi_key> <parenleft> <KP_Space> <KP_1> <parenright> 	: "㉑"   U3251 # CIRCLED NUMBER TWENTY ONE
--<Multi_key> <parenleft> <KP_2> <1> <parenright> 	: "㉑"   U3251 # CIRCLED NUMBER TWENTY ONE
--<Multi_key> <parenleft> <KP_2> <KP_1> <parenright> 	: "㉑"   U3251 # CIRCLED NUMBER TWENTY ONE
--<Multi_key> <parenleft> <2> <2> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <2> <KP_Space> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <2> <KP_2> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <KP_Space> <2> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <KP_Space> <KP_Space> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <KP_Space> <KP_2> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <KP_2> <2> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <KP_2> <KP_Space> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <KP_2> <KP_2> <parenright> 	: "㉒"   U3252 # CIRCLED NUMBER TWENTY TWO
--<Multi_key> <parenleft> <2> <3> <parenright> 	: "㉓"   U3253 # CIRCLED NUMBER TWENTY THREE
--<Multi_key> <parenleft> <2> <KP_3> <parenright> 	: "㉓"   U3253 # CIRCLED NUMBER TWENTY THREE
--<Multi_key> <parenleft> <KP_Space> <3> <parenright> 	: "㉓"   U3253 # CIRCLED NUMBER TWENTY THREE
--<Multi_key> <parenleft> <KP_Space> <KP_3> <parenright> 	: "㉓"   U3253 # CIRCLED NUMBER TWENTY THREE
--<Multi_key> <parenleft> <KP_2> <3> <parenright> 	: "㉓"   U3253 # CIRCLED NUMBER TWENTY THREE
--<Multi_key> <parenleft> <KP_2> <KP_3> <parenright> 	: "㉓"   U3253 # CIRCLED NUMBER TWENTY THREE
--<Multi_key> <parenleft> <2> <4> <parenright> 	: "㉔"   U3254 # CIRCLED NUMBER TWENTY FOUR
--<Multi_key> <parenleft> <2> <KP_4> <parenright> 	: "㉔"   U3254 # CIRCLED NUMBER TWENTY FOUR
--<Multi_key> <parenleft> <KP_Space> <4> <parenright> 	: "㉔"   U3254 # CIRCLED NUMBER TWENTY FOUR
--<Multi_key> <parenleft> <KP_Space> <KP_4> <parenright> 	: "㉔"   U3254 # CIRCLED NUMBER TWENTY FOUR
--<Multi_key> <parenleft> <KP_2> <4> <parenright> 	: "㉔"   U3254 # CIRCLED NUMBER TWENTY FOUR
--<Multi_key> <parenleft> <KP_2> <KP_4> <parenright> 	: "㉔"   U3254 # CIRCLED NUMBER TWENTY FOUR
--<Multi_key> <parenleft> <2> <5> <parenright> 	: "㉕"   U3255 # CIRCLED NUMBER TWENTY FIVE
--<Multi_key> <parenleft> <2> <KP_5> <parenright> 	: "㉕"   U3255 # CIRCLED NUMBER TWENTY FIVE
--<Multi_key> <parenleft> <KP_Space> <5> <parenright> 	: "㉕"   U3255 # CIRCLED NUMBER TWENTY FIVE
--<Multi_key> <parenleft> <KP_Space> <KP_5> <parenright> 	: "㉕"   U3255 # CIRCLED NUMBER TWENTY FIVE
--<Multi_key> <parenleft> <KP_2> <5> <parenright> 	: "㉕"   U3255 # CIRCLED NUMBER TWENTY FIVE
--<Multi_key> <parenleft> <KP_2> <KP_5> <parenright> 	: "㉕"   U3255 # CIRCLED NUMBER TWENTY FIVE
--<Multi_key> <parenleft> <2> <6> <parenright> 	: "㉖"   U3256 # CIRCLED NUMBER TWENTY SIX
--<Multi_key> <parenleft> <2> <KP_6> <parenright> 	: "㉖"   U3256 # CIRCLED NUMBER TWENTY SIX
--<Multi_key> <parenleft> <KP_Space> <6> <parenright> 	: "㉖"   U3256 # CIRCLED NUMBER TWENTY SIX
--<Multi_key> <parenleft> <KP_Space> <KP_6> <parenright> 	: "㉖"   U3256 # CIRCLED NUMBER TWENTY SIX
--<Multi_key> <parenleft> <KP_2> <6> <parenright> 	: "㉖"   U3256 # CIRCLED NUMBER TWENTY SIX
--<Multi_key> <parenleft> <KP_2> <KP_6> <parenright> 	: "㉖"   U3256 # CIRCLED NUMBER TWENTY SIX
--<Multi_key> <parenleft> <2> <7> <parenright> 	: "㉗"   U3257 # CIRCLED NUMBER TWENTY SEVEN
--<Multi_key> <parenleft> <2> <KP_7> <parenright> 	: "㉗"   U3257 # CIRCLED NUMBER TWENTY SEVEN
--<Multi_key> <parenleft> <KP_Space> <7> <parenright> 	: "㉗"   U3257 # CIRCLED NUMBER TWENTY SEVEN
--<Multi_key> <parenleft> <KP_Space> <KP_7> <parenright> 	: "㉗"   U3257 # CIRCLED NUMBER TWENTY SEVEN
--<Multi_key> <parenleft> <KP_2> <7> <parenright> 	: "㉗"   U3257 # CIRCLED NUMBER TWENTY SEVEN
--<Multi_key> <parenleft> <KP_2> <KP_7> <parenright> 	: "㉗"   U3257 # CIRCLED NUMBER TWENTY SEVEN
--<Multi_key> <parenleft> <2> <8> <parenright> 	: "㉘"   U3258 # CIRCLED NUMBER TWENTY EIGHT
--<Multi_key> <parenleft> <2> <KP_8> <parenright> 	: "㉘"   U3258 # CIRCLED NUMBER TWENTY EIGHT
--<Multi_key> <parenleft> <KP_Space> <8> <parenright> 	: "㉘"   U3258 # CIRCLED NUMBER TWENTY EIGHT
--<Multi_key> <parenleft> <KP_Space> <KP_8> <parenright> 	: "㉘"   U3258 # CIRCLED NUMBER TWENTY EIGHT
--<Multi_key> <parenleft> <KP_2> <8> <parenright> 	: "㉘"   U3258 # CIRCLED NUMBER TWENTY EIGHT
--<Multi_key> <parenleft> <KP_2> <KP_8> <parenright> 	: "㉘"   U3258 # CIRCLED NUMBER TWENTY EIGHT
--<Multi_key> <parenleft> <2> <9> <parenright> 	: "㉙"   U3259 # CIRCLED NUMBER TWENTY NINE
--<Multi_key> <parenleft> <2> <KP_9> <parenright> 	: "㉙"   U3259 # CIRCLED NUMBER TWENTY NINE
--<Multi_key> <parenleft> <KP_Space> <9> <parenright> 	: "㉙"   U3259 # CIRCLED NUMBER TWENTY NINE
--<Multi_key> <parenleft> <KP_Space> <KP_9> <parenright> 	: "㉙"   U3259 # CIRCLED NUMBER TWENTY NINE
--<Multi_key> <parenleft> <KP_2> <9> <parenright> 	: "㉙"   U3259 # CIRCLED NUMBER TWENTY NINE
--<Multi_key> <parenleft> <KP_2> <KP_9> <parenright> 	: "㉙"   U3259 # CIRCLED NUMBER TWENTY NINE
--<Multi_key> <parenleft> <3> <0> <parenright> 	: "㉚"   U325A # CIRCLED NUMBER THIRTY
--<Multi_key> <parenleft> <3> <KP_0> <parenright> 	: "㉚"   U325A # CIRCLED NUMBER THIRTY
--<Multi_key> <parenleft> <KP_3> <0> <parenright> 	: "㉚"   U325A # CIRCLED NUMBER THIRTY
--<Multi_key> <parenleft> <KP_3> <KP_0> <parenright> 	: "㉚"   U325A # CIRCLED NUMBER THIRTY
--<Multi_key> <parenleft> <3> <1> <parenright> 	: "㉛"   U325B # CIRCLED NUMBER THIRTY ONE
--<Multi_key> <parenleft> <3> <KP_1> <parenright> 	: "㉛"   U325B # CIRCLED NUMBER THIRTY ONE
--<Multi_key> <parenleft> <KP_3> <1> <parenright> 	: "㉛"   U325B # CIRCLED NUMBER THIRTY ONE
--<Multi_key> <parenleft> <KP_3> <KP_1> <parenright> 	: "㉛"   U325B # CIRCLED NUMBER THIRTY ONE
--<Multi_key> <parenleft> <3> <2> <parenright> 	: "㉜"   U325C # CIRCLED NUMBER THIRTY TWO
--<Multi_key> <parenleft> <3> <KP_Space> <parenright> 	: "㉜"   U325C # CIRCLED NUMBER THIRTY TWO
--<Multi_key> <parenleft> <3> <KP_2> <parenright> 	: "㉜"   U325C # CIRCLED NUMBER THIRTY TWO
--<Multi_key> <parenleft> <KP_3> <2> <parenright> 	: "㉜"   U325C # CIRCLED NUMBER THIRTY TWO
--<Multi_key> <parenleft> <KP_3> <KP_Space> <parenright> 	: "㉜"   U325C # CIRCLED NUMBER THIRTY TWO
--<Multi_key> <parenleft> <KP_3> <KP_2> <parenright> 	: "㉜"   U325C # CIRCLED NUMBER THIRTY TWO
--<Multi_key> <parenleft> <3> <3> <parenright> 	: "㉝"   U325D # CIRCLED NUMBER THIRTY THREE
--<Multi_key> <parenleft> <3> <KP_3> <parenright> 	: "㉝"   U325D # CIRCLED NUMBER THIRTY THREE
--<Multi_key> <parenleft> <KP_3> <3> <parenright> 	: "㉝"   U325D # CIRCLED NUMBER THIRTY THREE
--<Multi_key> <parenleft> <KP_3> <KP_3> <parenright> 	: "㉝"   U325D # CIRCLED NUMBER THIRTY THREE
--<Multi_key> <parenleft> <3> <4> <parenright> 	: "㉞"   U325E # CIRCLED NUMBER THIRTY FOUR
--<Multi_key> <parenleft> <3> <KP_4> <parenright> 	: "㉞"   U325E # CIRCLED NUMBER THIRTY FOUR
--<Multi_key> <parenleft> <KP_3> <4> <parenright> 	: "㉞"   U325E # CIRCLED NUMBER THIRTY FOUR
--<Multi_key> <parenleft> <KP_3> <KP_4> <parenright> 	: "㉞"   U325E # CIRCLED NUMBER THIRTY FOUR
--<Multi_key> <parenleft> <3> <5> <parenright> 	: "㉟"   U325F # CIRCLED NUMBER THIRTY FIVE
--<Multi_key> <parenleft> <3> <KP_5> <parenright> 	: "㉟"   U325F # CIRCLED NUMBER THIRTY FIVE
--<Multi_key> <parenleft> <KP_3> <5> <parenright> 	: "㉟"   U325F # CIRCLED NUMBER THIRTY FIVE
--<Multi_key> <parenleft> <KP_3> <KP_5> <parenright> 	: "㉟"   U325F # CIRCLED NUMBER THIRTY FIVE
--<Multi_key> <parenleft> <U1100> <parenright> 	: "㉠"   U3260 # CIRCLED HANGUL KIYEOK
--<Multi_key> <parenleft> <U1102> <parenright> 	: "㉡"   U3261 # CIRCLED HANGUL NIEUN
--<Multi_key> <parenleft> <U1103> <parenright> 	: "㉢"   U3262 # CIRCLED HANGUL TIKEUT
--<Multi_key> <parenleft> <U1105> <parenright> 	: "㉣"   U3263 # CIRCLED HANGUL RIEUL
--<Multi_key> <parenleft> <U1106> <parenright> 	: "㉤"   U3264 # CIRCLED HANGUL MIEUM
--<Multi_key> <parenleft> <U1107> <parenright> 	: "㉥"   U3265 # CIRCLED HANGUL PIEUP
--<Multi_key> <parenleft> <U1109> <parenright> 	: "㉦"   U3266 # CIRCLED HANGUL SIOS
--<Multi_key> <parenleft> <U110B> <parenright> 	: "㉧"   U3267 # CIRCLED HANGUL IEUNG
--<Multi_key> <parenleft> <U110C> <parenright> 	: "㉨"   U3268 # CIRCLED HANGUL CIEUC
--<Multi_key> <parenleft> <U110E> <parenright> 	: "㉩"   U3269 # CIRCLED HANGUL CHIEUCH
--<Multi_key> <parenleft> <U110F> <parenright> 	: "㉪"   U326A # CIRCLED HANGUL KHIEUKH
--<Multi_key> <parenleft> <U1110> <parenright> 	: "㉫"   U326B # CIRCLED HANGUL THIEUTH
--<Multi_key> <parenleft> <U1111> <parenright> 	: "㉬"   U326C # CIRCLED HANGUL PHIEUPH
--<Multi_key> <parenleft> <U1112> <parenright> 	: "㉭"   U326D # CIRCLED HANGUL HIEUH
--<Multi_key> <parenleft> <U1100> <U1161> <parenright> 	: "㉮"   U326E # CIRCLED HANGUL KIYEOK A
--<Multi_key> <parenleft> <U1102> <U1161> <parenright> 	: "㉯"   U326F # CIRCLED HANGUL NIEUN A
--<Multi_key> <parenleft> <U1103> <U1161> <parenright> 	: "㉰"   U3270 # CIRCLED HANGUL TIKEUT A
--<Multi_key> <parenleft> <U1105> <U1161> <parenright> 	: "㉱"   U3271 # CIRCLED HANGUL RIEUL A
--<Multi_key> <parenleft> <U1106> <U1161> <parenright> 	: "㉲"   U3272 # CIRCLED HANGUL MIEUM A
--<Multi_key> <parenleft> <U1107> <U1161> <parenright> 	: "㉳"   U3273 # CIRCLED HANGUL PIEUP A
--<Multi_key> <parenleft> <U1109> <U1161> <parenright> 	: "㉴"   U3274 # CIRCLED HANGUL SIOS A
--<Multi_key> <parenleft> <U110B> <U1161> <parenright> 	: "㉵"   U3275 # CIRCLED HANGUL IEUNG A
--<Multi_key> <parenleft> <U110C> <U1161> <parenright> 	: "㉶"   U3276 # CIRCLED HANGUL CIEUC A
--<Multi_key> <parenleft> <U110E> <U1161> <parenright> 	: "㉷"   U3277 # CIRCLED HANGUL CHIEUCH A
--<Multi_key> <parenleft> <U110F> <U1161> <parenright> 	: "㉸"   U3278 # CIRCLED HANGUL KHIEUKH A
--<Multi_key> <parenleft> <U1110> <U1161> <parenright> 	: "㉹"   U3279 # CIRCLED HANGUL THIEUTH A
--<Multi_key> <parenleft> <U1111> <U1161> <parenright> 	: "㉺"   U327A # CIRCLED HANGUL PHIEUPH A
--<Multi_key> <parenleft> <U1112> <U1161> <parenright> 	: "㉻"   U327B # CIRCLED HANGUL HIEUH A
--<Multi_key> <parenleft> <U4E00> <parenright> 	: "㊀"   U3280 # CIRCLED IDEOGRAPH ONE
--<Multi_key> <parenleft> <U4E8C> <parenright> 	: "㊁"   U3281 # CIRCLED IDEOGRAPH TWO
--<Multi_key> <parenleft> <U4E09> <parenright> 	: "㊂"   U3282 # CIRCLED IDEOGRAPH THREE
--<Multi_key> <parenleft> <U56DB> <parenright> 	: "㊃"   U3283 # CIRCLED IDEOGRAPH FOUR
--<Multi_key> <parenleft> <U4E94> <parenright> 	: "㊄"   U3284 # CIRCLED IDEOGRAPH FIVE
--<Multi_key> <parenleft> <U516D> <parenright> 	: "㊅"   U3285 # CIRCLED IDEOGRAPH SIX
--<Multi_key> <parenleft> <U4E03> <parenright> 	: "㊆"   U3286 # CIRCLED IDEOGRAPH SEVEN
--<Multi_key> <parenleft> <U516B> <parenright> 	: "㊇"   U3287 # CIRCLED IDEOGRAPH EIGHT
--<Multi_key> <parenleft> <U4E5D> <parenright> 	: "㊈"   U3288 # CIRCLED IDEOGRAPH NINE
--<Multi_key> <parenleft> <U5341> <parenright> 	: "㊉"   U3289 # CIRCLED IDEOGRAPH TEN
--<Multi_key> <parenleft> <U6708> <parenright> 	: "㊊"   U328A # CIRCLED IDEOGRAPH MOON
--<Multi_key> <parenleft> <U706B> <parenright> 	: "㊋"   U328B # CIRCLED IDEOGRAPH FIRE
--<Multi_key> <parenleft> <U6C34> <parenright> 	: "㊌"   U328C # CIRCLED IDEOGRAPH WATER
--<Multi_key> <parenleft> <U6728> <parenright> 	: "㊍"   U328D # CIRCLED IDEOGRAPH WOOD
--<Multi_key> <parenleft> <U91D1> <parenright> 	: "㊎"   U328E # CIRCLED IDEOGRAPH METAL
--<Multi_key> <parenleft> <U571F> <parenright> 	: "㊏"   U328F # CIRCLED IDEOGRAPH EARTH
--<Multi_key> <parenleft> <U65E5> <parenright> 	: "㊐"   U3290 # CIRCLED IDEOGRAPH SUN
--<Multi_key> <parenleft> <U682A> <parenright> 	: "㊑"   U3291 # CIRCLED IDEOGRAPH STOCK
--<Multi_key> <parenleft> <U6709> <parenright> 	: "㊒"   U3292 # CIRCLED IDEOGRAPH HAVE
--<Multi_key> <parenleft> <U793E> <parenright> 	: "㊓"   U3293 # CIRCLED IDEOGRAPH SOCIETY
--<Multi_key> <parenleft> <U540D> <parenright> 	: "㊔"   U3294 # CIRCLED IDEOGRAPH NAME
--<Multi_key> <parenleft> <U7279> <parenright> 	: "㊕"   U3295 # CIRCLED IDEOGRAPH SPECIAL
--<Multi_key> <parenleft> <U8CA1> <parenright> 	: "㊖"   U3296 # CIRCLED IDEOGRAPH FINANCIAL
--<Multi_key> <parenleft> <U795D> <parenright> 	: "㊗"   U3297 # CIRCLED IDEOGRAPH CONGRATULATION
--<Multi_key> <parenleft> <U52B4> <parenright> 	: "㊘"   U3298 # CIRCLED IDEOGRAPH LABOR
--<Multi_key> <parenleft> <U79D8> <parenright> 	: "㊙"   U3299 # CIRCLED IDEOGRAPH SECRET
--<Multi_key> <parenleft> <U7537> <parenright> 	: "㊚"   U329A # CIRCLED IDEOGRAPH MALE
--<Multi_key> <parenleft> <U5973> <parenright> 	: "㊛"   U329B # CIRCLED IDEOGRAPH FEMALE
--<Multi_key> <parenleft> <U9069> <parenright> 	: "㊜"   U329C # CIRCLED IDEOGRAPH SUITABLE
--<Multi_key> <parenleft> <U512A> <parenright> 	: "㊝"   U329D # CIRCLED IDEOGRAPH EXCELLENT
--<Multi_key> <parenleft> <U5370> <parenright> 	: "㊞"   U329E # CIRCLED IDEOGRAPH PRINT
--<Multi_key> <parenleft> <U6CE8> <parenright> 	: "㊟"   U329F # CIRCLED IDEOGRAPH ATTENTION
--<Multi_key> <parenleft> <U9805> <parenright> 	: "㊠"   U32A0 # CIRCLED IDEOGRAPH ITEM
--<Multi_key> <parenleft> <U4F11> <parenright> 	: "㊡"   U32A1 # CIRCLED IDEOGRAPH REST
--<Multi_key> <parenleft> <U5199> <parenright> 	: "㊢"   U32A2 # CIRCLED IDEOGRAPH COPY
--<Multi_key> <parenleft> <U6B63> <parenright> 	: "㊣"   U32A3 # CIRCLED IDEOGRAPH CORRECT
--<Multi_key> <parenleft> <U4E0A> <parenright> 	: "㊤"   U32A4 # CIRCLED IDEOGRAPH HIGH
--<Multi_key> <parenleft> <U4E2D> <parenright> 	: "㊥"   U32A5 # CIRCLED IDEOGRAPH CENTRE
--<Multi_key> <parenleft> <U4E0B> <parenright> 	: "㊦"   U32A6 # CIRCLED IDEOGRAPH LOW
--<Multi_key> <parenleft> <U5DE6> <parenright> 	: "㊧"   U32A7 # CIRCLED IDEOGRAPH LEFT
--<Multi_key> <parenleft> <U53F3> <parenright> 	: "㊨"   U32A8 # CIRCLED IDEOGRAPH RIGHT
--<Multi_key> <parenleft> <U533B> <parenright> 	: "㊩"   U32A9 # CIRCLED IDEOGRAPH MEDICINE
--<Multi_key> <parenleft> <U5B97> <parenright> 	: "㊪"   U32AA # CIRCLED IDEOGRAPH RELIGION
--<Multi_key> <parenleft> <U5B66> <parenright> 	: "㊫"   U32AB # CIRCLED IDEOGRAPH STUDY
--<Multi_key> <parenleft> <U76E3> <parenright> 	: "㊬"   U32AC # CIRCLED IDEOGRAPH SUPERVISE
--<Multi_key> <parenleft> <U4F01> <parenright> 	: "㊭"   U32AD # CIRCLED IDEOGRAPH ENTERPRISE
--<Multi_key> <parenleft> <U8CC7> <parenright> 	: "㊮"   U32AE # CIRCLED IDEOGRAPH RESOURCE
--<Multi_key> <parenleft> <U5354> <parenright> 	: "㊯"   U32AF # CIRCLED IDEOGRAPH ALLIANCE
--<Multi_key> <parenleft> <U591C> <parenright> 	: "㊰"   U32B0 # CIRCLED IDEOGRAPH NIGHT
--<Multi_key> <parenleft> <3> <6> <parenright> 	: "㊱"   U32B1 # CIRCLED NUMBER THIRTY SIX
--<Multi_key> <parenleft> <3> <KP_6> <parenright> 	: "㊱"   U32B1 # CIRCLED NUMBER THIRTY SIX
--<Multi_key> <parenleft> <KP_3> <6> <parenright> 	: "㊱"   U32B1 # CIRCLED NUMBER THIRTY SIX
--<Multi_key> <parenleft> <KP_3> <KP_6> <parenright> 	: "㊱"   U32B1 # CIRCLED NUMBER THIRTY SIX
--<Multi_key> <parenleft> <3> <7> <parenright> 	: "㊲"   U32B2 # CIRCLED NUMBER THIRTY SEVEN
--<Multi_key> <parenleft> <3> <KP_7> <parenright> 	: "㊲"   U32B2 # CIRCLED NUMBER THIRTY SEVEN
--<Multi_key> <parenleft> <KP_3> <7> <parenright> 	: "㊲"   U32B2 # CIRCLED NUMBER THIRTY SEVEN
--<Multi_key> <parenleft> <KP_3> <KP_7> <parenright> 	: "㊲"   U32B2 # CIRCLED NUMBER THIRTY SEVEN
--<Multi_key> <parenleft> <3> <8> <parenright> 	: "㊳"   U32B3 # CIRCLED NUMBER THIRTY EIGHT
--<Multi_key> <parenleft> <3> <KP_8> <parenright> 	: "㊳"   U32B3 # CIRCLED NUMBER THIRTY EIGHT
--<Multi_key> <parenleft> <KP_3> <8> <parenright> 	: "㊳"   U32B3 # CIRCLED NUMBER THIRTY EIGHT
--<Multi_key> <parenleft> <KP_3> <KP_8> <parenright> 	: "㊳"   U32B3 # CIRCLED NUMBER THIRTY EIGHT
--<Multi_key> <parenleft> <3> <9> <parenright> 	: "㊴"   U32B4 # CIRCLED NUMBER THIRTY NINE
--<Multi_key> <parenleft> <3> <KP_9> <parenright> 	: "㊴"   U32B4 # CIRCLED NUMBER THIRTY NINE
--<Multi_key> <parenleft> <KP_3> <9> <parenright> 	: "㊴"   U32B4 # CIRCLED NUMBER THIRTY NINE
--<Multi_key> <parenleft> <KP_3> <KP_9> <parenright> 	: "㊴"   U32B4 # CIRCLED NUMBER THIRTY NINE
--<Multi_key> <parenleft> <4> <0> <parenright> 	: "㊵"   U32B5 # CIRCLED NUMBER FORTY
--<Multi_key> <parenleft> <4> <KP_0> <parenright> 	: "㊵"   U32B5 # CIRCLED NUMBER FORTY
--<Multi_key> <parenleft> <KP_4> <0> <parenright> 	: "㊵"   U32B5 # CIRCLED NUMBER FORTY
--<Multi_key> <parenleft> <KP_4> <KP_0> <parenright> 	: "㊵"   U32B5 # CIRCLED NUMBER FORTY
--<Multi_key> <parenleft> <4> <1> <parenright> 	: "㊶"   U32B6 # CIRCLED NUMBER FORTY ONE
--<Multi_key> <parenleft> <4> <KP_1> <parenright> 	: "㊶"   U32B6 # CIRCLED NUMBER FORTY ONE
--<Multi_key> <parenleft> <KP_4> <1> <parenright> 	: "㊶"   U32B6 # CIRCLED NUMBER FORTY ONE
--<Multi_key> <parenleft> <KP_4> <KP_1> <parenright> 	: "㊶"   U32B6 # CIRCLED NUMBER FORTY ONE
--<Multi_key> <parenleft> <4> <2> <parenright> 	: "㊷"   U32B7 # CIRCLED NUMBER FORTY TWO
--<Multi_key> <parenleft> <4> <KP_Space> <parenright> 	: "㊷"   U32B7 # CIRCLED NUMBER FORTY TWO
--<Multi_key> <parenleft> <4> <KP_2> <parenright> 	: "㊷"   U32B7 # CIRCLED NUMBER FORTY TWO
--<Multi_key> <parenleft> <KP_4> <2> <parenright> 	: "㊷"   U32B7 # CIRCLED NUMBER FORTY TWO
--<Multi_key> <parenleft> <KP_4> <KP_Space> <parenright> 	: "㊷"   U32B7 # CIRCLED NUMBER FORTY TWO
--<Multi_key> <parenleft> <KP_4> <KP_2> <parenright> 	: "㊷"   U32B7 # CIRCLED NUMBER FORTY TWO
--<Multi_key> <parenleft> <4> <3> <parenright> 	: "㊸"   U32B8 # CIRCLED NUMBER FORTY THREE
--<Multi_key> <parenleft> <4> <KP_3> <parenright> 	: "㊸"   U32B8 # CIRCLED NUMBER FORTY THREE
--<Multi_key> <parenleft> <KP_4> <3> <parenright> 	: "㊸"   U32B8 # CIRCLED NUMBER FORTY THREE
--<Multi_key> <parenleft> <KP_4> <KP_3> <parenright> 	: "㊸"   U32B8 # CIRCLED NUMBER FORTY THREE
--<Multi_key> <parenleft> <4> <4> <parenright> 	: "㊹"   U32B9 # CIRCLED NUMBER FORTY FOUR
--<Multi_key> <parenleft> <4> <KP_4> <parenright> 	: "㊹"   U32B9 # CIRCLED NUMBER FORTY FOUR
--<Multi_key> <parenleft> <KP_4> <4> <parenright> 	: "㊹"   U32B9 # CIRCLED NUMBER FORTY FOUR
--<Multi_key> <parenleft> <KP_4> <KP_4> <parenright> 	: "㊹"   U32B9 # CIRCLED NUMBER FORTY FOUR
--<Multi_key> <parenleft> <4> <5> <parenright> 	: "㊺"   U32BA # CIRCLED NUMBER FORTY FIVE
--<Multi_key> <parenleft> <4> <KP_5> <parenright> 	: "㊺"   U32BA # CIRCLED NUMBER FORTY FIVE
--<Multi_key> <parenleft> <KP_4> <5> <parenright> 	: "㊺"   U32BA # CIRCLED NUMBER FORTY FIVE
--<Multi_key> <parenleft> <KP_4> <KP_5> <parenright> 	: "㊺"   U32BA # CIRCLED NUMBER FORTY FIVE
--<Multi_key> <parenleft> <4> <6> <parenright> 	: "㊻"   U32BB # CIRCLED NUMBER FORTY SIX
--<Multi_key> <parenleft> <4> <KP_6> <parenright> 	: "㊻"   U32BB # CIRCLED NUMBER FORTY SIX
--<Multi_key> <parenleft> <KP_4> <6> <parenright> 	: "㊻"   U32BB # CIRCLED NUMBER FORTY SIX
--<Multi_key> <parenleft> <KP_4> <KP_6> <parenright> 	: "㊻"   U32BB # CIRCLED NUMBER FORTY SIX
--<Multi_key> <parenleft> <4> <7> <parenright> 	: "㊼"   U32BC # CIRCLED NUMBER FORTY SEVEN
--<Multi_key> <parenleft> <4> <KP_7> <parenright> 	: "㊼"   U32BC # CIRCLED NUMBER FORTY SEVEN
--<Multi_key> <parenleft> <KP_4> <7> <parenright> 	: "㊼"   U32BC # CIRCLED NUMBER FORTY SEVEN
--<Multi_key> <parenleft> <KP_4> <KP_7> <parenright> 	: "㊼"   U32BC # CIRCLED NUMBER FORTY SEVEN
--<Multi_key> <parenleft> <4> <8> <parenright> 	: "㊽"   U32BD # CIRCLED NUMBER FORTY EIGHT
--<Multi_key> <parenleft> <4> <KP_8> <parenright> 	: "㊽"   U32BD # CIRCLED NUMBER FORTY EIGHT
--<Multi_key> <parenleft> <KP_4> <8> <parenright> 	: "㊽"   U32BD # CIRCLED NUMBER FORTY EIGHT
--<Multi_key> <parenleft> <KP_4> <KP_8> <parenright> 	: "㊽"   U32BD # CIRCLED NUMBER FORTY EIGHT
--<Multi_key> <parenleft> <4> <9> <parenright> 	: "㊾"   U32BE # CIRCLED NUMBER FORTY NINE
--<Multi_key> <parenleft> <4> <KP_9> <parenright> 	: "㊾"   U32BE # CIRCLED NUMBER FORTY NINE
--<Multi_key> <parenleft> <KP_4> <9> <parenright> 	: "㊾"   U32BE # CIRCLED NUMBER FORTY NINE
--<Multi_key> <parenleft> <KP_4> <KP_9> <parenright> 	: "㊾"   U32BE # CIRCLED NUMBER FORTY NINE
--<Multi_key> <parenleft> <5> <0> <parenright> 	: "㊿"   U32BF # CIRCLED NUMBER FIFTY
--<Multi_key> <parenleft> <5> <KP_0> <parenright> 	: "㊿"   U32BF # CIRCLED NUMBER FIFTY
--<Multi_key> <parenleft> <KP_5> <0> <parenright> 	: "㊿"   U32BF # CIRCLED NUMBER FIFTY
--<Multi_key> <parenleft> <KP_5> <KP_0> <parenright> 	: "㊿"   U32BF # CIRCLED NUMBER FIFTY
--<Multi_key> <parenleft> <kana_A> <parenright> 	: "㋐"   U32D0 # CIRCLED KATAKANA A
--<Multi_key> <parenleft> <kana_I> <parenright> 	: "㋑"   U32D1 # CIRCLED KATAKANA I
--<Multi_key> <parenleft> <kana_U> <parenright> 	: "㋒"   U32D2 # CIRCLED KATAKANA U
--<Multi_key> <parenleft> <kana_E> <parenright> 	: "㋓"   U32D3 # CIRCLED KATAKANA E
--<Multi_key> <parenleft> <kana_O> <parenright> 	: "㋔"   U32D4 # CIRCLED KATAKANA O
--<Multi_key> <parenleft> <kana_KA> <parenright> 	: "㋕"   U32D5 # CIRCLED KATAKANA KA
--<Multi_key> <parenleft> <kana_KI> <parenright> 	: "㋖"   U32D6 # CIRCLED KATAKANA KI
--<Multi_key> <parenleft> <kana_KU> <parenright> 	: "㋗"   U32D7 # CIRCLED KATAKANA KU
--<Multi_key> <parenleft> <kana_KE> <parenright> 	: "㋘"   U32D8 # CIRCLED KATAKANA KE
--<Multi_key> <parenleft> <kana_KO> <parenright> 	: "㋙"   U32D9 # CIRCLED KATAKANA KO
--<Multi_key> <parenleft> <kana_SA> <parenright> 	: "㋚"   U32DA # CIRCLED KATAKANA SA
--<Multi_key> <parenleft> <kana_SHI> <parenright> 	: "㋛"   U32DB # CIRCLED KATAKANA SI
--<Multi_key> <parenleft> <kana_SU> <parenright> 	: "㋜"   U32DC # CIRCLED KATAKANA SU
--<Multi_key> <parenleft> <kana_SE> <parenright> 	: "㋝"   U32DD # CIRCLED KATAKANA SE
--<Multi_key> <parenleft> <kana_SO> <parenright> 	: "㋞"   U32DE # CIRCLED KATAKANA SO
--<Multi_key> <parenleft> <kana_TA> <parenright> 	: "㋟"   U32DF # CIRCLED KATAKANA TA
--<Multi_key> <parenleft> <kana_CHI> <parenright> 	: "㋠"   U32E0 # CIRCLED KATAKANA TI
--<Multi_key> <parenleft> <kana_TSU> <parenright> 	: "㋡"   U32E1 # CIRCLED KATAKANA TU
--<Multi_key> <parenleft> <kana_TE> <parenright> 	: "㋢"   U32E2 # CIRCLED KATAKANA TE
--<Multi_key> <parenleft> <kana_TO> <parenright> 	: "㋣"   U32E3 # CIRCLED KATAKANA TO
--<Multi_key> <parenleft> <kana_NA> <parenright> 	: "㋤"   U32E4 # CIRCLED KATAKANA NA
--<Multi_key> <parenleft> <kana_NI> <parenright> 	: "㋥"   U32E5 # CIRCLED KATAKANA NI
--<Multi_key> <parenleft> <kana_NU> <parenright> 	: "㋦"   U32E6 # CIRCLED KATAKANA NU
--<Multi_key> <parenleft> <kana_NE> <parenright> 	: "㋧"   U32E7 # CIRCLED KATAKANA NE
--<Multi_key> <parenleft> <kana_NO> <parenright> 	: "㋨"   U32E8 # CIRCLED KATAKANA NO
--<Multi_key> <parenleft> <kana_HA> <parenright> 	: "㋩"   U32E9 # CIRCLED KATAKANA HA
--<Multi_key> <parenleft> <kana_HI> <parenright> 	: "㋪"   U32EA # CIRCLED KATAKANA HI
--<Multi_key> <parenleft> <kana_FU> <parenright> 	: "㋫"   U32EB # CIRCLED KATAKANA HU
--<Multi_key> <parenleft> <kana_HE> <parenright> 	: "㋬"   U32EC # CIRCLED KATAKANA HE
--<Multi_key> <parenleft> <kana_HO> <parenright> 	: "㋭"   U32ED # CIRCLED KATAKANA HO
--<Multi_key> <parenleft> <kana_MA> <parenright> 	: "㋮"   U32EE # CIRCLED KATAKANA MA
--<Multi_key> <parenleft> <kana_MI> <parenright> 	: "㋯"   U32EF # CIRCLED KATAKANA MI
--<Multi_key> <parenleft> <kana_MU> <parenright> 	: "㋰"   U32F0 # CIRCLED KATAKANA MU
--<Multi_key> <parenleft> <kana_ME> <parenright> 	: "㋱"   U32F1 # CIRCLED KATAKANA ME
--<Multi_key> <parenleft> <kana_MO> <parenright> 	: "㋲"   U32F2 # CIRCLED KATAKANA MO
--<Multi_key> <parenleft> <kana_YA> <parenright> 	: "㋳"   U32F3 # CIRCLED KATAKANA YA
--<Multi_key> <parenleft> <kana_YU> <parenright> 	: "㋴"   U32F4 # CIRCLED KATAKANA YU
--<Multi_key> <parenleft> <kana_YO> <parenright> 	: "㋵"   U32F5 # CIRCLED KATAKANA YO
--<Multi_key> <parenleft> <kana_RA> <parenright> 	: "㋶"   U32F6 # CIRCLED KATAKANA RA
--<Multi_key> <parenleft> <kana_RI> <parenright> 	: "㋷"   U32F7 # CIRCLED KATAKANA RI
--<Multi_key> <parenleft> <kana_RU> <parenright> 	: "㋸"   U32F8 # CIRCLED KATAKANA RU
--<Multi_key> <parenleft> <kana_RE> <parenright> 	: "㋹"   U32F9 # CIRCLED KATAKANA RE
--<Multi_key> <parenleft> <kana_RO> <parenright> 	: "㋺"   U32FA # CIRCLED KATAKANA RO
--<Multi_key> <parenleft> <kana_WA> <parenright> 	: "㋻"   U32FB # CIRCLED KATAKANA WA
--<Multi_key> <parenleft> <U30F0> <parenright> 	: "㋼"   U32FC # CIRCLED KATAKANA WI
--<Multi_key> <parenleft> <U30F1> <parenright> 	: "㋽"   U32FD # CIRCLED KATAKANA WE
--<Multi_key> <parenleft> <kana_WO> <parenright> 	: "㋾"   U32FE # CIRCLED KATAKANA WO
--<Multi_key> <U05B4> <hebrew_yod> 	: "יִ"   UFB1D # HEBREW LETTER YOD WITH HIRIQ
--<Multi_key> <U05B7> <U05F2> 	: "ײַ"   UFB1F # HEBREW LIGATURE YIDDISH YOD YOD PATAH
--<Multi_key> <U05C1> <hebrew_shin> 	: "שׁ"   UFB2A # HEBREW LETTER SHIN WITH SHIN DOT
--<Multi_key> <U05C2> <hebrew_shin> 	: "שׂ"   UFB2B # HEBREW LETTER SHIN WITH SIN DOT
--<Multi_key> <U05C1> <UFB49> 	: "שּׁ"   UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
--<Multi_key> <U05C1> <U05BC> <hebrew_shin> 	: "שּׁ"   UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
--<Multi_key> <U05C2> <UFB49> 	: "שּׂ"   UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
--<Multi_key> <U05C2> <U05BC> <hebrew_shin> 	: "שּׂ"   UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
--<Multi_key> <U05B7> <hebrew_aleph> 	: "אַ"   UFB2E # HEBREW LETTER ALEF WITH PATAH
--<Multi_key> <U05B8> <hebrew_aleph> 	: "אָ"   UFB2F # HEBREW LETTER ALEF WITH QAMATS
--<Multi_key> <U05BC> <hebrew_aleph> 	: "אּ"   UFB30 # HEBREW LETTER ALEF WITH MAPIQ
--<Multi_key> <U05BC> <hebrew_bet> 	: "בּ"   UFB31 # HEBREW LETTER BET WITH DAGESH
--<Multi_key> <U05BC> <hebrew_beth> 	: "בּ"   UFB31 # HEBREW LETTER BET WITH DAGESH
--<Multi_key> <U05BC> <hebrew_gimel> 	: "גּ"   UFB32 # HEBREW LETTER GIMEL WITH DAGESH
--<Multi_key> <U05BC> <hebrew_gimmel> 	: "גּ"   UFB32 # HEBREW LETTER GIMEL WITH DAGESH
--<Multi_key> <U05BC> <hebrew_dalet> 	: "דּ"   UFB33 # HEBREW LETTER DALET WITH DAGESH
--<Multi_key> <U05BC> <hebrew_daleth> 	: "דּ"   UFB33 # HEBREW LETTER DALET WITH DAGESH
--<Multi_key> <U05BC> <hebrew_he> 	: "הּ"   UFB34 # HEBREW LETTER HE WITH MAPIQ
--<Multi_key> <U05BC> <hebrew_waw> 	: "וּ"   UFB35 # HEBREW LETTER VAV WITH DAGESH
--<Multi_key> <U05BC> <hebrew_zain> 	: "זּ"   UFB36 # HEBREW LETTER ZAYIN WITH DAGESH
--<Multi_key> <U05BC> <hebrew_zayin> 	: "זּ"   UFB36 # HEBREW LETTER ZAYIN WITH DAGESH
--<Multi_key> <U05BC> <hebrew_tet> 	: "טּ"   UFB38 # HEBREW LETTER TET WITH DAGESH
--<Multi_key> <U05BC> <hebrew_teth> 	: "טּ"   UFB38 # HEBREW LETTER TET WITH DAGESH
--<Multi_key> <U05BC> <hebrew_yod> 	: "יּ"   UFB39 # HEBREW LETTER YOD WITH DAGESH
--<Multi_key> <U05BC> <hebrew_finalkaph> 	: "ךּ"   UFB3A # HEBREW LETTER FINAL KAF WITH DAGESH
--<Multi_key> <U05BC> <hebrew_kaph> 	: "כּ"   UFB3B # HEBREW LETTER KAF WITH DAGESH
--<Multi_key> <U05BC> <hebrew_lamed> 	: "לּ"   UFB3C # HEBREW LETTER LAMED WITH DAGESH
--<Multi_key> <U05BC> <hebrew_mem> 	: "מּ"   UFB3E # HEBREW LETTER MEM WITH DAGESH
--<Multi_key> <U05BC> <hebrew_nun> 	: "נּ"   UFB40 # HEBREW LETTER NUN WITH DAGESH
--<Multi_key> <U05BC> <hebrew_samech> 	: "סּ"   UFB41 # HEBREW LETTER SAMEKH WITH DAGESH
--<Multi_key> <U05BC> <hebrew_samekh> 	: "סּ"   UFB41 # HEBREW LETTER SAMEKH WITH DAGESH
--<Multi_key> <U05BC> <hebrew_finalpe> 	: "ףּ"   UFB43 # HEBREW LETTER FINAL PE WITH DAGESH
--<Multi_key> <U05BC> <hebrew_pe> 	: "פּ"   UFB44 # HEBREW LETTER PE WITH DAGESH
--<Multi_key> <U05BC> <hebrew_zade> 	: "צּ"   UFB46 # HEBREW LETTER TSADI WITH DAGESH
--<Multi_key> <U05BC> <hebrew_zadi> 	: "צּ"   UFB46 # HEBREW LETTER TSADI WITH DAGESH
--<Multi_key> <U05BC> <hebrew_kuf> 	: "קּ"   UFB47 # HEBREW LETTER QOF WITH DAGESH
--<Multi_key> <U05BC> <hebrew_qoph> 	: "קּ"   UFB47 # HEBREW LETTER QOF WITH DAGESH
--<Multi_key> <U05BC> <hebrew_resh> 	: "רּ"   UFB48 # HEBREW LETTER RESH WITH DAGESH
--<Multi_key> <U05BC> <hebrew_shin> 	: "שּ"   UFB49 # HEBREW LETTER SHIN WITH DAGESH
--<Multi_key> <U05BC> <hebrew_taf> 	: "תּ"   UFB4A # HEBREW LETTER TAV WITH DAGESH
--<Multi_key> <U05BC> <hebrew_taw> 	: "תּ"   UFB4A # HEBREW LETTER TAV WITH DAGESH
--<Multi_key> <U05B9> <hebrew_waw> 	: "וֹ"   UFB4B # HEBREW LETTER VAV WITH HOLAM
--<Multi_key> <U05BF> <hebrew_bet> 	: "בֿ"   UFB4C # HEBREW LETTER BET WITH RAFE
--<Multi_key> <U05BF> <hebrew_beth> 	: "בֿ"   UFB4C # HEBREW LETTER BET WITH RAFE
--<Multi_key> <U05BF> <hebrew_kaph> 	: "כֿ"   UFB4D # HEBREW LETTER KAF WITH RAFE
--<Multi_key> <U05BF> <hebrew_pe> 	: "פֿ"   UFB4E # HEBREW LETTER PE WITH RAFE
--<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> <U1D15F> <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> <U1D15F> <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> <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> <U1D1BC> <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> <U1D1BC> <U1D16F> 	: "𝆺𝅥𝅯"   U1D1C0 # MUSICAL SYMBOL FUSA BLACK
--/* <Multi_key> <U1D1BA> <U1D165> <U1D16F> 	: "𝆺𝅥𝅯"   U1D1C0 # MUSICAL SYMBOL FUSA BLACK */
--
++XCOMM
 +XCOMM Additional latin-2 sequences
 +<Multi_key> <a> <space>		: "\xcb\x9b"	ogonek
 +<Multi_key> <u> <space>		: "\xcb\x98"	breve
@@ -5697,133 +900,67 @@
 +<Multi_key> <r> <apostrophe>	: "\xc5\x95"	racute
 +<Multi_key> <u> <asterisk>	: "\xc5\xaf"	uring
 +<Multi_key> <z> <apostrophe>	: "\xc5\xba"	zacute
- XCOMM
--XCOMM Khmer digraphs
-+XCOMM Latin-2 dead key compose sequences and keysyms for division and multiply:
-+<dead_abovedot> <C>	: "\xc4\x8a"	Cabovedot
-+<dead_abovedot> <c>	: "\xc4\x8b"	cabovedot
-+<dead_abovedot> <E>	: "\xc4\x96"	Eabovedot
-+<dead_abovedot> <e>	: "\xc4\x97"	eabovedot
-+<dead_abovedot> <G>	: "\xc4\xa0"	Gabovedot
-+<dead_abovedot> <g>	: "\xc4\xa1"	gabovedot
-+<dead_abovedot> <I>	: "\xc4\xb0"	Iabovedot
-+<dead_abovedot> <Z>	: "\xc5\xbb"	Zabovedot
-+<dead_abovedot> <z>	: "\xc5\xbc"	zabovedot
-+<dead_abovering> <A>	: "\xc3\x85"	Aring
-+<dead_abovering> <a>	: "\xc3\xa5"	aring
-+<dead_abovering> <U>	: "\xc5\xae"	Uring
-+<dead_abovering> <u>	: "\xc5\xaf"	uring
-+<dead_breve> <A>	: "\xc4\x82"	Abreve
-+<dead_breve> <a>	: "\xc4\x83"	abreve
-+<dead_caron> <C>	: "\xc4\x8c"	Ccaron
-+<dead_caron> <c>	: "\xc4\x8d"	ccaron
-+<dead_caron> <D>	: "\xc4\x8e"	Dcaron
-+<dead_caron> <d>	: "\xc4\x8f"	dcaron
-+<dead_caron> <E>	: "\xc4\x9a"	Ecaron
-+<dead_caron> <e>	: "\xc4\x9b"	ecaron
-+<dead_caron> <L>	: "\xc4\xbd"	Lcaron
-+<dead_caron> <l>	: "\xc4\xbe"	lcaron
-+<dead_caron> <N>	: "\xc5\x87"	Ncaron
-+<dead_caron> <n>	: "\xc5\x88"	ncaron
-+<dead_caron> <R>	: "\xc5\x98"	Rcaron
-+<dead_caron> <r>	: "\xc5\x99"	rcaron
-+<dead_caron> <S>	: "\xc5\xa0"	Scaron
-+<dead_caron> <s>	: "\xc5\xa1"	scaron
-+<dead_caron> <T>	: "\xc5\xa4"	Tcaron
-+<dead_caron> <t>	: "\xc5\xa5"	tcaron
-+<dead_caron> <Z>	: "\xc5\xbd"	Zcaron
-+<dead_caron> <z>	: "\xc5\xbe"	zcaron
-+<dead_doubleacute> <O>	: "\xc5\x90"	Odoubleacute
-+<dead_doubleacute> <o>	: "\xc5\x91"	odoubleacute
-+<dead_doubleacute> <U>	: "\xc5\xb0"	Udoubleacute
-+<dead_doubleacute> <u>	: "\xc5\xb1"	udoubleacute
-+<dead_ogonek> <A>	: "\xc4\x84"	Aogonek
-+<dead_ogonek> <a>	: "\xc4\x85"	aogonek
-+<dead_ogonek> <E>	: "\xc4\x98"	Eogonek
-+<dead_ogonek> <e>	: "\xc4\x99"	eogonek
++XCOMM
++XCOMM keysyms for division and multiply:
 +<division>		: "\xc3\xb7"	division
 +<multiply>		: "\xc3\x97"	multiply
- XCOMM
--
--<U17ff> :   "ាំ"
--<U17fe> :   "ោះ"
--<U17fd> :   "េះ"
--<U17fc> :   "ុំ"
--<U17fb> :   "ុះ"
--
++XCOMM
 +XCOMM Latin-3 sequences
 +<Multi_key> <C> <asciicircum>	: "\xc4\x88"	Ccircumflex
-+<Multi_key> <asciicircum> <C>	: "\xc4\x88"	Ccircumflex
 +<Multi_key> <C> <greater>	: "\xc4\x88"	Ccircumflex
 +<Multi_key> <greater> <C>	: "\xc4\x88"	Ccircumflex
 +
 +<Multi_key> <c> <asciicircum>	: "\xc4\x89"	ccircumflex
-+<Multi_key> <asciicircum> <c>	: "\xc4\x89"	ccircumflex
 +<Multi_key> <c> <greater>	: "\xc4\x89"	ccircumflex
 +<Multi_key> <greater> <c>	: "\xc4\x89"	ccircumflex
 +
-+<Multi_key> <period> <C>	: "\xc4\x8a"	Cabovedot
 +<Multi_key> <C> <period> 	: "\xc4\x8a"	Cabovedot
 +
-+<Multi_key> <period> <c>	: "\xc4\x8b"	cabovedot
 +<Multi_key> <c> <period> 	: "\xc4\x8b"	cabovedot
 +
 +<Multi_key> <G> <asciicircum>	: "\xc4\x9c"	Gcircumflex
-+<Multi_key> <asciicircum> <G>	: "\xc4\x9c"	Gcircumflex
 +<Multi_key> <G> <greater>	: "\xc4\x9c"	Gcircumflex
 +<Multi_key> <greater> <G>	: "\xc4\x9c"	Gcircumflex
 +
 +<Multi_key> <g> <asciicircum>	: "\xc4\x9d"	gcircumflex
-+<Multi_key> <asciicircum> <g>	: "\xc4\x9d"	gcircumflex
 +<Multi_key> <g> <greater>	: "\xc4\x9d"	gcircumflex
 +<Multi_key> <greater> <g>	: "\xc4\x9d"	gcircumflex
 +
-+<Multi_key> <period> <G>	: "\xc4\xa0"	Gabovedot
 +<Multi_key> <G> <period> 	: "\xc4\xa0"	Gabovedot
 +
-+<Multi_key> <period> <g>	: "\xc4\xa1"	gabovedot
 +<Multi_key> <g> <period> 	: "\xc4\xa1"	gabovedot
 +
 +<Multi_key> <H> <asciicircum>	: "\xc4\xa4"	Hcircumflex
-+<Multi_key> <asciicircum> <H>	: "\xc4\xa4"	Hcircumflex
 +<Multi_key> <H> <greater>	: "\xc4\xa4"	Hcircumflex
 +<Multi_key> <greater> <H>	: "\xc4\xa4"	Hcircumflex
 +
 +<Multi_key> <h> <asciicircum>	: "\xc4\xa5"	hcircumflex
-+<Multi_key> <asciicircum> <h>	: "\xc4\xa5"	hcircumflex
 +<Multi_key> <h> <greater>	: "\xc4\xa5"	hcircumflex
 +<Multi_key> <greater> <h>	: "\xc4\xa5"	hcircumflex
 +
 +<Multi_key> <J> <asciicircum>	: "\xc4\xb4"	Jcircumflex
-+<Multi_key> <asciicircum> <J>	: "\xc4\xb4"	Jcircumflex
 +<Multi_key> <J> <greater>	: "\xc4\xb4"	Jcircumflex
 +<Multi_key> <greater> <J>	: "\xc4\xb4"	Jcircumflex
 +
 +<Multi_key> <j> <asciicircum>	: "\xc4\xb5"	jcircumflex
-+<Multi_key> <asciicircum> <j>	: "\xc4\xb5"	jcircumflex
 +<Multi_key> <j> <greater>	: "\xc4\xb5"	jcircumflex
 +<Multi_key> <greater> <j>	: "\xc4\xb5"	jcircumflex
 +
 +<Multi_key> <S> <asciicircum>	: "\xc5\x9c"	Scircumflex
-+<Multi_key> <asciicircum> <S>	: "\xc5\x9c"	Scircumflex
 +<Multi_key> <S> <greater>	: "\xc5\x9c"	Scircumflex
 +<Multi_key> <greater> <S>	: "\xc5\x9c"	Scircumflex
 +
 +<Multi_key> <s> <asciicircum>	: "\xc5\x9d"	scircumflex
-+<Multi_key> <asciicircum> <s>	: "\xc5\x9d"	scircumflex
 +<Multi_key> <s> <greater>	: "\xc5\x9d"	scircumflex
 +<Multi_key> <greater> <s>	: "\xc5\x9d"	scircumflex
 +
 +<Multi_key> <U> <breve>		: "\xc5\xac"	Ubreve
 +<Multi_key> <breve> <U>		: "\xc5\xac"	Ubreve
-+<Multi_key> <U> <u>		: "\xc5\xac"	Ubreve
 +<Multi_key> <u> <U>		: "\xc5\xac"	Ubreve
 +
 +<Multi_key> <u> <breve>		: "\xc5\xad"	ubreve
 +<Multi_key> <breve> <u>		: "\xc5\xad"	ubreve
-+<Multi_key> <u> <u>		: "\xc5\xad"	ubreve
- XCOMM
--XCOMM Arabic Lam-Alef ligatures
++XCOMM
 +XCOMM Additional Latin-3 keysyms and compose sequences:
 +<cabovedot>		: "\xc4\x8b"	cabovedot
 +<Cabovedot>		: "\xc4\x8a"	Cabovedot
@@ -5834,11 +971,9 @@
 +<Multi_key> <h> <bar>	: "\xc4\xa7"	hstroke
 +<Multi_key> <bar> <h>	: "\xc4\xa7"	hstroke
 +<Multi_key> <h> <slash>	: "\xc4\xa7"	hstroke
-+<Multi_key> <slash> <h>	: "\xc4\xa7"	hstroke
 +<Multi_key> <H> <bar>	: "\xc4\xa6"	Hstroke
 +<Multi_key> <bar> <H>	: "\xc4\xa6"	Hstroke
 +<Multi_key> <H> <slash>	: "\xc4\xa6"	Hstroke
-+<Multi_key> <slash> <H>	: "\xc4\xa6"	Hstroke
 +Ctrl<T> <h> <bar>	: "\xc4\xa7"	hstroke
 +Ctrl<T> <bar> <h>	: "\xc4\xa7"	hstroke
 +Ctrl<T> <h> <slash>	: "\xc4\xa7"	hstroke
@@ -5849,21 +984,13 @@
 +Ctrl<T> <slash> <H>	: "\xc4\xa6"	Hstroke
 +XCOMM Latin-4 sequences
 +<Multi_key> <N> <N>		: "\xc5\x8a"	ENG
-+<Multi_key> <U> <a>		: "\xc5\xb2"	Uogonek
 +<Multi_key> <u> <a>		: "\xc5\xb3"	uogonek
-+<Multi_key> <k> <k>		: "\xc4\xb8"	kra
 +<Multi_key> <R> <comma>		: "\xc5\x96"	Rcedilla
-+<Multi_key> <comma> <R>		: "\xc5\x96"	Rcedilla
 +<Multi_key> <r> <comma>		: "\xc5\x97"	rcedilla
-+<Multi_key> <comma> <r>		: "\xc5\x97"	rcedilla
 +<Multi_key> <I> <asciitilde>	: "\xc4\xa8"	Itilde
-+<Multi_key> <asciitilde> <I>	: "\xc4\xa8"	Itilde
 +<Multi_key> <i> <asciitilde>	: "\xc4\xa9"	itilde
-+<Multi_key> <asciitilde> <i>	: "\xc4\xa9"	itilde
 +<Multi_key> <L> <comma>		: "\xc4\xbb"	Lcedilla
-+<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
 +<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
-+<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
 +<diaeresis> <space>		: "\xc2\xa8"	diaeresis
 +<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
 +<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
@@ -5874,36 +1001,24 @@
 +<Multi_key> <v> <s>		: "\xc5\xa1"	scaron
 +<Multi_key> <V> <s>		: "\xc5\xa1"	scaron
 +<Multi_key> <E> <underscore>	: "\xc4\x92"	Emacron
-+<Multi_key> <underscore> <E>	: "\xc4\x92"	Emacron
 +<Multi_key> <e> <underscore>	: "\xc4\x93"	emacron
-+<Multi_key> <underscore> <e>	: "\xc4\x93"	emacron
 +<Multi_key> <G> <comma>		: "\xc4\xa2"	Gcedilla
-+<Multi_key> <comma> <G>		: "\xc4\xa2"	Gcedilla
 +<Multi_key> <g> <comma>		: "\xc4\xa3"	gcedilla
-+<Multi_key> <comma> <g>		: "\xc4\xa3"	gcedilla
 +<Multi_key> <T> <bar>		: "\xc5\xa6"	Tslash
 +<Multi_key> <bar> <T>		: "\xc5\xa6"	Tslash
 +<Multi_key> <t> <bar>		: "\xc5\xa7"	tslash
 +<Multi_key> <bar> <t>		: "\xc5\xa7"	tslash
 +<Multi_key> <n> <n>		: "\xc5\x8b" 	eng
 +<Multi_key> <A> <underscore>	: "\xc4\x80"	Amacron
-+<Multi_key> <underscore> <A>	: "\xc4\x80"	Amacron
 +<Multi_key> <a> <underscore>	: "\xc4\x81"	amacron
-+<Multi_key> <underscore> <a>	: "\xc4\x81"	amacron
 +<Multi_key> <d> <underscore>	: "\xc4\x91"
 +<Multi_key> <underscore> <d> 	: "\xc4\x91"
 +<Multi_key> <N> <comma>		: "\xc5\x85"	Ncedilla
-+<Multi_key> <comma> <N>		: "\xc5\x85"	Ncedilla
 +<Multi_key> <n> <comma>		: "\xc5\x86"	ncedilla
-+<Multi_key> <comma> <n>		: "\xc5\x86"	ncedilla
 +<Multi_key> <O> <underscore>	: "\xc5\x8c"	Omacron
-+<Multi_key> <underscore> <O>	: "\xc5\x8c"	Omacron
 +<Multi_key> <o> <underscore>	: "\xc5\x8d"	omacron
-+<Multi_key> <underscore> <o>	: "\xc5\x8d"	omacron
 +<Multi_key> <K> <comma>		: "\xc4\xb6"	Kcedilla
-+<Multi_key> <comma> <K>		: "\xc4\xb6"	Kcedilla
 +<Multi_key> <k> <comma>		: "\xc4\xb7"	kcedilla
-+<Multi_key> <comma> <k>		: "\xc4\xb7"	kcedilla
 +<Multi_key> <I> <a>		: "\xc4\xae"	Iogonek
 +<Multi_key> <a> <I>		: "\xc4\xae"	Iogonek
 +<Multi_key> <i> <a>		: "\xc4\xaf"	iogonek
@@ -5911,17 +1026,11 @@
 +<Multi_key> <E> <period>	: "\xc4\x96"	Eabovedot
 +<Multi_key> <e> <period>	: "\xc4\x97"	eabovedot
 +<Multi_key> <U> <asciitilde>	: "\xc5\xa8"	Utilde
-+<Multi_key> <asciitilde> <U>	: "\xc5\xa8"	Utilde
 +<Multi_key> <u> <asciitilde>	: "\xc5\xa9"	utilde
-+<Multi_key> <asciitilde> <u>	: "\xc5\xa9"	utilde
 +<Multi_key> <U> <underscore>	: "\xc5\xaa"	Umacron
-+<Multi_key> <underscore> <U>	: "\xc5\xaa"	Umacron
 +<Multi_key> <u> <underscore>	: "\xc5\xab"	umacron
-+<Multi_key> <underscore> <u>	: "\xc5\xab"	umacron
 +<Multi_key> <I> <underscore>	: "\xc4\xaa"	Imacron
-+<Multi_key> <underscore> <I> 	: "\xc4\xaa"	Imacron
 +<Multi_key> <i> <underscore>	: "\xc4\xab"	imacron
-+<Multi_key> <underscore> <i> 	: "\xc4\xab"	imacron
 +
 +XCOMM Ctrl<T> combo
 +Ctrl<T> <a> <A>			: "\xc4\x84"	Aogonek
@@ -6117,13 +1226,7 @@
 +Ctrl<T> <r> <apostrophe>	: "\xc5\x95"	racute
 +Ctrl<T> <u> <asterisk>		: "\xc5\xaf"	uring
 +Ctrl<T> <z> <apostrophe>	: "\xc5\xba"	zacute
- XCOMM
--
--<UFEFB>	:   "لا" # ARABIC LIGATURE LAM WITH ALEF
--<UFEF7>	:   "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
--<UFEF9>	:   "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
--<UFEF5>	:   "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
--
++XCOMM
 +XCOMM Latin-3 sequences
 +Ctrl<T> <C> <asciicircum>	: "\xc4\x88"	Ccircumflex
 +Ctrl<T> <asciicircum> <C>	: "\xc4\x88"	Ccircumflex
@@ -6195,8 +1298,7 @@
 +Ctrl<T> <u> <breve>		: "\xc5\xad"	ubreve
 +Ctrl<T> <breve> <u>		: "\xc5\xad"	ubreve
 +Ctrl<T> <u> <u>			: "\xc5\xad"	ubreve
- XCOMM
--XCOMM French-Dvorak Bépo compositions
++XCOMM
 +XCOMM Latin-4 sequences
 +Ctrl<T> <N> <N>		: "\xc5\x8a"	ENG
 +Ctrl<T> <U> <a>		: "\xc5\xb2"	Uogonek
@@ -6263,409 +1365,14 @@
 +Ctrl<T> <underscore> <I> 	: "\xc4\xaa"	Imacron
 +Ctrl<T> <i> <underscore>	: "\xc4\xab"	imacron
 +Ctrl<T> <underscore> <i> 	: "\xc4\xab"	imacron
- 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
--
++XCOMM
 +XCOMM Latin-9 input sequences:
-+<Multi_key> <o> <e> 		: "\xc5\x93"
-+<Multi_key> <O> <E> 		: "\xc5\x92"
 +<Multi_key> <Y> <quotedbl> 	: "\xc5\xb8"
-+<Multi_key> <quotedbl> <Y> 	: "\xc5\xb8"
 +Ctrl<T> <o> <e> 		: "\xc5\x93"
 +Ctrl<T> <O> <E> 		: "\xc5\x92"
 +Ctrl<T> <Y> <quotedbl> 		: "\xc5\xb8"
 +Ctrl<T> <quotedbl> <Y>		: "\xc5\xb8"
- XCOMM
--XCOMM Cyrillic NFDs
++XCOMM
 +XCOMM Rules for SunXK_FA_* keysyms:
 +<SunFA_Acute> <apostrophe>	: "\xc2\xb4"
 +<SunFA_Acute> <A>		: "\xc3\x81"
@@ -6773,7 +1480,7 @@
 +<SunFA_Tilde> <O>		: "\xc3\x95"
 +<SunFA_Tilde> <o>		: "\xc3\xb5"
 +<SunFA_Tilde> <space>		: "\x7e"
- XCOMM
++XCOMM
 +XCOMM Cyrillic keysyms:
 +<Byelorussian_shortu>	: "\xd1\x9e"	Byelorussian_shortu
 +<Byelorussian_SHORTU>	: "\xd0\x8e"	Byelorussian_SHORTU
@@ -6960,195 +1667,7 @@
 +Ctrl<T> <s> <c>		: SWITCH_STATE_TO "[ S-Chinese ]"
 +Ctrl<T> <t> <c>		: SWITCH_STATE_TO "[ T-Chinese ]"
 +Ctrl<T> <h> <k>		: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
- 
--<dead_doublegrave> <Cyrillic_a>			: "а̏"		# CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_a>	: "а̏"		# CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_a>		: "а̑"		# CYRILLIC SMALL LETTER A WITH COMBINING INVERTED BREVE
--
--<dead_grave> <Cyrillic_a>			: "а̀"		# CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT
--<Multi_key> <grave> <Cyrillic_a>		: "а̀"		# CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT
--
--<dead_acute> <Cyrillic_a>			: "а́"		# CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_a>		: "а́"		# CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_a>		: "а́"		# CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
--
--<dead_macron> <Cyrillic_a>			: "а̄"		# CYRILLIC SMALL LETTER A WITH COMBINING MACRON
--<Multi_key> <macron> <Cyrillic_a>		: "а̄"		# CYRILLIC SMALL LETTER A WITH COMBINING MACRON
--<Multi_key> <underscore> <Cyrillic_a>		: "а̄"		# CYRILLIC SMALL LETTER A WITH COMBINING MACRON
--
--<dead_circumflex> <Cyrillic_a>			: "а̂"		# CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_a>		: "а̂"		# CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_A>			: "А̏"		# CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_A>	: "А̏"		# CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_A>		: "А̑"		# CYRILLIC CAPITAL LETTER A WITH COMBINING INVERTED BREVE
--
--<dead_grave> <Cyrillic_A>			: "А̀"		# CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT
--<Multi_key> <grave> <Cyrillic_A>		: "А̀"		# CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT
--
--<dead_acute> <Cyrillic_A>			: "А́"		# CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_A>		: "А́"		# CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_A>		: "А́"		# CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
--
--<dead_macron> <Cyrillic_A>			: "А̄"		# CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
--<Multi_key> <macron> <Cyrillic_A>		: "А̄"		# CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
--<Multi_key> <underscore> <Cyrillic_A>		: "А̄"		# CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
--
--<dead_circumflex> <Cyrillic_A>			: "А̂"		# CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_A>		: "А̂"		# CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_ie>		: "е̏"		# CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_ie>	: "е̏"		# CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_ie>		: "е̑"		# CYRILLIC SMALL LETTER IE WITH COMBINING INVERTED BREVE
--
--<dead_acute> <Cyrillic_ie>			: "е́"		# CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_ie>		: "е́"		# CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_ie>		: "е́"		# CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
--
--<dead_macron> <Cyrillic_ie>			: "е̄"		# CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
--<Multi_key> <macron> <Cyrillic_ie>		: "е̄"		# CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
--<Multi_key> <underscore> <Cyrillic_ie>		: "е̄"		# CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
--
--<dead_circumflex> <Cyrillic_ie>			: "е̂"		# CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_ie>		: "е̂"		# CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_IE>		: "Е̏"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_IE>	: "Е̏"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_IE>		: "Е̑"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING INVERTED BREVE
--
--<dead_acute> <Cyrillic_IE>			: "Е́"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_IE>		: "Е́"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_IE>		: "Е́"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
--
--<dead_macron> <Cyrillic_IE>			: "Е̄"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
--<Multi_key> <macron> <Cyrillic_IE>		: "Е̄"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
--<Multi_key> <underscore> <Cyrillic_IE>		: "Е̄"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
--
--<dead_circumflex> <Cyrillic_IE>			: "Е̂"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_IE>		: "Е̂"		# CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_i>			: "и̏"		# CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_i>	: "и̏"		# CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_i>		: "и̑"		# CYRILLIC SMALL LETTER I WITH COMBINING INVERTED BREVE
--
--<dead_acute> <Cyrillic_i>			: "и́"		# CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_i>		: "и́"		# CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_i>		: "и́"		# CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
--
--<dead_circumflex> <Cyrillic_i>			: "и̂"		# CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_i>		: "и̂"		# CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_I>			: "И̏"		# CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_I>	: "И̏"		# CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_I>		: "И̑"		# CYRILLIC CAPITAL LETTER I WITH COMBINING INVERTED BREVE
--
--<dead_acute> <Cyrillic_I>			: "И́"		# CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_I>		: "И́"		# CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_I>		: "И́"		# CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
--
--<dead_circumflex> <Cyrillic_I>			: "И̂"		# CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_I>		: "И̂"		# CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_o>			: "о̏"		# CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_o>	: "о̏"		# CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_o>		: "о̑"		# CYRILLIC SMALL LETTER O WITH COMBINING INVERTED BREVE
--
--<dead_grave> <Cyrillic_o>			: "о̀"		# CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT
--<Multi_key> <grave> <Cyrillic_o>		: "о̀"		# CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT
--
--<dead_acute> <Cyrillic_o>			: "о́"		# CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_o>		: "о́"		# CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_o>		: "о́"		# CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
--
--<dead_macron> <Cyrillic_o>			: "о̄"		# CYRILLIC SMALL LETTER O WITH COMBINING MACRON
--<Multi_key> <macron> <Cyrillic_o>		: "о̄"		# CYRILLIC SMALL LETTER O WITH COMBINING MACRON
--<Multi_key> <underscore> <Cyrillic_o>		: "о̄"		# CYRILLIC SMALL LETTER O WITH COMBINING MACRON
--
--<dead_circumflex> <Cyrillic_o>			: "о̂"		# CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_o>		: "о̂"		# CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_O>			: "О̏"		# CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_O>	: "О̏"		# CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_O>		: "О̑"		# CYRILLIC CAPITAL LETTER O WITH COMBINING INVERTED BREVE
--
--<dead_grave> <Cyrillic_O>			: "О̀"		# CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT
--<Multi_key> <grave> <Cyrillic_O>		: "О̀"		# CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT
--
--<dead_acute> <Cyrillic_O>			: "О́"		# CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_O>		: "О́"		# CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_O>		: "О́"		# CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
--
--<dead_macron> <Cyrillic_O>			: "О̄"		# CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
--<Multi_key> <macron> <Cyrillic_O>		: "О̄"		# CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
--<Multi_key> <underscore> <Cyrillic_O>		: "О̄"		# CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
--
--<dead_circumflex> <Cyrillic_O>			: "О̂"		# CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_O>		: "О̂"		# CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_u>			: "у̏"		# CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_u>	: "у̏"		# CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_u>		: "у̑"		# CYRILLIC SMALL LETTER U WITH COMBINING INVERTED BREVE
--
--<dead_grave> <Cyrillic_u>			: "у̀"		# CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT
--<Multi_key> <grave> <Cyrillic_u>		: "у̀"		# CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT
--
--<dead_acute> <Cyrillic_u>			: "у́"		# CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_u>		: "у́"		# CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_u>		: "у́"		# CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
--
--<dead_circumflex> <Cyrillic_u>			: "у̂"		# CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_u>		: "у̂"		# CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_U>			: "У̏"		# CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_U>	: "У̏"		# CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_U>		: "У̑"		# CYRILLIC CAPITAL LETTER U WITH COMBINING INVERTED BREVE
--
--<dead_grave> <Cyrillic_U>			: "У̀"		# CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT
--<Multi_key> <grave> <Cyrillic_U>		: "У̀"		# CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT
--
--<dead_acute> <Cyrillic_U>			: "У́"		# CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_U>		: "У́"		# CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_U>		: "У́"		# CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
--
--<dead_circumflex> <Cyrillic_U>			: "У̂"		# CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_U>		: "У̂"		# CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_er>		: "р̏"		# CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_er>	: "р̏"		# CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_er>		: "р̑"		# CYRILLIC SMALL LETTER ER WITH COMBINING INVERTED BREVE
--
--<dead_grave> <Cyrillic_er>			: "р̀"		# CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT
--<Multi_key> <grave> <Cyrillic_er>		: "р̀"		# CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT
--
--<dead_acute> <Cyrillic_er>			: "р́"		# CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_er>		: "р́"		# CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_er>		: "р́"		# CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
--
--<dead_macron> <Cyrillic_er>			: "р̄"		# CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
--<Multi_key> <macron> <Cyrillic_er>		: "р̄"		# CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
--<Multi_key> <underscore> <Cyrillic_er>		: "р̄"		# CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
--
--<dead_circumflex> <Cyrillic_er>			: "р̂"		# CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_er>		: "р̂"		# CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
--
--<dead_doublegrave> <Cyrillic_ER>		: "Р̏"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
--<Multi_key> <grave> <grave> <Cyrillic_ER>	: "Р̏"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
--
--<dead_invertedbreve> <Cyrillic_ER>		: "Р̑"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING INVERTED BREVE
--
--<dead_grave> <Cyrillic_ER>			: "Р̀"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT
--<Multi_key> <grave> <Cyrillic_ER>		: "Р̀"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT
++
 +XCOMM
 +XCOMM Key sequences for euro sign:
 +AltGraph<e>		: "\xe2\x82\xac"
@@ -7172,14 +1691,8 @@
 +Ctrl<T> <E> <equal>	: "\xe2\x82\xac"
 +Ctrl<T> <equal> <E>	: "\xe2\x82\xac"
 +<EuroSign>		: "\xe2\x82\xac"
- 
--<dead_acute> <Cyrillic_ER>			: "Р́"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
--<Multi_key> <acute> <Cyrillic_ER>		: "Р́"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
--<Multi_key> <apostrophe> <Cyrillic_ER>		: "Р́"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
- 
--<dead_macron> <Cyrillic_ER>			: "Р̄"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
--<Multi_key> <macron> <Cyrillic_ER>		: "Р̄"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
--<Multi_key> <underscore> <Cyrillic_ER>		: "Р̄"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
++
++
 +XCOMM
 +XCOMM The following seven mappings are not appropriate here; this kind of mappings
 +XCOMM should be done at the keytable level at /usr/openwin/share/etc/keytables,
@@ -7297,9 +1810,7 @@
 +<Greek_NU>	: "\xce\x9d"	Greek_NU
 +<Greek_MU>	: "\xce\x9c"	Greek_MU
 +<periodcentered> : "\xc2\xb7"	periodcentered
- 
--<dead_circumflex> <Cyrillic_ER>			: "Р̂"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
--<Multi_key> <asciicircum> <Cyrillic_ER>		: "Р̂"		# CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
++
 +XCOMM
 +XCOMM XK_dead_acute and XK_dead_diaeresis defined in Greece*.kt keytable files.
 +XCOMM XK_Greek_* are not defined in Greece*.kt keytable files. Nonetheless, we
@@ -7378,7 +1889,7 @@
 +<colon> <semicolon> <y>		:"\xce\xb0"
 +<semicolon> <colon> <i>		:"\xce\x90"
 +<colon> <semicolon> <i>		:"\xce\x90"
- 
++
 +XCOMM
 +XCOMM The following special key sequences are for Tonos, Diaeresis/Dialytica,
 +XCOMM and Dialytika Tonos.
@@ -7917,5 +2428,3 @@
 +Ctrl<space>		: SWITCH_STATE_TO "[ English/European ]"
 +LANGUAGE : in_IN
 +END_STATE
-+ 
- <Multi_key> <backslash> <o> <slash>		: "🙌"		# PERSON RAISING BOTH HANDS IN CELEBRATION
--- a/open-src/lib/libX11/compose-iso8859-7.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-iso8859-7.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,10 +21,10 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-diff -ru nls/iso8859-7/Compose.pre nls.new/iso8859-7/Compose.pre
-diff -urp -x '*~' -x '*.orig' nls/iso8859-7/Compose.pre nls/iso8859-7/Compose.pre
---- nls/iso8859-7/Compose.pre	2010-01-14 17:11:36.000000000 -0800
-+++ nls/iso8859-7/Compose.pre	2010-06-07 15:49:32.087244734 -0700
+diff --git a/nls/iso8859-7/Compose.pre b/nls/iso8859-7/Compose.pre
+index c79b277..965cf1a 100644
+--- a/nls/iso8859-7/Compose.pre
++++ b/nls/iso8859-7/Compose.pre
 @@ -1,4 +1,34 @@
  XCOMM
 +XCOMM Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
@@ -218,9 +218,9 @@
 -<Multi_key> <quotedbl> <apostrophe> <Greek_upsilon>	: "\340" Greek_upsilonaccentdieresis
 -<Multi_key> <apostrophe> <quotedbl> <space>		: "\265" Greek_accentdieresis
 -<Multi_key> <quotedbl> <apostrophe> <space>		: "\265" Greek_accentdieresis
- 
- XCOMM
- XCOMM
+-
+-XCOMM
+-XCOMM
 -XCOMM dead key accent keysyms
 -XCOMM Special Character
 -<dead_circumflex> <slash>		: "|"	bar
@@ -277,6 +277,9 @@
 -<dead_diaeresis> <dead_acute> <Greek_iota>	: "\300"	Greek_iotaaccentdieresis
 -<dead_diaeresis> <dead_acute> <Greek_upsilon>	: "\340"	Greek_upsilonaccentdieresis
 -<dead_diaeresis> <dead_acute> <space>		: "\265"	Greek_accentdieresis
++
++XCOMM
++XCOMM
 +XCOMM Compose table for the Greek language [timf]
 +XCOMM
 +
--- a/open-src/lib/libX11/compose-ja_JP.UTF-8.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-ja_JP.UTF-8.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 diff -urp -x '*~' -x '*.orig' nls/ja_JP.UTF-8/Compose.pre nls/ja_JP.UTF-8/Compose.pre
 --- nls/ja_JP.UTF-8/Compose.pre	2007-05-16 08:34:44.000000000 -0700
 +++ nls/ja_JP.UTF-8/Compose.pre	2008-02-27 21:08:32.576467000 -0800
-@@ -0,0 +1,2584 @@
+@@ -0,0 +1,2583 @@
 +XCOMM
 +XCOMM Copyright 1996, 2002, Oracle and/or its affiliates. All rights reserved.
 +XCOMM
@@ -1195,7 +1195,6 @@
 +<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
 +<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
 +<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
-+<diaeresis>			: "\xc2\xa8"	diaeresis
 +<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
 +<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
 +<Multi_key> <v> <S>		: "\xc5\xa0"	Scaron
--- a/open-src/lib/libX11/compose-ko_KR.UTF-8.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-ko_KR.UTF-8.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 diff -urp -x '*~' -x '*.orig' nls/ko_KR.UTF-8/Compose.pre nls/ko_KR.UTF-8/Compose.pre
 --- nls/ko_KR.UTF-8/Compose.pre	2010-01-14 17:11:36.000000000 -0800
 +++ nls/ko_KR.UTF-8/Compose.pre	2010-06-07 15:49:38.139156903 -0700
-@@ -0,0 +1,2539 @@
+@@ -0,0 +1,2538 @@
 +XCOMM
 +XCOMM Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
 +XCOMM
@@ -1193,7 +1193,6 @@
 +<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
 +<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
 +<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
-+<diaeresis>			: "\xc2\xa8"	diaeresis
 +<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
 +<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
 +<Multi_key> <v> <S>		: "\xc5\xa0"	Scaron
--- a/open-src/lib/libX11/compose-pt_BR.UTF-8.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-pt_BR.UTF-8.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,17 +21,55 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-diff -urp -x '*~' -x '*.orig' nls/pt_BR.UTF-8/Compose.pre nls/pt_BR.UTF-8/Compose.pre
---- nls/pt_BR.UTF-8/Compose.pre	2009-03-24 22:23:13.000000000 -0700
-+++ nls/pt_BR.UTF-8/Compose.pre	2009-03-25 18:27:14.664666000 -0700
+diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
+index b6d7c8a..a69e1c4 100644
+--- a/nls/pt_BR.UTF-8/Compose.pre
++++ b/nls/pt_BR.UTF-8/Compose.pre
 @@ -1,4275 +1,2729 @@
 -XCOMM UTF-8 (Unicode) compose sequence
 -XCOMM [email protected]
  XCOMM
 -XCOMM Modified for Brazilian Portuguese by Gustavo Noronha Silva <[email protected]>
--
++XCOMM
++XCOMM Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
++XCOMM
++XCOMM
++XCOMM Copyright (C) 1994 X Consortium
++XCOMM
++XCOMM Permission is hereby granted, free of charge, to any person obtaining a copy
++XCOMM of this software and associated documentation files (the "Software"), to
++XCOMM deal in the Software without restriction, including without limitation the
++XCOMM rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++XCOMM sell copies of the Software, and to permit persons to whom the Software is
++XCOMM furnished to do so, subject to the following conditions:
++XCOMM
++XCOMM The above copyright notice and this permission notice shall be included in
++XCOMM all copies or substantial portions of the Software.
++XCOMM
++XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++XCOMM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++XCOMM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++XCOMM X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++XCOMM AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++XCOMM TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++XCOMM
++XCOMM Except as contained in this notice, the name of the X Consortium shall not
++XCOMM be used in advertising or otherwise to promote the sale, use or other deal-
++XCOMM ings in this Software without prior written authorization from the X Consor-
++XCOMM tium.
++XCOMM
++XCOMM X Window System is a trademark of X Consortium, Inc.
++XCOMM
+ 
 -XCOMM Part 1 - Manual definitions
--
++XCOMM
++XCOMM
++XCOMM Copyright 1996, 2002, Oracle and/or its affiliates. All rights reserved.
++XCOMM
++XCOMM
++XCOMM Compose table for the pt_BR.UTF-8 locale
++XCOMM
+ 
 -XCOMM Spacing versions of dead accents
 -<dead_tilde> <space>			: "~"	asciitilde
 -<dead_tilde> <dead_tilde>		: "~"	asciitilde
@@ -61,7 +99,23 @@
 -<dead_ogonek> <dead_ogonek>		: "˛"	ogonek
 -<dead_iota> <space>			: "ͺ"	U37a
 -<dead_iota> <dead_iota>			: "ͺ"	U37a
--
++STATE "[ English/European ]"
++<Multi_key> <c> <c>	: SWITCH_STATE_TO "[ Cyrillic ]"
++<Multi_key> <g> <g>	: SWITCH_STATE_TO "[ Greek ]"
++<Multi_key> <t> <t>	: SWITCH_STATE_TO "[ Thai ]"
++<Multi_key> <a> <r>	: SWITCH_STATE_TO "[ Arabic ]"
++<Multi_key> <h> <i>	: SWITCH_STATE_TO "[ Indic ]"
++<Multi_key> <i> <n>	: SWITCH_STATE_TO "[ Indic ]"
++<Multi_key> <h> <h>	: SWITCH_STATE_TO "[ Hebrew ]"
++<Multi_key> <u> <h>	: SWITCH_STATE_TO "[ Unicode Hex ]"
++<Multi_key> <u> <o>	: SWITCH_STATE_TO "[ Unicode Octal ]"
++<Multi_key> <l> <l>	: SWITCH_STATE_TO "[ Lookup ]"
++<Multi_key> <j>	<a>	: SWITCH_STATE_TO "[ Japanese ]"
++<Multi_key> <k>	<o>	: SWITCH_STATE_TO "[ Korean ]"
++<Multi_key> <s>	<c>	: SWITCH_STATE_TO "[ S-Chinese ]"
++<Multi_key> <t>	<c>	: SWITCH_STATE_TO "[ T-Chinese ]"
++<Multi_key> <h>	<k>	: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
+ 
 -XCOMM ASCII characters that may be difficult to access
 -XCOMM on some keyboards.
 -<Multi_key> <plus> <plus>		: "#"	numbersign
@@ -73,47 +127,1226 @@
 -<Multi_key> <slash> <less>		: "\\"	backslash
 -<Multi_key> <less> <slash>		: "\\"	backslash
 -<Multi_key> <parenright> <parenright>	: "]"	bracketright
--
++Ctrl<T> <c> <c>		: SWITCH_STATE_TO "[ Cyrillic ]"
++Ctrl<T> <g> <g>		: SWITCH_STATE_TO "[ Greek ]"
++Ctrl<T> <t> <t>		: SWITCH_STATE_TO "[ Thai ]"
++Ctrl<T> <a> <r>		: SWITCH_STATE_TO "[ Arabic ]"
++Ctrl<T> <h> <i>		: SWITCH_STATE_TO "[ Indic ]"
++Ctrl<T> <i> <n>		: SWITCH_STATE_TO "[ Indic ]"
++Ctrl<T> <h> <h>		: SWITCH_STATE_TO "[ Hebrew ]"
++Ctrl<T> <u> <h>		: SWITCH_STATE_TO "[ Unicode Hex ]"
++Ctrl<T> <u> <o>		: SWITCH_STATE_TO "[ Unicode Octal ]"
++Ctrl<T> <l> <l>		: SWITCH_STATE_TO "[ Lookup ]"
++Ctrl<T> <j> <a>		: SWITCH_STATE_TO "[ Japanese ]"
++Ctrl<T> <k> <o>		: SWITCH_STATE_TO "[ Korean ]"
++Ctrl<T> <s> <c>		: SWITCH_STATE_TO "[ S-Chinese ]"
++Ctrl<T> <t> <c>		: SWITCH_STATE_TO "[ T-Chinese ]"
++Ctrl<T> <h> <k>		: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
+ 
 -<Multi_key> <asciicircum> <space>	: "^"	asciicircum
 -<Multi_key> <space> <asciicircum>	: "^"	asciicircum
 -<Multi_key> <greater> <space>		: "^"	asciicircum
 -<Multi_key> <space> <greater>		: "^"	asciicircum
--
++XCOMM Rules to compose Euro Currency Symbol
++AltGraph<e>		: "\xe2\x82\xac"
++AltGraph<E>		: "\xe2\x82\xac"
++AltGraph<4>		: "\xe2\x82\xac"
++AltGraph<5>		: "\xe2\x82\xac"
++<Multi_key> <c> <equal>	: "\xe2\x82\xac"
++<Multi_key> <equal> <c>	: "\xe2\x82\xac"
++<Multi_key> <C> <equal>	: "\xe2\x82\xac"
++<Multi_key> <equal> <C>	: "\xe2\x82\xac"
++Ctrl<T> <c> <equal>	: "\xe2\x82\xac"
++Ctrl<T> <equal> <c>	: "\xe2\x82\xac"
++Ctrl<T> <C> <equal>	: "\xe2\x82\xac"
++Ctrl<T> <equal> <C>	: "\xe2\x82\xac"
++<Multi_key> <e> <equal> : "\xe2\x82\xac"
++<Multi_key> <equal> <e>	: "\xe2\x82\xac"
++<Multi_key> <E> <equal>	: "\xe2\x82\xac"
++<Multi_key> <equal> <E>	: "\xe2\x82\xac"
++Ctrl<T> <e> <equal>	: "\xe2\x82\xac"
++Ctrl<T> <equal> <e>	: "\xe2\x82\xac"
++Ctrl<T> <E> <equal>	: "\xe2\x82\xac"
++Ctrl<T> <equal> <E>	: "\xe2\x82\xac"
++<EuroSign>		: "\xe2\x82\xac"
+ 
 -<Multi_key> <grave> <space>		: "`"	grave
 -<Multi_key> <space> <grave>		: "`"	grave
--
+ 
 -<Multi_key> <parenleft> <minus>		: "{"	braceleft
 -<Multi_key> <minus> <parenleft>		: "{"	braceleft
--
++<Multi_key> <plus> <plus>		: "\x23"	numbersign
++<Multi_key> <apostrophe> <space>	: "\x27"	apostrophe
++<Multi_key> <space> <apostrophe>	: "\x27'"	apostrophe
++<Multi_key> <A> <A>			: "\x40"	at
++<Multi_key> <a> <A>			: "\xc4\x84"	Aogonek
++<Multi_key> <A> <a> 			: "\xc4\x84"	Aogonek
++<Multi_key> <a> <a> 			: "\xc4\x85"	aogonek
++<Multi_key> <parenleft> <parenleft>	: "\x5b"	bracketleft
++<Multi_key> <slash> <slash>		: "\x5c"	backslash
++<Multi_key> <slash> <less>		: "\x5c"	backslash
++<Multi_key> <less> <slash>		: "\x5c"	backslash
++<Multi_key> <parenright> <parenright>	: "\x5d"	bracketright
++<Multi_key> <asciicircum> <space>	: "\x5e"	asciicircum
++<Multi_key> <space> <asciicircum>	: "\x5e"	asciicircum
++<Multi_key> <greater> <space>		: "\x5e"	asciicircum
++<Multi_key> <space> <greater>		: "\x5e"	asciicircum
++<Multi_key> <grave> <space>		: "\x60"	grave
++<Multi_key> <space> <grave>		: "\x60"	grave
++<Multi_key> <parenleft> <minus>		: "\x7b"	braceleft
++<Multi_key> <minus> <parenleft>		: "\x7b"	braceleft
++<Multi_key> <slash> <asciicircum>	: "\x7c"	bar
++<Multi_key> <asciicircum> <slash>	: "\x7c"	bar
++<Multi_key> <V> <L>			: "\x7c"	bar
++<Multi_key> <L> <V>			: "\x7c"	bar
++<Multi_key> <v> <l>			: "\x7c"	bar
++<Multi_key> <l> <v>			: "\x7c"	bar
++<Multi_key> <parenright> <minus>	: "\x7d"	braceright
++<Multi_key> <minus> <parenright>	: "\x7d"	braceright
++<Multi_key> <asciitilde> <space>	: "\x7e"	asciitilde
++<Multi_key> <space> <asciitilde>	: "\x7e"	asciitilde
++<Multi_key> <minus> <space>		: "\x7e"	asciitilde
++<Multi_key> <space> <minus>		: "\x7e"	asciitilde
++<Multi_key> <exclam> <exclam>		: "\xc2\xa1"	exclamdown
++<Multi_key> <C> <acute> 		: "\xc4\x86"	Cacute
++<Multi_key> <c> <acute> 		: "\xc4\x87"	cacute
++<Multi_key> <acute> <C>			: "\xc4\x86"	Cacute
++<Multi_key> <acute> <c>			: "\xc4\x87"	cacute
++<Multi_key> <c> <slash>			: "\xc2\xa2"	cent
++<Multi_key> <slash> <c>			: "\xc2\xa2"	cent
++<Multi_key> <C> <slash>			: "\xc2\xa2"	cent
++<Multi_key> <slash> <C>			: "\xc2\xa2"	cent
++<Multi_key> <C> <bar>			: "\xc2\xa2"	cent
++<Multi_key> <bar> <C>			: "\xc2\xa2"	cent
++<Multi_key> <c> <bar>			: "\xc2\xa2"	cent
++<Multi_key> <bar> <c>			: "\xc2\xa2"	cent
++<Multi_key> <acute> <L>			: "\xc4\xb9"	Lacute
++<Multi_key> <L> <acute> 		: "\xc4\xb9"	Lacute
++<Multi_key> <acute> <l>			: "\xc4\xba"	lacute
++<Multi_key> <l> <acute> 		: "\xc4\xba"	lacute
++<Multi_key> <l> <minus>			: "\xc2\xa3"	sterling
++<Multi_key> <minus> <l>			: "\xc2\xa3"	sterling
++<Multi_key> <L> <minus>			: "\xc2\xa3"	sterling
++<Multi_key> <minus> <L>			: "\xc2\xa3"	sterling
++<Multi_key> <l> <equal>			: "\xc2\xa3"	sterling
++<Multi_key> <equal> <l>			: "\xc2\xa3"	sterling
++<Multi_key> <L> <equal>			: "\xc2\xa3"	sterling
++<Multi_key> <equal> <L>			: "\xc2\xa3"	sterling
++<Multi_key> <acute> <N>			: "\xc5\x83"	Nacute
++<Multi_key> <N> <acute> 		: "\xc5\x83"	Nacute
++<Multi_key> <y> <minus>			: "\xc2\xa5"	yen
++<Multi_key> <minus> <y>			: "\xc2\xa5"	yen
++<Multi_key> <Y> <minus>			: "\xc2\xa5"	yen
++<Multi_key> <minus> <Y>			: "\xc2\xa5"	yen
++<Multi_key> <y> <equal>			: "\xc2\xa5"	yen
++<Multi_key> <equal> <y>			: "\xc2\xa5"	yen
++<Multi_key> <Y> <equal>			: "\xc2\xa5"	yen
++<Multi_key> <equal> <Y>			: "\xc2\xa5"	yen
++<Multi_key> <s> <o>			: "\xc2\xa7"	section
++<Multi_key> <o> <s>			: "\xc2\xa7"	section
++<Multi_key> <S> <O>			: "\xc2\xa7"	section
++<Multi_key> <O> <S>			: "\xc2\xa7"	section
++<Multi_key> <S> <exclam>		: "\xc2\xa7"	section
++<Multi_key> <exclam> <S>		: "\xc2\xa7"	section
++<Multi_key> <s> <exclam>		: "\xc2\xa7"	section
++<Multi_key> <exclam> <s>		: "\xc2\xa7"	section
++<Multi_key> <S> <0>			: "\xc2\xa7"	section
++<Multi_key> <0> <S>			: "\xc2\xa7"	section
++<Multi_key> <s> <0>			: "\xc2\xa7"	section
++<Multi_key> <0> <s>			: "\xc2\xa7"	section
++<Multi_key> <x> <o>			: "\xc2\xa4"	currency
++<Multi_key> <o> <x>			: "\xc2\xa4"	currency
++<Multi_key> <X> <O>			: "\xc2\xa4"	currency
++<Multi_key> <O> <X>			: "\xc2\xa4"	currency
++<Multi_key> <x> <O>			: "\xc2\xa4"	currency
++<Multi_key> <O> <x>			: "\xc2\xa4"	currency
++<Multi_key> <X> <o>			: "\xc2\xa4"	currency
++<Multi_key> <o> <X>			: "\xc2\xa4"	currency
++<Multi_key> <x> <0>			: "\xc2\xa4"	currency
++<Multi_key> <0> <x>			: "\xc2\xa4"	currency
++<Multi_key> <X> <0>			: "\xc2\xa4"	currency
++<Multi_key> <0> <X>			: "\xc2\xa4"	currency
++<Multi_key> <c> <o>			: "\xc2\xa9"	copyright
++<Multi_key> <o> <c>			: "\xc2\xa9"	copyright
++<Multi_key> <C> <O>			: "\xc2\xa9"	copyright
++<Multi_key> <O> <C>			: "\xc2\xa9"	copyright
++<Multi_key> <c> <O>			: "\xc2\xa9"	copyright
++<Multi_key> <O> <c>			: "\xc2\xa9"	copyright
++<Multi_key> <C> <o>			: "\xc2\xa9"	copyright
++<Multi_key> <o> <C>			: "\xc2\xa9"	copyright
++<Multi_key> <c> <0>			: "\xc2\xa9"	copyright
++<Multi_key> <0> <c>			: "\xc2\xa9"	copyright
++<Multi_key> <C> <0>			: "\xc2\xa9"	copyright
++<Multi_key> <0> <C>			: "\xc2\xa9"	copyright
++<Multi_key> <a> <minus>			: "\xc2\xaa"	ordfeminine
++<Multi_key> <minus> <a>			: "\xc2\xaa"	ordfeminine
++<Multi_key> <A> <minus>			: "\xc2\xaa"	ordfeminine
++<Multi_key> <minus> <A>			: "\xc2\xaa"	ordfeminine
++<Multi_key> <o> <minus>			: "\xc2\xba"	masculine
++<Multi_key> <minus> <o>			: "\xc2\xba"	masculine
++<Multi_key> <O> <minus>			: "\xc2\xba"	masculine
++<Multi_key> <minus> <O>			: "\xc2\xba"	masculine
++<Multi_key> <less> <less>		: "\xc2\xab"	guillemotleft
++<Multi_key> <greater> <greater>		: "\xc2\xbb"	guillemotright
++<Multi_key> <0> <asciicircum>		: "\xc2\xb0"	degree
++<Multi_key> <asciicircum> <0>		: "\xc2\xb0"	degree
++<Multi_key> <0> <asterisk>		: "\xc2\xb0"	degree
++<Multi_key> <asterisk> <0>		: "\xc2\xb0"	degree
++<Multi_key> <plus> <minus>		: "\xc2\xb1"	plusminus
++<Multi_key> <minus> <plus>		: "\xc2\xb1"	plusminus
++<Multi_key> <slash> <u>			: "\xc2\xb5"	mu
++<Multi_key> <u> <slash>			: "\xc2\xb5"	mu
++<Multi_key> <slash> <U>			: "\xc2\xb5"	mu
++<Multi_key> <U> <slash>			: "\xc2\xb5"	mu
++<Multi_key> <1> <asciicircum>		: "\xc2\xb9"	onesuperior
++<Multi_key> <asciicircum> <1>		: "\xc2\xb9"	onesuperior
++<Multi_key> <S> <1>			: "\xc2\xb9"	onesuperior
++<Multi_key> <1> <S>			: "\xc2\xb9"	onesuperior
++<Multi_key> <s> <1>			: "\xc2\xb9"	onesuperior
++<Multi_key> <1> <s>			: "\xc2\xb9"	onesuperior
++<Multi_key> <2> <asciicircum>		: "\xc2\xb2"	twosuperior
++<Multi_key> <asciicircum> <2>		: "\xc2\xb2"	twosuperior
++<Multi_key> <S> <2>			: "\xc2\xb2"	twosuperior
++<Multi_key> <2> <S>			: "\xc2\xb2"	twosuperior
++<Multi_key> <s> <2>			: "\xc2\xb2"	twosuperior
++<Multi_key> <2> <s>			: "\xc2\xb2"	twosuperior
++<Multi_key> <3> <asciicircum>		: "\xc2\xb3"	threesuperior
++<Multi_key> <asciicircum> <3>		: "\xc2\xb3"	threesuperior
++<Multi_key> <S> <3>			: "\xc2\xb3"	threesuperior
++<Multi_key> <3> <S>			: "\xc2\xb3"	threesuperior
++<Multi_key> <s> <3>			: "\xc2\xb3"	threesuperior
++<Multi_key> <3> <s>			: "\xc2\xb3"	threesuperior
++<Multi_key> <p> <exclam>		: "\xc2\xb6"	paragraph
++<Multi_key> <exclam> <p>		: "\xc2\xb6"	paragraph
++<Multi_key> <P> <exclam>		: "\xc2\xb6"	paragraph
++<Multi_key> <exclam> <P>		: "\xc2\xb6"	paragraph
++<Multi_key> <period> <asciicircum>	: "\xc2\xb7"	periodcentered
++<Multi_key> <asciicircum> <period>	: "\xc2\xb7"	periodcentered
++<Multi_key> <period> <period>		: "\xc2\xb7"	periodcentered
++<Multi_key> <1> <4>			: "\xc2\xbc"	onequarter
++<Multi_key> <1> <2>			: "\xc2\xbd"	onehalf
++<Multi_key> <3> <4>			: "\xc2\xbe"	threequarters
++<Multi_key> <question> <question>	: "\xc2\xbf"	questiondown
++<Multi_key> <space> <space>		: "\xc2\xa0"	nobreakspace
++<Multi_key> <bar> <bar>			: "\xc2\xa6"	brokenbar
++<Multi_key> <exclam> <asciicircum>	: "\xc2\xa6"	brokenbar
++<Multi_key> <asciicircum> <exclam>	: "\xc2\xa6"	brokenbar
++<Multi_key> <V> <B>			: "\xc2\xa6"	brokenbar
++<Multi_key> <B> <V>			: "\xc2\xa6"	brokenbar
++<Multi_key> <v> <b>			: "\xc2\xa6"	brokenbar
++<Multi_key> <b> <v>			: "\xc2\xa6"	brokenbar
++<Multi_key> <minus> <comma>		: "\xc2\xac"	notsign
++<Multi_key> <comma> <minus>		: "\xc2\xac"	notsign
++<Multi_key> <minus> <minus>		: "\xc2\xad"	hyphen
++<Multi_key> <R> <O>			: "\xc2\xae"	registered
++<Multi_key> <O> <R>			: "\xc2\xae"	registered
++<Multi_key> <minus> <asciicircum>	: "\xc2\xaf"	macron
++<Multi_key> <asciicircum> <minus>	: "\xc2\xaf"	macron
++<Multi_key> <underscore> <asciicircum>	: "\xc2\xaf"	macron
++<Multi_key> <asciicircum> <underscore>	: "\xc2\xaf"	macron
++<Multi_key> <underscore> <underscore>	: "\xc2\xaf"	macron
++<Multi_key> <minus> <colon>		: "\xc3\xb7"	division
++<Multi_key> <colon> <minus>		: "\xc3\xb7"	division
++<Multi_key> <x> <x>			: "\xc3\x97"	multiply
++<Multi_key> <apostrophe> <apostrophe>	: "\xc2\xb4"	acute
++<Multi_key> <comma> <comma>		: "\xc2\xb8"	cedilla
++<Multi_key> <quotedbl> <quotedbl>	: "\xc2\xa8"	diaeresis
++<Multi_key> <A> <grave>			: "\xc3\x80"	Agrave
++<Multi_key> <grave> <A>			: "\xc3\x80"	Agrave
++<Multi_key> <A> <acute>			: "\xc3\x81"	Aacute
++<Multi_key> <acute> <A>			: "\xc3\x81"	Aacute
++<Multi_key> <A> <apostrophe>		: "\xc3\x81"	Aacute
++<Multi_key> <apostrophe> <A>		: "\xc3\x81"	Aacute
++<Multi_key> <A> <asciicircum>		: "\xc3\x82"	Acircumflex
++<Multi_key> <asciicircum> <A>		: "\xc3\x82"	Acircumflex
++<Multi_key> <A> <greater>		: "\xc3\x82"	Acircumflex
++<Multi_key> <greater> <A>		: "\xc3\x82"	Acircumflex
++<Multi_key> <A> <asciitilde>		: "\xc3\x83"	Atilde
++<Multi_key> <asciitilde> <A>		: "\xc3\x83"	Atilde
++<Multi_key> <A> <quotedbl>		: "\xc3\x84"	Adiaeresis
++<Multi_key> <quotedbl> <A>		: "\xc3\x84"	Adiaeresis
++<Multi_key> <A> <asterisk>		: "\xc3\x85"	Aring
++<Multi_key> <asterisk> <A>		: "\xc3\x85"	Aring
++<Multi_key> <A> <E>			: "\xc3\x86"	AE
++<Multi_key> <a> <grave>			: "\xc3\xa0"	agrave
++<Multi_key> <grave> <a>			: "\xc3\xa0"	agrave
++<Multi_key> <a> <acute>			: "\xc3\xa1"	aacute
++<Multi_key> <acute> <a>			: "\xc3\xa1"	aacute
++<Multi_key> <a> <apostrophe>		: "\xc3\xa1"	aacute
++<Multi_key> <apostrophe> <a>		: "\xc3\xa1"	aacute
++<Multi_key> <a> <asciicircum>		: "\xc3\xa2"	acircumflex
++<Multi_key> <asciicircum> <a>		: "\xc3\xa2"	acircumflex
++<Multi_key> <a> <greater>		: "\xc3\xa2"	acircumflex
++<Multi_key> <greater> <a>		: "\xc3\xa2"	acircumflex
++<Multi_key> <a> <asciitilde>		: "\xc3\xa3"	atilde
++<Multi_key> <asciitilde> <a>		: "\xc3\xa3"	atilde
++<Multi_key> <a> <quotedbl>		: "\xc3\xa4"	adiaeresis
++<Multi_key> <quotedbl> <a>		: "\xc3\xa4"	adiaeresis
++<Multi_key> <a> <asterisk>		: "\xc3\xa5"	aring
++<Multi_key> <asterisk> <a>		: "\xc3\xa5"	aring
++<Multi_key> <a> <e>			: "\xc3\xa6"	ae
++<Multi_key> <C> <comma>			: "\xc3\x87"	Ccedilla
++<Multi_key> <comma> <C>			: "\xc3\x87"	Ccedilla
++<Multi_key> <c> <comma>			: "\xc3\xa7"	ccedilla
++<Multi_key> <comma> <c>			: "\xc3\xa7"	ccedilla
++XCOMM<Multi_key> <minus> <D>		: "\xc3\x90"	ETH
++XCOMM<Multi_key> <minus> <d>		: "\xc3\xb0"	eth
++<Multi_key> <D> <minus>			: "\xc3\x90"	ETH
++<Multi_key> <d> <minus>			: "\xc3\xb0"	eth
++<Multi_key> <slash> <D>			: "\xc4\x90"	Dstroke
++<Multi_key> <slash> <d>			: "\xc4\x91"	dstroke
++<Multi_key> <E> <grave>			: "\xc3\x88"	Egrave
++<Multi_key> <grave> <E>			: "\xc3\x88"	Egrave
++<Multi_key> <E> <acute>			: "\xc3\x89"	Eacute
++<Multi_key> <acute> <E>			: "\xc3\x89"	Eacute
++<Multi_key> <E> <apostrophe>		: "\xc3\x89"	Eacute
++<Multi_key> <apostrophe> <E>		: "\xc3\x89"	Eacute
++<Multi_key> <E> <asciicircum>		: "\xc3\x8a"	Ecircumflex
++<Multi_key> <asciicircum> <E>		: "\xc3\x8a"	Ecircumflex
++<Multi_key> <E> <greater>		: "\xc3\x8a"	Ecircumflex
++<Multi_key> <greater> <E>		: "\xc3\x8a"	Ecircumflex
++<Multi_key> <E> <quotedbl>		: "\xc3\x8b"	Ediaeresis
++<Multi_key> <quotedbl> <E>		: "\xc3\x8b"	Ediaeresis
++<Multi_key> <e> <grave>			: "\xc3\xa8"	egrave
++<Multi_key> <grave> <e>			: "\xc3\xa8"	egrave
++<Multi_key> <e> <acute>			: "\xc3\xa9"	eacute
++<Multi_key> <acute> <e>			: "\xc3\xa9"	eacute
++<Multi_key> <e> <apostrophe>		: "\xc3\xa9"	eacute
++<Multi_key> <apostrophe> <e>		: "\xc3\xa9"	eacute
++<Multi_key> <e> <asciicircum>		: "\xc3\xaa"	ecircumflex
++<Multi_key> <asciicircum> <e>		: "\xc3\xaa"	ecircumflex
++<Multi_key> <e> <greater>		: "\xc3\xaa"	ecircumflex
++<Multi_key> <greater> <e>		: "\xc3\xaa"	ecircumflex
++<Multi_key> <e> <quotedbl>		: "\xc3\xab"	ediaeresis
++<Multi_key> <quotedbl> <e>		: "\xc3\xab"	ediaeresis
++<Multi_key> <I> <grave>			: "\xc3\x8c"	Igrave
++<Multi_key> <grave> <I>			: "\xc3\x8c"	Igrave
++<Multi_key> <I> <acute>			: "\xc3\x8d"	Iacute
++<Multi_key> <acute> <I>			: "\xc3\x8d"	Iacute
++<Multi_key> <I> <apostrophe>		: "\xc3\x8d"	Iacute
++<Multi_key> <apostrophe> <I>		: "\xc3\x8d"	Iacute
++<Multi_key> <I> <asciicircum>		: "\xc3\x8e"	Icircumflex
++<Multi_key> <asciicircum> <I>		: "\xc3\x8e"	Icircumflex
++<Multi_key> <I> <greater>		: "\xc3\x8e"	Icircumflex
++<Multi_key> <greater> <I>		: "\xc3\x8e"	Icircumflex
++<Multi_key> <I> <quotedbl>		: "\xc3\x8f"	Idiaeresis
++<Multi_key> <quotedbl> <I>		: "\xc3\x8f"	Idiaeresis
++<Multi_key> <i> <grave>			: "\xc3\xac"	igrave
++<Multi_key> <grave> <i>			: "\xc3\xac"	igrave
++<Multi_key> <i> <acute>			: "\xc3\xad"	iacute
++<Multi_key> <acute> <i>			: "\xc3\xad"	iacute
++<Multi_key> <i> <apostrophe>		: "\xc3\xad"	iacute
++<Multi_key> <apostrophe> <i>		: "\xc3\xad"	iacute
++<Multi_key> <i> <asciicircum>		: "\xc3\xae"	icircumflex
++<Multi_key> <asciicircum> <i>		: "\xc3\xae"	icircumflex
++<Multi_key> <i> <greater>		: "\xc3\xae"	icircumflex
++<Multi_key> <greater> <i>		: "\xc3\xae"	icircumflex
++<Multi_key> <i> <quotedbl>		: "\xc3\xaf"	idiaeresis
++<Multi_key> <quotedbl> <i>		: "\xc3\xaf"	idiaeresis
++<Multi_key> <N> <asciitilde>		: "\xc3\x91"	Ntilde
++<Multi_key> <asciitilde> <N>		: "\xc3\x91"	Ntilde
++<Multi_key> <N> <minus>			: "\xc3\x91"	Ntilde
++<Multi_key> <minus> <N>			: "\xc3\x91"	Ntilde
++<Multi_key> <n> <asciitilde>		: "\xc3\xb1"	ntilde
++<Multi_key> <asciitilde> <n>		: "\xc3\xb1"	ntilde
++<Multi_key> <n> <minus>			: "\xc3\xb1"	ntilde
++<Multi_key> <minus> <n>			: "\xc3\xb1"	ntilde
++<Multi_key> <O> <grave>			: "\xc3\x92"	Ograve
++<Multi_key> <grave> <O>			: "\xc3\x92"	Ograve
++<Multi_key> <O> <acute>			: "\xc3\x93"	Oacute
++<Multi_key> <acute> <O>			: "\xc3\x93"	Oacute
++<Multi_key> <O> <apostrophe>		: "\xc3\x93"	Oacute
++<Multi_key> <apostrophe> <O>		: "\xc3\x93"	Oacute
++<Multi_key> <O> <asciicircum>		: "\xc3\x94"	Ocircumflex
++<Multi_key> <asciicircum> <O>		: "\xc3\x94"	Ocircumflex
++<Multi_key> <O> <greater>		: "\xc3\x94"	Ocircumflex
++<Multi_key> <greater> <O>		: "\xc3\x94"	Ocircumflex
++<Multi_key> <O> <asciitilde>		: "\xc3\x95"	Otilde
++<Multi_key> <asciitilde> <O>		: "\xc3\x95"	Otilde
++<Multi_key> <O> <quotedbl>		: "\xc3\x96"	Odiaeresis
++<Multi_key> <quotedbl> <O>		: "\xc3\x96"	Odiaeresis
++<Multi_key> <O> <slash>			: "\xc3\x98"	Ooblique
++<Multi_key> <slash> <O>			: "\xc3\x98"	Ooblique
++<Multi_key> <o> <grave>			: "\xc3\xb2"	ograve
++<Multi_key> <grave> <o>			: "\xc3\xb2"	ograve
++<Multi_key> <o> <acute>			: "\xc3\xb3"	oacute
++<Multi_key> <acute> <o>			: "\xc3\xb3"	oacute
++<Multi_key> <o> <apostrophe>		: "\xc3\xb3"	oacute
++<Multi_key> <apostrophe> <o>		: "\xc3\xb3"	oacute
++<Multi_key> <o> <asciicircum>		: "\xc3\xb4"	ocircumflex
++<Multi_key> <asciicircum> <o>		: "\xc3\xb4"	ocircumflex
++<Multi_key> <o> <greater>		: "\xc3\xb4"	ocircumflex
++<Multi_key> <greater> <o>		: "\xc3\xb4"	ocircumflex
++<Multi_key> <o> <asciitilde>		: "\xc3\xb5"	otilde
++<Multi_key> <asciitilde> <o>		: "\xc3\xb5"	otilde
++<Multi_key> <o> <quotedbl>		: "\xc3\xb6"	odiaeresis
++<Multi_key> <quotedbl> <o>		: "\xc3\xb6"	odiaeresis
++<Multi_key> <o> <slash>			: "\xc3\xb8"	oslash
++<Multi_key> <slash> <o>			: "\xc3\xb8"	oslash
++<Multi_key> <U> <grave>			: "\xc3\x99"	Ugrave
++<Multi_key> <grave> <U>			: "\xc3\x99"	Ugrave
++<Multi_key> <U> <acute>			: "\xc3\x9a"	Uacute
++<Multi_key> <acute> <U>			: "\xc3\x9a"	Uacute
++<Multi_key> <U> <apostrophe>		: "\xc3\x9a"	Uacute
++<Multi_key> <apostrophe> <U>		: "\xc3\x9a"	Uacute
++<Multi_key> <U> <asciicircum>		: "\xc3\x9b"	Ucircumflex
++<Multi_key> <asciicircum> <U>		: "\xc3\x9b"	Ucircumflex
++<Multi_key> <U> <greater>		: "\xc3\x9b"	Ucircumflex
++<Multi_key> <greater> <U>		: "\xc3\x9b"	Ucircumflex
++<Multi_key> <U> <quotedbl>		: "\xc3\x9c"	Udiaeresis
++<Multi_key> <quotedbl> <U>		: "\xc3\x9c"	Udiaeresis
++<Multi_key> <u> <grave>			: "\xc3\xb9"	ugrave
++<Multi_key> <grave> <u>			: "\xc3\xb9"	ugrave
++<Multi_key> <u> <acute>			: "\xc3\xba"	uacute
++<Multi_key> <acute> <u>			: "\xc3\xba"	uacute
++<Multi_key> <u> <apostrophe>		: "\xc3\xba"	uacute
++<Multi_key> <apostrophe> <u>		: "\xc3\xba"	uacute
++<Multi_key> <u> <asciicircum>		: "\xc3\xbb"	ucircumflex
++<Multi_key> <asciicircum> <u>		: "\xc3\xbb"	ucircumflex
++<Multi_key> <u> <greater>		: "\xc3\xbb"	ucircumflex
++<Multi_key> <greater> <u>		: "\xc3\xbb"	ucircumflex
++<Multi_key> <u> <quotedbl>		: "\xc3\xbc"	udiaeresis
++<Multi_key> <quotedbl> <u>		: "\xc3\xbc"	udiaeresis
++<Multi_key> <s> <s>			: "\xc3\x9f"	ssharp
++<Multi_key> <T> <H>			: "\xc3\x9e"	THORN
++<Multi_key> <t> <h>			: "\xc3\xbe"	thorn
++<Multi_key> <Y> <acute>			: "\xc3\x9d"	Yacute
++<Multi_key> <acute> <Y>			: "\xc3\x9d"	Yacute
++<Multi_key> <Y> <apostrophe>		: "\xc3\x9d"	Yacute
++<Multi_key> <apostrophe> <Y>		: "\xc3\x9d"	Yacute
++<Multi_key> <y> <acute>			: "\xc3\xbd"	yacute
++<Multi_key> <acute> <y>			: "\xc3\xbd"	yacute
++<Multi_key> <y> <apostrophe>		: "\xc3\xbd"	yacute
++<Multi_key> <apostrophe> <y>		: "\xc3\xbd"	yacute
++<Multi_key> <y> <quotedbl>		: "\xc3\xbf"	ydiaeresis
++<Multi_key> <quotedbl> <y>		: "\xc3\xbf"	ydiaeresis
++<ecaron>	: "\xc4\x9b"	ecaron
++<scaron>	: "\xc5\xa1"	scaron
++<ccaron>	: "\xc4\x8d"	ccaron
++<rcaron>	: "\xc5\x99"	rcaron
++<yacute>	: "\xc3\xbd"	yacute
++<aacute>	: "\xc3\xa1"	aacute
++<iacute>	: "\xc3\xad"	iacute
++<eacute>	: "\xc3\xa9"	eacute
++<uacute>	: "\xc3\xba"	uacute
++<uring>		: "\xc5\xaf"	uring
++<section>	: "\xc2\xa7"	section
++<ssharp>	: "\xc3\x9f"	ssharp
++<zabovedot>	: "\xc5\xbc"	zabovedot
++<Zabovedot>	: "\xc5\xbb"	Zabovedot
++<ogonek>	: "\xcb\x9b"	ogonek
++<oacute>	: "\xc3\xb3"	oacute
++<zacute>	: "\xc5\xba"	zacute
++<lstroke>	: "\xc5\x82"	lstroke
++<Lstroke>	: "\xc5\x81"	Lstroke
++<aogonek>	: "\xc4\x85"	aogonek
++<eogonek>	: "\xc4\x99"	eogonek
++<currency>	: "\xe2\x82\xac" currency
++<sacute>	: "\xc5\x9b"	sacute
++<nacute>	: "\xc5\x84"	nacute
++<cacute>	: "\xc4\x87"	cacute
++<degree>	: "\xc2\xb0"	degree
++<Odiaeresis>	: "\xc3\x96"	Odiaeresis
++<Udiaeresis>	: "\xc3\x9c"	Udiaeresis
++<odiaeresis>	: "\xc3\xb6"	odiaeresis
++<udiaeresis>	: "\xc3\xbc"	udiaeresis
++<Oacute> 	: "\xc3\x93"	Oacute
++<odoubleacute>	: "\xc5\x91"	odoubleacute
++<Odoubleacute>	: "\xc5\x90"	Odoubleacute
++<Uacute>	: "\xc3\x9a"	Uacute
++<Eacute>	: "\xc3\x89"	Eacute
++<Aacute>	: "\xc3\x81"	Aacute
++<adiaeresis>	: "\xc3\xa4"	adiaeresis
++<Adiaeresis>	: "\xc3\x84"	Adiaeresis
++<udoubleacute>	: "\xc5\xb1"	udoubleacute
++<Udoubleacute>	: "\xc5\xb0"	Udoubleacute
++<Iacute>	: "\xc3\x8d"	Iacute
++<dead_circumflex> <slash>	: "\x7c"	bar
++<dead_grave> <space>		: "\x60"	grave
++<dead_acute> <space>		: "\x27"	apostrophe
++<dead_diaeresis> <space>	: "\xc2\xa8"	diaeresis
++<dead_circumflex> <space>	: "\x5e"	asciicircum
++<dead_tilde> <space>		: "\x7e"	asciitilde
++<dead_circumflex> <0>		: "\xc2\xb0"	degree
++<dead_circumflex> <1>		: "\xc2\xb9"	onesuperior
++<dead_circumflex> <2>		: "\xc2\xb2"	twosuperior
++<dead_circumflex> <3>		: "\xc2\xb3"	threesuperior
++<dead_circumflex> <period>	: "\xc2\xb7"	periodcentered
++<dead_circumflex> <exclam>	: "\xc2\xa6"	brokenbar
++<dead_cedilla> <minus>		: "\xc2\xac"	notsign
++<dead_circumflex> <minus>	: "\xc2\xaf"	macron
++<dead_circumflex> <underscore>	: "\xc2\xaf"	macron
++<dead_acute> <apostrophe>	: "\xc2\xb4"	acute
++<dead_cedilla> <comma>		: "\xc2\xb8"	cedilla
++<dead_diaeresis> <quotedbl>	: "\xc2\xa8"	diaeresis
++<dead_grave> <A>		: "\xc3\x80"	Agrave
++<dead_acute> <A>		: "\xc3\x81"	Aacute
++<dead_circumflex> <A>		: "\xc3\x82"	Acircumflex
++<dead_tilde> <A>		: "\xc3\x83"	Atilde
++<dead_diaeresis> <A>		: "\xc3\x84"	Adiaeresis
++<dead_grave> <a>		: "\xc3\xa0"	agrave
++<dead_acute> <a>		: "\xc3\xa1"	aacute
++<dead_circumflex> <a>		: "\xc3\xa2"	acircumflex
++<dead_tilde> <a>		: "\xc3\xa3"	atilde
++<dead_diaeresis> <a>		: "\xc3\xa4"	adiaeresis
++<dead_cedilla> <C>		: "\xc3\x87"	Ccedilla
++<dead_cedilla> <c>		: "\xc3\xa7"	ccedilla
++<dead_grave> <E>		: "\xc3\x88"	Egrave
++<dead_acute> <E>		: "\xc3\x89"	Eacute
++<dead_circumflex> <E>		: "\xc3\x8a"	Ecircumflex
++<dead_diaeresis> <E>		: "\xc3\x8b"	Ediaeresis
++<dead_grave> <e>		: "\xc3\xa8"	egrave
++<dead_acute> <e>		: "\xc3\xa9"	eacute
++<dead_circumflex> <e>		: "\xc3\xaa"	ecircumflex
++<dead_diaeresis> <e>		: "\xc3\xab"	ediaeresis
++<dead_grave> <I>		: "\xc3\x8c"	Igrave
++<dead_acute> <I>		: "\xc3\x8d"	Iacute
++<dead_circumflex> <I>		: "\xc3\x8e"	Icircumflex
++<dead_diaeresis> <I>		: "\xc3\x8f"	Idiaeresis
++<dead_grave> <i>		: "\xc3\xac"	igrave
++<dead_acute> <i>		: "\xc3\xad"	iacute
++<dead_circumflex> <i>		: "\xc3\xae"	icircumflex
++<dead_diaeresis> <i>		: "\xc3\xaf"	idiaeresis
++<dead_tilde> <N>		: "\xc3\x91"	Ntilde
++<dead_tilde> <n>		: "\xc3\xb1"	ntilde
++<dead_grave> <O>		: "\xc3\x92"	Ograve
++<dead_acute> <O>		: "\xc3\x93"	Oacute
++<dead_circumflex> <O>		: "\xc3\x94"	Ocircumflex
++<dead_tilde> <O>		: "\xc3\x95"	Otilde
++<dead_diaeresis> <O>		: "\xc3\x96"	Odiaeresis
++<dead_grave> <o>		: "\xc3\xb2"	ograve
++<dead_acute> <o>		: "\xc3\xb3"	oacute
++<dead_circumflex> <o>		: "\xc3\xb4"	ocircumflex
++<dead_tilde> <o>		: "\xc3\xb5"	otilde
++<dead_diaeresis> <o>		: "\xc3\xb6"	odiaeresis
++<dead_cedilla> <S>		: "\xc5\x9e"	Scedilla
++<dead_cedilla> <s>		: "\xc5\x9f"	scedilla
++<dead_grave> <U>		: "\xc3\x99"	Ugrave
++<dead_acute> <U>		: "\xc3\x9a"	Uacute
++<dead_circumflex> <U>		: "\xc3\x9b"	Ucircumflex
++<dead_diaeresis> <U>		: "\xc3\x9c"	Udiaeresis
++<dead_grave> <u>		: "\xc3\xb9"	ugrave
++<dead_acute> <u>		: "\xc3\xba"	uacute
++<dead_circumflex> <u>		: "\xc3\xbb"	ucircumflex
++<dead_diaeresis> <u>		: "\xc3\xbc"	udiaeresis
++<dead_acute> <Y>		: "\xc3\x9d"	Yacute
++<dead_acute> <y>		: "\xc3\xbd"	yacute
++<Multi_key> <caron> <Z>		: "\xc5\xbd"	Zcaron
++<Multi_key> <Z> <caron> 	: "\xc5\xbd"	Zcaron
++<Multi_key> <v> <Z>		: "\xc5\xbd"	Zcaron
++<Multi_key> <Z> <v>		: "\xc5\xbd"	Zcaron
++<zcaron>			: "\xc5\xbe"	zcaron
++<Multi_key> <caron> <z>		: "\xc5\xbe"	zcaron
++<Multi_key> <z> <caron> 	: "\xc5\xbe"	zcaron
++<Multi_key> <z> <v>		: "\xc5\xbe"	zcaron
++<Multi_key> <v> <z>		: "\xc5\xbe"	zcaron
++<dead_diaeresis> <y>		: "\xc3\xbf"	ydiaeresis
++Ctrl<T> <plus> <plus>		: "\x23"	numbersign
++Ctrl<T> <apostrophe> <space>	: "\x27"	apostrophe
++Ctrl<T> <space> <apostrophe>	: "\x27"	apostrophe
++Ctrl<T> <A> <A>			: "\x40"	at
++Ctrl<T> <parenleft> <parenleft>	: "\x5b"	bracketleft
++Ctrl<T> <slash> <slash>		: "\x5c"	backslash
++Ctrl<T> <slash> <less>		: "\x5c"	backslash
++Ctrl<T> <less> <slash>		: "\x5c"	backslash
++Ctrl<T> <parenright> <parenright>	: "\x5d"	bracketright
++Ctrl<T> <asciicircum> <space>	: "\x5e"	asciicircum
++Ctrl<T> <space> <asciicircum>	: "\x5e"	asciicircum
++Ctrl<T> <greater> <space>	: "\x5e"	asciicircum
++Ctrl<T> <space> <greater>	: "\x5e"	asciicircum
++Ctrl<T> <grave> <space>		: "\x60"	grave
++Ctrl<T> <space> <grave>		: "\x60"	grave
++Ctrl<T> <parenleft> <minus>	: "\x7b"	braceleft
++Ctrl<T> <minus> <parenleft>	: "\x7b"	braceleft
++Ctrl<T> <slash> <asciicircum>	: "\x7c"	bar
++Ctrl<T> <asciicircum> <slash>	: "\x7c"	bar
++Ctrl<T> <V> <L>			: "\x7c"	bar
++Ctrl<T> <L> <V>			: "\x7c"	bar
++Ctrl<T> <v> <l>			: "\x7c"	bar
++Ctrl<T> <l> <v>			: "\x7c"	bar
++Ctrl<T> <parenright> <minus>	: "\x7d"	braceright
++Ctrl<T> <minus> <parenright>	: "\x7d"	braceright
++Ctrl<T> <asciitilde> <space>	: "\x7e"	asciitilde
++Ctrl<T> <space> <asciitilde>	: "\x7e"	asciitilde
++Ctrl<T> <minus> <space>		: "\x7e"	asciitilde
++Ctrl<T> <space> <minus>		: "\x7e"	asciitilde
++Ctrl<T> <exclam> <exclam>	: "\xc2\xa1"	exclamdown
++Ctrl<T> <c> <slash>		: "\xc2\xa2"	cent
++Ctrl<T> <slash> <c>		: "\xc2\xa2"	cent
++Ctrl<T> <C> <slash>		: "\xc2\xa2"	cent
++Ctrl<T> <slash> <C>		: "\xc2\xa2"	cent
++Ctrl<T> <C> <bar>		: "\xc2\xa2"	cent
++Ctrl<T> <bar> <C>		: "\xc2\xa2"	cent
++Ctrl<T> <c> <bar>		: "\xc2\xa2"	cent
++Ctrl<T> <bar> <c>		: "\xc2\xa2"	cent
++Ctrl<T> <acute> <L>			: "\xc4\xb9"	Lacute
++Ctrl<T> <L> <acute> 		: "\xc4\xb9"	Lacute
++Ctrl<T> <acute> <l>			: "\xc4\xba"	lacute
++Ctrl<T> <l> <acute> 		: "\xc4\xba"	lacute
++Ctrl<T> <l> <minus>		: "\xc2\xa3"	sterling
++Ctrl<T> <minus> <l>		: "\xc2\xa3"	sterling
++Ctrl<T> <L> <minus>		: "\xc2\xa3"	sterling
++Ctrl<T> <minus> <L>		: "\xc2\xa3"	sterling
++Ctrl<T> <l> <equal>		: "\xc2\xa3"	sterling
++Ctrl<T> <equal> <l>		: "\xc2\xa3"	sterling
++Ctrl<T> <L> <equal>		: "\xc2\xa3"	sterling
++Ctrl<T> <equal> <L>		: "\xc2\xa3"	sterling
++Ctrl<T> <y> <minus>		: "\xc2\xa5"	yen
++Ctrl<T> <minus> <y>		: "\xc2\xa5"	yen
++Ctrl<T> <Y> <minus>		: "\xc2\xa5"	yen
++Ctrl<T> <minus> <Y>		: "\xc2\xa5"	yen
++Ctrl<T> <y> <equal>		: "\xc2\xa5"	yen
++Ctrl<T> <equal> <y>		: "\xc2\xa5"	yen
++Ctrl<T> <Y> <equal>		: "\xc2\xa5"	yen
++Ctrl<T> <equal> <Y>		: "\xc2\xa5"	yen
++Ctrl<T> <s> <o>			: "\xc2\xa7"	section
++Ctrl<T> <o> <s>			: "\xc2\xa7"	section
++Ctrl<T> <S> <O>			: "\xc2\xa7"	section
++Ctrl<T> <O> <S>			: "\xc2\xa7"	section
++Ctrl<T> <S> <exclam>		: "\xc2\xa7"	section
++Ctrl<T> <exclam> <S>		: "\xc2\xa7"	section
++Ctrl<T> <s> <exclam>		: "\xc2\xa7"	section
++Ctrl<T> <exclam> <s>		: "\xc2\xa7"	section
++Ctrl<T> <S> <0>			: "\xc2\xa7"	section
++Ctrl<T> <0> <S>			: "\xc2\xa7"	section
++Ctrl<T> <s> <0>			: "\xc2\xa7"	section
++Ctrl<T> <0> <s>			: "\xc2\xa7"	section
++Ctrl<T> <x> <o>			: "\xc2\xa4"	currency
++Ctrl<T> <o> <x>			: "\xc2\xa4"	currency
++Ctrl<T> <X> <O>			: "\xc2\xa4"	currency
++Ctrl<T> <O> <X>			: "\xc2\xa4"	currency
++Ctrl<T> <x> <O>			: "\xc2\xa4"	currency
++Ctrl<T> <O> <x>			: "\xc2\xa4"	currency
++Ctrl<T> <X> <o>			: "\xc2\xa4"	currency
++Ctrl<T> <o> <X>			: "\xc2\xa4"	currency
++Ctrl<T> <x> <0>			: "\xc2\xa4"	currency
++Ctrl<T> <0> <x>			: "\xc2\xa4"	currency
++Ctrl<T> <X> <0>			: "\xc2\xa4"	currency
++Ctrl<T> <0> <X>			: "\xc2\xa4"	currency
++Ctrl<T> <c> <o>			: "\xc2\xa9"	copyright
++Ctrl<T> <o> <c>			: "\xc2\xa9"	copyright
++Ctrl<T> <C> <O>			: "\xc2\xa9"	copyright
++Ctrl<T> <O> <C>			: "\xc2\xa9"	copyright
++Ctrl<T> <c> <O>			: "\xc2\xa9"	copyright
++Ctrl<T> <O> <c>			: "\xc2\xa9"	copyright
++Ctrl<T> <C> <o>			: "\xc2\xa9"	copyright
++Ctrl<T> <o> <C>			: "\xc2\xa9"	copyright
++Ctrl<T> <c> <0>			: "\xc2\xa9"	copyright
++Ctrl<T> <0> <c>			: "\xc2\xa9"	copyright
++Ctrl<T> <C> <0>			: "\xc2\xa9"	copyright
++Ctrl<T> <0> <C>			: "\xc2\xa9"	copyright
++Ctrl<T> <a> <underscore>	: "\xc2\xaa"	ordfeminine
++Ctrl<T> <underscore> <a>	: "\xc2\xaa"	ordfeminine
++Ctrl<T> <A> <underscore>	: "\xc2\xaa"	ordfeminine
++Ctrl<T> <underscore> <A>	: "\xc2\xaa"	ordfeminine
++Ctrl<T> <O> <underscore>	: "\xc2\xba"	masculine
++Ctrl<T> <o> <underscore>	: "\xc2\xba"	masculine
++Ctrl<T> <underscore> <o>	: "\xc2\xba"	masculine
++Ctrl<T> <underscore> <O>	: "\xc2\xba"	masculine
++Ctrl<T> <less> <less>		: "\xc2\xab"	guillemotleft
++Ctrl<T> <greater> <greater>	: "\xc2\xbb"	guillemotright
++Ctrl<T> <0> <asciicircum>	: "\xc2\xb0"	degree
++Ctrl<T> <asciicircum> <0>	: "\xc2\xb0"	degree
++Ctrl<T> <0> <asterisk>		: "\xc2\xb0"	degree
++Ctrl<T> <asterisk> <0>		: "\xc2\xb0"	degree
++Ctrl<T> <plus> <minus>		: "\xc2\xb1"	plusminus
++Ctrl<T> <minus> <plus>		: "\xc2\xb1"	plusminus
++Ctrl<T> <slash> <u>		: "\xc2\xb5"	mu
++Ctrl<T> <u> <slash>		: "\xc2\xb5"	mu
++Ctrl<T> <slash> <U>		: "\xc2\xb5"	mu
++Ctrl<T> <U> <slash>		: "\xc2\xb5"	mu
++Ctrl<T> <1> <asciicircum>	: "\xc2\xb9"	onesuperior
++Ctrl<T> <asciicircum> <1>	: "\xc2\xb9"	onesuperior
++Ctrl<T> <S> <1>			: "\xc2\xb9"	onesuperior
++Ctrl<T> <1> <S>			: "\xc2\xb9"	onesuperior
++Ctrl<T> <s> <1>			: "\xc2\xb9"	onesuperior
++Ctrl<T> <1> <s>			: "\xc2\xb9"	onesuperior
++Ctrl<T> <2> <asciicircum>	: "\xc2\xb2"	twosuperior
++Ctrl<T> <asciicircum> <2>	: "\xc2\xb2"	twosuperior
++Ctrl<T> <S> <2>			: "\xc2\xb2"	twosuperior
++Ctrl<T> <2> <S>			: "\xc2\xb2"	twosuperior
++Ctrl<T> <s> <2>			: "\xc2\xb2"	twosuperior
++Ctrl<T> <2> <s>			: "\xc2\xb2"	twosuperior
++Ctrl<T> <3> <asciicircum>	: "\xc2\xb3"	threesuperior
++Ctrl<T> <asciicircum> <3>	: "\xc2\xb3"	threesuperior
++Ctrl<T> <S> <3>			: "\xc2\xb3"	threesuperior
++Ctrl<T> <3> <S>			: "\xc2\xb3"	threesuperior
++Ctrl<T> <s> <3>			: "\xc2\xb3"	threesuperior
++Ctrl<T> <3> <s>			: "\xc2\xb3"	threesuperior
++Ctrl<T> <p> <exclam>		: "\xc2\xb6"	paragraph
++Ctrl<T> <exclam> <p>		: "\xc2\xb6"	paragraph
++Ctrl<T> <P> <exclam>		: "\xc2\xb6"	paragraph
++Ctrl<T> <exclam> <P>		: "\xc2\xb6"	paragraph
++Ctrl<T> <period> <asciicircum>	: "\xc2\xb7"	periodcentered
++Ctrl<T> <asciicircum> <period>	: "\xc2\xb7"	periodcentered
++Ctrl<T> <period> <period>	: "\xc2\xb7"	periodcentered
++Ctrl<T> <1> <4>			: "\xc2\xbc"	onequarter
++Ctrl<T> <1> <2>			: "\xc2\xbd"	onehalf
++Ctrl<T> <3> <4>			: "\xc2\xbe"	threequarters
++Ctrl<T> <question> <question>	: "\xc2\xbf"	questiondown
++Ctrl<T> <space> <space>		: "\xc2\xa0"	nobreakspace
++Ctrl<T> <bar> <bar>		: "\xc2\xa6"	brokenbar
++Ctrl<T> <exclam> <asciicircum>	: "\xc2\xa6"	brokenbar
++Ctrl<T> <asciicircum> <exclam>	: "\xc2\xa6"	brokenbar
++Ctrl<T> <V> <B>			: "\xc2\xa6"	brokenbar
++Ctrl<T> <B> <V>			: "\xc2\xa6"	brokenbar
++Ctrl<T> <v> <b>			: "\xc2\xa6"	brokenbar
++Ctrl<T> <b> <v>			: "\xc2\xa6"	brokenbar
++Ctrl<T> <minus> <comma>		: "\xc2\xac"	notsign
++Ctrl<T> <comma> <minus>		: "\xc2\xac"	notsign
++Ctrl<T> <minus> <minus>		: "\xc2\xad"	hyphen
++Ctrl<T> <R> <O>			: "\xc2\xae"	registered
++Ctrl<T> <O> <R>			: "\xc2\xae"	registered
++Ctrl<T> <minus> <asciicircum>	: "\xc2\xaf"	macron
++Ctrl<T> <asciicircum> <minus>	: "\xc2\xaf"	macron
++Ctrl<T> <underscore> <asciicircum>	: "\xc2\xaf"	macron
++Ctrl<T> <asciicircum> <underscore>	: "\xc2\xaf"	macron
++Ctrl<T> <underscore> <underscore>	: "\xc2\xaf"	macron
++Ctrl<T> <minus> <colon>		: "\xc3\xb7"	division
++Ctrl<T> <colon> <minus>		: "\xc3\xb7"	division
++Ctrl<T> <x> <x>			: "\xc3\x97"	multiply
++Ctrl<T> <apostrophe> <apostrophe>	: "\xc2\xb4"	acute
++Ctrl<T> <comma> <comma>		: "\xc2\xb8"	cedilla
++Ctrl<T> <quotedbl> <quotedbl>	: "\xc2\xa8"	diaeresis
++Ctrl<T> <A> <grave>		: "\xc3\x80"	Agrave
++Ctrl<T> <grave> <A>		: "\xc3\x80"	Agrave
++Ctrl<T> <A> <acute>		: "\xc3\x81"	Aacute
++Ctrl<T> <acute> <A>		: "\xc3\x81"	Aacute
++Ctrl<T> <A> <apostrophe>	: "\xc3\x81"	Aacute
++Ctrl<T> <apostrophe> <A>	: "\xc3\x81"	Aacute
++Ctrl<T> <A> <asciicircum>	: "\xc3\x82"	Acircumflex
++Ctrl<T> <asciicircum> <A>	: "\xc3\x82"	Acircumflex
++Ctrl<T> <A> <greater>		: "\xc3\x82"	Acircumflex
++Ctrl<T> <greater> <A>		: "\xc3\x82"	Acircumflex
++Ctrl<T> <A> <asciitilde>	: "\xc3\x83"	Atilde
++Ctrl<T> <asciitilde> <A>	: "\xc3\x83"	Atilde
++Ctrl<T> <A> <minus>		: "\xc3\x83"	Atilde
++Ctrl<T> <minus> <A>		: "\xc3\x83"	Atilde
++Ctrl<T> <A> <quotedbl>		: "\xc3\x84"	Adiaeresis
++Ctrl<T> <quotedbl> <A>		: "\xc3\x84"	Adiaeresis
++Ctrl<T> <A> <asterisk>		: "\xc3\x85"	Aring
++Ctrl<T> <asterisk> <A>		: "\xc3\x85"	Aring
++Ctrl<T> <A> <E>			: "\xc3\x86"	AE
++Ctrl<T> <a> <grave>		: "\xc3\xa0"	agrave
++Ctrl<T> <grave> <a>		: "\xc3\xa0"	agrave
++Ctrl<T> <a> <acute>		: "\xc3\xa1"	aacute
++Ctrl<T> <acute> <a>		: "\xc3\xa1"	aacute
++Ctrl<T> <a> <apostrophe>	: "\xc3\xa1"	aacute
++Ctrl<T> <apostrophe> <a>	: "\xc3\xa1"	aacute
++Ctrl<T> <a> <asciicircum>	: "\xc3\xa2"	acircumflex
++Ctrl<T> <asciicircum> <a>	: "\xc3\xa2"	acircumflex
++Ctrl<T> <a> <greater>		: "\xc3\xa2"	acircumflex
++Ctrl<T> <greater> <a>		: "\xc3\xa2"	acircumflex
++Ctrl<T> <a> <asciitilde>	: "\xc3\xa3"	atilde
++Ctrl<T> <asciitilde> <a>	: "\xc3\xa3"	atilde
++Ctrl<T> <a> <minus>		: "\xc3\xa3"	atilde
++Ctrl<T> <minus> <a>		: "\xc3\xa3"	atilde
++Ctrl<T> <a> <quotedbl>		: "\xc3\xa4"	adiaeresis
++Ctrl<T> <quotedbl> <a>		: "\xc3\xa4"	adiaeresis
++Ctrl<T> <a> <asterisk>		: "\xc3\xa5"	aring
++Ctrl<T> <asterisk> <a>		: "\xc3\xa5"	aring
++Ctrl<T> <a> <e>			: "\xc3\xa6"	ae
++Ctrl<T> <C> <comma>		: "\xc3\x87"	Ccedilla
++Ctrl<T> <comma> <C>		: "\xc3\x87"	Ccedilla
++Ctrl<T> <c> <comma>		: "\xc3\xa7"	ccedilla
++Ctrl<T> <comma> <c>		: "\xc3\xa7"	ccedilla
++Ctrl<T> <minus> <D>		: "\xc3\x90"	ETH
++Ctrl<T> <D> <minus>		: "\xc3\x90"	ETH
++Ctrl<T> <minus> <d>		: "\xc3\xb0"	eth
++Ctrl<T> <d> <minus>		: "\xc3\xb0"	eth
++Ctrl<T> <E> <grave>		: "\xc3\x88"	Egrave
++Ctrl<T> <grave> <E>		: "\xc3\x88"	Egrave
++Ctrl<T> <E> <acute>		: "\xc3\x89"	Eacute
++Ctrl<T> <acute> <E>		: "\xc3\x89"	Eacute
++Ctrl<T> <E> <apostrophe>	: "\xc3\x89"	Eacute
++Ctrl<T> <apostrophe> <E>	: "\xc3\x89"	Eacute
++Ctrl<T> <E> <asciicircum>	: "\xc3\x8a"	Ecircumflex
++Ctrl<T> <asciicircum> <E>	: "\xc3\x8a"	Ecircumflex
++Ctrl<T> <E> <greater>		: "\xc3\x8a"	Ecircumflex
++Ctrl<T> <greater> <E>		: "\xc3\x8a"	Ecircumflex
++Ctrl<T> <E> <quotedbl>		: "\xc3\x8b"	Ediaeresis
++Ctrl<T> <quotedbl> <E>		: "\xc3\x8b"	Ediaeresis
++Ctrl<T> <e> <grave>		: "\xc3\xa8"	egrave
++Ctrl<T> <grave> <e>		: "\xc3\xa8"	egrave
++Ctrl<T> <e> <acute>		: "\xc3\xa9"	eacute
++Ctrl<T> <acute> <e>		: "\xc3\xa9"	eacute
++Ctrl<T> <e> <apostrophe>	: "\xc3\xa9"	eacute
++Ctrl<T> <apostrophe> <e>	: "\xc3\xa9"	eacute
++Ctrl<T> <e> <asciicircum>	: "\xc3\xaa"	ecircumflex
++Ctrl<T> <asciicircum> <e>	: "\xc3\xaa"	ecircumflex
++Ctrl<T> <e> <greater>		: "\xc3\xaa"	ecircumflex
++Ctrl<T> <greater> <e>		: "\xc3\xaa"	ecircumflex
++Ctrl<T> <e> <quotedbl>		: "\xc3\xab"	ediaeresis
++Ctrl<T> <quotedbl> <e>		: "\xc3\xab"	ediaeresis
++Ctrl<T> <I> <grave>		: "\xc3\x8c"	Igrave
++Ctrl<T> <grave> <I>		: "\xc3\x8c"	Igrave
++Ctrl<T> <I> <acute>		: "\xc3\x8d"	Iacute
++Ctrl<T> <acute> <I>		: "\xc3\x8d"	Iacute
++Ctrl<T> <I> <apostrophe>	: "\xc3\x8d"	Iacute
++Ctrl<T> <apostrophe> <I>	: "\xc3\x8d"	Iacute
++Ctrl<T> <I> <asciicircum>	: "\xc3\x8e"	Icircumflex
++Ctrl<T> <asciicircum> <I>	: "\xc3\x8e"	Icircumflex
++Ctrl<T> <I> <greater>		: "\xc3\x8e"	Icircumflex
++Ctrl<T> <greater> <I>		: "\xc3\x8e"	Icircumflex
++Ctrl<T> <I> <quotedbl>		: "\xc3\x8f"	Idiaeresis
++Ctrl<T> <quotedbl> <I>		: "\xc3\x8f"	Idiaeresis
++Ctrl<T> <i> <grave>		: "\xc3\xac"	igrave
++Ctrl<T> <grave> <i>		: "\xc3\xac"	igrave
++Ctrl<T> <i> <acute>		: "\xc3\xad"	iacute
++Ctrl<T> <acute> <i>		: "\xc3\xad"	iacute
++Ctrl<T> <i> <apostrophe>	: "\xc3\xad"	iacute
++Ctrl<T> <apostrophe> <i>	: "\xc3\xad"	iacute
++Ctrl<T> <i> <asciicircum>	: "\xc3\xae"	icircumflex
++Ctrl<T> <asciicircum> <i>	: "\xc3\xae"	icircumflex
++Ctrl<T> <i> <greater>		: "\xc3\xae"	icircumflex
++Ctrl<T> <greater> <i>		: "\xc3\xae"	icircumflex
++Ctrl<T> <i> <quotedbl>		: "\xc3\xaf"	idiaeresis
++Ctrl<T> <quotedbl> <i>		: "\xc3\xaf"	idiaeresis
++Ctrl<T> <N> <asciitilde>	: "\xc3\x91"	Ntilde
++Ctrl<T> <asciitilde> <N>	: "\xc3\x91"	Ntilde
++Ctrl<T> <N> <minus>		: "\xc3\x91"	Ntilde
++Ctrl<T> <minus> <N>		: "\xc3\x91"	Ntilde
++Ctrl<T> <n> <asciitilde>	: "\xc3\xb1"	ntilde
++Ctrl<T> <asciitilde> <n>	: "\xc3\xb1"	ntilde
++Ctrl<T> <n> <minus>		: "\xc3\xb1"	ntilde
++Ctrl<T> <minus> <n>		: "\xc3\xb1"	ntilde
++Ctrl<T> <O> <grave>		: "\xc3\x92"	Ograve
++Ctrl<T> <grave> <O>		: "\xc3\x92"	Ograve
++Ctrl<T> <O> <acute>		: "\xc3\x93"	Oacute
++Ctrl<T> <acute> <O>		: "\xc3\x93"	Oacute
++Ctrl<T> <O> <apostrophe>	: "\xc3\x93"	Oacute
++Ctrl<T> <apostrophe> <O>	: "\xc3\x93"	Oacute
++Ctrl<T> <O> <asciicircum>	: "\xc3\x94"	Ocircumflex
++Ctrl<T> <asciicircum> <O>	: "\xc3\x94"	Ocircumflex
++Ctrl<T> <O> <greater>		: "\xc3\x94"	Ocircumflex
++Ctrl<T> <greater> <O>		: "\xc3\x94"	Ocircumflex
++Ctrl<T> <O> <asciitilde>	: "\xc3\x95"	Otilde
++Ctrl<T> <asciitilde> <O>	: "\xc3\x95"	Otilde
++Ctrl<T> <O> <minus>		: "\xc3\x95"	Otilde
++Ctrl<T> <minus> <O>		: "\xc3\x95"	Otilde
++Ctrl<T> <O> <quotedbl>		: "\xc3\x96"	Odiaeresis
++Ctrl<T> <quotedbl> <O>		: "\xc3\x96"	Odiaeresis
++Ctrl<T> <O> <slash>		: "\xc3\x98"	Ooblique
++Ctrl<T> <slash> <O>		: "\xc3\x98"	Ooblique
++Ctrl<T> <o> <grave>		: "\xc3\xb2"	ograve
++Ctrl<T> <grave> <o>		: "\xc3\xb2"	ograve
++Ctrl<T> <o> <acute>		: "\xc3\xb3"	oacute
++Ctrl<T> <acute> <o>		: "\xc3\xb3"	oacute
++Ctrl<T> <o> <apostrophe>	: "\xc3\xb3"	oacute
++Ctrl<T> <apostrophe> <o>	: "\xc3\xb3"	oacute
++Ctrl<T> <o> <asciicircum>	: "\xc3\xb4"	ocircumflex
++Ctrl<T> <asciicircum> <o>	: "\xc3\xb4"	ocircumflex
++Ctrl<T> <o> <greater>		: "\xc3\xb4"	ocircumflex
++Ctrl<T> <greater> <o>		: "\xc3\xb4"	ocircumflex
++Ctrl<T> <o> <asciitilde>	: "\xc3\xb5"	otilde
++Ctrl<T> <asciitilde> <o>	: "\xc3\xb5"	otilde
++Ctrl<T> <o> <minus>		: "\xc3\xb5"	otilde
++Ctrl<T> <minus> <o>		: "\xc3\xb5"	otilde
++Ctrl<T> <o> <quotedbl>		: "\xc3\xb6"	odiaeresis
++Ctrl<T> <quotedbl> <o>		: "\xc3\xb6"	odiaeresis
++Ctrl<T> <o> <slash>		: "\xc3\xb8"	oslash
++Ctrl<T> <slash> <o>		: "\xc3\xb8"	oslash
++Ctrl<T> <U> <grave>		: "\xc3\x99"	Ugrave
++Ctrl<T> <grave> <U>		: "\xc3\x99"	Ugrave
++Ctrl<T> <U> <acute>		: "\xc3\x9a"	Uacute
++Ctrl<T> <acute> <U>		: "\xc3\x9a"	Uacute
++Ctrl<T> <U> <apostrophe>	: "\xc3\x9a"	Uacute
++Ctrl<T> <apostrophe> <U>	: "\xc3\x9a"	Uacute
++Ctrl<T> <U> <asciicircum>	: "\xc3\x9b"	Ucircumflex
++Ctrl<T> <asciicircum> <U>	: "\xc3\x9b"	Ucircumflex
++Ctrl<T> <U> <greater>		: "\xc3\x9b"	Ucircumflex
++Ctrl<T> <greater> <U>		: "\xc3\x9b"	Ucircumflex
++Ctrl<T> <U> <quotedbl>		: "\xc3\x9c"	Udiaeresis
++Ctrl<T> <quotedbl> <U>		: "\xc3\x9c"	Udiaeresis
++Ctrl<T> <u> <grave>		: "\xc3\xb9"	ugrave
++Ctrl<T> <grave> <u>		: "\xc3\xb9"	ugrave
++Ctrl<T> <u> <acute>		: "\xc3\xba"	uacute
++Ctrl<T> <acute> <u>		: "\xc3\xba"	uacute
++Ctrl<T> <u> <apostrophe>	: "\xc3\xba"	uacute
++Ctrl<T> <apostrophe> <u>	: "\xc3\xba"	uacute
++Ctrl<T> <u> <asciicircum>	: "\xc3\xbb"	ucircumflex
++Ctrl<T> <asciicircum> <u>	: "\xc3\xbb"	ucircumflex
++Ctrl<T> <u> <greater>		: "\xc3\xbb"	ucircumflex
++Ctrl<T> <greater> <u>		: "\xc3\xbb"	ucircumflex
++Ctrl<T> <u> <quotedbl>		: "\xc3\xbc"	udiaeresis
++Ctrl<T> <quotedbl> <u>		: "\xc3\xbc"	udiaeresis
++Ctrl<T> <s> <s>			: "\xc3\x9f"	ssharp
++Ctrl<T> <T> <H>			: "\xc3\x9e"	THORN
++Ctrl<T> <t> <h>			: "\xc3\xbe"	thorn
++Ctrl<T> <Y> <acute>		: "\xc3\x9d"	Yacute
++Ctrl<T> <acute> <Y>		: "\xc3\x9d"	Yacute
++Ctrl<T> <Y> <apostrophe>	: "\xc3\x9d"	Yacute
++Ctrl<T> <apostrophe> <Y>	: "\xc3\x9d"	Yacute
++Ctrl<T> <y> <acute>		: "\xc3\xbd"	yacute
++Ctrl<T> <acute> <y>		: "\xc3\xbd"	yacute
++Ctrl<T> <y> <apostrophe>	: "\xc3\xbd"	yacute
++Ctrl<T> <apostrophe> <y>	: "\xc3\xbd"	yacute
++Ctrl<T> <y> <quotedbl>		: "\xc3\xbf"	ydiaeresis
++Ctrl<T> <quotedbl> <y>		: "\xc3\xbf"	ydiaeresis
++XCOMM turkish
++<Multi_key> <G> <u>		: "\xc4\x9e"	Gbreve
++<Multi_key> <u> <G>		: "\xc4\x9e"	Gbreve
++<Multi_key> <g> <u>		: "\xc4\x9f"	gbreve
++<Multi_key> <u> <g>		: "\xc4\x9f"	gbreve
++<Multi_key> <I> <period>	: "\xc4\xb0"	Iabovedot
++<Multi_key> <period> <I>	: "\xc4\xb0"	Iabovedot
++<Multi_key> <i> <period>	: "\xc4\xb1"	idotless
++<Multi_key> <period> <i>	: "\xc4\xb1"	idotless
++XCOMM polish
++<Multi_key> <space> <breve>	: "\xcb\x98"	breve
++<Multi_key> <space> <degree>	: "\xc2\xb0"	degree
++<Multi_key> <space> <ogonek>	: "\xcb\x9b"	ogonek
++<Multi_key> <space> <caron>	: "\xcb\x87"	caron
++<Multi_key> <space> <v>		: "\xcb\x87"	caron
++<Multi_key> <space> <doubleacute> : "\xcb\x9d"	doubleacute
++<Multi_key> <diaeresis> <A>	: "\xc3\x84"	Adiaeresis
++<Multi_key> <A> <diaeresis> 	: "\xc3\x84"	Adiaeresis
++<Multi_key> <diaeresis> <E>	: "\xc3\x8b" 	Ediaeresis
++<Multi_key> <E> <diaeresis> 	: "\xc3\x8b" 	Ediaeresis
++<Multi_key> <diaeresis> <O>	: "\xc3\x96"	Odiaeresis
++<Multi_key> <O> <diaeresis> 	: "\xc3\x96"	Odiaeresis
++<Multi_key> <diaeresis> <U>	: "\xc3\x9c"	Udiaeresis
++<Multi_key> <U> <diaeresis> 	: "\xc3\x9c"	Udiaeresis
++<Multi_key> <diaeresis> <a>	: "\xc3\xa4"	adiaeresis
++<Multi_key> <a> <diaeresis> 	: "\xc3\xa4"	adiaeresis
++<Multi_key> <diaeresis> <e>	: "\xc3\xab"	ediaeresis
++<Multi_key> <e> <diaeresis> 	: "\xc3\xab"	ediaeresis
++<Multi_key> <diaeresis> <o>	: "\xc3\xb6"	odiaeresis
++<Multi_key> <o> <diaeresis> 	: "\xc3\xb6"	odiaeresis
++<Multi_key> <diaeresis> <u>	: "\xc3\xbc"	udiaeresis
++<Multi_key> <u> <diaeresis> 	: "\xc3\xbc"	udiaeresis
++<Multi_key> <acute> <R>		: "\xc5\x94"	Racute
++<Multi_key> <R> <acute> 	: "\xc5\x94"	Racute
++<Multi_key> <acute> <S>		: "\xc5\x9a"	Sacute
++<Multi_key> <S> <acute> 	: "\xc5\x9a"	Sacute
++<Multi_key> <acute> <Z>		: "\xc4\xbe"	Zacute
++<Multi_key> <Z> <acute> 	: "\xc4\xbe"	Zacute
++<Multi_key> <acute> <n>		: "\xc5\x84"	nacute
++<Multi_key> <n> <acute> 	: "\xc5\x84"	nacute
++<Multi_key> <acute> <r>		: "\xc5\x95"	racute
++<Multi_key> <r> <acute> 	: "\xc5\x95"	racute
++<Multi_key> <acute> <s>		: "\xc5\x9b"	sacute
++<Multi_key> <s> <acute> 	: "\xc5\x9b"	sacute
++<Multi_key> <acute> <z>		: "\xc5\xba"	zacute
++<Multi_key> <z> <acute> 	: "\xc5\xba"	zacute
++<Multi_key> <0> <O>		: "\xc2\xb0"	degree
++<Multi_key> <o> <o> 		: "\xc2\xb0"	degree
++<Multi_key> <comma> <S>		: "\xc5\x9e"	Scedilla
++<Multi_key> <S> <comma> 	: "\xc5\x9e"	Scedilla
++<Multi_key> <comma> <T>		: "\xc5\xa2"	Tcedilla
++<Multi_key> <T> <comma> 	: "\xc5\xa2"	Tcedilla
++<Multi_key> <comma> <s>		: "\xc5\x9f"	scedilla
++<Multi_key> <s> <comma> 	: "\xc5\x9f"	scedilla
++<Multi_key> <comma> <t>		: "\xc5\xa3"	tcedilla
++<Multi_key> <t> <comma> 	: "\xc5\xa3"	tcedilla
++<Multi_key> <caron> <C>		: "\xc4\x8c"	Ccaron
++<Multi_key> <C> <caron> 	: "\xc4\x8c"	Ccaron
++<Multi_key> <caron> <D>		: "\xc4\x8e"	Dcaron
++<Multi_key> <D> <caron> 	: "\xc4\x8e"	Dcaron
++<Multi_key> <caron> <E>		: "\xc4\x9a"	Ecaron
++<Multi_key> <E> <caron> 	: "\xc4\x9a"	Ecaron
++<Multi_key> <caron> <L>		: "\xc4\xbd"	Lcaron
++<Multi_key> <L> <caron> 	: "\xc4\xbd"	Lcaron
++<Multi_key> <caron> <N>		: "\xc5\x87" 	Ncaron
++<Multi_key> <N> <caron>		: "\xc5\x87" 	Ncaron
++<Multi_key> <caron> <R>		: "\xc5\x98"	Rcaron
++<Multi_key> <R> <caron> 	: "\xc5\x98"	Rcaron
++<Multi_key> <caron> <S>		: "\xc5\xa0"	Scaron
++<Multi_key> <S> <caron> 	: "\xc5\xa0"	Scaron
++<Multi_key> <caron> <T>		: "\xc5\xa4"	Tcaron
++<Multi_key> <T> <caron> 	: "\xc5\xa4"	Tcaron
++<Multi_key> <caron> <U>		: "\xc5\xae"	Uring
++<Multi_key> <U> <caron> 	: "\xc5\xae"	Uring
++<Multi_key> <caron> <c>		: "\xc4\x8d"	ccaron
++<Multi_key> <c> <caron> 	: "\xc4\x8d"	ccaron
++<Multi_key> <caron> <d>		: "\xc4\x8f"	dcaron
++<Multi_key> <d> <caron> 	: "\xc4\x8f"	dcaron
++<Multi_key> <caron> <e>		: "\xc4\x9b"	ecaron
++<Multi_key> <e> <caron> 	: "\xc4\x9b"	ecaron
++<Multi_key> <caron> <l>		: "\xc4\xbe"	lcaron
++<Multi_key> <l> <caron> 	: "\xc4\xbe"	lcaron
++<Multi_key> <caron> <n>		: "\xc5\x88"	ncaron
++<Multi_key> <n> <caron> 	: "\xc5\x88"	ncaron
++<Multi_key> <caron> <r>		: "\xc5\x99"	rcaron
++<Multi_key> <r> <caron> 	: "\xc5\x99"	rcaron
++<Multi_key> <caron> <s>		: "\xc5\xa1"	scaron
++<Multi_key> <s> <caron> 	: "\xc5\xa1"	scaron
++<Multi_key> <caron> <t>		: "\xc5\xa5"	tcaron
++<Multi_key> <t> <caron> 	: "\xc5\xa5"	tcaron
++<Multi_key> <caron> <u>		: "\xc5\xaf"	uring
++<Multi_key> <u> <caron> 	: "\xc5\xaf"	uring
++<Multi_key> <v> <C>		: "\xc4\x8c"	Ccaron
++<Multi_key> <C> <v> 		: "\xc4\x8c"	Ccaron
++<Multi_key> <v> <D>		: "\xc4\x8e"	Dcaron
++<Multi_key> <D> <v> 		: "\xc4\x8e"	Dcaron
++<Multi_key> <v> <E>		: "\xc4\x9a"	Ecaron
++<Multi_key> <E> <v> 		: "\xc4\x9a"	Ecaron
++<Multi_key> <v> <N>		: "\xc5\x87" 	Ncaron
++<Multi_key> <N> <v>		: "\xc5\x87" 	Ncaron
++<Multi_key> <v> <R>		: "\xc5\x98"	Rcaron
++<Multi_key> <R> <v> 		: "\xc5\x98"	Rcaron
++<Multi_key> <v> <T>		: "\xc5\xa4"	Tcaron
++<Multi_key> <T> <v> 		: "\xc5\xa4"	Tcaron
++<Multi_key> <v> <U>		: "\xc5\xae"	Uring
++<Multi_key> <U> <v> 		: "\xc5\xae"	Uring
++<Multi_key> <v> <c>		: "\xc4\x8d"	ccaron
++<Multi_key> <c> <v> 		: "\xc4\x8d"	ccaron
++<Multi_key> <v> <d>		: "\xc4\x8f"	dcaron
++<Multi_key> <d> <v> 		: "\xc4\x8f"	dcaron
++<Multi_key> <v> <e>		: "\xc4\x9b"	ecaron
++<Multi_key> <e> <v> 		: "\xc4\x9b"	ecaron
++<Multi_key> <v> <n>		: "\xc5\x88"	ncaron
++<Multi_key> <n> <v> 		: "\xc5\x88"	ncaron
++<Multi_key> <v> <r>		: "\xc5\x99"	rcaron
++<Multi_key> <r> <v> 		: "\xc5\x99"	rcaron
++<Multi_key> <v> <t>		: "\xc5\xa5"	tcaron
++<Multi_key> <t> <v> 		: "\xc5\xa5"	tcaron
++<Multi_key> <v> <u>		: "\xc5\xaf"	uring
++<Multi_key> <u> <v> 		: "\xc5\xaf"	uring
++<Multi_key> <breve> <A>		: "\xc4\x82"	Abreve
++<Multi_key> <A> <breve> 	: "\xc4\x82"	Abreve
++<Multi_key> <breve> <a>		: "\xc4\x83"	abreve
++<Multi_key> <a> <breve> 	: "\xc4\x83"	abreve
++<Multi_key> <ogonek> <A>	: "\xc4\x84"	Aogonek
++<Multi_key> <A> <ogonek> 	: "\xc4\x84"	Aogonek
++<Multi_key> <ogonek> <E>	: "\xc4\x98"	Eogonek
++<Multi_key> <E> <ogonek> 	: "\xc4\x98"	Eogonek
++<Multi_key> <ogonek> <a> 	: "\xc4\x85"	aogonek
++<Multi_key> <a> <ogonek> 	: "\xc4\x85"	aogonek
++<Multi_key> <ogonek> <e> 	: "\xc4\x99"	eogonek
++<Multi_key> <e> <ogonek> 	: "\xc4\x99"	eogonek
++<Multi_key> <E> <a> 		: "\xc4\x98"	Eogonek
++<Multi_key> <e> <a> 		: "\xc4\x99"	eogonek
++<Multi_key> <doubleacute> <O>	: "\xc5\x90"	Odoubleacute
++<Multi_key> <O> <doubleacute> 	: "\xc5\x90"	Odoubleacute
++<Multi_key> <doubleacute> <U>	: "\xc5\xb0"	Udoubleacute
++<Multi_key> <U> <doubleacute> 	: "\xc5\xb0"	Udoubleacute
++<Multi_key> <doubleacute> <o>	: "\xc5\x91"	odoubleacute
++<Multi_key> <o> <doubleacute> 	: "\xc5\x91"	odoubleacute
++<Multi_key> <doubleacute> <u>	: "\xc5\xb1"	udoubleacute
++<Multi_key> <u> <doubleacute> 	: "\xc5\xb1"	udoubleacute
++<Multi_key> <period> <U>	: "\xc5\xae"	Uring
++<Multi_key> <U> <period> 	: "\xc5\xae"	Uring
++<Multi_key> <period> <u>	: "\xc5\xaf"	uring
++<Multi_key> <u> <period> 	: "\xc5\xaf"	uring
++<Multi_key> <period> <z>	: "\xc5\xbc"	zabovedot
++<Multi_key> <z> <period> 	: "\xc5\xbc"	zabovedot
++<Multi_key> <period> <Z>	: "\xc5\xbb"	Zabovedot
++<Multi_key> <Z> <period> 	: "\xc5\xbb"	Zabovedot
++<acute> <A>		: "\xc3\x81"	Aacute
++<acute> <C>		: "\xc4\x86"	Cacute
++<acute> <E>		: "\xc3\x89"	Eacute
++<acute> <I>		: "\xc3\x8d"	Iacute
++<acute> <L>		: "\xc4\xb9"	Lacute
++<acute> <N>		: "\xc5\x83"	Nacute
++<acute> <O>		: "\xc3\x93"	Oacute
++<acute> <R>		: "\xc5\x94"	Racute
++<acute> <S>		: "\xc5\x9a"	Sacute
++<acute> <U>		: "\xc3\x9a"	Uacute
++<acute> <Y>		: "\xc3\x9d"	Yacute
++<acute> <Z>		: "\xc4\xbe"	Zacute
++<acute> <a>		: "\xc3\xa1"	aacute
++<acute> <c>		: "\xc4\x87"	cacute
++<acute> <e>		: "\xc3\xa9"	eacute
++<acute> <i>		: "\xc3\xad"	iacute
++<acute> <l>		: "\xc4\xba"	lacute
++<acute> <n>		: "\xc5\x84"	nacute
++<acute> <o>		: "\xc3\xb3"	oacute
++<acute> <r>		: "\xc5\x95"	racute
++<acute> <s>		: "\xc5\x9b"	sacute
++<acute> <u>		: "\xc3\xba"	uacute
++<acute> <y>		: "\xc3\xbd"	yacute
++<acute> <z>		: "\xc5\xba"	zacute
++<diaeresis> <A>		: "\xc3\x84" 	Adiaeresis
++<diaeresis> <E>		: "\xc3\x8b"	Ediaeresis
++<diaeresis> <O>		: "\xc3\x96"	Odiaeresis
++<diaeresis> <U>		: "\xc3\x9c"	Udiaeresis
++<diaeresis> <a>		: "\xc3\xa4" 	adiaeresis
++<diaeresis> <e>		: "\xc3\xab"	ediaeresis
++<diaeresis> <o>		: "\xc3\xb6"	odiaeresis
++<diaeresis> <u>		: "\xc3\xbc"	udiaeresis
++XCOMM
++XCOMM Additional latin-2 sequences
++<Ukrainian_IE>          : "\xd0\x84"    Ukrainian_IE
++<Ukrainian_ie>          : "\xd1\x94"    Ukrainian_ie
++<Ukrainian_I>           : "\xd0\x86"    Ukrainian_I
++<Ukrainian_i>           : "\xd1\x96"    Ukrainian_i
++<Ukrainian_GHE_WITH_UPTURN>     : "\xd2\x90"    Ukrainian_GHE_WITH_UPTURN
++<Ukrainian_ghe_with_upturn>     : "\xd2\x91"    Ukrainian_ghe_with_upturn
++<Ukrainian_YI>          : "\xd0\x87"    Ukrainian_YI
++<Ukrainian_yi>          : "\xd1\x97"    Ukrainian_yi
++<Serbian_TSHE>          : "\xd0\x8b"    Serbian_TSHE
++<Serbian_tshe>          : "\xd1\x9b"    Serbian_tshe
++<Serbian_DJE>           : "\xd0\x82"    Serbian_DJE
++<Serbian_dje>           : "\xd1\x92"    Serbian_dje
++<Macedonia_GJE>         : "\xd0\x83"    Macedonia_GJE
++<Macedonia_gje>         : "\xd1\x93"    Macedonia_gje
++<Macedonia_KJE>         : "\xd0\x8c"    Macedonia_KJE
++<Macedonia_kje>         : "\xd1\x9c"    Macedonia_kje
++<Macedonia_DSE>         : "\xd0\x85"    Macedonia_DSE
++<Macedonia_dse>         : "\xd1\x95"    Macedonia_dse
++<Byelorussian_SHORTU>   : "\xd0\x8e"    Byelorussian_SHORTU
++<Byelorussian_shortu>   : "\xd1\x9e"    Byelorussian_shortu
++XCOMM Cyrillic keysyms:
++<Zabovedot>             : "\xc5\xbb"    Zabovedot
++<zabovedot>             : "\xc5\xbc"    zabovedot
++<Gabovedot>             : "\xc4\xa0"    Gabovedot
++<gabovedot>             : "\xc4\xa1"    gabovedot
++<Cabovedot>             : "\xc4\x8a"    Cabovedot
++<cabovedot>             : "\xc4\x8b"    cabovedot
++XCOMM Additional Latin-3 keysyms and compose sequences:
++<multiply>              : "\xc3\x97"    multiply
++<division>              : "\xc3\xb7"    division
++<dead_ogonek> <e>       : "\xc4\x99"    eogonek
++<dead_ogonek> <E>       : "\xc4\x98"    Eogonek
++<dead_ogonek> <a>       : "\xc4\x85"    aogonek
++<dead_ogonek> <A>       : "\xc4\x84"    Aogonek
++<dead_doubleacute> <u>  : "\xc5\xb1"    udoubleacute
++<dead_doubleacute> <U>  : "\xc5\xb0"    Udoubleacute
++<dead_doubleacute> <o>  : "\xc5\x91"    odoubleacute
++<dead_doubleacute> <O>  : "\xc5\x90"    Odoubleacute
++<dead_caron> <z>        : "\xc5\xbe"    zcaron
++<dead_caron> <Z>        : "\xc5\xbd"    Zcaron
++<dead_caron> <t>        : "\xc5\xa5"    tcaron
++<dead_caron> <T>        : "\xc5\xa4"    Tcaron
++<dead_caron> <s>        : "\xc5\xa1"    scaron
++<dead_caron> <S>        : "\xc5\xa0"    Scaron
++<dead_caron> <r>        : "\xc5\x99"    rcaron
++<dead_caron> <R>        : "\xc5\x98"    Rcaron
++<dead_caron> <n>        : "\xc5\x88"    ncaron
++<dead_caron> <N>        : "\xc5\x87"    Ncaron
++<dead_caron> <l>        : "\xc4\xbe"    lcaron
++<dead_caron> <L>        : "\xc4\xbd"    Lcaron
++<dead_caron> <e>        : "\xc4\x9b"    ecaron
++<dead_caron> <E>        : "\xc4\x9a"    Ecaron
++<dead_caron> <d>        : "\xc4\x8f"    dcaron
++<dead_caron> <D>        : "\xc4\x8e"    Dcaron
++<dead_caron> <c>        : "\xc4\x8d"    ccaron
++<dead_caron> <C>        : "\xc4\x8c"    Ccaron
++<dead_breve> <a>        : "\xc4\x83"    abreve
++<dead_breve> <A>        : "\xc4\x82"    Abreve
++<dead_abovering> <u>    : "\xc5\xaf"    uring
++<dead_abovering> <U>    : "\xc5\xae"    Uring
++<dead_abovering> <a>    : "\xc3\xa5"    aring
++<dead_abovering> <A>    : "\xc3\x85"    Aring
++<dead_abovedot> <z>     : "\xc5\xbc"    zabovedot
++<dead_abovedot> <Z>     : "\xc5\xbb"    Zabovedot
++<dead_abovedot> <I>     : "\xc4\xb0"    Iabovedot
++<dead_abovedot> <g>     : "\xc4\xa1"    gabovedot
++<dead_abovedot> <G>     : "\xc4\xa0"    Gabovedot
++<dead_abovedot> <e>     : "\xc4\x97"    eabovedot
++<dead_abovedot> <E>     : "\xc4\x96"    Eabovedot
++<dead_abovedot> <c>     : "\xc4\x8b"    cabovedot
++<dead_abovedot> <C>     : "\xc4\x8a"    Cabovedot
++XCOMM Latin-2 dead key compose sequences and keysyms for division and multiply:
++<dead_diaeresis> <Y>            : "\xc5\xb8"
++<SunFA_Diaeresis> <Y>           : "\xc5\xb8"
++Ctrl<T> <quotedbl> <Y>          : "\xc5\xb8"
++Ctrl<T> <Y> <quotedbl>          : "\xc5\xb8"
++Ctrl<T> <O> <E>                 : "\xc5\x92"
++Ctrl<T> <o> <e>                 : "\xc5\x93"
++<Multi_key> <quotedbl> <Y>      : "\xc5\xb8"
++<Multi_key> <Y> <quotedbl>      : "\xc5\xb8"
++<Multi_key> <O> <E>             : "\xc5\x92"
++<Multi_key> <o> <e>             : "\xc5\x93"
++<tcaron>                : "\xc5\xa5"    tcaron
++<dcaron>                : "\xc4\x8f"    dcaron
++Ctrl<T> <slash> <H>     : "\xc4\xa6"    Hstroke
++Ctrl<T> <H> <slash>     : "\xc4\xa6"    Hstroke
++Ctrl<T> <bar> <H>       : "\xc4\xa6"    Hstroke
++Ctrl<T> <H> <bar>       : "\xc4\xa6"    Hstroke
++Ctrl<T> <slash> <h>     : "\xc4\xa7"    hstroke
++Ctrl<T> <h> <slash>     : "\xc4\xa7"    hstroke
++Ctrl<T> <bar> <h>       : "\xc4\xa7"    hstroke
++Ctrl<T> <h> <bar>       : "\xc4\xa7"    hstroke
++<Multi_key> <slash> <H> : "\xc4\xa6"    Hstroke
++<Multi_key> <H> <slash> : "\xc4\xa6"    Hstroke
++<Multi_key> <bar> <H>   : "\xc4\xa6"    Hstroke
++<Multi_key> <H> <bar>   : "\xc4\xa6"    Hstroke
++<Multi_key> <slash> <h> : "\xc4\xa7"    hstroke
++<Multi_key> <h> <slash> : "\xc4\xa7"    hstroke
++<Multi_key> <bar> <h>   : "\xc4\xa7"    hstroke
++<Multi_key> <h> <bar>   : "\xc4\xa7"    hstroke
++<Hstroke>               : "\xc4\xa6"    Hstroke
++<hstroke>               : "\xc4\xa7"    hstroke
++<Multi_key> <a> <space>		: "\xcb\x9b"	ogonek
++<Multi_key> <u> <space>		: "\xcb\x98"	breve
++<Multi_key> <v> <space>		: "\xcb\x87"	caron
++<Multi_key> <quotedbl> <space>	: "\xcb\x9d"	doubleacute
++<Multi_key> <A> <u>		: "\xc4\x82"	Abreve
++<Multi_key> <C> <apostrophe>	: "\xc4\x86"	Cacute
++<Multi_key> <L> <apostrophe>	: "\xc4\xb9"	Lacute
++<Multi_key> <L> <slash>		: "\xc5\x81"	Lstroke
++<Multi_key> <L> <greater>	: "\xc4\xbd"	Lcaron
++<Multi_key> <N> <apostrophe>	: "\xc5\x83"	Nacute
++<Multi_key> <S> <apostrophe>	: "\xc5\x9a"	Sacute
++<Multi_key> <R> <apostrophe>	: "\xc5\x94"	Racute
++<Multi_key> <U> <asterisk>	: "\xc5\xae"	Uring
++<Multi_key> <Z> <apostrophe>	: "\xc5\xb9"	Zacute
++<Multi_key> <a> <u>		: "\xc4\x83"	abreve
++<Multi_key> <c> <apostrophe>	: "\xc4\x87"	cacute
++<Multi_key> <l> <apostrophe>	: "\xc4\xba"	lacute
++<Multi_key> <l> <slash>		: "\xc5\x82"	lstroke
++<Multi_key> <l> <greater>	: "\xc4\xbe"	lcaron
++<Multi_key> <n> <apostrophe>	: "\xc5\x84"	nacute
++<Multi_key> <s> <apostrophe>	: "\xc5\x9b"	sacute
++<Multi_key> <r> <apostrophe>	: "\xc5\x95"	racute
++<Multi_key> <u> <asterisk>	: "\xc5\xaf"	uring
++<Multi_key> <z> <apostrophe>	: "\xc5\xba"	zacute
++XCOMM
++XCOMM Latin-3 sequences
++<Multi_key> <C> <asciicircum>	: "\xc4\x88"	Ccircumflex
++<Multi_key> <asciicircum> <C>	: "\xc4\x88"	Ccircumflex
++<Multi_key> <C> <greater>	: "\xc4\x88"	Ccircumflex
++<Multi_key> <greater> <C>	: "\xc4\x88"	Ccircumflex
+ 
 -<Multi_key> <slash> <asciicircum>	: "|"	bar
 -<Multi_key> <asciicircum> <slash>	: "|"	bar
 -<Multi_key> <V> <L>			: "|"	bar
 -<Multi_key> <L> <V>			: "|"	bar
 -<Multi_key> <v> <l>			: "|"	bar
 -<Multi_key> <l> <v>			: "|"	bar
--
++<Multi_key> <c> <asciicircum>	: "\xc4\x89"	ccircumflex
++<Multi_key> <asciicircum> <c>	: "\xc4\x89"	ccircumflex
++<Multi_key> <c> <greater>	: "\xc4\x89"	ccircumflex
++<Multi_key> <greater> <c>	: "\xc4\x89"	ccircumflex
+ 
 -<Multi_key> <parenright> <minus>	: "}"	braceright
 -<Multi_key> <minus> <parenright>	: "}"	braceright
--
++<Multi_key> <period> <C>	: "\xc4\x8a"	Cabovedot
++<Multi_key> <C> <period> 	: "\xc4\x8a"	Cabovedot
+ 
 -<Multi_key> <asciitilde> <space>	: "~"	asciitilde
 -<Multi_key> <space> <asciitilde>	: "~"	asciitilde
 -<Multi_key> <minus> <space>		: "~"	asciitilde
 -<Multi_key> <space> <minus>		: "~"	asciitilde
--
++<Multi_key> <period> <c>	: "\xc4\x8b"	cabovedot
++<Multi_key> <c> <period> 	: "\xc4\x8b"	cabovedot
+ 
 -XCOMM Spaces
--<Multi_key> <space> <space> : " " nobreakspace # NO-BREAK SPACE
+-<Multi_key> <space> <space> : "\240" nobreakspace # NO-BREAK SPACE
 -<Multi_key> <space> <period>: " " U2008 # PUNCTUATION SPACE
--
++<Multi_key> <G> <asciicircum>	: "\xc4\x9c"	Gcircumflex
++<Multi_key> <asciicircum> <G>	: "\xc4\x9c"	Gcircumflex
++<Multi_key> <G> <greater>	: "\xc4\x9c"	Gcircumflex
++<Multi_key> <greater> <G>	: "\xc4\x9c"	Gcircumflex
+ 
 -<Multi_key> <o> <c> : "©" copyright
 -<Multi_key> <o> <C> : "©" copyright
 -<Multi_key> <O> <c> : "©" copyright
 -<Multi_key> <O> <C> : "©" copyright
--
++<Multi_key> <g> <asciicircum>	: "\xc4\x9d"	gcircumflex
++<Multi_key> <asciicircum> <g>	: "\xc4\x9d"	gcircumflex
++<Multi_key> <g> <greater>	: "\xc4\x9d"	gcircumflex
++<Multi_key> <greater> <g>	: "\xc4\x9d"	gcircumflex
+ 
 -<Multi_key> <o> <r> : "®" registered
 -<Multi_key> <o> <R> : "®" registered
 -<Multi_key> <O> <r> : "®" registered
 -<Multi_key> <O> <R> : "®" registered
--
++<Multi_key> <period> <G>	: "\xc4\xa0"	Gabovedot
++<Multi_key> <G> <period> 	: "\xc4\xa0"	Gabovedot
+ 
 -<Multi_key> <period> <greater> : "›" U203a
 -<Multi_key> <period> <less> : "‹" U2039
 -<Multi_key> <period> <period> : "…" ellipsis
@@ -129,14 +1362,24 @@
 -<Multi_key> <minus> <d> : "đ" dstroke
 -<Multi_key> <minus> <D> : "Đ" Dstroke
 -<Multi_key> <s> <s> : "ß" ssharp
--
++<Multi_key> <period> <g>	: "\xc4\xa1"	gabovedot
++<Multi_key> <g> <period> 	: "\xc4\xa1"	gabovedot
+ 
 -<Multi_key> <o> <e> : "œ" oe
 -<Multi_key> <O> <E> : "Œ" OE
 -<Multi_key> <a> <e> : "æ" ae
 -<Multi_key> <A> <E> : "Æ" AE
--
++<Multi_key> <H> <asciicircum>	: "\xc4\xa4"	Hcircumflex
++<Multi_key> <asciicircum> <H>	: "\xc4\xa4"	Hcircumflex
++<Multi_key> <H> <greater>	: "\xc4\xa4"	Hcircumflex
++<Multi_key> <greater> <H>	: "\xc4\xa4"	Hcircumflex
+ 
 -<Multi_key> <o> <o> : "°" degree # ^0 already taken
--
++<Multi_key> <h> <asciicircum>	: "\xc4\xa5"	hcircumflex
++<Multi_key> <asciicircum> <h>	: "\xc4\xa5"	hcircumflex
++<Multi_key> <h> <greater>	: "\xc4\xa5"	hcircumflex
++<Multi_key> <greater> <h>	: "\xc4\xa5"	hcircumflex
+ 
 -XCOMM Quotation marks
 -<Multi_key> <quotedbl> <backslash>	: "〝" U301d # REVERSED DOUBLE PRIME QUOTATION MARK
 -<Multi_key> <quotedbl> <slash>		: "〞" U301e # DOUBLE PRIME QUOTATION MARK
@@ -154,10 +1397,18 @@
 -<Multi_key> <quotedbl> <greater>	: "”" U201d # RIGHT DOUBLE QUOTATION MARK
 -<Multi_key> <comma> <quotedbl>          : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
 -<Multi_key> <quotedbl> <comma>          : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
--
++<Multi_key> <J> <asciicircum>	: "\xc4\xb4"	Jcircumflex
++<Multi_key> <asciicircum> <J>	: "\xc4\xb4"	Jcircumflex
++<Multi_key> <J> <greater>	: "\xc4\xb4"	Jcircumflex
++<Multi_key> <greater> <J>	: "\xc4\xb4"	Jcircumflex
+ 
 -XCOMM Per xxx
 -<Multi_key> <percent> <o>		: "‰" U2030 # PER MILLE SIGN
--
++<Multi_key> <j> <asciicircum>	: "\xc4\xb5"	jcircumflex
++<Multi_key> <asciicircum> <j>	: "\xc4\xb5"	jcircumflex
++<Multi_key> <j> <greater>	: "\xc4\xb5"	jcircumflex
++<Multi_key> <greater> <j>	: "\xc4\xb5"	jcircumflex
+ 
 -XCOMM Currencies
 -<Multi_key> <C> <E>			: "₠" U20a0 # EURO-CURRENCY SIGN
 -<Multi_key> <C> <slash>			: "₡" U20a1 # COLON SIGN
@@ -184,75 +1435,614 @@
 -<Multi_key> <equal> <E>			: "€" EuroSign # EURO SIGN
 -<Multi_key> <e> <equal>			: "€" EuroSign # EURO SIGN
 -<Multi_key> <equal> <e>			: "€" EuroSign # EURO SIGN
--
++<Multi_key> <S> <asciicircum>	: "\xc5\x9c"	Scircumflex
++<Multi_key> <asciicircum> <S>	: "\xc5\x9c"	Scircumflex
++<Multi_key> <S> <greater>	: "\xc5\x9c"	Scircumflex
++<Multi_key> <greater> <S>	: "\xc5\x9c"	Scircumflex
+ 
 -<Multi_key> <L> <minus> 		: "£" sterling # POUND SIGN
 -<Multi_key> <minus> <L> 		: "£" sterling # POUND SIGN
 -<Multi_key> <Y> <equal>			: "¥" yen
 -<Multi_key> <equal><Y>			: "¥" yen
--
++<Multi_key> <s> <asciicircum>	: "\xc5\x9d"	scircumflex
++<Multi_key> <asciicircum> <s>	: "\xc5\x9d"	scircumflex
++<Multi_key> <s> <greater>	: "\xc5\x9d"	scircumflex
++<Multi_key> <greater> <s>	: "\xc5\x9d"	scircumflex
+ 
 -XCOMM Long S
 -<Multi_key> <f> <s>	: "ſ" U017f # LONG S
 -<Multi_key> <f> <S>	: "ſ" U017f # LONG S
--
++<Multi_key> <U> <breve>		: "\xc5\xac"	Ubreve
++<Multi_key> <breve> <U>		: "\xc5\xac"	Ubreve
++<Multi_key> <U> <u>		: "\xc5\xac"	Ubreve
++<Multi_key> <u> <U>		: "\xc5\xac"	Ubreve
+ 
 -XCOMM Dashes
 -<Multi_key> <minus> <minus> <period> : "–" U2013 # EN DASH
 -<Multi_key> <minus> <minus> <minus>  : "—" U2014 # EM DASH
--
++<Multi_key> <u> <breve>		: "\xc5\xad"	ubreve
++<Multi_key> <breve> <u>		: "\xc5\xad"	ubreve
++<Multi_key> <u> <u>		: "\xc5\xad"	ubreve
++XCOMM
++XCOMM Latin-4 sequences
++<Multi_key> <N> <N>		: "\xc5\x8a"	ENG
++<Multi_key> <U> <a>		: "\xc5\xb2"	Uogonek
++<Multi_key> <u> <a>		: "\xc5\xb3"	uogonek
++<Multi_key> <k> <k>		: "\xc4\xb8"	kra
++<Multi_key> <R> <comma>		: "\xc5\x96"	Rcedilla
++<Multi_key> <comma> <R>		: "\xc5\x96"	Rcedilla
++<Multi_key> <r> <comma>		: "\xc5\x97"	rcedilla
++<Multi_key> <comma> <r>		: "\xc5\x97"	rcedilla
++<Multi_key> <I> <asciitilde>	: "\xc4\xa8"	Itilde
++<Multi_key> <asciitilde> <I>	: "\xc4\xa8"	Itilde
++<Multi_key> <i> <asciitilde>	: "\xc4\xa9"	itilde
++<Multi_key> <asciitilde> <i>	: "\xc4\xa9"	itilde
++<Multi_key> <L> <comma>		: "\xc4\xbb"	Lcedilla
++<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
++<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
++<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
++<diaeresis>			: "\xc2\xa8"	diaeresis
++<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
++<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
++<Multi_key> <v> <S>		: "\xc5\xa0"	Scaron
++<Multi_key> <V> <S>		: "\xc5\xa0"	Scaron
++<Multi_key> <s> <v>		: "\xc5\xa1"	scaron
++<Multi_key> <s> <V>		: "\xc5\xa1"	scaron
++<Multi_key> <v> <s>		: "\xc5\xa1"	scaron
++<Multi_key> <V> <s>		: "\xc5\xa1"	scaron
++<Multi_key> <E> <underscore>	: "\xc4\x92"	Emacron
++<Multi_key> <underscore> <E>	: "\xc4\x92"	Emacron
++<Multi_key> <e> <underscore>	: "\xc4\x93"	emacron
++<Multi_key> <underscore> <e>	: "\xc4\x93"	emacron
++<Multi_key> <G> <comma>		: "\xc4\xa2"	Gcedilla
++<Multi_key> <comma> <G>		: "\xc4\xa2"	Gcedilla
++<Multi_key> <g> <comma>		: "\xc4\xa3"	gcedilla
++<Multi_key> <comma> <g>		: "\xc4\xa3"	gcedilla
++<Multi_key> <T> <bar>		: "\xc5\xa6"	Tslash
++<Multi_key> <bar> <T>		: "\xc5\xa6"	Tslash
++<Multi_key> <t> <bar>		: "\xc5\xa7"	tslash
++<Multi_key> <bar> <t>		: "\xc5\xa7"	tslash
++<Multi_key> <n> <n>		: "\xc5\x8b" 	eng
++<Multi_key> <A> <underscore>	: "\xc4\x80"	Amacron
++<Multi_key> <underscore> <A>	: "\xc4\x80"	Amacron
++<Multi_key> <a> <underscore>	: "\xc4\x81"	amacron
++<Multi_key> <underscore> <a>	: "\xc4\x81"	amacron
++<Multi_key> <d> <underscore>	: "\xc4\x91"
++<Multi_key> <underscore> <d> 	: "\xc4\x91"
++<Multi_key> <N> <comma>		: "\xc5\x85"	Ncedilla
++<Multi_key> <comma> <N>		: "\xc5\x85"	Ncedilla
++<Multi_key> <n> <comma>		: "\xc5\x86"	ncedilla
++<Multi_key> <comma> <n>		: "\xc5\x86"	ncedilla
++<Multi_key> <O> <underscore>	: "\xc5\x8c"	Omacron
++<Multi_key> <underscore> <O>	: "\xc5\x8c"	Omacron
++<Multi_key> <o> <underscore>	: "\xc5\x8d"	omacron
++<Multi_key> <underscore> <o>	: "\xc5\x8d"	omacron
++<Multi_key> <K> <comma>		: "\xc4\xb6"	Kcedilla
++<Multi_key> <comma> <K>		: "\xc4\xb6"	Kcedilla
++<Multi_key> <k> <comma>		: "\xc4\xb7"	kcedilla
++<Multi_key> <comma> <k>		: "\xc4\xb7"	kcedilla
++<Multi_key> <I> <a>		: "\xc4\xae"	Iogonek
++<Multi_key> <a> <I>		: "\xc4\xae"	Iogonek
++<Multi_key> <i> <a>		: "\xc4\xaf"	iogonek
++<Multi_key> <a> <i>		: "\xc4\xaf"	iogonek
++<Multi_key> <E> <period>	: "\xc4\x96"	Eabovedot
++<Multi_key> <e> <period>	: "\xc4\x97"	eabovedot
++<Multi_key> <U> <asciitilde>	: "\xc5\xa8"	Utilde
++<Multi_key> <asciitilde> <U>	: "\xc5\xa8"	Utilde
++<Multi_key> <u> <asciitilde>	: "\xc5\xa9"	utilde
++<Multi_key> <asciitilde> <u>	: "\xc5\xa9"	utilde
++<Multi_key> <U> <underscore>	: "\xc5\xaa"	Umacron
++<Multi_key> <underscore> <U>	: "\xc5\xaa"	Umacron
++<Multi_key> <u> <underscore>	: "\xc5\xab"	umacron
++<Multi_key> <underscore> <u>	: "\xc5\xab"	umacron
++<Multi_key> <I> <underscore>	: "\xc4\xaa"	Imacron
++<Multi_key> <underscore> <I> 	: "\xc4\xaa"	Imacron
++<Multi_key> <i> <underscore>	: "\xc4\xab"	imacron
++<Multi_key> <underscore> <i> 	: "\xc4\xab"	imacron
+ 
 -XCOMM Musical alterations
 -<Multi_key> <numbersign> <b>		: "♭" U266d # MUSIC FLAT SIGN
 -<Multi_key> <numbersign> <f>		: "♮" U266e # MUSIC NATURAL SIGN
 -<Multi_key> <numbersign> <numbersign>	: "♯" U266f # MUSIC SHARP SIGN
--
++XCOMM Ctrl<T> combo
++Ctrl<T> <a> <A>			: "\xc4\x84"	Aogonek
++Ctrl<T> <A> <a> 			: "\xc4\x84"	Aogonek
++Ctrl<T> <a> <a> 			: "\xc4\x85"	aogonek
++Ctrl<T> <C> <acute> 		: "\xc4\x86"	Cacute
++Ctrl<T> <c> <acute> 		: "\xc4\x87"	cacute
++Ctrl<T> <acute> <C>			: "\xc4\x86"	Cacute
++Ctrl<T> <acute> <c>			: "\xc4\x87"	cacute
++Ctrl<T> <acute> <N>			: "\xc5\x83"	Nacute
++Ctrl<T> <N> <acute> 		: "\xc5\x83"	Nacute
++XCOMM Ctrl<T> <minus> <D>		: "\xc3\x90"	ETH
++XCOMM Ctrl<T> <minus> <d>		: "\xc3\xb0"	eth
++Ctrl<T> <slash> <D>			: "\xc4\x90"	Dstroke
++Ctrl<T> <slash> <d>			: "\xc4\x91"	dstroke
++Ctrl<T> <caron> <Z>		: "\xc5\xbd"	Zcaron
++Ctrl<T> <Z> <caron> 	: "\xc5\xbd"	Zcaron
++Ctrl<T> <v> <Z>		: "\xc5\xbd"	Zcaron
++Ctrl<T> <Z> <v>		: "\xc5\xbd"	Zcaron
++Ctrl<T> <caron> <z>		: "\xc5\xbe"	zcaron
++Ctrl<T> <z> <caron> 	: "\xc5\xbe"	zcaron
++Ctrl<T> <z> <v>		: "\xc5\xbe"	zcaron
++Ctrl<T> <v> <z>		: "\xc5\xbe"	zcaron
++Ctrl<T> <G> <u>		: "\xc4\x9e"	Gbreve
++Ctrl<T> <u> <G>		: "\xc4\x9e"	Gbreve
++Ctrl<T> <g> <u>		: "\xc4\x9f"	gbreve
++Ctrl<T> <u> <g>		: "\xc4\x9f"	gbreve
++Ctrl<T> <I> <period>	: "\xc4\xb0"	Iabovedot
++Ctrl<T> <period> <I>	: "\xc4\xb0"	Iabovedot
++Ctrl<T> <i> <period>	: "\xc4\xb1"	idotless
++Ctrl<T> <period> <i>	: "\xc4\xb1"	idotless
++Ctrl<T> <space> <breve>	: "\xcb\x98"	breve
++Ctrl<T> <space> <degree>	: "\xc2\xb0"	degree
++Ctrl<T> <space> <ogonek>	: "\xcb\x9b"	ogonek
++Ctrl<T> <space> <caron>	: "\xcb\x87"	caron
++Ctrl<T> <space> <v>		: "\xcb\x87"	caron
++Ctrl<T> <space> <doubleacute> : "\xcb\x9d"	doubleacute
++Ctrl<T> <diaeresis> <A>	: "\xc3\x84"	Adiaeresis
++Ctrl<T> <A> <diaeresis> 	: "\xc3\x84"	Adiaeresis
++Ctrl<T> <diaeresis> <E>	: "\xc3\x8b" 	Ediaeresis
++Ctrl<T> <E> <diaeresis> 	: "\xc3\x8b" 	Ediaeresis
++Ctrl<T> <diaeresis> <O>	: "\xc3\x96"	Odiaeresis
++Ctrl<T> <O> <diaeresis> 	: "\xc3\x96"	Odiaeresis
++Ctrl<T> <diaeresis> <U>	: "\xc3\x9c"	Udiaeresis
++Ctrl<T> <U> <diaeresis> 	: "\xc3\x9c"	Udiaeresis
++Ctrl<T> <diaeresis> <a>	: "\xc3\xa4"	adiaeresis
++Ctrl<T> <a> <diaeresis> 	: "\xc3\xa4"	adiaeresis
++Ctrl<T> <diaeresis> <e>	: "\xc3\xab"	ediaeresis
++Ctrl<T> <e> <diaeresis> 	: "\xc3\xab"	ediaeresis
++Ctrl<T> <diaeresis> <o>	: "\xc3\xb6"	odiaeresis
++Ctrl<T> <o> <diaeresis> 	: "\xc3\xb6"	odiaeresis
++Ctrl<T> <diaeresis> <u>	: "\xc3\xbc"	udiaeresis
++Ctrl<T> <u> <diaeresis> 	: "\xc3\xbc"	udiaeresis
++Ctrl<T> <acute> <R>		: "\xc5\x94"	Racute
++Ctrl<T> <R> <acute> 	: "\xc5\x94"	Racute
++Ctrl<T> <acute> <S>		: "\xc5\x9a"	Sacute
++Ctrl<T> <S> <acute> 	: "\xc5\x9a"	Sacute
++Ctrl<T> <acute> <Z>		: "\xc4\xbe"	Zacute
++Ctrl<T> <Z> <acute> 	: "\xc4\xbe"	Zacute
++Ctrl<T> <acute> <n>		: "\xc5\x84"	nacute
++Ctrl<T> <n> <acute> 	: "\xc5\x84"	nacute
++Ctrl<T> <acute> <r>		: "\xc5\x95"	racute
++Ctrl<T> <r> <acute> 	: "\xc5\x95"	racute
++Ctrl<T> <acute> <s>		: "\xc5\x9b"	sacute
++Ctrl<T> <s> <acute> 	: "\xc5\x9b"	sacute
++Ctrl<T> <acute> <z>		: "\xc5\xba"	zacute
++Ctrl<T> <z> <acute> 	: "\xc5\xba"	zacute
++Ctrl<T> <0> <O>		: "\xc2\xb0"	degree
++Ctrl<T> <o> <o> 		: "\xc2\xb0"	degree
++Ctrl<T> <comma> <S>		: "\xc5\x9e"	Scedilla
++Ctrl<T> <S> <comma> 	: "\xc5\x9e"	Scedilla
++Ctrl<T> <comma> <T>		: "\xc5\xa2"	Tcedilla
++Ctrl<T> <T> <comma> 	: "\xc5\xa2"	Tcedilla
++Ctrl<T> <comma> <s>		: "\xc5\x9f"	scedilla
++Ctrl<T> <s> <comma> 	: "\xc5\x9f"	scedilla
++Ctrl<T> <comma> <t>		: "\xc5\xa3"	tcedilla
++Ctrl<T> <t> <comma> 	: "\xc5\xa3"	tcedilla
++Ctrl<T> <caron> <C>		: "\xc4\x8c"	Ccaron
++Ctrl<T> <C> <caron> 	: "\xc4\x8c"	Ccaron
++Ctrl<T> <caron> <D>		: "\xc4\x8e"	Dcaron
++Ctrl<T> <D> <caron> 	: "\xc4\x8e"	Dcaron
++Ctrl<T> <caron> <E>		: "\xc4\x9a"	Ecaron
++Ctrl<T> <E> <caron> 	: "\xc4\x9a"	Ecaron
++Ctrl<T> <caron> <L>		: "\xc4\xbd"	Lcaron
++Ctrl<T> <L> <caron> 	: "\xc4\xbd"	Lcaron
++Ctrl<T> <caron> <N>		: "\xc5\x87" 	Ncaron
++Ctrl<T> <N> <caron>		: "\xc5\x87" 	Ncaron
++Ctrl<T> <caron> <R>		: "\xc5\x98"	Rcaron
++Ctrl<T> <R> <caron> 	: "\xc5\x98"	Rcaron
++Ctrl<T> <caron> <S>		: "\xc5\xa0"	Scaron
++Ctrl<T> <S> <caron> 	: "\xc5\xa0"	Scaron
++Ctrl<T> <caron> <T>		: "\xc5\xa4"	Tcaron
++Ctrl<T> <T> <caron> 	: "\xc5\xa4"	Tcaron
++Ctrl<T> <caron> <U>		: "\xc5\xae"	Uring
++Ctrl<T> <U> <caron> 	: "\xc5\xae"	Uring
++Ctrl<T> <caron> <c>		: "\xc4\x8d"	ccaron
++Ctrl<T> <c> <caron> 	: "\xc4\x8d"	ccaron
++Ctrl<T> <caron> <d>		: "\xc4\x8f"	dcaron
++Ctrl<T> <d> <caron> 	: "\xc4\x8f"	dcaron
++Ctrl<T> <caron> <e>		: "\xc4\x9b"	ecaron
++Ctrl<T> <e> <caron> 	: "\xc4\x9b"	ecaron
++Ctrl<T> <caron> <l>		: "\xc4\xbe"	lcaron
++Ctrl<T> <l> <caron> 	: "\xc4\xbe"	lcaron
++Ctrl<T> <caron> <n>		: "\xc5\x88"	ncaron
++Ctrl<T> <n> <caron> 	: "\xc5\x88"	ncaron
++Ctrl<T> <caron> <r>		: "\xc5\x99"	rcaron
++Ctrl<T> <r> <caron> 	: "\xc5\x99"	rcaron
++Ctrl<T> <caron> <s>		: "\xc5\xa1"	scaron
++Ctrl<T> <s> <caron> 	: "\xc5\xa1"	scaron
++Ctrl<T> <caron> <t>		: "\xc5\xa5"	tcaron
++Ctrl<T> <t> <caron> 	: "\xc5\xa5"	tcaron
++Ctrl<T> <caron> <u>		: "\xc5\xaf"	uring
++Ctrl<T> <u> <caron> 	: "\xc5\xaf"	uring
++Ctrl<T> <v> <C>		: "\xc4\x8c"	Ccaron
++Ctrl<T> <C> <v> 		: "\xc4\x8c"	Ccaron
++Ctrl<T> <v> <D>		: "\xc4\x8e"	Dcaron
++Ctrl<T> <D> <v> 		: "\xc4\x8e"	Dcaron
++Ctrl<T> <v> <E>		: "\xc4\x9a"	Ecaron
++Ctrl<T> <E> <v> 		: "\xc4\x9a"	Ecaron
++Ctrl<T> <v> <N>		: "\xc5\x87" 	Ncaron
++Ctrl<T> <N> <v>		: "\xc5\x87" 	Ncaron
++Ctrl<T> <v> <R>		: "\xc5\x98"	Rcaron
++Ctrl<T> <R> <v> 		: "\xc5\x98"	Rcaron
++Ctrl<T> <v> <T>		: "\xc5\xa4"	Tcaron
++Ctrl<T> <T> <v> 		: "\xc5\xa4"	Tcaron
++Ctrl<T> <v> <U>		: "\xc5\xae"	Uring
++Ctrl<T> <U> <v> 		: "\xc5\xae"	Uring
++Ctrl<T> <v> <c>		: "\xc4\x8d"	ccaron
++Ctrl<T> <c> <v> 		: "\xc4\x8d"	ccaron
++Ctrl<T> <v> <d>		: "\xc4\x8f"	dcaron
++Ctrl<T> <d> <v> 		: "\xc4\x8f"	dcaron
++Ctrl<T> <v> <e>		: "\xc4\x9b"	ecaron
++Ctrl<T> <e> <v> 		: "\xc4\x9b"	ecaron
++Ctrl<T> <v> <n>		: "\xc5\x88"	ncaron
++Ctrl<T> <n> <v> 		: "\xc5\x88"	ncaron
++Ctrl<T> <v> <r>		: "\xc5\x99"	rcaron
++Ctrl<T> <r> <v> 		: "\xc5\x99"	rcaron
++Ctrl<T> <v> <t>		: "\xc5\xa5"	tcaron
++Ctrl<T> <t> <v> 		: "\xc5\xa5"	tcaron
++Ctrl<T> <v> <u>		: "\xc5\xaf"	uring
++Ctrl<T> <u> <v> 		: "\xc5\xaf"	uring
++Ctrl<T> <breve> <A>		: "\xc4\x82"	Abreve
++Ctrl<T> <A> <breve> 	: "\xc4\x82"	Abreve
++Ctrl<T> <breve> <a>		: "\xc4\x83"	abreve
++Ctrl<T> <a> <breve> 	: "\xc4\x83"	abreve
++Ctrl<T> <ogonek> <A>	: "\xc4\x84"	Aogonek
++Ctrl<T> <A> <ogonek> 	: "\xc4\x84"	Aogonek
++Ctrl<T> <ogonek> <E>	: "\xc4\x98"	Eogonek
++Ctrl<T> <E> <ogonek> 	: "\xc4\x98"	Eogonek
++Ctrl<T> <ogonek> <a> 	: "\xc4\x85"	aogonek
++Ctrl<T> <a> <ogonek> 	: "\xc4\x85"	aogonek
++Ctrl<T> <ogonek> <e> 	: "\xc4\x99"	eogonek
++Ctrl<T> <e> <ogonek> 	: "\xc4\x99"	eogonek
++Ctrl<T> <E> <a> 		: "\xc4\x98"	Eogonek
++Ctrl<T> <e> <a> 		: "\xc4\x99"	eogonek
++Ctrl<T> <doubleacute> <O>	: "\xc5\x90"	Odoubleacute
++Ctrl<T> <O> <doubleacute> 	: "\xc5\x90"	Odoubleacute
++Ctrl<T> <doubleacute> <U>	: "\xc5\xb0"	Udoubleacute
++Ctrl<T> <U> <doubleacute> 	: "\xc5\xb0"	Udoubleacute
++Ctrl<T> <doubleacute> <o>	: "\xc5\x91"	odoubleacute
++Ctrl<T> <o> <doubleacute> 	: "\xc5\x91"	odoubleacute
++Ctrl<T> <doubleacute> <u>	: "\xc5\xb1"	udoubleacute
++Ctrl<T> <u> <doubleacute> 	: "\xc5\xb1"	udoubleacute
++Ctrl<T> <period> <U>	: "\xc5\xae"	Uring
++Ctrl<T> <U> <period> 	: "\xc5\xae"	Uring
++Ctrl<T> <period> <u>	: "\xc5\xaf"	uring
++Ctrl<T> <u> <period> 	: "\xc5\xaf"	uring
++Ctrl<T> <period> <z>	: "\xc5\xbc"	zabovedot
++Ctrl<T> <z> <period> 	: "\xc5\xbc"	zabovedot
++Ctrl<T> <period> <Z>	: "\xc5\xbb"	Zabovedot
++Ctrl<T> <Z> <period> 	: "\xc5\xbb"	Zabovedot
++Ctrl<T> <a> <space>	: "\xcb\x9b"	ogonek
++Ctrl<T> <u> <space>	: "\xcb\x98"	breve
++Ctrl<T> <v> <space>	: "\xcb\x87"	caron
++Ctrl<T> <quotedbl> <space>	: "\xcb\x9d"	doubleacute
++Ctrl<T> <A> <u>			: "\xc4\x82"	Abreve
++Ctrl<T> <C> <apostrophe>	: "\xc4\x86"	Cacute
++Ctrl<T> <L> <apostrophe>	: "\xc4\xb9"	Lacute
++Ctrl<T> <L> <slash>		: "\xc5\x81"	Lstroke
++Ctrl<T> <L> <greater>		: "\xc4\xbd"	Lcaron
++Ctrl<T> <N> <apostrophe>	: "\xc5\x83"	Nacute
++Ctrl<T> <S> <apostrophe>	: "\xc5\x9a"	Sacute
++Ctrl<T> <R> <apostrophe>	: "\xc5\x94"	Racute
++Ctrl<T> <U> <asterisk>		: "\xc5\xae"	Uring
++Ctrl<T> <Z> <apostrophe>	: "\xc5\xb9"	Zacute
++Ctrl<T> <a> <u>			: "\xc4\x83"	abreve
++Ctrl<T> <c> <apostrophe>	: "\xc4\x87"	cacute
++Ctrl<T> <l> <apostrophe>	: "\xc4\xba"	lacute
++Ctrl<T> <l> <slash>		: "\xc5\x82"	lstroke
++Ctrl<T> <l> <greater>		: "\xc4\xbe"	lcaron
++Ctrl<T> <n> <apostrophe>	: "\xc5\x84"	nacute
++Ctrl<T> <s> <apostrophe>	: "\xc5\x9b"	sacute
++Ctrl<T> <r> <apostrophe>	: "\xc5\x95"	racute
++Ctrl<T> <u> <asterisk>		: "\xc5\xaf"	uring
++Ctrl<T> <z> <apostrophe>	: "\xc5\xba"	zacute
++XCOMM
++XCOMM Latin-3 sequences
++Ctrl<T> <C> <asciicircum>	: "\xc4\x88"	Ccircumflex
++Ctrl<T> <asciicircum> <C>	: "\xc4\x88"	Ccircumflex
++Ctrl<T> <C> <greater>		: "\xc4\x88"	Ccircumflex
++Ctrl<T> <greater> <C>		: "\xc4\x88"	Ccircumflex
+ 
 -XCOMM Other symbols
 -<Multi_key> <s> <o>             : "§" section # SECTION SIGN
 -<Multi_key> <o> <s>             : "§" section # SECTION SIGN
--
++Ctrl<T> <c> <asciicircum>	: "\xc4\x89"	ccircumflex
++Ctrl<T> <asciicircum> <c>	: "\xc4\x89"	ccircumflex
++Ctrl<T> <c> <greater>		: "\xc4\x89"	ccircumflex
++Ctrl<T> <greater> <c>		: "\xc4\x89"	ccircumflex
+ 
 -<Multi_key> <o> <x>		: "¤" currency
 -<Multi_key> <x> <o>		: "¤" currency
--
++Ctrl<T> <period> <C>		: "\xc4\x8a"	Cabovedot
++Ctrl<T> <C> <period> 		: "\xc4\x8a"	Cabovedot
+ 
 -<Multi_key> <P> <P>		: "¶" paragraph # PILCROW SIGN (PARAGRAPH SIGN)
--
++Ctrl<T> <period> <c>		: "\xc4\x8b"	cabovedot
++Ctrl<T> <c> <period> 		: "\xc4\x8b"	cabovedot
+ 
 -<Multi_key> <question> <exclam>         : "‽"   U203D # INTERROBANG
 -<Multi_key> <exclam> <question>         : "‽"   U203D # INTERROBANG
--
++Ctrl<T> <G> <asciicircum>	: "\xc4\x9c"	Gcircumflex
++Ctrl<T> <asciicircum> <G>	: "\xc4\x9c"	Gcircumflex
++Ctrl<T> <G> <greater>		: "\xc4\x9c"	Gcircumflex
++Ctrl<T> <greater> <G>		: "\xc4\x9c"	Gcircumflex
+ 
 -XCOMM Part 2
--
++Ctrl<T> <g> <asciicircum>	: "\xc4\x9d"	gcircumflex
++Ctrl<T> <asciicircum> <g>	: "\xc4\x9d"	gcircumflex
++Ctrl<T> <g> <greater>		: "\xc4\x9d"	gcircumflex
++Ctrl<T> <greater> <g>		: "\xc4\x9d"	gcircumflex
+ 
 -XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos  automatically
 -XCOMM generated  from UnicodeData-2.0.14.txt at
 -XCOMM    ftp://ftp.unicode.org/Public/2.0-Update/UnicodeData-2.0.14.txt
 -XCOMM   by Jungshik Shin <[email protected]>  2002-10-17
 -XCOMM There are some conflicts among sequences, but I left them alone.
++Ctrl<T> <period> <G>		: "\xc4\xa0"	Gabovedot
++Ctrl<T> <G> <period> 		: "\xc4\xa0"	Gabovedot
++
++Ctrl<T> <period> <g>		: "\xc4\xa1"	gabovedot
++Ctrl<T> <g> <period> 		: "\xc4\xa1"	gabovedot
++
++Ctrl<T> <H> <asciicircum>	: "\xc4\xa4"	Hcircumflex
++Ctrl<T> <asciicircum> <H>	: "\xc4\xa4"	Hcircumflex
++Ctrl<T> <H> <greater>		: "\xc4\xa4"	Hcircumflex
++Ctrl<T> <greater> <H>		: "\xc4\xa4"	Hcircumflex
++
++Ctrl<T> <h> <asciicircum>	: "\xc4\xa5"	hcircumflex
++Ctrl<T> <asciicircum> <h>	: "\xc4\xa5"	hcircumflex
++Ctrl<T> <h> <greater>		: "\xc4\xa5"	hcircumflex
++Ctrl<T> <greater> <h>		: "\xc4\xa5"	hcircumflex
++
++Ctrl<T> <J> <asciicircum>	: "\xc4\xb4"	Jcircumflex
++Ctrl<T> <asciicircum> <J>	: "\xc4\xb4"	Jcircumflex
++Ctrl<T> <J> <greater>		: "\xc4\xb4"	Jcircumflex
++Ctrl<T> <greater> <J>		: "\xc4\xb4"	Jcircumflex
++
++Ctrl<T> <j> <asciicircum>	: "\xc4\xb5"	jcircumflex
++Ctrl<T> <asciicircum> <j>	: "\xc4\xb5"	jcircumflex
++Ctrl<T> <j> <greater>		: "\xc4\xb5"	jcircumflex
++Ctrl<T> <greater> <j>		: "\xc4\xb5"	jcircumflex
++
++Ctrl<T> <S> <asciicircum>	: "\xc5\x9c"	Scircumflex
++Ctrl<T> <asciicircum> <S>	: "\xc5\x9c"	Scircumflex
++Ctrl<T> <S> <greater>		: "\xc5\x9c"	Scircumflex
++Ctrl<T> <greater> <S>		: "\xc5\x9c"	Scircumflex
++
++Ctrl<T> <s> <asciicircum>	: "\xc5\x9d"	scircumflex
++Ctrl<T> <asciicircum> <s>	: "\xc5\x9d"	scircumflex
++Ctrl<T> <s> <greater>		: "\xc5\x9d"	scircumflex
++Ctrl<T> <greater> <s>		: "\xc5\x9d"	scircumflex
++
++Ctrl<T> <U> <breve>		: "\xc5\xac"	Ubreve
++Ctrl<T> <breve> <U>		: "\xc5\xac"	Ubreve
++Ctrl<T> <U> <u>			: "\xc5\xac"	Ubreve
++Ctrl<T> <u> <U>			: "\xc5\xac"	Ubreve
++
++Ctrl<T> <u> <breve>		: "\xc5\xad"	ubreve
++Ctrl<T> <breve> <u>		: "\xc5\xad"	ubreve
++Ctrl<T> <u> <u>			: "\xc5\xad"	ubreve
  XCOMM
 -XCOMM group 1: cluster jamos made of three basic jamos
-+XCOMM Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
-+XCOMM
-+XCOMM
-+XCOMM Copyright (C) 1994 X Consortium
++XCOMM Latin-4 sequences
++Ctrl<T> <N> <N>		: "\xc5\x8a"	ENG
++Ctrl<T> <U> <a>		: "\xc5\xb2"	Uogonek
++Ctrl<T> <u> <a>		: "\xc5\xb3"	uogonek
++Ctrl<T> <k> <k>		: "\xc4\xb8"	kra
++Ctrl<T> <R> <comma>		: "\xc5\x96"	Rcedilla
++Ctrl<T> <comma> <R>		: "\xc5\x96"	Rcedilla
++Ctrl<T> <r> <comma>		: "\xc5\x97"	rcedilla
++Ctrl<T> <comma> <r>		: "\xc5\x97"	rcedilla
++Ctrl<T> <I> <asciitilde>	: "\xc4\xa8"	Itilde
++Ctrl<T> <asciitilde> <I>	: "\xc4\xa8"	Itilde
++Ctrl<T> <i> <asciitilde>	: "\xc4\xa9"	itilde
++Ctrl<T> <asciitilde> <i>	: "\xc4\xa9"	itilde
++Ctrl<T> <L> <comma>		: "\xc4\xbb"	Lcedilla
++Ctrl<T> <comma> <L>		: "\xc4\xbb"	Lcedilla
++Ctrl<T> <l> <comma>		: "\xc4\xbc"	lcedilla
++Ctrl<T> <comma> <l>		: "\xc4\xbc"	lcedilla
++Ctrl<T> <S> <v>		: "\xc5\xa0"	Scaron
++Ctrl<T> <S> <V>		: "\xc5\xa0"	Scaron
++Ctrl<T> <v> <S>		: "\xc5\xa0"	Scaron
++Ctrl<T> <V> <S>		: "\xc5\xa0"	Scaron
++Ctrl<T> <s> <v>		: "\xc5\xa1"	scaron
++Ctrl<T> <s> <V>		: "\xc5\xa1"	scaron
++Ctrl<T> <v> <s>		: "\xc5\xa1"	scaron
++Ctrl<T> <V> <s>		: "\xc5\xa1"	scaron
++Ctrl<T> <E> <underscore>	: "\xc4\x92"	Emacron
++Ctrl<T> <underscore> <E>	: "\xc4\x92"	Emacron
++Ctrl<T> <e> <underscore>	: "\xc4\x93"	emacron
++Ctrl<T> <underscore> <e>	: "\xc4\x93"	emacron
++Ctrl<T> <G> <comma>		: "\xc4\xa2"	Gcedilla
++Ctrl<T> <comma> <G>		: "\xc4\xa2"	Gcedilla
++Ctrl<T> <g> <comma>		: "\xc4\xa3"	gcedilla
++Ctrl<T> <comma> <g>		: "\xc4\xa3"	gcedilla
++Ctrl<T> <T> <bar>		: "\xc5\xa6"	Tslash
++Ctrl<T> <bar> <T>		: "\xc5\xa6"	Tslash
++Ctrl<T> <t> <bar>		: "\xc5\xa7"	tslash
++Ctrl<T> <bar> <t>		: "\xc5\xa7"	tslash
++Ctrl<T> <n> <n>		: "\xc5\x8b" 	eng
++Ctrl<T> <d> <underscore>	: "\xc4\x91"
++Ctrl<T> <underscore> <d> 	: "\xc4\x91"
++Ctrl<T> <N> <comma>		: "\xc5\x85"	Ncedilla
++Ctrl<T> <comma> <N>		: "\xc5\x85"	Ncedilla
++Ctrl<T> <n> <comma>		: "\xc5\x86"	ncedilla
++Ctrl<T> <comma> <n>		: "\xc5\x86"	ncedilla
++Ctrl<T> <K> <comma>		: "\xc4\xb6"	Kcedilla
++Ctrl<T> <comma> <K>		: "\xc4\xb6"	Kcedilla
++Ctrl<T> <k> <comma>		: "\xc4\xb7"	kcedilla
++Ctrl<T> <comma> <k>		: "\xc4\xb7"	kcedilla
++Ctrl<T> <I> <a>		: "\xc4\xae"	Iogonek
++Ctrl<T> <a> <I>		: "\xc4\xae"	Iogonek
++Ctrl<T> <i> <a>		: "\xc4\xaf"	iogonek
++Ctrl<T> <a> <i>		: "\xc4\xaf"	iogonek
++Ctrl<T> <E> <period>	: "\xc4\x96"	Eabovedot
++Ctrl<T> <e> <period>	: "\xc4\x97"	eabovedot
++Ctrl<T> <U> <asciitilde>	: "\xc5\xa8"	Utilde
++Ctrl<T> <asciitilde> <U>	: "\xc5\xa8"	Utilde
++Ctrl<T> <u> <asciitilde>	: "\xc5\xa9"	utilde
++Ctrl<T> <asciitilde> <u>	: "\xc5\xa9"	utilde
++Ctrl<T> <U> <underscore>	: "\xc5\xaa"	Umacron
++Ctrl<T> <underscore> <U>	: "\xc5\xaa"	Umacron
++Ctrl<T> <u> <underscore>	: "\xc5\xab"	umacron
++Ctrl<T> <underscore> <u>	: "\xc5\xab"	umacron
++Ctrl<T> <I> <underscore>	: "\xc4\xaa"	Imacron
++Ctrl<T> <underscore> <I> 	: "\xc4\xaa"	Imacron
++Ctrl<T> <i> <underscore>	: "\xc4\xab"	imacron
++Ctrl<T> <underscore> <i> 	: "\xc4\xab"	imacron
 +XCOMM
-+XCOMM Permission is hereby granted, free of charge, to any person obtaining a copy
-+XCOMM of this software and associated documentation files (the "Software"), to
-+XCOMM deal in the Software without restriction, including without limitation the
-+XCOMM rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+XCOMM sell copies of the Software, and to permit persons to whom the Software is
-+XCOMM furnished to do so, subject to the following conditions:
-+XCOMM
-+XCOMM The above copyright notice and this permission notice shall be included in
-+XCOMM all copies or substantial portions of the Software.
++XCOMM Latin-9 input sequences:
++<Multi_key> <o> <e> 		: "\xc5\x93"
++<Multi_key> <O> <E> 		: "\xc5\x92"
++<Multi_key> <Y> <quotedbl> 	: "\xc5\xb8"
++<Multi_key> <quotedbl> <Y> 	: "\xc5\xb8"
++Ctrl<T> <o> <e> 		: "\xc5\x93"
++Ctrl<T> <O> <E> 		: "\xc5\x92"
++Ctrl<T> <Y> <quotedbl> 		: "\xc5\xb8"
++Ctrl<T> <quotedbl> <Y>		: "\xc5\xb8"
 +XCOMM
-+XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+XCOMM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+XCOMM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+XCOMM X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+XCOMM AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+XCOMM TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+XCOMM
-+XCOMM Except as contained in this notice, the name of the X Consortium shall not
-+XCOMM be used in advertising or otherwise to promote the sale, use or other deal-
-+XCOMM ings in this Software without prior written authorization from the X Consor-
-+XCOMM tium.
-+XCOMM
-+XCOMM X Window System is a trademark of X Consortium, Inc.
-+XCOMM
++XCOMM Rules for SunXK_FA_* keysyms:
++<SunFA_Acute> <apostrophe>	: "\xc2\xb4"
++<SunFA_Acute> <A>		: "\xc3\x81"
++<SunFA_Acute> <a>		: "\xc3\xa1"
++<SunFA_Acute> <C>		: "\xc4\x86"
++<SunFA_Acute> <c>		: "\xc4\x87"
++<SunFA_Acute> <E>		: "\xc3\x89"
++<SunFA_Acute> <e>		: "\xc3\xa9"
++<SunFA_Acute> <I>		: "\xc3\x8d"
++<SunFA_Acute> <i>		: "\xc3\xad"
++<SunFA_Acute> <L>		: "\xc4\xb9"
++<SunFA_Acute> <l>		: "\xc4\xba"
++<SunFA_Acute> <N>		: "\xc5\x83"
++<SunFA_Acute> <n>		: "\xc5\x84"
++<SunFA_Acute> <O>		: "\xc3\x93"
++<SunFA_Acute> <o>		: "\xc3\xb3"
++<SunFA_Acute> <R>		: "\xc5\x94"
++<SunFA_Acute> <r>		: "\xc5\x95"
++<SunFA_Acute> <space>		: "\x27"
++<SunFA_Acute> <S>		: "\xc5\x9a"
++<SunFA_Acute> <s>		: "\xc5\x9b"
++<SunFA_Acute> <U>		: "\xc3\x9a"
++<SunFA_Acute> <u>		: "\xc3\xba"
++<SunFA_Acute> <Y>		: "\xc3\x9d"
++<SunFA_Acute> <y>		: "\xc3\xbd"
++<SunFA_Acute> <Z>		: "\xc4\xbe"
++<SunFA_Acute> <z>		: "\xc5\xba"
++<SunFA_Cedilla> <comma>		: "\xc2\xb8"
++<SunFA_Cedilla> <C>		: "\xc3\x87"
++<SunFA_Cedilla> <c>		: "\xc3\xa7"
++<SunFA_Cedilla> <G>		: "\xc4\xa2"
++<SunFA_Cedilla> <g>		: "\xc4\xa3"
++<SunFA_Cedilla> <K>		: "\xc4\xb6"
++<SunFA_Cedilla> <k>		: "\xc4\xb7"
++<SunFA_Cedilla> <L>		: "\xc4\xbb"
++<SunFA_Cedilla> <l>		: "\xc4\xbc"
++<SunFA_Cedilla> <minus>		: "\xc2\xac"
++<SunFA_Cedilla> <N>		: "\xc5\x85"
++<SunFA_Cedilla> <n>		: "\xc5\x86"
++<SunFA_Cedilla> <R>		: "\xc5\x96"
++<SunFA_Cedilla> <r>		: "\xc5\x97"
++<SunFA_Cedilla> <S>		: "\xc5\x9e"
++<SunFA_Cedilla> <s>		: "\xc5\x9f"
++<SunFA_Cedilla> <T>		: "\xc5\xa2"
++<SunFA_Cedilla> <t>		: "\xc5\xa3"
++<SunFA_Circum> <0>		: "\xc2\xb0"
++<SunFA_Circum> <1>		: "\xc2\xb9"
++<SunFA_Circum> <2>		: "\xc2\xb2"
++<SunFA_Circum> <3>		: "\xc2\xb3"
++<SunFA_Circum> <A>		: "\xc3\x82"
++<SunFA_Circum> <a>		: "\xc3\xa2"
++<SunFA_Circum> <C>		: "\xc4\x88"
++<SunFA_Circum> <c>		: "\xc4\x89"
++<SunFA_Circum> <E>		: "\xc3\x8a"
++<SunFA_Circum> <e>		: "\xc3\xaa"
++<SunFA_Circum> <exclam>		: "\xc2\xa6"
++<SunFA_Circum> <G>		: "\xc4\x9c"
++<SunFA_Circum> <g>		: "\xc4\x9d"
++<SunFA_Circum> <H>		: "\xc4\xa4"
++<SunFA_Circum> <h>		: "\xc4\xa5"
++<SunFA_Circum> <I>		: "\xc3\x8e"
++<SunFA_Circum> <i>		: "\xc3\xae"
++<SunFA_Circum> <J>		: "\xc4\xb4"
++<SunFA_Circum> <j>		: "\xc4\xb5"
++<SunFA_Circum> <minus>		: "\xc2\xaf"
++<SunFA_Circum> <O>		: "\xc3\x94"
++<SunFA_Circum> <o>		: "\xc3\xb4"
++<SunFA_Circum> <period>		: "\xc2\xb7"
++<SunFA_Circum> <slash>		: "\x7c"
++<SunFA_Circum> <space>		: "\x5e"
++<SunFA_Circum> <S>		: "\xc5\x9c"
++<SunFA_Circum> <s>		: "\xc5\x9d"
++<SunFA_Circum> <underscore>	: "\xc2\xaf"
++<SunFA_Circum> <U>		: "\xc3\x9b"
++<SunFA_Circum> <u>		: "\xc3\xbb"
++<SunFA_Diaeresis> <A>		: "\xc3\x84"
++<SunFA_Diaeresis> <a>		: "\xc3\xa4"
++<SunFA_Diaeresis> <E>		: "\xc3\x8b"
++<SunFA_Diaeresis> <e>		: "\xc3\xab"
++<SunFA_Diaeresis> <I>		: "\xc3\x8f"
++<SunFA_Diaeresis> <i>		: "\xc3\xaf"
++<SunFA_Diaeresis> <O>		: "\xc3\x96"
++<SunFA_Diaeresis> <o>		: "\xc3\xb6"
++<SunFA_Diaeresis> <quotedbl>	: "\xc2\xa8"
++<SunFA_Diaeresis> <space>	: "\xc2\xa8"
++<SunFA_Diaeresis> <U>		: "\xc3\x9c"
++<SunFA_Diaeresis> <u>		: "\xc3\xbc"
++<SunFA_Diaeresis> <y>		: "\xc3\xbf"
++<SunFA_Diaeresis> <Y>		: "\xc5\xb8"
++<SunFA_Grave> <A>		: "\xc3\x80"
++<SunFA_Grave> <a>		: "\xc3\xa0"
++<SunFA_Grave> <E>		: "\xc3\x88"
++<SunFA_Grave> <e>		: "\xc3\xa8"
++<SunFA_Grave> <I>		: "\xc3\x8c"
++<SunFA_Grave> <i>		: "\xc3\xac"
++<SunFA_Grave> <O>		: "\xc3\x92"
++<SunFA_Grave> <o>		: "\xc3\xb2"
++<SunFA_Grave> <space>		: "\x60"
++<SunFA_Grave> <U>		: "\xc3\x99"
++<SunFA_Grave> <u>		: "\xc3\xb9"
++<SunFA_Tilde> <A>		: "\xc3\x83"
++<SunFA_Tilde> <a>		: "\xc3\xa3"
++<SunFA_Tilde> <N>		: "\xc3\x91"
++<SunFA_Tilde> <n>		: "\xc3\xb1"
++<SunFA_Tilde> <O>		: "\xc3\x95"
++<SunFA_Tilde> <o>		: "\xc3\xb5"
++<SunFA_Tilde> <space>		: "\x7e"
++END_STATE
++
++STATE "[ Cyrillic ]"
++Ctrl<space>		: SWITCH_STATE_TO "[ English/European ]"
++<Multi_key> <g> <g>	: SWITCH_STATE_TO "[ Greek ]"
++<Multi_key> <t> <t>	: SWITCH_STATE_TO "[ Thai ]"
++<Multi_key> <a> <r>	: SWITCH_STATE_TO "[ Arabic ]"
++<Multi_key> <h> <i>	: SWITCH_STATE_TO "[ Indic ]"
++<Multi_key> <i> <n>	: SWITCH_STATE_TO "[ Indic ]"
++<Multi_key> <h> <h>	: SWITCH_STATE_TO "[ Hebrew ]"
++<Multi_key> <u> <h>	: SWITCH_STATE_TO "[ Unicode Hex ]"
++<Multi_key> <u> <o>	: SWITCH_STATE_TO "[ Unicode Octal ]"
++<Multi_key> <l> <l>	: SWITCH_STATE_TO "[ Lookup ]"
++<Multi_key> <j>	<a>	: SWITCH_STATE_TO "[ Japanese ]"
++<Multi_key> <k>	<o>	: SWITCH_STATE_TO "[ Korean ]"
++<Multi_key> <s>	<c>	: SWITCH_STATE_TO "[ S-Chinese ]"
++<Multi_key> <t>	<c>	: SWITCH_STATE_TO "[ T-Chinese ]"
++<Multi_key> <h>	<k>	: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
++
++Ctrl<T> <g> <g>		: SWITCH_STATE_TO "[ Greek ]"
++Ctrl<T> <t> <t>		: SWITCH_STATE_TO "[ Thai ]"
++Ctrl<T> <a> <r>		: SWITCH_STATE_TO "[ Arabic ]"
++Ctrl<T> <h> <i>		: SWITCH_STATE_TO "[ Indic ]"
++Ctrl<T> <i> <n>		: SWITCH_STATE_TO "[ Indic ]"
++Ctrl<T> <h> <h>		: SWITCH_STATE_TO "[ Hebrew ]"
++Ctrl<T> <u> <h>		: SWITCH_STATE_TO "[ Unicode Hex ]"
++Ctrl<T> <u> <o>		: SWITCH_STATE_TO "[ Unicode Octal ]"
++Ctrl<T> <l> <l>		: SWITCH_STATE_TO "[ Lookup ]"
++Ctrl<T> <j> <a>		: SWITCH_STATE_TO "[ Japanese ]"
++Ctrl<T> <k> <o>		: SWITCH_STATE_TO "[ Korean ]"
++Ctrl<T> <s> <c>		: SWITCH_STATE_TO "[ S-Chinese ]"
++Ctrl<T> <t> <c>		: SWITCH_STATE_TO "[ T-Chinese ]"
++Ctrl<T> <h> <k>		: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
  
 -/* The following block gets overridden by later shorter compositions
 -  <Multi_key> <U1107> <U1109> <U1100> : "ᄢ"  	U1122	 : ᄇᅠ ᄉᅠ ᄀᅠ  = ᄢᅠ
@@ -486,7 +2276,84 @@
 -  <Multi_key> <U11af> <U11bb> : "ᇖ"  	U11d6	 : ᅟᅠᆯ ᅟᅠᆻ   = ᅟᅠᇖ
 -  <Multi_key> <U11b7> <U11bb> : "ᇞ"  	U11de	 : ᅟᅠᆷ ᅟᅠᆻ   = ᅟᅠᇞ
 -  <Multi_key> <U11bc> <U11a9> : "ᇭ"  	U11ed	 : ᅟᅠᆼ ᅟᅠᆩ   = ᅟᅠᇭ
--
++<at>		: "\x22"	quotedbl
++<numbersign>	: "\xe2\x84\x96"	numerosign
++<dollar>	: "\x25"	percent
++<percent>	: "\x3a"	colon
++<asciicircum>	: "\x2c"	comma
++<ampersand>	: "\x2e"	period
++<asterisk>	: "\x3b"	semicolon
++<numerosign>	: "\xe2\x84\x96" numerosign
++<q>		: "\xd0\xb9"	Cyrillic_shorti
++<w>		: "\xd1\x86"	Cyrillic_tse
++<e>		: "\xd1\x83"	Cyrillic_u
++<r>		: "\xd0\xba"	Cyrillic_ka
++<t>		: "\xd0\xb5"	Cyrillic_ie
++<y>		: "\xd0\xbd"	Cyrillic_en
++<u>		: "\xd0\xb3"	Cyrillic_ghe
++<i>		: "\xd1\x88"	Cyrillic_sha
++<o>		: "\xd1\x89"	Cyrillic_shcha
++<p>		: "\xd0\xb7"	Cyrillic_ze
++<bracketleft>	: "\xd1\x85"	Cyrillic_ha
++<bracketright>	: "\xd1\x8a"	Cyrillic_hardsign
++<Q>		: "\xd0\x99"	Cyrillic_SHORTI
++<W>		: "\xd0\xa6"	Cyrillic_TSE
++<E>		: "\xd0\xa3"	Cyrillic_U
++<R>		: "\xd0\x9a"	Cyrillic_KA
++<T>		: "\xd0\x95"	Cyrillic_IE
++<Y>		: "\xd0\x9d"	Cyrillic_EN
++<U>		: "\xd0\x93"	Cyrillic_GHE
++<I>		: "\xd0\xa8"	Cyrillic_SHA
++<O>		: "\xd0\xa9"	Cyrillic_SHCHA
++<P>		: "\xd0\x97"	Cyrillic_ZE
++Lock<bracketleft> 	: "\xd0\xa5"	Cyrillic_HA
++Lock<bracketright>	: "\xd0\xaa"	Cyrillic_HARDSIGN
++<braceleft> 	: "\xd0\xa5"	Cyrillic_HA
++<braceright>	: "\xd0\xaa"	Cyrillic_HARDSIGN
++<a>		: "\xd1\x84"	Cyrillic_ef
++<s>		: "\xd1\x8b"	Cyrillic_yeru
++<d>		: "\xd0\xb2"	Cyrillic_ve
++<f>		: "\xd0\xb0"	Cyrillic_a
++<g>		: "\xd0\xbf"	Cyrillic_pe
++<h>		: "\xd1\x80"	Cyrillic_er
++<j>		: "\xd0\xbe"	Cyrillic_o
++<k>		: "\xd0\xbb"	Cyrillic_el
++<l>		: "\xd0\xb4"	Cyrillic_de
++<semicolon>	: "\xd0\xb6"	Cyrillic_zhe
++<quoteright>	: "\xd1\x8d"	Cyrillic_e
++<A>		: "\xd0\xa4"	Cyrillic_EF
++<S>		: "\xd0\xab"	Cyrillic_YERU
++<D>		: "\xd0\x92"	Cyrillic_VE
++<F>		: "\xd0\x90"	Cyrillic_A
++<G>		: "\xd0\x9f"	Cyrillic_PE
++<H>		: "\xd0\xa0"	Cyrillic_ER
++<J>		: "\xd0\x9e"	Cyrillic_O
++<K>		: "\xd0\x9b"	Cyrillic_EL
++<L>		: "\xd0\x94"	Cyrillic_DE
++<colon>		: "\xd0\x96"	Cyrillic_ZHE
++<quotedbl>	: "\xd0\xad"	Cyrillic_E
++<z>		: "\xd1\x8f"	Cyrillic_ya
++<x>		: "\xd1\x87"	Cyrillic_che
++<c>		: "\xd1\x81"	Cyrillic_es
++<v>		: "\xd0\xbc"	Cyrillic_em
++<b>		: "\xd0\xb8"	Cyrillic_i
++<n>		: "\xd1\x82"	Cyrillic_te
++<m>		: "\xd1\x8c"	Cyrillic_softsign
++<comma>		: "\xd0\xb1"	Cyrillic_be
++<period>	: "\xd1\x8e"	Cyrillic_yu
++<slash>		: "\xd1\x91"	Cyrillic_io
++<Z>		: "\xd0\xaf"	Cyrillic_YA
++<X>		: "\xd0\xa7"	Cyrillic_CHE
++<C>		: "\xd0\xa1"	Cyrillic_ES
++<V>		: "\xd0\x9c"	Cyrillic_EM
++<B>		: "\xd0\x98"	Cyrillic_I
++<N>		: "\xd0\xa2"	Cyrillic_TE
++<M>		: "\xd0\xac"	Cyrillic_SOFTSIGN
++<less>		: "\xd0\x91"	Cyrillic_BE
++<greater>	: "\xd0\xae"	Cyrillic_YU
++<question>	: "\xd0\x81"	Cyrillic_IO
++END_STATE
+ 
 -<dead_circumflex> <Multi_key> <underscore> <a>	: "ª" ordfeminine # FEMININE ORDINAL INDICATOR
 -<Multi_key> <asciicircum> <underscore> <a>	: "ª" ordfeminine # FEMININE ORDINAL INDICATOR
 -<dead_circumflex> <Multi_key> <underbar> <a>	: "ª" ordfeminine # FEMININE ORDINAL INDICATOR
@@ -1084,10 +2951,10 @@
 -<Multi_key> <macron> <semicolon> <o>	: "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
 -<Multi_key> <underscore> <dead_ogonek> <o>	: "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
 -<Multi_key> <underscore> <semicolon> <o>	: "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
--<dead_caron> <U01b7>	: "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
--<Multi_key> <c> <U01b7>	: "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
--<dead_caron> <U0292>	: "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
--<Multi_key> <c> <U0292>	: "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
+-<dead_caron> <EZH>	: "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
+-<Multi_key> <c> <EZH>	: "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
+-<dead_caron> <ezh>	: "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
+-<Multi_key> <c> <ezh>	: "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
 -<dead_caron> <j>	: "ǰ" U01F0 # LATIN SMALL LETTER J WITH CARON
 -<Multi_key> <c> <j>	: "ǰ" U01F0 # LATIN SMALL LETTER J WITH CARON
 -<dead_acute> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
@@ -4310,1902 +6177,6 @@
 -XCOMM <Multi_key> <U1d1b9> <U1d165> <U1d16f>	: "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
 -<Multi_key> <U1d1bc> <U1d16f>	: "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
 -XCOMM <Multi_key> <U1d1ba> <U1d165> <U1d16f>	: "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
-+XCOMM
-+XCOMM
-+XCOMM Copyright 1996, 2002, Oracle and/or its affiliates. All rights reserved.
-+XCOMM
-+XCOMM
-+XCOMM Compose table for the pt_BR.UTF-8 locale
-+XCOMM
- 
-+STATE "[ English/European ]"
-+<Multi_key> <c> <c>	: SWITCH_STATE_TO "[ Cyrillic ]"
-+<Multi_key> <g> <g>	: SWITCH_STATE_TO "[ Greek ]"
-+<Multi_key> <t> <t>	: SWITCH_STATE_TO "[ Thai ]"
-+<Multi_key> <a> <r>	: SWITCH_STATE_TO "[ Arabic ]"
-+<Multi_key> <h> <i>	: SWITCH_STATE_TO "[ Indic ]"
-+<Multi_key> <i> <n>	: SWITCH_STATE_TO "[ Indic ]"
-+<Multi_key> <h> <h>	: SWITCH_STATE_TO "[ Hebrew ]"
-+<Multi_key> <u> <h>	: SWITCH_STATE_TO "[ Unicode Hex ]"
-+<Multi_key> <u> <o>	: SWITCH_STATE_TO "[ Unicode Octal ]"
-+<Multi_key> <l> <l>	: SWITCH_STATE_TO "[ Lookup ]"
-+<Multi_key> <j>	<a>	: SWITCH_STATE_TO "[ Japanese ]"
-+<Multi_key> <k>	<o>	: SWITCH_STATE_TO "[ Korean ]"
-+<Multi_key> <s>	<c>	: SWITCH_STATE_TO "[ S-Chinese ]"
-+<Multi_key> <t>	<c>	: SWITCH_STATE_TO "[ T-Chinese ]"
-+<Multi_key> <h>	<k>	: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
-+
-+Ctrl<T> <c> <c>		: SWITCH_STATE_TO "[ Cyrillic ]"
-+Ctrl<T> <g> <g>		: SWITCH_STATE_TO "[ Greek ]"
-+Ctrl<T> <t> <t>		: SWITCH_STATE_TO "[ Thai ]"
-+Ctrl<T> <a> <r>		: SWITCH_STATE_TO "[ Arabic ]"
-+Ctrl<T> <h> <i>		: SWITCH_STATE_TO "[ Indic ]"
-+Ctrl<T> <i> <n>		: SWITCH_STATE_TO "[ Indic ]"
-+Ctrl<T> <h> <h>		: SWITCH_STATE_TO "[ Hebrew ]"
-+Ctrl<T> <u> <h>		: SWITCH_STATE_TO "[ Unicode Hex ]"
-+Ctrl<T> <u> <o>		: SWITCH_STATE_TO "[ Unicode Octal ]"
-+Ctrl<T> <l> <l>		: SWITCH_STATE_TO "[ Lookup ]"
-+Ctrl<T> <j> <a>		: SWITCH_STATE_TO "[ Japanese ]"
-+Ctrl<T> <k> <o>		: SWITCH_STATE_TO "[ Korean ]"
-+Ctrl<T> <s> <c>		: SWITCH_STATE_TO "[ S-Chinese ]"
-+Ctrl<T> <t> <c>		: SWITCH_STATE_TO "[ T-Chinese ]"
-+Ctrl<T> <h> <k>		: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
-+
-+XCOMM Rules to compose Euro Currency Symbol
-+AltGraph<e>		: "\xe2\x82\xac"
-+AltGraph<E>		: "\xe2\x82\xac"
-+AltGraph<4>		: "\xe2\x82\xac"
-+AltGraph<5>		: "\xe2\x82\xac"
-+<Multi_key> <c> <equal>	: "\xe2\x82\xac"
-+<Multi_key> <equal> <c>	: "\xe2\x82\xac"
-+<Multi_key> <C> <equal>	: "\xe2\x82\xac"
-+<Multi_key> <equal> <C>	: "\xe2\x82\xac"
-+Ctrl<T> <c> <equal>	: "\xe2\x82\xac"
-+Ctrl<T> <equal> <c>	: "\xe2\x82\xac"
-+Ctrl<T> <C> <equal>	: "\xe2\x82\xac"
-+Ctrl<T> <equal> <C>	: "\xe2\x82\xac"
-+<Multi_key> <e> <equal> : "\xe2\x82\xac"
-+<Multi_key> <equal> <e>	: "\xe2\x82\xac"
-+<Multi_key> <E> <equal>	: "\xe2\x82\xac"
-+<Multi_key> <equal> <E>	: "\xe2\x82\xac"
-+Ctrl<T> <e> <equal>	: "\xe2\x82\xac"
-+Ctrl<T> <equal> <e>	: "\xe2\x82\xac"
-+Ctrl<T> <E> <equal>	: "\xe2\x82\xac"
-+Ctrl<T> <equal> <E>	: "\xe2\x82\xac"
-+<EuroSign>		: "\xe2\x82\xac"
-+
-+
-+<Multi_key> <plus> <plus>		: "\x23"	numbersign
-+<Multi_key> <apostrophe> <space>	: "\x27"	apostrophe
-+<Multi_key> <space> <apostrophe>	: "\x27'"	apostrophe
-+<Multi_key> <A> <A>			: "\x40"	at
-+<Multi_key> <a> <A>			: "\xc4\x84"	Aogonek
-+<Multi_key> <A> <a> 			: "\xc4\x84"	Aogonek
-+<Multi_key> <a> <a> 			: "\xc4\x85"	aogonek
-+<Multi_key> <parenleft> <parenleft>	: "\x5b"	bracketleft
-+<Multi_key> <slash> <slash>		: "\x5c"	backslash
-+<Multi_key> <slash> <less>		: "\x5c"	backslash
-+<Multi_key> <less> <slash>		: "\x5c"	backslash
-+<Multi_key> <parenright> <parenright>	: "\x5d"	bracketright
-+<Multi_key> <asciicircum> <space>	: "\x5e"	asciicircum
-+<Multi_key> <space> <asciicircum>	: "\x5e"	asciicircum
-+<Multi_key> <greater> <space>		: "\x5e"	asciicircum
-+<Multi_key> <space> <greater>		: "\x5e"	asciicircum
-+<Multi_key> <grave> <space>		: "\x60"	grave
-+<Multi_key> <space> <grave>		: "\x60"	grave
-+<Multi_key> <parenleft> <minus>		: "\x7b"	braceleft
-+<Multi_key> <minus> <parenleft>		: "\x7b"	braceleft
-+<Multi_key> <slash> <asciicircum>	: "\x7c"	bar
-+<Multi_key> <asciicircum> <slash>	: "\x7c"	bar
-+<Multi_key> <V> <L>			: "\x7c"	bar
-+<Multi_key> <L> <V>			: "\x7c"	bar
-+<Multi_key> <v> <l>			: "\x7c"	bar
-+<Multi_key> <l> <v>			: "\x7c"	bar
-+<Multi_key> <parenright> <minus>	: "\x7d"	braceright
-+<Multi_key> <minus> <parenright>	: "\x7d"	braceright
-+<Multi_key> <asciitilde> <space>	: "\x7e"	asciitilde
-+<Multi_key> <space> <asciitilde>	: "\x7e"	asciitilde
-+<Multi_key> <minus> <space>		: "\x7e"	asciitilde
-+<Multi_key> <space> <minus>		: "\x7e"	asciitilde
-+<Multi_key> <exclam> <exclam>		: "\xc2\xa1"	exclamdown
-+<Multi_key> <C> <acute> 		: "\xc4\x86"	Cacute
-+<Multi_key> <c> <acute> 		: "\xc4\x87"	cacute
-+<Multi_key> <acute> <C>			: "\xc4\x86"	Cacute
-+<Multi_key> <acute> <c>			: "\xc4\x87"	cacute
-+<Multi_key> <c> <slash>			: "\xc2\xa2"	cent
-+<Multi_key> <slash> <c>			: "\xc2\xa2"	cent
-+<Multi_key> <C> <slash>			: "\xc2\xa2"	cent
-+<Multi_key> <slash> <C>			: "\xc2\xa2"	cent
-+<Multi_key> <C> <bar>			: "\xc2\xa2"	cent
-+<Multi_key> <bar> <C>			: "\xc2\xa2"	cent
-+<Multi_key> <c> <bar>			: "\xc2\xa2"	cent
-+<Multi_key> <bar> <c>			: "\xc2\xa2"	cent
-+<Multi_key> <acute> <L>			: "\xc4\xb9"	Lacute
-+<Multi_key> <L> <acute> 		: "\xc4\xb9"	Lacute
-+<Multi_key> <acute> <l>			: "\xc4\xba"	lacute
-+<Multi_key> <l> <acute> 		: "\xc4\xba"	lacute
-+<Multi_key> <l> <minus>			: "\xc2\xa3"	sterling
-+<Multi_key> <minus> <l>			: "\xc2\xa3"	sterling
-+<Multi_key> <L> <minus>			: "\xc2\xa3"	sterling
-+<Multi_key> <minus> <L>			: "\xc2\xa3"	sterling
-+<Multi_key> <l> <equal>			: "\xc2\xa3"	sterling
-+<Multi_key> <equal> <l>			: "\xc2\xa3"	sterling
-+<Multi_key> <L> <equal>			: "\xc2\xa3"	sterling
-+<Multi_key> <equal> <L>			: "\xc2\xa3"	sterling
-+<Multi_key> <acute> <N>			: "\xc5\x83"	Nacute
-+<Multi_key> <N> <acute> 		: "\xc5\x83"	Nacute
-+<Multi_key> <y> <minus>			: "\xc2\xa5"	yen
-+<Multi_key> <minus> <y>			: "\xc2\xa5"	yen
-+<Multi_key> <Y> <minus>			: "\xc2\xa5"	yen
-+<Multi_key> <minus> <Y>			: "\xc2\xa5"	yen
-+<Multi_key> <y> <equal>			: "\xc2\xa5"	yen
-+<Multi_key> <equal> <y>			: "\xc2\xa5"	yen
-+<Multi_key> <Y> <equal>			: "\xc2\xa5"	yen
-+<Multi_key> <equal> <Y>			: "\xc2\xa5"	yen
-+<Multi_key> <s> <o>			: "\xc2\xa7"	section
-+<Multi_key> <o> <s>			: "\xc2\xa7"	section
-+<Multi_key> <S> <O>			: "\xc2\xa7"	section
-+<Multi_key> <O> <S>			: "\xc2\xa7"	section
-+<Multi_key> <S> <exclam>		: "\xc2\xa7"	section
-+<Multi_key> <exclam> <S>		: "\xc2\xa7"	section
-+<Multi_key> <s> <exclam>		: "\xc2\xa7"	section
-+<Multi_key> <exclam> <s>		: "\xc2\xa7"	section
-+<Multi_key> <S> <0>			: "\xc2\xa7"	section
-+<Multi_key> <0> <S>			: "\xc2\xa7"	section
-+<Multi_key> <s> <0>			: "\xc2\xa7"	section
-+<Multi_key> <0> <s>			: "\xc2\xa7"	section
-+<Multi_key> <x> <o>			: "\xc2\xa4"	currency
-+<Multi_key> <o> <x>			: "\xc2\xa4"	currency
-+<Multi_key> <X> <O>			: "\xc2\xa4"	currency
-+<Multi_key> <O> <X>			: "\xc2\xa4"	currency
-+<Multi_key> <x> <O>			: "\xc2\xa4"	currency
-+<Multi_key> <O> <x>			: "\xc2\xa4"	currency
-+<Multi_key> <X> <o>			: "\xc2\xa4"	currency
-+<Multi_key> <o> <X>			: "\xc2\xa4"	currency
-+<Multi_key> <x> <0>			: "\xc2\xa4"	currency
-+<Multi_key> <0> <x>			: "\xc2\xa4"	currency
-+<Multi_key> <X> <0>			: "\xc2\xa4"	currency
-+<Multi_key> <0> <X>			: "\xc2\xa4"	currency
-+<Multi_key> <c> <o>			: "\xc2\xa9"	copyright
-+<Multi_key> <o> <c>			: "\xc2\xa9"	copyright
-+<Multi_key> <C> <O>			: "\xc2\xa9"	copyright
-+<Multi_key> <O> <C>			: "\xc2\xa9"	copyright
-+<Multi_key> <c> <O>			: "\xc2\xa9"	copyright
-+<Multi_key> <O> <c>			: "\xc2\xa9"	copyright
-+<Multi_key> <C> <o>			: "\xc2\xa9"	copyright
-+<Multi_key> <o> <C>			: "\xc2\xa9"	copyright
-+<Multi_key> <c> <0>			: "\xc2\xa9"	copyright
-+<Multi_key> <0> <c>			: "\xc2\xa9"	copyright
-+<Multi_key> <C> <0>			: "\xc2\xa9"	copyright
-+<Multi_key> <0> <C>			: "\xc2\xa9"	copyright
-+<Multi_key> <a> <minus>			: "\xc2\xaa"	ordfeminine
-+<Multi_key> <minus> <a>			: "\xc2\xaa"	ordfeminine
-+<Multi_key> <A> <minus>			: "\xc2\xaa"	ordfeminine
-+<Multi_key> <minus> <A>			: "\xc2\xaa"	ordfeminine
-+<Multi_key> <o> <minus>			: "\xc2\xba"	masculine
-+<Multi_key> <minus> <o>			: "\xc2\xba"	masculine
-+<Multi_key> <O> <minus>			: "\xc2\xba"	masculine
-+<Multi_key> <minus> <O>			: "\xc2\xba"	masculine
-+<Multi_key> <less> <less>		: "\xc2\xab"	guillemotleft
-+<Multi_key> <greater> <greater>		: "\xc2\xbb"	guillemotright
-+<Multi_key> <0> <asciicircum>		: "\xc2\xb0"	degree
-+<Multi_key> <asciicircum> <0>		: "\xc2\xb0"	degree
-+<Multi_key> <0> <asterisk>		: "\xc2\xb0"	degree
-+<Multi_key> <asterisk> <0>		: "\xc2\xb0"	degree
-+<Multi_key> <plus> <minus>		: "\xc2\xb1"	plusminus
-+<Multi_key> <minus> <plus>		: "\xc2\xb1"	plusminus
-+<Multi_key> <slash> <u>			: "\xc2\xb5"	mu
-+<Multi_key> <u> <slash>			: "\xc2\xb5"	mu
-+<Multi_key> <slash> <U>			: "\xc2\xb5"	mu
-+<Multi_key> <U> <slash>			: "\xc2\xb5"	mu
-+<Multi_key> <1> <asciicircum>		: "\xc2\xb9"	onesuperior
-+<Multi_key> <asciicircum> <1>		: "\xc2\xb9"	onesuperior
-+<Multi_key> <S> <1>			: "\xc2\xb9"	onesuperior
-+<Multi_key> <1> <S>			: "\xc2\xb9"	onesuperior
-+<Multi_key> <s> <1>			: "\xc2\xb9"	onesuperior
-+<Multi_key> <1> <s>			: "\xc2\xb9"	onesuperior
-+<Multi_key> <2> <asciicircum>		: "\xc2\xb2"	twosuperior
-+<Multi_key> <asciicircum> <2>		: "\xc2\xb2"	twosuperior
-+<Multi_key> <S> <2>			: "\xc2\xb2"	twosuperior
-+<Multi_key> <2> <S>			: "\xc2\xb2"	twosuperior
-+<Multi_key> <s> <2>			: "\xc2\xb2"	twosuperior
-+<Multi_key> <2> <s>			: "\xc2\xb2"	twosuperior
-+<Multi_key> <3> <asciicircum>		: "\xc2\xb3"	threesuperior
-+<Multi_key> <asciicircum> <3>		: "\xc2\xb3"	threesuperior
-+<Multi_key> <S> <3>			: "\xc2\xb3"	threesuperior
-+<Multi_key> <3> <S>			: "\xc2\xb3"	threesuperior
-+<Multi_key> <s> <3>			: "\xc2\xb3"	threesuperior
-+<Multi_key> <3> <s>			: "\xc2\xb3"	threesuperior
-+<Multi_key> <p> <exclam>		: "\xc2\xb6"	paragraph
-+<Multi_key> <exclam> <p>		: "\xc2\xb6"	paragraph
-+<Multi_key> <P> <exclam>		: "\xc2\xb6"	paragraph
-+<Multi_key> <exclam> <P>		: "\xc2\xb6"	paragraph
-+<Multi_key> <period> <asciicircum>	: "\xc2\xb7"	periodcentered
-+<Multi_key> <asciicircum> <period>	: "\xc2\xb7"	periodcentered
-+<Multi_key> <period> <period>		: "\xc2\xb7"	periodcentered
-+<Multi_key> <1> <4>			: "\xc2\xbc"	onequarter
-+<Multi_key> <1> <2>			: "\xc2\xbd"	onehalf
-+<Multi_key> <3> <4>			: "\xc2\xbe"	threequarters
-+<Multi_key> <question> <question>	: "\xc2\xbf"	questiondown
-+<Multi_key> <space> <space>		: "\xc2\xa0"	nobreakspace
-+<Multi_key> <bar> <bar>			: "\xc2\xa6"	brokenbar
-+<Multi_key> <exclam> <asciicircum>	: "\xc2\xa6"	brokenbar
-+<Multi_key> <asciicircum> <exclam>	: "\xc2\xa6"	brokenbar
-+<Multi_key> <V> <B>			: "\xc2\xa6"	brokenbar
-+<Multi_key> <B> <V>			: "\xc2\xa6"	brokenbar
-+<Multi_key> <v> <b>			: "\xc2\xa6"	brokenbar
-+<Multi_key> <b> <v>			: "\xc2\xa6"	brokenbar
-+<Multi_key> <minus> <comma>		: "\xc2\xac"	notsign
-+<Multi_key> <comma> <minus>		: "\xc2\xac"	notsign
-+<Multi_key> <minus> <minus>		: "\xc2\xad"	hyphen
-+<Multi_key> <R> <O>			: "\xc2\xae"	registered
-+<Multi_key> <O> <R>			: "\xc2\xae"	registered
-+<Multi_key> <minus> <asciicircum>	: "\xc2\xaf"	macron
-+<Multi_key> <asciicircum> <minus>	: "\xc2\xaf"	macron
-+<Multi_key> <underscore> <asciicircum>	: "\xc2\xaf"	macron
-+<Multi_key> <asciicircum> <underscore>	: "\xc2\xaf"	macron
-+<Multi_key> <underscore> <underscore>	: "\xc2\xaf"	macron
-+<Multi_key> <minus> <colon>		: "\xc3\xb7"	division
-+<Multi_key> <colon> <minus>		: "\xc3\xb7"	division
-+<Multi_key> <x> <x>			: "\xc3\x97"	multiply
-+<Multi_key> <apostrophe> <apostrophe>	: "\xc2\xb4"	acute
-+<Multi_key> <comma> <comma>		: "\xc2\xb8"	cedilla
-+<Multi_key> <quotedbl> <quotedbl>	: "\xc2\xa8"	diaeresis
-+<Multi_key> <A> <grave>			: "\xc3\x80"	Agrave
-+<Multi_key> <grave> <A>			: "\xc3\x80"	Agrave
-+<Multi_key> <A> <acute>			: "\xc3\x81"	Aacute
-+<Multi_key> <acute> <A>			: "\xc3\x81"	Aacute
-+<Multi_key> <A> <apostrophe>		: "\xc3\x81"	Aacute
-+<Multi_key> <apostrophe> <A>		: "\xc3\x81"	Aacute
-+<Multi_key> <A> <asciicircum>		: "\xc3\x82"	Acircumflex
-+<Multi_key> <asciicircum> <A>		: "\xc3\x82"	Acircumflex
-+<Multi_key> <A> <greater>		: "\xc3\x82"	Acircumflex
-+<Multi_key> <greater> <A>		: "\xc3\x82"	Acircumflex
-+<Multi_key> <A> <asciitilde>		: "\xc3\x83"	Atilde
-+<Multi_key> <asciitilde> <A>		: "\xc3\x83"	Atilde
-+<Multi_key> <A> <quotedbl>		: "\xc3\x84"	Adiaeresis
-+<Multi_key> <quotedbl> <A>		: "\xc3\x84"	Adiaeresis
-+<Multi_key> <A> <asterisk>		: "\xc3\x85"	Aring
-+<Multi_key> <asterisk> <A>		: "\xc3\x85"	Aring
-+<Multi_key> <A> <E>			: "\xc3\x86"	AE
-+<Multi_key> <a> <grave>			: "\xc3\xa0"	agrave
-+<Multi_key> <grave> <a>			: "\xc3\xa0"	agrave
-+<Multi_key> <a> <acute>			: "\xc3\xa1"	aacute
-+<Multi_key> <acute> <a>			: "\xc3\xa1"	aacute
-+<Multi_key> <a> <apostrophe>		: "\xc3\xa1"	aacute
-+<Multi_key> <apostrophe> <a>		: "\xc3\xa1"	aacute
-+<Multi_key> <a> <asciicircum>		: "\xc3\xa2"	acircumflex
-+<Multi_key> <asciicircum> <a>		: "\xc3\xa2"	acircumflex
-+<Multi_key> <a> <greater>		: "\xc3\xa2"	acircumflex
-+<Multi_key> <greater> <a>		: "\xc3\xa2"	acircumflex
-+<Multi_key> <a> <asciitilde>		: "\xc3\xa3"	atilde
-+<Multi_key> <asciitilde> <a>		: "\xc3\xa3"	atilde
-+<Multi_key> <a> <quotedbl>		: "\xc3\xa4"	adiaeresis
-+<Multi_key> <quotedbl> <a>		: "\xc3\xa4"	adiaeresis
-+<Multi_key> <a> <asterisk>		: "\xc3\xa5"	aring
-+<Multi_key> <asterisk> <a>		: "\xc3\xa5"	aring
-+<Multi_key> <a> <e>			: "\xc3\xa6"	ae
-+<Multi_key> <C> <comma>			: "\xc3\x87"	Ccedilla
-+<Multi_key> <comma> <C>			: "\xc3\x87"	Ccedilla
-+<Multi_key> <c> <comma>			: "\xc3\xa7"	ccedilla
-+<Multi_key> <comma> <c>			: "\xc3\xa7"	ccedilla
-+XCOMM<Multi_key> <minus> <D>		: "\xc3\x90"	ETH
-+XCOMM<Multi_key> <minus> <d>		: "\xc3\xb0"	eth
-+<Multi_key> <D> <minus>			: "\xc3\x90"	ETH
-+<Multi_key> <d> <minus>			: "\xc3\xb0"	eth
-+<Multi_key> <slash> <D>			: "\xc4\x90"	Dstroke
-+<Multi_key> <slash> <d>			: "\xc4\x91"	dstroke
-+<Multi_key> <E> <grave>			: "\xc3\x88"	Egrave
-+<Multi_key> <grave> <E>			: "\xc3\x88"	Egrave
-+<Multi_key> <E> <acute>			: "\xc3\x89"	Eacute
-+<Multi_key> <acute> <E>			: "\xc3\x89"	Eacute
-+<Multi_key> <E> <apostrophe>		: "\xc3\x89"	Eacute
-+<Multi_key> <apostrophe> <E>		: "\xc3\x89"	Eacute
-+<Multi_key> <E> <asciicircum>		: "\xc3\x8a"	Ecircumflex
-+<Multi_key> <asciicircum> <E>		: "\xc3\x8a"	Ecircumflex
-+<Multi_key> <E> <greater>		: "\xc3\x8a"	Ecircumflex
-+<Multi_key> <greater> <E>		: "\xc3\x8a"	Ecircumflex
-+<Multi_key> <E> <quotedbl>		: "\xc3\x8b"	Ediaeresis
-+<Multi_key> <quotedbl> <E>		: "\xc3\x8b"	Ediaeresis
-+<Multi_key> <e> <grave>			: "\xc3\xa8"	egrave
-+<Multi_key> <grave> <e>			: "\xc3\xa8"	egrave
-+<Multi_key> <e> <acute>			: "\xc3\xa9"	eacute
-+<Multi_key> <acute> <e>			: "\xc3\xa9"	eacute
-+<Multi_key> <e> <apostrophe>		: "\xc3\xa9"	eacute
-+<Multi_key> <apostrophe> <e>		: "\xc3\xa9"	eacute
-+<Multi_key> <e> <asciicircum>		: "\xc3\xaa"	ecircumflex
-+<Multi_key> <asciicircum> <e>		: "\xc3\xaa"	ecircumflex
-+<Multi_key> <e> <greater>		: "\xc3\xaa"	ecircumflex
-+<Multi_key> <greater> <e>		: "\xc3\xaa"	ecircumflex
-+<Multi_key> <e> <quotedbl>		: "\xc3\xab"	ediaeresis
-+<Multi_key> <quotedbl> <e>		: "\xc3\xab"	ediaeresis
-+<Multi_key> <I> <grave>			: "\xc3\x8c"	Igrave
-+<Multi_key> <grave> <I>			: "\xc3\x8c"	Igrave
-+<Multi_key> <I> <acute>			: "\xc3\x8d"	Iacute
-+<Multi_key> <acute> <I>			: "\xc3\x8d"	Iacute
-+<Multi_key> <I> <apostrophe>		: "\xc3\x8d"	Iacute
-+<Multi_key> <apostrophe> <I>		: "\xc3\x8d"	Iacute
-+<Multi_key> <I> <asciicircum>		: "\xc3\x8e"	Icircumflex
-+<Multi_key> <asciicircum> <I>		: "\xc3\x8e"	Icircumflex
-+<Multi_key> <I> <greater>		: "\xc3\x8e"	Icircumflex
-+<Multi_key> <greater> <I>		: "\xc3\x8e"	Icircumflex
-+<Multi_key> <I> <quotedbl>		: "\xc3\x8f"	Idiaeresis
-+<Multi_key> <quotedbl> <I>		: "\xc3\x8f"	Idiaeresis
-+<Multi_key> <i> <grave>			: "\xc3\xac"	igrave
-+<Multi_key> <grave> <i>			: "\xc3\xac"	igrave
-+<Multi_key> <i> <acute>			: "\xc3\xad"	iacute
-+<Multi_key> <acute> <i>			: "\xc3\xad"	iacute
-+<Multi_key> <i> <apostrophe>		: "\xc3\xad"	iacute
-+<Multi_key> <apostrophe> <i>		: "\xc3\xad"	iacute
-+<Multi_key> <i> <asciicircum>		: "\xc3\xae"	icircumflex
-+<Multi_key> <asciicircum> <i>		: "\xc3\xae"	icircumflex
-+<Multi_key> <i> <greater>		: "\xc3\xae"	icircumflex
-+<Multi_key> <greater> <i>		: "\xc3\xae"	icircumflex
-+<Multi_key> <i> <quotedbl>		: "\xc3\xaf"	idiaeresis
-+<Multi_key> <quotedbl> <i>		: "\xc3\xaf"	idiaeresis
-+<Multi_key> <N> <asciitilde>		: "\xc3\x91"	Ntilde
-+<Multi_key> <asciitilde> <N>		: "\xc3\x91"	Ntilde
-+<Multi_key> <N> <minus>			: "\xc3\x91"	Ntilde
-+<Multi_key> <minus> <N>			: "\xc3\x91"	Ntilde
-+<Multi_key> <n> <asciitilde>		: "\xc3\xb1"	ntilde
-+<Multi_key> <asciitilde> <n>		: "\xc3\xb1"	ntilde
-+<Multi_key> <n> <minus>			: "\xc3\xb1"	ntilde
-+<Multi_key> <minus> <n>			: "\xc3\xb1"	ntilde
-+<Multi_key> <O> <grave>			: "\xc3\x92"	Ograve
-+<Multi_key> <grave> <O>			: "\xc3\x92"	Ograve
-+<Multi_key> <O> <acute>			: "\xc3\x93"	Oacute
-+<Multi_key> <acute> <O>			: "\xc3\x93"	Oacute
-+<Multi_key> <O> <apostrophe>		: "\xc3\x93"	Oacute
-+<Multi_key> <apostrophe> <O>		: "\xc3\x93"	Oacute
-+<Multi_key> <O> <asciicircum>		: "\xc3\x94"	Ocircumflex
-+<Multi_key> <asciicircum> <O>		: "\xc3\x94"	Ocircumflex
-+<Multi_key> <O> <greater>		: "\xc3\x94"	Ocircumflex
-+<Multi_key> <greater> <O>		: "\xc3\x94"	Ocircumflex
-+<Multi_key> <O> <asciitilde>		: "\xc3\x95"	Otilde
-+<Multi_key> <asciitilde> <O>		: "\xc3\x95"	Otilde
-+<Multi_key> <O> <quotedbl>		: "\xc3\x96"	Odiaeresis
-+<Multi_key> <quotedbl> <O>		: "\xc3\x96"	Odiaeresis
-+<Multi_key> <O> <slash>			: "\xc3\x98"	Ooblique
-+<Multi_key> <slash> <O>			: "\xc3\x98"	Ooblique
-+<Multi_key> <o> <grave>			: "\xc3\xb2"	ograve
-+<Multi_key> <grave> <o>			: "\xc3\xb2"	ograve
-+<Multi_key> <o> <acute>			: "\xc3\xb3"	oacute
-+<Multi_key> <acute> <o>			: "\xc3\xb3"	oacute
-+<Multi_key> <o> <apostrophe>		: "\xc3\xb3"	oacute
-+<Multi_key> <apostrophe> <o>		: "\xc3\xb3"	oacute
-+<Multi_key> <o> <asciicircum>		: "\xc3\xb4"	ocircumflex
-+<Multi_key> <asciicircum> <o>		: "\xc3\xb4"	ocircumflex
-+<Multi_key> <o> <greater>		: "\xc3\xb4"	ocircumflex
-+<Multi_key> <greater> <o>		: "\xc3\xb4"	ocircumflex
-+<Multi_key> <o> <asciitilde>		: "\xc3\xb5"	otilde
-+<Multi_key> <asciitilde> <o>		: "\xc3\xb5"	otilde
-+<Multi_key> <o> <quotedbl>		: "\xc3\xb6"	odiaeresis
-+<Multi_key> <quotedbl> <o>		: "\xc3\xb6"	odiaeresis
-+<Multi_key> <o> <slash>			: "\xc3\xb8"	oslash
-+<Multi_key> <slash> <o>			: "\xc3\xb8"	oslash
-+<Multi_key> <U> <grave>			: "\xc3\x99"	Ugrave
-+<Multi_key> <grave> <U>			: "\xc3\x99"	Ugrave
-+<Multi_key> <U> <acute>			: "\xc3\x9a"	Uacute
-+<Multi_key> <acute> <U>			: "\xc3\x9a"	Uacute
-+<Multi_key> <U> <apostrophe>		: "\xc3\x9a"	Uacute
-+<Multi_key> <apostrophe> <U>		: "\xc3\x9a"	Uacute
-+<Multi_key> <U> <asciicircum>		: "\xc3\x9b"	Ucircumflex
-+<Multi_key> <asciicircum> <U>		: "\xc3\x9b"	Ucircumflex
-+<Multi_key> <U> <greater>		: "\xc3\x9b"	Ucircumflex
-+<Multi_key> <greater> <U>		: "\xc3\x9b"	Ucircumflex
-+<Multi_key> <U> <quotedbl>		: "\xc3\x9c"	Udiaeresis
-+<Multi_key> <quotedbl> <U>		: "\xc3\x9c"	Udiaeresis
-+<Multi_key> <u> <grave>			: "\xc3\xb9"	ugrave
-+<Multi_key> <grave> <u>			: "\xc3\xb9"	ugrave
-+<Multi_key> <u> <acute>			: "\xc3\xba"	uacute
-+<Multi_key> <acute> <u>			: "\xc3\xba"	uacute
-+<Multi_key> <u> <apostrophe>		: "\xc3\xba"	uacute
-+<Multi_key> <apostrophe> <u>		: "\xc3\xba"	uacute
-+<Multi_key> <u> <asciicircum>		: "\xc3\xbb"	ucircumflex
-+<Multi_key> <asciicircum> <u>		: "\xc3\xbb"	ucircumflex
-+<Multi_key> <u> <greater>		: "\xc3\xbb"	ucircumflex
-+<Multi_key> <greater> <u>		: "\xc3\xbb"	ucircumflex
-+<Multi_key> <u> <quotedbl>		: "\xc3\xbc"	udiaeresis
-+<Multi_key> <quotedbl> <u>		: "\xc3\xbc"	udiaeresis
-+<Multi_key> <s> <s>			: "\xc3\x9f"	ssharp
-+<Multi_key> <T> <H>			: "\xc3\x9e"	THORN
-+<Multi_key> <t> <h>			: "\xc3\xbe"	thorn
-+<Multi_key> <Y> <acute>			: "\xc3\x9d"	Yacute
-+<Multi_key> <acute> <Y>			: "\xc3\x9d"	Yacute
-+<Multi_key> <Y> <apostrophe>		: "\xc3\x9d"	Yacute
-+<Multi_key> <apostrophe> <Y>		: "\xc3\x9d"	Yacute
-+<Multi_key> <y> <acute>			: "\xc3\xbd"	yacute
-+<Multi_key> <acute> <y>			: "\xc3\xbd"	yacute
-+<Multi_key> <y> <apostrophe>		: "\xc3\xbd"	yacute
-+<Multi_key> <apostrophe> <y>		: "\xc3\xbd"	yacute
-+<Multi_key> <y> <quotedbl>		: "\xc3\xbf"	ydiaeresis
-+<Multi_key> <quotedbl> <y>		: "\xc3\xbf"	ydiaeresis
-+<ecaron>	: "\xc4\x9b"	ecaron
-+<scaron>	: "\xc5\xa1"	scaron
-+<ccaron>	: "\xc4\x8d"	ccaron
-+<rcaron>	: "\xc5\x99"	rcaron
-+<yacute>	: "\xc3\xbd"	yacute
-+<aacute>	: "\xc3\xa1"	aacute
-+<iacute>	: "\xc3\xad"	iacute
-+<eacute>	: "\xc3\xa9"	eacute
-+<uacute>	: "\xc3\xba"	uacute
-+<uring>		: "\xc5\xaf"	uring
-+<section>	: "\xc2\xa7"	section
-+<ssharp>	: "\xc3\x9f"	ssharp
-+<zabovedot>	: "\xc5\xbc"	zabovedot
-+<Zabovedot>	: "\xc5\xbb"	Zabovedot
-+<ogonek>	: "\xcb\x9b"	ogonek
-+<oacute>	: "\xc3\xb3"	oacute
-+<zacute>	: "\xc5\xba"	zacute
-+<lstroke>	: "\xc5\x82"	lstroke
-+<Lstroke>	: "\xc5\x81"	Lstroke
-+<aogonek>	: "\xc4\x85"	aogonek
-+<eogonek>	: "\xc4\x99"	eogonek
-+<currency>	: "\xe2\x82\xac" currency
-+<sacute>	: "\xc5\x9b"	sacute
-+<nacute>	: "\xc5\x84"	nacute
-+<cacute>	: "\xc4\x87"	cacute
-+<degree>	: "\xc2\xb0"	degree
-+<Odiaeresis>	: "\xc3\x96"	Odiaeresis
-+<Udiaeresis>	: "\xc3\x9c"	Udiaeresis
-+<odiaeresis>	: "\xc3\xb6"	odiaeresis
-+<udiaeresis>	: "\xc3\xbc"	udiaeresis
-+<Oacute> 	: "\xc3\x93"	Oacute
-+<odoubleacute>	: "\xc5\x91"	odoubleacute
-+<Odoubleacute>	: "\xc5\x90"	Odoubleacute
-+<Uacute>	: "\xc3\x9a"	Uacute
-+<Eacute>	: "\xc3\x89"	Eacute
-+<Aacute>	: "\xc3\x81"	Aacute
-+<adiaeresis>	: "\xc3\xa4"	adiaeresis
-+<Adiaeresis>	: "\xc3\x84"	Adiaeresis
-+<udoubleacute>	: "\xc5\xb1"	udoubleacute
-+<Udoubleacute>	: "\xc5\xb0"	Udoubleacute
-+<Iacute>	: "\xc3\x8d"	Iacute
-+<dead_circumflex> <slash>	: "\x7c"	bar
-+<dead_grave> <space>		: "\x60"	grave
-+<dead_acute> <space>		: "\x27"	apostrophe
-+<dead_diaeresis> <space>	: "\xc2\xa8"	diaeresis
-+<dead_circumflex> <space>	: "\x5e"	asciicircum
-+<dead_tilde> <space>		: "\x7e"	asciitilde
-+<dead_circumflex> <0>		: "\xc2\xb0"	degree
-+<dead_circumflex> <1>		: "\xc2\xb9"	onesuperior
-+<dead_circumflex> <2>		: "\xc2\xb2"	twosuperior
-+<dead_circumflex> <3>		: "\xc2\xb3"	threesuperior
-+<dead_circumflex> <period>	: "\xc2\xb7"	periodcentered
-+<dead_circumflex> <exclam>	: "\xc2\xa6"	brokenbar
-+<dead_cedilla> <minus>		: "\xc2\xac"	notsign
-+<dead_circumflex> <minus>	: "\xc2\xaf"	macron
-+<dead_circumflex> <underscore>	: "\xc2\xaf"	macron
-+<dead_acute> <apostrophe>	: "\xc2\xb4"	acute
-+<dead_cedilla> <comma>		: "\xc2\xb8"	cedilla
-+<dead_diaeresis> <quotedbl>	: "\xc2\xa8"	diaeresis
-+<dead_grave> <A>		: "\xc3\x80"	Agrave
-+<dead_acute> <A>		: "\xc3\x81"	Aacute
-+<dead_circumflex> <A>		: "\xc3\x82"	Acircumflex
-+<dead_tilde> <A>		: "\xc3\x83"	Atilde
-+<dead_diaeresis> <A>		: "\xc3\x84"	Adiaeresis
-+<dead_grave> <a>		: "\xc3\xa0"	agrave
-+<dead_acute> <a>		: "\xc3\xa1"	aacute
-+<dead_circumflex> <a>		: "\xc3\xa2"	acircumflex
-+<dead_tilde> <a>		: "\xc3\xa3"	atilde
-+<dead_diaeresis> <a>		: "\xc3\xa4"	adiaeresis
-+<dead_cedilla> <C>		: "\xc3\x87"	Ccedilla
-+<dead_cedilla> <c>		: "\xc3\xa7"	ccedilla
-+<dead_grave> <E>		: "\xc3\x88"	Egrave
-+<dead_acute> <E>		: "\xc3\x89"	Eacute
-+<dead_circumflex> <E>		: "\xc3\x8a"	Ecircumflex
-+<dead_diaeresis> <E>		: "\xc3\x8b"	Ediaeresis
-+<dead_grave> <e>		: "\xc3\xa8"	egrave
-+<dead_acute> <e>		: "\xc3\xa9"	eacute
-+<dead_circumflex> <e>		: "\xc3\xaa"	ecircumflex
-+<dead_diaeresis> <e>		: "\xc3\xab"	ediaeresis
-+<dead_grave> <I>		: "\xc3\x8c"	Igrave
-+<dead_acute> <I>		: "\xc3\x8d"	Iacute
-+<dead_circumflex> <I>		: "\xc3\x8e"	Icircumflex
-+<dead_diaeresis> <I>		: "\xc3\x8f"	Idiaeresis
-+<dead_grave> <i>		: "\xc3\xac"	igrave
-+<dead_acute> <i>		: "\xc3\xad"	iacute
-+<dead_circumflex> <i>		: "\xc3\xae"	icircumflex
-+<dead_diaeresis> <i>		: "\xc3\xaf"	idiaeresis
-+<dead_tilde> <N>		: "\xc3\x91"	Ntilde
-+<dead_tilde> <n>		: "\xc3\xb1"	ntilde
-+<dead_grave> <O>		: "\xc3\x92"	Ograve
-+<dead_acute> <O>		: "\xc3\x93"	Oacute
-+<dead_circumflex> <O>		: "\xc3\x94"	Ocircumflex
-+<dead_tilde> <O>		: "\xc3\x95"	Otilde
-+<dead_diaeresis> <O>		: "\xc3\x96"	Odiaeresis
-+<dead_grave> <o>		: "\xc3\xb2"	ograve
-+<dead_acute> <o>		: "\xc3\xb3"	oacute
-+<dead_circumflex> <o>		: "\xc3\xb4"	ocircumflex
-+<dead_tilde> <o>		: "\xc3\xb5"	otilde
-+<dead_diaeresis> <o>		: "\xc3\xb6"	odiaeresis
-+<dead_cedilla> <S>		: "\xc5\x9e"	Scedilla
-+<dead_cedilla> <s>		: "\xc5\x9f"	scedilla
-+<dead_grave> <U>		: "\xc3\x99"	Ugrave
-+<dead_acute> <U>		: "\xc3\x9a"	Uacute
-+<dead_circumflex> <U>		: "\xc3\x9b"	Ucircumflex
-+<dead_diaeresis> <U>		: "\xc3\x9c"	Udiaeresis
-+<dead_grave> <u>		: "\xc3\xb9"	ugrave
-+<dead_acute> <u>		: "\xc3\xba"	uacute
-+<dead_circumflex> <u>		: "\xc3\xbb"	ucircumflex
-+<dead_diaeresis> <u>		: "\xc3\xbc"	udiaeresis
-+<dead_acute> <Y>		: "\xc3\x9d"	Yacute
-+<dead_acute> <y>		: "\xc3\xbd"	yacute
-+<Multi_key> <caron> <Z>		: "\xc5\xbd"	Zcaron
-+<Multi_key> <Z> <caron> 	: "\xc5\xbd"	Zcaron
-+<Multi_key> <v> <Z>		: "\xc5\xbd"	Zcaron
-+<Multi_key> <Z> <v>		: "\xc5\xbd"	Zcaron
-+<zcaron>			: "\xc5\xbe"	zcaron
-+<Multi_key> <caron> <z>		: "\xc5\xbe"	zcaron
-+<Multi_key> <z> <caron> 	: "\xc5\xbe"	zcaron
-+<Multi_key> <z> <v>		: "\xc5\xbe"	zcaron
-+<Multi_key> <v> <z>		: "\xc5\xbe"	zcaron
-+<dead_diaeresis> <y>		: "\xc3\xbf"	ydiaeresis
-+Ctrl<T> <plus> <plus>		: "\x23"	numbersign
-+Ctrl<T> <apostrophe> <space>	: "\x27"	apostrophe
-+Ctrl<T> <space> <apostrophe>	: "\x27"	apostrophe
-+Ctrl<T> <A> <A>			: "\x40"	at
-+Ctrl<T> <parenleft> <parenleft>	: "\x5b"	bracketleft
-+Ctrl<T> <slash> <slash>		: "\x5c"	backslash
-+Ctrl<T> <slash> <less>		: "\x5c"	backslash
-+Ctrl<T> <less> <slash>		: "\x5c"	backslash
-+Ctrl<T> <parenright> <parenright>	: "\x5d"	bracketright
-+Ctrl<T> <asciicircum> <space>	: "\x5e"	asciicircum
-+Ctrl<T> <space> <asciicircum>	: "\x5e"	asciicircum
-+Ctrl<T> <greater> <space>	: "\x5e"	asciicircum
-+Ctrl<T> <space> <greater>	: "\x5e"	asciicircum
-+Ctrl<T> <grave> <space>		: "\x60"	grave
-+Ctrl<T> <space> <grave>		: "\x60"	grave
-+Ctrl<T> <parenleft> <minus>	: "\x7b"	braceleft
-+Ctrl<T> <minus> <parenleft>	: "\x7b"	braceleft
-+Ctrl<T> <slash> <asciicircum>	: "\x7c"	bar
-+Ctrl<T> <asciicircum> <slash>	: "\x7c"	bar
-+Ctrl<T> <V> <L>			: "\x7c"	bar
-+Ctrl<T> <L> <V>			: "\x7c"	bar
-+Ctrl<T> <v> <l>			: "\x7c"	bar
-+Ctrl<T> <l> <v>			: "\x7c"	bar
-+Ctrl<T> <parenright> <minus>	: "\x7d"	braceright
-+Ctrl<T> <minus> <parenright>	: "\x7d"	braceright
-+Ctrl<T> <asciitilde> <space>	: "\x7e"	asciitilde
-+Ctrl<T> <space> <asciitilde>	: "\x7e"	asciitilde
-+Ctrl<T> <minus> <space>		: "\x7e"	asciitilde
-+Ctrl<T> <space> <minus>		: "\x7e"	asciitilde
-+Ctrl<T> <exclam> <exclam>	: "\xc2\xa1"	exclamdown
-+Ctrl<T> <c> <slash>		: "\xc2\xa2"	cent
-+Ctrl<T> <slash> <c>		: "\xc2\xa2"	cent
-+Ctrl<T> <C> <slash>		: "\xc2\xa2"	cent
-+Ctrl<T> <slash> <C>		: "\xc2\xa2"	cent
-+Ctrl<T> <C> <bar>		: "\xc2\xa2"	cent
-+Ctrl<T> <bar> <C>		: "\xc2\xa2"	cent
-+Ctrl<T> <c> <bar>		: "\xc2\xa2"	cent
-+Ctrl<T> <bar> <c>		: "\xc2\xa2"	cent
-+Ctrl<T> <acute> <L>			: "\xc4\xb9"	Lacute
-+Ctrl<T> <L> <acute> 		: "\xc4\xb9"	Lacute
-+Ctrl<T> <acute> <l>			: "\xc4\xba"	lacute
-+Ctrl<T> <l> <acute> 		: "\xc4\xba"	lacute
-+Ctrl<T> <l> <minus>		: "\xc2\xa3"	sterling
-+Ctrl<T> <minus> <l>		: "\xc2\xa3"	sterling
-+Ctrl<T> <L> <minus>		: "\xc2\xa3"	sterling
-+Ctrl<T> <minus> <L>		: "\xc2\xa3"	sterling
-+Ctrl<T> <l> <equal>		: "\xc2\xa3"	sterling
-+Ctrl<T> <equal> <l>		: "\xc2\xa3"	sterling
-+Ctrl<T> <L> <equal>		: "\xc2\xa3"	sterling
-+Ctrl<T> <equal> <L>		: "\xc2\xa3"	sterling
-+Ctrl<T> <y> <minus>		: "\xc2\xa5"	yen
-+Ctrl<T> <minus> <y>		: "\xc2\xa5"	yen
-+Ctrl<T> <Y> <minus>		: "\xc2\xa5"	yen
-+Ctrl<T> <minus> <Y>		: "\xc2\xa5"	yen
-+Ctrl<T> <y> <equal>		: "\xc2\xa5"	yen
-+Ctrl<T> <equal> <y>		: "\xc2\xa5"	yen
-+Ctrl<T> <Y> <equal>		: "\xc2\xa5"	yen
-+Ctrl<T> <equal> <Y>		: "\xc2\xa5"	yen
-+Ctrl<T> <s> <o>			: "\xc2\xa7"	section
-+Ctrl<T> <o> <s>			: "\xc2\xa7"	section
-+Ctrl<T> <S> <O>			: "\xc2\xa7"	section
-+Ctrl<T> <O> <S>			: "\xc2\xa7"	section
-+Ctrl<T> <S> <exclam>		: "\xc2\xa7"	section
-+Ctrl<T> <exclam> <S>		: "\xc2\xa7"	section
-+Ctrl<T> <s> <exclam>		: "\xc2\xa7"	section
-+Ctrl<T> <exclam> <s>		: "\xc2\xa7"	section
-+Ctrl<T> <S> <0>			: "\xc2\xa7"	section
-+Ctrl<T> <0> <S>			: "\xc2\xa7"	section
-+Ctrl<T> <s> <0>			: "\xc2\xa7"	section
-+Ctrl<T> <0> <s>			: "\xc2\xa7"	section
-+Ctrl<T> <x> <o>			: "\xc2\xa4"	currency
-+Ctrl<T> <o> <x>			: "\xc2\xa4"	currency
-+Ctrl<T> <X> <O>			: "\xc2\xa4"	currency
-+Ctrl<T> <O> <X>			: "\xc2\xa4"	currency
-+Ctrl<T> <x> <O>			: "\xc2\xa4"	currency
-+Ctrl<T> <O> <x>			: "\xc2\xa4"	currency
-+Ctrl<T> <X> <o>			: "\xc2\xa4"	currency
-+Ctrl<T> <o> <X>			: "\xc2\xa4"	currency
-+Ctrl<T> <x> <0>			: "\xc2\xa4"	currency
-+Ctrl<T> <0> <x>			: "\xc2\xa4"	currency
-+Ctrl<T> <X> <0>			: "\xc2\xa4"	currency
-+Ctrl<T> <0> <X>			: "\xc2\xa4"	currency
-+Ctrl<T> <c> <o>			: "\xc2\xa9"	copyright
-+Ctrl<T> <o> <c>			: "\xc2\xa9"	copyright
-+Ctrl<T> <C> <O>			: "\xc2\xa9"	copyright
-+Ctrl<T> <O> <C>			: "\xc2\xa9"	copyright
-+Ctrl<T> <c> <O>			: "\xc2\xa9"	copyright
-+Ctrl<T> <O> <c>			: "\xc2\xa9"	copyright
-+Ctrl<T> <C> <o>			: "\xc2\xa9"	copyright
-+Ctrl<T> <o> <C>			: "\xc2\xa9"	copyright
-+Ctrl<T> <c> <0>			: "\xc2\xa9"	copyright
-+Ctrl<T> <0> <c>			: "\xc2\xa9"	copyright
-+Ctrl<T> <C> <0>			: "\xc2\xa9"	copyright
-+Ctrl<T> <0> <C>			: "\xc2\xa9"	copyright
-+Ctrl<T> <a> <underscore>	: "\xc2\xaa"	ordfeminine
-+Ctrl<T> <underscore> <a>	: "\xc2\xaa"	ordfeminine
-+Ctrl<T> <A> <underscore>	: "\xc2\xaa"	ordfeminine
-+Ctrl<T> <underscore> <A>	: "\xc2\xaa"	ordfeminine
-+Ctrl<T> <O> <underscore>	: "\xc2\xba"	masculine
-+Ctrl<T> <o> <underscore>	: "\xc2\xba"	masculine
-+Ctrl<T> <underscore> <o>	: "\xc2\xba"	masculine
-+Ctrl<T> <underscore> <O>	: "\xc2\xba"	masculine
-+Ctrl<T> <less> <less>		: "\xc2\xab"	guillemotleft
-+Ctrl<T> <greater> <greater>	: "\xc2\xbb"	guillemotright
-+Ctrl<T> <0> <asciicircum>	: "\xc2\xb0"	degree
-+Ctrl<T> <asciicircum> <0>	: "\xc2\xb0"	degree
-+Ctrl<T> <0> <asterisk>		: "\xc2\xb0"	degree
-+Ctrl<T> <asterisk> <0>		: "\xc2\xb0"	degree
-+Ctrl<T> <plus> <minus>		: "\xc2\xb1"	plusminus
-+Ctrl<T> <minus> <plus>		: "\xc2\xb1"	plusminus
-+Ctrl<T> <slash> <u>		: "\xc2\xb5"	mu
-+Ctrl<T> <u> <slash>		: "\xc2\xb5"	mu
-+Ctrl<T> <slash> <U>		: "\xc2\xb5"	mu
-+Ctrl<T> <U> <slash>		: "\xc2\xb5"	mu
-+Ctrl<T> <1> <asciicircum>	: "\xc2\xb9"	onesuperior
-+Ctrl<T> <asciicircum> <1>	: "\xc2\xb9"	onesuperior
-+Ctrl<T> <S> <1>			: "\xc2\xb9"	onesuperior
-+Ctrl<T> <1> <S>			: "\xc2\xb9"	onesuperior
-+Ctrl<T> <s> <1>			: "\xc2\xb9"	onesuperior
-+Ctrl<T> <1> <s>			: "\xc2\xb9"	onesuperior
-+Ctrl<T> <2> <asciicircum>	: "\xc2\xb2"	twosuperior
-+Ctrl<T> <asciicircum> <2>	: "\xc2\xb2"	twosuperior
-+Ctrl<T> <S> <2>			: "\xc2\xb2"	twosuperior
-+Ctrl<T> <2> <S>			: "\xc2\xb2"	twosuperior
-+Ctrl<T> <s> <2>			: "\xc2\xb2"	twosuperior
-+Ctrl<T> <2> <s>			: "\xc2\xb2"	twosuperior
-+Ctrl<T> <3> <asciicircum>	: "\xc2\xb3"	threesuperior
-+Ctrl<T> <asciicircum> <3>	: "\xc2\xb3"	threesuperior
-+Ctrl<T> <S> <3>			: "\xc2\xb3"	threesuperior
-+Ctrl<T> <3> <S>			: "\xc2\xb3"	threesuperior
-+Ctrl<T> <s> <3>			: "\xc2\xb3"	threesuperior
-+Ctrl<T> <3> <s>			: "\xc2\xb3"	threesuperior
-+Ctrl<T> <p> <exclam>		: "\xc2\xb6"	paragraph
-+Ctrl<T> <exclam> <p>		: "\xc2\xb6"	paragraph
-+Ctrl<T> <P> <exclam>		: "\xc2\xb6"	paragraph
-+Ctrl<T> <exclam> <P>		: "\xc2\xb6"	paragraph
-+Ctrl<T> <period> <asciicircum>	: "\xc2\xb7"	periodcentered
-+Ctrl<T> <asciicircum> <period>	: "\xc2\xb7"	periodcentered
-+Ctrl<T> <period> <period>	: "\xc2\xb7"	periodcentered
-+Ctrl<T> <1> <4>			: "\xc2\xbc"	onequarter
-+Ctrl<T> <1> <2>			: "\xc2\xbd"	onehalf
-+Ctrl<T> <3> <4>			: "\xc2\xbe"	threequarters
-+Ctrl<T> <question> <question>	: "\xc2\xbf"	questiondown
-+Ctrl<T> <space> <space>		: "\xc2\xa0"	nobreakspace
-+Ctrl<T> <bar> <bar>		: "\xc2\xa6"	brokenbar
-+Ctrl<T> <exclam> <asciicircum>	: "\xc2\xa6"	brokenbar
-+Ctrl<T> <asciicircum> <exclam>	: "\xc2\xa6"	brokenbar
-+Ctrl<T> <V> <B>			: "\xc2\xa6"	brokenbar
-+Ctrl<T> <B> <V>			: "\xc2\xa6"	brokenbar
-+Ctrl<T> <v> <b>			: "\xc2\xa6"	brokenbar
-+Ctrl<T> <b> <v>			: "\xc2\xa6"	brokenbar
-+Ctrl<T> <minus> <comma>		: "\xc2\xac"	notsign
-+Ctrl<T> <comma> <minus>		: "\xc2\xac"	notsign
-+Ctrl<T> <minus> <minus>		: "\xc2\xad"	hyphen
-+Ctrl<T> <R> <O>			: "\xc2\xae"	registered
-+Ctrl<T> <O> <R>			: "\xc2\xae"	registered
-+Ctrl<T> <minus> <asciicircum>	: "\xc2\xaf"	macron
-+Ctrl<T> <asciicircum> <minus>	: "\xc2\xaf"	macron
-+Ctrl<T> <underscore> <asciicircum>	: "\xc2\xaf"	macron
-+Ctrl<T> <asciicircum> <underscore>	: "\xc2\xaf"	macron
-+Ctrl<T> <underscore> <underscore>	: "\xc2\xaf"	macron
-+Ctrl<T> <minus> <colon>		: "\xc3\xb7"	division
-+Ctrl<T> <colon> <minus>		: "\xc3\xb7"	division
-+Ctrl<T> <x> <x>			: "\xc3\x97"	multiply
-+Ctrl<T> <apostrophe> <apostrophe>	: "\xc2\xb4"	acute
-+Ctrl<T> <comma> <comma>		: "\xc2\xb8"	cedilla
-+Ctrl<T> <quotedbl> <quotedbl>	: "\xc2\xa8"	diaeresis
-+Ctrl<T> <A> <grave>		: "\xc3\x80"	Agrave
-+Ctrl<T> <grave> <A>		: "\xc3\x80"	Agrave
-+Ctrl<T> <A> <acute>		: "\xc3\x81"	Aacute
-+Ctrl<T> <acute> <A>		: "\xc3\x81"	Aacute
-+Ctrl<T> <A> <apostrophe>	: "\xc3\x81"	Aacute
-+Ctrl<T> <apostrophe> <A>	: "\xc3\x81"	Aacute
-+Ctrl<T> <A> <asciicircum>	: "\xc3\x82"	Acircumflex
-+Ctrl<T> <asciicircum> <A>	: "\xc3\x82"	Acircumflex
-+Ctrl<T> <A> <greater>		: "\xc3\x82"	Acircumflex
-+Ctrl<T> <greater> <A>		: "\xc3\x82"	Acircumflex
-+Ctrl<T> <A> <asciitilde>	: "\xc3\x83"	Atilde
-+Ctrl<T> <asciitilde> <A>	: "\xc3\x83"	Atilde
-+Ctrl<T> <A> <minus>		: "\xc3\x83"	Atilde
-+Ctrl<T> <minus> <A>		: "\xc3\x83"	Atilde
-+Ctrl<T> <A> <quotedbl>		: "\xc3\x84"	Adiaeresis
-+Ctrl<T> <quotedbl> <A>		: "\xc3\x84"	Adiaeresis
-+Ctrl<T> <A> <asterisk>		: "\xc3\x85"	Aring
-+Ctrl<T> <asterisk> <A>		: "\xc3\x85"	Aring
-+Ctrl<T> <A> <E>			: "\xc3\x86"	AE
-+Ctrl<T> <a> <grave>		: "\xc3\xa0"	agrave
-+Ctrl<T> <grave> <a>		: "\xc3\xa0"	agrave
-+Ctrl<T> <a> <acute>		: "\xc3\xa1"	aacute
-+Ctrl<T> <acute> <a>		: "\xc3\xa1"	aacute
-+Ctrl<T> <a> <apostrophe>	: "\xc3\xa1"	aacute
-+Ctrl<T> <apostrophe> <a>	: "\xc3\xa1"	aacute
-+Ctrl<T> <a> <asciicircum>	: "\xc3\xa2"	acircumflex
-+Ctrl<T> <asciicircum> <a>	: "\xc3\xa2"	acircumflex
-+Ctrl<T> <a> <greater>		: "\xc3\xa2"	acircumflex
-+Ctrl<T> <greater> <a>		: "\xc3\xa2"	acircumflex
-+Ctrl<T> <a> <asciitilde>	: "\xc3\xa3"	atilde
-+Ctrl<T> <asciitilde> <a>	: "\xc3\xa3"	atilde
-+Ctrl<T> <a> <minus>		: "\xc3\xa3"	atilde
-+Ctrl<T> <minus> <a>		: "\xc3\xa3"	atilde
-+Ctrl<T> <a> <quotedbl>		: "\xc3\xa4"	adiaeresis
-+Ctrl<T> <quotedbl> <a>		: "\xc3\xa4"	adiaeresis
-+Ctrl<T> <a> <asterisk>		: "\xc3\xa5"	aring
-+Ctrl<T> <asterisk> <a>		: "\xc3\xa5"	aring
-+Ctrl<T> <a> <e>			: "\xc3\xa6"	ae
-+Ctrl<T> <C> <comma>		: "\xc3\x87"	Ccedilla
-+Ctrl<T> <comma> <C>		: "\xc3\x87"	Ccedilla
-+Ctrl<T> <c> <comma>		: "\xc3\xa7"	ccedilla
-+Ctrl<T> <comma> <c>		: "\xc3\xa7"	ccedilla
-+Ctrl<T> <minus> <D>		: "\xc3\x90"	ETH
-+Ctrl<T> <D> <minus>		: "\xc3\x90"	ETH
-+Ctrl<T> <minus> <d>		: "\xc3\xb0"	eth
-+Ctrl<T> <d> <minus>		: "\xc3\xb0"	eth
-+Ctrl<T> <E> <grave>		: "\xc3\x88"	Egrave
-+Ctrl<T> <grave> <E>		: "\xc3\x88"	Egrave
-+Ctrl<T> <E> <acute>		: "\xc3\x89"	Eacute
-+Ctrl<T> <acute> <E>		: "\xc3\x89"	Eacute
-+Ctrl<T> <E> <apostrophe>	: "\xc3\x89"	Eacute
-+Ctrl<T> <apostrophe> <E>	: "\xc3\x89"	Eacute
-+Ctrl<T> <E> <asciicircum>	: "\xc3\x8a"	Ecircumflex
-+Ctrl<T> <asciicircum> <E>	: "\xc3\x8a"	Ecircumflex
-+Ctrl<T> <E> <greater>		: "\xc3\x8a"	Ecircumflex
-+Ctrl<T> <greater> <E>		: "\xc3\x8a"	Ecircumflex
-+Ctrl<T> <E> <quotedbl>		: "\xc3\x8b"	Ediaeresis
-+Ctrl<T> <quotedbl> <E>		: "\xc3\x8b"	Ediaeresis
-+Ctrl<T> <e> <grave>		: "\xc3\xa8"	egrave
-+Ctrl<T> <grave> <e>		: "\xc3\xa8"	egrave
-+Ctrl<T> <e> <acute>		: "\xc3\xa9"	eacute
-+Ctrl<T> <acute> <e>		: "\xc3\xa9"	eacute
-+Ctrl<T> <e> <apostrophe>	: "\xc3\xa9"	eacute
-+Ctrl<T> <apostrophe> <e>	: "\xc3\xa9"	eacute
-+Ctrl<T> <e> <asciicircum>	: "\xc3\xaa"	ecircumflex
-+Ctrl<T> <asciicircum> <e>	: "\xc3\xaa"	ecircumflex
-+Ctrl<T> <e> <greater>		: "\xc3\xaa"	ecircumflex
-+Ctrl<T> <greater> <e>		: "\xc3\xaa"	ecircumflex
-+Ctrl<T> <e> <quotedbl>		: "\xc3\xab"	ediaeresis
-+Ctrl<T> <quotedbl> <e>		: "\xc3\xab"	ediaeresis
-+Ctrl<T> <I> <grave>		: "\xc3\x8c"	Igrave
-+Ctrl<T> <grave> <I>		: "\xc3\x8c"	Igrave
-+Ctrl<T> <I> <acute>		: "\xc3\x8d"	Iacute
-+Ctrl<T> <acute> <I>		: "\xc3\x8d"	Iacute
-+Ctrl<T> <I> <apostrophe>	: "\xc3\x8d"	Iacute
-+Ctrl<T> <apostrophe> <I>	: "\xc3\x8d"	Iacute
-+Ctrl<T> <I> <asciicircum>	: "\xc3\x8e"	Icircumflex
-+Ctrl<T> <asciicircum> <I>	: "\xc3\x8e"	Icircumflex
-+Ctrl<T> <I> <greater>		: "\xc3\x8e"	Icircumflex
-+Ctrl<T> <greater> <I>		: "\xc3\x8e"	Icircumflex
-+Ctrl<T> <I> <quotedbl>		: "\xc3\x8f"	Idiaeresis
-+Ctrl<T> <quotedbl> <I>		: "\xc3\x8f"	Idiaeresis
-+Ctrl<T> <i> <grave>		: "\xc3\xac"	igrave
-+Ctrl<T> <grave> <i>		: "\xc3\xac"	igrave
-+Ctrl<T> <i> <acute>		: "\xc3\xad"	iacute
-+Ctrl<T> <acute> <i>		: "\xc3\xad"	iacute
-+Ctrl<T> <i> <apostrophe>	: "\xc3\xad"	iacute
-+Ctrl<T> <apostrophe> <i>	: "\xc3\xad"	iacute
-+Ctrl<T> <i> <asciicircum>	: "\xc3\xae"	icircumflex
-+Ctrl<T> <asciicircum> <i>	: "\xc3\xae"	icircumflex
-+Ctrl<T> <i> <greater>		: "\xc3\xae"	icircumflex
-+Ctrl<T> <greater> <i>		: "\xc3\xae"	icircumflex
-+Ctrl<T> <i> <quotedbl>		: "\xc3\xaf"	idiaeresis
-+Ctrl<T> <quotedbl> <i>		: "\xc3\xaf"	idiaeresis
-+Ctrl<T> <N> <asciitilde>	: "\xc3\x91"	Ntilde
-+Ctrl<T> <asciitilde> <N>	: "\xc3\x91"	Ntilde
-+Ctrl<T> <N> <minus>		: "\xc3\x91"	Ntilde
-+Ctrl<T> <minus> <N>		: "\xc3\x91"	Ntilde
-+Ctrl<T> <n> <asciitilde>	: "\xc3\xb1"	ntilde
-+Ctrl<T> <asciitilde> <n>	: "\xc3\xb1"	ntilde
-+Ctrl<T> <n> <minus>		: "\xc3\xb1"	ntilde
-+Ctrl<T> <minus> <n>		: "\xc3\xb1"	ntilde
-+Ctrl<T> <O> <grave>		: "\xc3\x92"	Ograve
-+Ctrl<T> <grave> <O>		: "\xc3\x92"	Ograve
-+Ctrl<T> <O> <acute>		: "\xc3\x93"	Oacute
-+Ctrl<T> <acute> <O>		: "\xc3\x93"	Oacute
-+Ctrl<T> <O> <apostrophe>	: "\xc3\x93"	Oacute
-+Ctrl<T> <apostrophe> <O>	: "\xc3\x93"	Oacute
-+Ctrl<T> <O> <asciicircum>	: "\xc3\x94"	Ocircumflex
-+Ctrl<T> <asciicircum> <O>	: "\xc3\x94"	Ocircumflex
-+Ctrl<T> <O> <greater>		: "\xc3\x94"	Ocircumflex
-+Ctrl<T> <greater> <O>		: "\xc3\x94"	Ocircumflex
-+Ctrl<T> <O> <asciitilde>	: "\xc3\x95"	Otilde
-+Ctrl<T> <asciitilde> <O>	: "\xc3\x95"	Otilde
-+Ctrl<T> <O> <minus>		: "\xc3\x95"	Otilde
-+Ctrl<T> <minus> <O>		: "\xc3\x95"	Otilde
-+Ctrl<T> <O> <quotedbl>		: "\xc3\x96"	Odiaeresis
-+Ctrl<T> <quotedbl> <O>		: "\xc3\x96"	Odiaeresis
-+Ctrl<T> <O> <slash>		: "\xc3\x98"	Ooblique
-+Ctrl<T> <slash> <O>		: "\xc3\x98"	Ooblique
-+Ctrl<T> <o> <grave>		: "\xc3\xb2"	ograve
-+Ctrl<T> <grave> <o>		: "\xc3\xb2"	ograve
-+Ctrl<T> <o> <acute>		: "\xc3\xb3"	oacute
-+Ctrl<T> <acute> <o>		: "\xc3\xb3"	oacute
-+Ctrl<T> <o> <apostrophe>	: "\xc3\xb3"	oacute
-+Ctrl<T> <apostrophe> <o>	: "\xc3\xb3"	oacute
-+Ctrl<T> <o> <asciicircum>	: "\xc3\xb4"	ocircumflex
-+Ctrl<T> <asciicircum> <o>	: "\xc3\xb4"	ocircumflex
-+Ctrl<T> <o> <greater>		: "\xc3\xb4"	ocircumflex
-+Ctrl<T> <greater> <o>		: "\xc3\xb4"	ocircumflex
-+Ctrl<T> <o> <asciitilde>	: "\xc3\xb5"	otilde
-+Ctrl<T> <asciitilde> <o>	: "\xc3\xb5"	otilde
-+Ctrl<T> <o> <minus>		: "\xc3\xb5"	otilde
-+Ctrl<T> <minus> <o>		: "\xc3\xb5"	otilde
-+Ctrl<T> <o> <quotedbl>		: "\xc3\xb6"	odiaeresis
-+Ctrl<T> <quotedbl> <o>		: "\xc3\xb6"	odiaeresis
-+Ctrl<T> <o> <slash>		: "\xc3\xb8"	oslash
-+Ctrl<T> <slash> <o>		: "\xc3\xb8"	oslash
-+Ctrl<T> <U> <grave>		: "\xc3\x99"	Ugrave
-+Ctrl<T> <grave> <U>		: "\xc3\x99"	Ugrave
-+Ctrl<T> <U> <acute>		: "\xc3\x9a"	Uacute
-+Ctrl<T> <acute> <U>		: "\xc3\x9a"	Uacute
-+Ctrl<T> <U> <apostrophe>	: "\xc3\x9a"	Uacute
-+Ctrl<T> <apostrophe> <U>	: "\xc3\x9a"	Uacute
-+Ctrl<T> <U> <asciicircum>	: "\xc3\x9b"	Ucircumflex
-+Ctrl<T> <asciicircum> <U>	: "\xc3\x9b"	Ucircumflex
-+Ctrl<T> <U> <greater>		: "\xc3\x9b"	Ucircumflex
-+Ctrl<T> <greater> <U>		: "\xc3\x9b"	Ucircumflex
-+Ctrl<T> <U> <quotedbl>		: "\xc3\x9c"	Udiaeresis
-+Ctrl<T> <quotedbl> <U>		: "\xc3\x9c"	Udiaeresis
-+Ctrl<T> <u> <grave>		: "\xc3\xb9"	ugrave
-+Ctrl<T> <grave> <u>		: "\xc3\xb9"	ugrave
-+Ctrl<T> <u> <acute>		: "\xc3\xba"	uacute
-+Ctrl<T> <acute> <u>		: "\xc3\xba"	uacute
-+Ctrl<T> <u> <apostrophe>	: "\xc3\xba"	uacute
-+Ctrl<T> <apostrophe> <u>	: "\xc3\xba"	uacute
-+Ctrl<T> <u> <asciicircum>	: "\xc3\xbb"	ucircumflex
-+Ctrl<T> <asciicircum> <u>	: "\xc3\xbb"	ucircumflex
-+Ctrl<T> <u> <greater>		: "\xc3\xbb"	ucircumflex
-+Ctrl<T> <greater> <u>		: "\xc3\xbb"	ucircumflex
-+Ctrl<T> <u> <quotedbl>		: "\xc3\xbc"	udiaeresis
-+Ctrl<T> <quotedbl> <u>		: "\xc3\xbc"	udiaeresis
-+Ctrl<T> <s> <s>			: "\xc3\x9f"	ssharp
-+Ctrl<T> <T> <H>			: "\xc3\x9e"	THORN
-+Ctrl<T> <t> <h>			: "\xc3\xbe"	thorn
-+Ctrl<T> <Y> <acute>		: "\xc3\x9d"	Yacute
-+Ctrl<T> <acute> <Y>		: "\xc3\x9d"	Yacute
-+Ctrl<T> <Y> <apostrophe>	: "\xc3\x9d"	Yacute
-+Ctrl<T> <apostrophe> <Y>	: "\xc3\x9d"	Yacute
-+Ctrl<T> <y> <acute>		: "\xc3\xbd"	yacute
-+Ctrl<T> <acute> <y>		: "\xc3\xbd"	yacute
-+Ctrl<T> <y> <apostrophe>	: "\xc3\xbd"	yacute
-+Ctrl<T> <apostrophe> <y>	: "\xc3\xbd"	yacute
-+Ctrl<T> <y> <quotedbl>		: "\xc3\xbf"	ydiaeresis
-+Ctrl<T> <quotedbl> <y>		: "\xc3\xbf"	ydiaeresis
-+XCOMM turkish
-+<Multi_key> <G> <u>		: "\xc4\x9e"	Gbreve
-+<Multi_key> <u> <G>		: "\xc4\x9e"	Gbreve
-+<Multi_key> <g> <u>		: "\xc4\x9f"	gbreve
-+<Multi_key> <u> <g>		: "\xc4\x9f"	gbreve
-+<Multi_key> <I> <period>	: "\xc4\xb0"	Iabovedot
-+<Multi_key> <period> <I>	: "\xc4\xb0"	Iabovedot
-+<Multi_key> <i> <period>	: "\xc4\xb1"	idotless
-+<Multi_key> <period> <i>	: "\xc4\xb1"	idotless
-+XCOMM polish
-+<Multi_key> <space> <breve>	: "\xcb\x98"	breve
-+<Multi_key> <space> <degree>	: "\xc2\xb0"	degree
-+<Multi_key> <space> <ogonek>	: "\xcb\x9b"	ogonek
-+<Multi_key> <space> <caron>	: "\xcb\x87"	caron
-+<Multi_key> <space> <v>		: "\xcb\x87"	caron
-+<Multi_key> <space> <doubleacute> : "\xcb\x9d"	doubleacute
-+<Multi_key> <diaeresis> <A>	: "\xc3\x84"	Adiaeresis
-+<Multi_key> <A> <diaeresis> 	: "\xc3\x84"	Adiaeresis
-+<Multi_key> <diaeresis> <E>	: "\xc3\x8b" 	Ediaeresis
-+<Multi_key> <E> <diaeresis> 	: "\xc3\x8b" 	Ediaeresis
-+<Multi_key> <diaeresis> <O>	: "\xc3\x96"	Odiaeresis
-+<Multi_key> <O> <diaeresis> 	: "\xc3\x96"	Odiaeresis
-+<Multi_key> <diaeresis> <U>	: "\xc3\x9c"	Udiaeresis
-+<Multi_key> <U> <diaeresis> 	: "\xc3\x9c"	Udiaeresis
-+<Multi_key> <diaeresis> <a>	: "\xc3\xa4"	adiaeresis
-+<Multi_key> <a> <diaeresis> 	: "\xc3\xa4"	adiaeresis
-+<Multi_key> <diaeresis> <e>	: "\xc3\xab"	ediaeresis
-+<Multi_key> <e> <diaeresis> 	: "\xc3\xab"	ediaeresis
-+<Multi_key> <diaeresis> <o>	: "\xc3\xb6"	odiaeresis
-+<Multi_key> <o> <diaeresis> 	: "\xc3\xb6"	odiaeresis
-+<Multi_key> <diaeresis> <u>	: "\xc3\xbc"	udiaeresis
-+<Multi_key> <u> <diaeresis> 	: "\xc3\xbc"	udiaeresis
-+<Multi_key> <acute> <R>		: "\xc5\x94"	Racute
-+<Multi_key> <R> <acute> 	: "\xc5\x94"	Racute
-+<Multi_key> <acute> <S>		: "\xc5\x9a"	Sacute
-+<Multi_key> <S> <acute> 	: "\xc5\x9a"	Sacute
-+<Multi_key> <acute> <Z>		: "\xc4\xbe"	Zacute
-+<Multi_key> <Z> <acute> 	: "\xc4\xbe"	Zacute
-+<Multi_key> <acute> <n>		: "\xc5\x84"	nacute
-+<Multi_key> <n> <acute> 	: "\xc5\x84"	nacute
-+<Multi_key> <acute> <r>		: "\xc5\x95"	racute
-+<Multi_key> <r> <acute> 	: "\xc5\x95"	racute
-+<Multi_key> <acute> <s>		: "\xc5\x9b"	sacute
-+<Multi_key> <s> <acute> 	: "\xc5\x9b"	sacute
-+<Multi_key> <acute> <z>		: "\xc5\xba"	zacute
-+<Multi_key> <z> <acute> 	: "\xc5\xba"	zacute
-+<Multi_key> <0> <O>		: "\xc2\xb0"	degree
-+<Multi_key> <o> <o> 		: "\xc2\xb0"	degree
-+<Multi_key> <comma> <S>		: "\xc5\x9e"	Scedilla
-+<Multi_key> <S> <comma> 	: "\xc5\x9e"	Scedilla
-+<Multi_key> <comma> <T>		: "\xc5\xa2"	Tcedilla
-+<Multi_key> <T> <comma> 	: "\xc5\xa2"	Tcedilla
-+<Multi_key> <comma> <s>		: "\xc5\x9f"	scedilla
-+<Multi_key> <s> <comma> 	: "\xc5\x9f"	scedilla
-+<Multi_key> <comma> <t>		: "\xc5\xa3"	tcedilla
-+<Multi_key> <t> <comma> 	: "\xc5\xa3"	tcedilla
-+<Multi_key> <caron> <C>		: "\xc4\x8c"	Ccaron
-+<Multi_key> <C> <caron> 	: "\xc4\x8c"	Ccaron
-+<Multi_key> <caron> <D>		: "\xc4\x8e"	Dcaron
-+<Multi_key> <D> <caron> 	: "\xc4\x8e"	Dcaron
-+<Multi_key> <caron> <E>		: "\xc4\x9a"	Ecaron
-+<Multi_key> <E> <caron> 	: "\xc4\x9a"	Ecaron
-+<Multi_key> <caron> <L>		: "\xc4\xbd"	Lcaron
-+<Multi_key> <L> <caron> 	: "\xc4\xbd"	Lcaron
-+<Multi_key> <caron> <N>		: "\xc5\x87" 	Ncaron
-+<Multi_key> <N> <caron>		: "\xc5\x87" 	Ncaron
-+<Multi_key> <caron> <R>		: "\xc5\x98"	Rcaron
-+<Multi_key> <R> <caron> 	: "\xc5\x98"	Rcaron
-+<Multi_key> <caron> <S>		: "\xc5\xa0"	Scaron
-+<Multi_key> <S> <caron> 	: "\xc5\xa0"	Scaron
-+<Multi_key> <caron> <T>		: "\xc5\xa4"	Tcaron
-+<Multi_key> <T> <caron> 	: "\xc5\xa4"	Tcaron
-+<Multi_key> <caron> <U>		: "\xc5\xae"	Uring
-+<Multi_key> <U> <caron> 	: "\xc5\xae"	Uring
-+<Multi_key> <caron> <c>		: "\xc4\x8d"	ccaron
-+<Multi_key> <c> <caron> 	: "\xc4\x8d"	ccaron
-+<Multi_key> <caron> <d>		: "\xc4\x8f"	dcaron
-+<Multi_key> <d> <caron> 	: "\xc4\x8f"	dcaron
-+<Multi_key> <caron> <e>		: "\xc4\x9b"	ecaron
-+<Multi_key> <e> <caron> 	: "\xc4\x9b"	ecaron
-+<Multi_key> <caron> <l>		: "\xc4\xbe"	lcaron
-+<Multi_key> <l> <caron> 	: "\xc4\xbe"	lcaron
-+<Multi_key> <caron> <n>		: "\xc5\x88"	ncaron
-+<Multi_key> <n> <caron> 	: "\xc5\x88"	ncaron
-+<Multi_key> <caron> <r>		: "\xc5\x99"	rcaron
-+<Multi_key> <r> <caron> 	: "\xc5\x99"	rcaron
-+<Multi_key> <caron> <s>		: "\xc5\xa1"	scaron
-+<Multi_key> <s> <caron> 	: "\xc5\xa1"	scaron
-+<Multi_key> <caron> <t>		: "\xc5\xa5"	tcaron
-+<Multi_key> <t> <caron> 	: "\xc5\xa5"	tcaron
-+<Multi_key> <caron> <u>		: "\xc5\xaf"	uring
-+<Multi_key> <u> <caron> 	: "\xc5\xaf"	uring
-+<Multi_key> <v> <C>		: "\xc4\x8c"	Ccaron
-+<Multi_key> <C> <v> 		: "\xc4\x8c"	Ccaron
-+<Multi_key> <v> <D>		: "\xc4\x8e"	Dcaron
-+<Multi_key> <D> <v> 		: "\xc4\x8e"	Dcaron
-+<Multi_key> <v> <E>		: "\xc4\x9a"	Ecaron
-+<Multi_key> <E> <v> 		: "\xc4\x9a"	Ecaron
-+<Multi_key> <v> <N>		: "\xc5\x87" 	Ncaron
-+<Multi_key> <N> <v>		: "\xc5\x87" 	Ncaron
-+<Multi_key> <v> <R>		: "\xc5\x98"	Rcaron
-+<Multi_key> <R> <v> 		: "\xc5\x98"	Rcaron
-+<Multi_key> <v> <T>		: "\xc5\xa4"	Tcaron
-+<Multi_key> <T> <v> 		: "\xc5\xa4"	Tcaron
-+<Multi_key> <v> <U>		: "\xc5\xae"	Uring
-+<Multi_key> <U> <v> 		: "\xc5\xae"	Uring
-+<Multi_key> <v> <c>		: "\xc4\x8d"	ccaron
-+<Multi_key> <c> <v> 		: "\xc4\x8d"	ccaron
-+<Multi_key> <v> <d>		: "\xc4\x8f"	dcaron
-+<Multi_key> <d> <v> 		: "\xc4\x8f"	dcaron
-+<Multi_key> <v> <e>		: "\xc4\x9b"	ecaron
-+<Multi_key> <e> <v> 		: "\xc4\x9b"	ecaron
-+<Multi_key> <v> <n>		: "\xc5\x88"	ncaron
-+<Multi_key> <n> <v> 		: "\xc5\x88"	ncaron
-+<Multi_key> <v> <r>		: "\xc5\x99"	rcaron
-+<Multi_key> <r> <v> 		: "\xc5\x99"	rcaron
-+<Multi_key> <v> <t>		: "\xc5\xa5"	tcaron
-+<Multi_key> <t> <v> 		: "\xc5\xa5"	tcaron
-+<Multi_key> <v> <u>		: "\xc5\xaf"	uring
-+<Multi_key> <u> <v> 		: "\xc5\xaf"	uring
-+<Multi_key> <breve> <A>		: "\xc4\x82"	Abreve
-+<Multi_key> <A> <breve> 	: "\xc4\x82"	Abreve
-+<Multi_key> <breve> <a>		: "\xc4\x83"	abreve
-+<Multi_key> <a> <breve> 	: "\xc4\x83"	abreve
-+<Multi_key> <ogonek> <A>	: "\xc4\x84"	Aogonek
-+<Multi_key> <A> <ogonek> 	: "\xc4\x84"	Aogonek
-+<Multi_key> <ogonek> <E>	: "\xc4\x98"	Eogonek
-+<Multi_key> <E> <ogonek> 	: "\xc4\x98"	Eogonek
-+<Multi_key> <ogonek> <a> 	: "\xc4\x85"	aogonek
-+<Multi_key> <a> <ogonek> 	: "\xc4\x85"	aogonek
-+<Multi_key> <ogonek> <e> 	: "\xc4\x99"	eogonek
-+<Multi_key> <e> <ogonek> 	: "\xc4\x99"	eogonek
-+<Multi_key> <E> <a> 		: "\xc4\x98"	Eogonek
-+<Multi_key> <e> <a> 		: "\xc4\x99"	eogonek
-+<Multi_key> <doubleacute> <O>	: "\xc5\x90"	Odoubleacute
-+<Multi_key> <O> <doubleacute> 	: "\xc5\x90"	Odoubleacute
-+<Multi_key> <doubleacute> <U>	: "\xc5\xb0"	Udoubleacute
-+<Multi_key> <U> <doubleacute> 	: "\xc5\xb0"	Udoubleacute
-+<Multi_key> <doubleacute> <o>	: "\xc5\x91"	odoubleacute
-+<Multi_key> <o> <doubleacute> 	: "\xc5\x91"	odoubleacute
-+<Multi_key> <doubleacute> <u>	: "\xc5\xb1"	udoubleacute
-+<Multi_key> <u> <doubleacute> 	: "\xc5\xb1"	udoubleacute
-+<Multi_key> <period> <U>	: "\xc5\xae"	Uring
-+<Multi_key> <U> <period> 	: "\xc5\xae"	Uring
-+<Multi_key> <period> <u>	: "\xc5\xaf"	uring
-+<Multi_key> <u> <period> 	: "\xc5\xaf"	uring
-+<Multi_key> <period> <z>	: "\xc5\xbc"	zabovedot
-+<Multi_key> <z> <period> 	: "\xc5\xbc"	zabovedot
-+<Multi_key> <period> <Z>	: "\xc5\xbb"	Zabovedot
-+<Multi_key> <Z> <period> 	: "\xc5\xbb"	Zabovedot
-+<acute> <A>		: "\xc3\x81"	Aacute
-+<acute> <C>		: "\xc4\x86"	Cacute
-+<acute> <E>		: "\xc3\x89"	Eacute
-+<acute> <I>		: "\xc3\x8d"	Iacute
-+<acute> <L>		: "\xc4\xb9"	Lacute
-+<acute> <N>		: "\xc5\x83"	Nacute
-+<acute> <O>		: "\xc3\x93"	Oacute
-+<acute> <R>		: "\xc5\x94"	Racute
-+<acute> <S>		: "\xc5\x9a"	Sacute
-+<acute> <U>		: "\xc3\x9a"	Uacute
-+<acute> <Y>		: "\xc3\x9d"	Yacute
-+<acute> <Z>		: "\xc4\xbe"	Zacute
-+<acute> <a>		: "\xc3\xa1"	aacute
-+<acute> <c>		: "\xc4\x87"	cacute
-+<acute> <e>		: "\xc3\xa9"	eacute
-+<acute> <i>		: "\xc3\xad"	iacute
-+<acute> <l>		: "\xc4\xba"	lacute
-+<acute> <n>		: "\xc5\x84"	nacute
-+<acute> <o>		: "\xc3\xb3"	oacute
-+<acute> <r>		: "\xc5\x95"	racute
-+<acute> <s>		: "\xc5\x9b"	sacute
-+<acute> <u>		: "\xc3\xba"	uacute
-+<acute> <y>		: "\xc3\xbd"	yacute
-+<acute> <z>		: "\xc5\xba"	zacute
-+<diaeresis> <A>		: "\xc3\x84" 	Adiaeresis
-+<diaeresis> <E>		: "\xc3\x8b"	Ediaeresis
-+<diaeresis> <O>		: "\xc3\x96"	Odiaeresis
-+<diaeresis> <U>		: "\xc3\x9c"	Udiaeresis
-+<diaeresis> <a>		: "\xc3\xa4" 	adiaeresis
-+<diaeresis> <e>		: "\xc3\xab"	ediaeresis
-+<diaeresis> <o>		: "\xc3\xb6"	odiaeresis
-+<diaeresis> <u>		: "\xc3\xbc"	udiaeresis
-+XCOMM
-+XCOMM Additional latin-2 sequences
-+<Ukrainian_IE>          : "\xd0\x84"    Ukrainian_IE
-+<Ukrainian_ie>          : "\xd1\x94"    Ukrainian_ie
-+<Ukrainian_I>           : "\xd0\x86"    Ukrainian_I
-+<Ukrainian_i>           : "\xd1\x96"    Ukrainian_i
-+<Ukrainian_GHE_WITH_UPTURN>     : "\xd2\x90"    Ukrainian_GHE_WITH_UPTURN
-+<Ukrainian_ghe_with_upturn>     : "\xd2\x91"    Ukrainian_ghe_with_upturn
-+<Ukrainian_YI>          : "\xd0\x87"    Ukrainian_YI
-+<Ukrainian_yi>          : "\xd1\x97"    Ukrainian_yi
-+<Serbian_TSHE>          : "\xd0\x8b"    Serbian_TSHE
-+<Serbian_tshe>          : "\xd1\x9b"    Serbian_tshe
-+<Serbian_DJE>           : "\xd0\x82"    Serbian_DJE
-+<Serbian_dje>           : "\xd1\x92"    Serbian_dje
-+<Macedonia_GJE>         : "\xd0\x83"    Macedonia_GJE
-+<Macedonia_gje>         : "\xd1\x93"    Macedonia_gje
-+<Macedonia_KJE>         : "\xd0\x8c"    Macedonia_KJE
-+<Macedonia_kje>         : "\xd1\x9c"    Macedonia_kje
-+<Macedonia_DSE>         : "\xd0\x85"    Macedonia_DSE
-+<Macedonia_dse>         : "\xd1\x95"    Macedonia_dse
-+<Byelorussian_SHORTU>   : "\xd0\x8e"    Byelorussian_SHORTU
-+<Byelorussian_shortu>   : "\xd1\x9e"    Byelorussian_shortu
-+XCOMM Cyrillic keysyms:
-+<Zabovedot>             : "\xc5\xbb"    Zabovedot
-+<zabovedot>             : "\xc5\xbc"    zabovedot
-+<Gabovedot>             : "\xc4\xa0"    Gabovedot
-+<gabovedot>             : "\xc4\xa1"    gabovedot
-+<Cabovedot>             : "\xc4\x8a"    Cabovedot
-+<cabovedot>             : "\xc4\x8b"    cabovedot
-+XCOMM Additional Latin-3 keysyms and compose sequences:
-+<multiply>              : "\xc3\x97"    multiply
-+<division>              : "\xc3\xb7"    division
-+<dead_ogonek> <e>       : "\xc4\x99"    eogonek
-+<dead_ogonek> <E>       : "\xc4\x98"    Eogonek
-+<dead_ogonek> <a>       : "\xc4\x85"    aogonek
-+<dead_ogonek> <A>       : "\xc4\x84"    Aogonek
-+<dead_doubleacute> <u>  : "\xc5\xb1"    udoubleacute
-+<dead_doubleacute> <U>  : "\xc5\xb0"    Udoubleacute
-+<dead_doubleacute> <o>  : "\xc5\x91"    odoubleacute
-+<dead_doubleacute> <O>  : "\xc5\x90"    Odoubleacute
-+<dead_caron> <z>        : "\xc5\xbe"    zcaron
-+<dead_caron> <Z>        : "\xc5\xbd"    Zcaron
-+<dead_caron> <t>        : "\xc5\xa5"    tcaron
-+<dead_caron> <T>        : "\xc5\xa4"    Tcaron
-+<dead_caron> <s>        : "\xc5\xa1"    scaron
-+<dead_caron> <S>        : "\xc5\xa0"    Scaron
-+<dead_caron> <r>        : "\xc5\x99"    rcaron
-+<dead_caron> <R>        : "\xc5\x98"    Rcaron
-+<dead_caron> <n>        : "\xc5\x88"    ncaron
-+<dead_caron> <N>        : "\xc5\x87"    Ncaron
-+<dead_caron> <l>        : "\xc4\xbe"    lcaron
-+<dead_caron> <L>        : "\xc4\xbd"    Lcaron
-+<dead_caron> <e>        : "\xc4\x9b"    ecaron
-+<dead_caron> <E>        : "\xc4\x9a"    Ecaron
-+<dead_caron> <d>        : "\xc4\x8f"    dcaron
-+<dead_caron> <D>        : "\xc4\x8e"    Dcaron
-+<dead_caron> <c>        : "\xc4\x8d"    ccaron
-+<dead_caron> <C>        : "\xc4\x8c"    Ccaron
-+<dead_breve> <a>        : "\xc4\x83"    abreve
-+<dead_breve> <A>        : "\xc4\x82"    Abreve
-+<dead_abovering> <u>    : "\xc5\xaf"    uring
-+<dead_abovering> <U>    : "\xc5\xae"    Uring
-+<dead_abovering> <a>    : "\xc3\xa5"    aring
-+<dead_abovering> <A>    : "\xc3\x85"    Aring
-+<dead_abovedot> <z>     : "\xc5\xbc"    zabovedot
-+<dead_abovedot> <Z>     : "\xc5\xbb"    Zabovedot
-+<dead_abovedot> <I>     : "\xc4\xb0"    Iabovedot
-+<dead_abovedot> <g>     : "\xc4\xa1"    gabovedot
-+<dead_abovedot> <G>     : "\xc4\xa0"    Gabovedot
-+<dead_abovedot> <e>     : "\xc4\x97"    eabovedot
-+<dead_abovedot> <E>     : "\xc4\x96"    Eabovedot
-+<dead_abovedot> <c>     : "\xc4\x8b"    cabovedot
-+<dead_abovedot> <C>     : "\xc4\x8a"    Cabovedot
-+XCOMM Latin-2 dead key compose sequences and keysyms for division and multiply:
-+<dead_diaeresis> <Y>            : "\xc5\xb8"
-+<SunFA_Diaeresis> <Y>           : "\xc5\xb8"
-+Ctrl<T> <quotedbl> <Y>          : "\xc5\xb8"
-+Ctrl<T> <Y> <quotedbl>          : "\xc5\xb8"
-+Ctrl<T> <O> <E>                 : "\xc5\x92"
-+Ctrl<T> <o> <e>                 : "\xc5\x93"
-+<Multi_key> <quotedbl> <Y>      : "\xc5\xb8"
-+<Multi_key> <Y> <quotedbl>      : "\xc5\xb8"
-+<Multi_key> <O> <E>             : "\xc5\x92"
-+<Multi_key> <o> <e>             : "\xc5\x93"
-+<tcaron>                : "\xc5\xa5"    tcaron
-+<dcaron>                : "\xc4\x8f"    dcaron
-+Ctrl<T> <slash> <H>     : "\xc4\xa6"    Hstroke
-+Ctrl<T> <H> <slash>     : "\xc4\xa6"    Hstroke
-+Ctrl<T> <bar> <H>       : "\xc4\xa6"    Hstroke
-+Ctrl<T> <H> <bar>       : "\xc4\xa6"    Hstroke
-+Ctrl<T> <slash> <h>     : "\xc4\xa7"    hstroke
-+Ctrl<T> <h> <slash>     : "\xc4\xa7"    hstroke
-+Ctrl<T> <bar> <h>       : "\xc4\xa7"    hstroke
-+Ctrl<T> <h> <bar>       : "\xc4\xa7"    hstroke
-+<Multi_key> <slash> <H> : "\xc4\xa6"    Hstroke
-+<Multi_key> <H> <slash> : "\xc4\xa6"    Hstroke
-+<Multi_key> <bar> <H>   : "\xc4\xa6"    Hstroke
-+<Multi_key> <H> <bar>   : "\xc4\xa6"    Hstroke
-+<Multi_key> <slash> <h> : "\xc4\xa7"    hstroke
-+<Multi_key> <h> <slash> : "\xc4\xa7"    hstroke
-+<Multi_key> <bar> <h>   : "\xc4\xa7"    hstroke
-+<Multi_key> <h> <bar>   : "\xc4\xa7"    hstroke
-+<Hstroke>               : "\xc4\xa6"    Hstroke
-+<hstroke>               : "\xc4\xa7"    hstroke
-+<Multi_key> <a> <space>		: "\xcb\x9b"	ogonek
-+<Multi_key> <u> <space>		: "\xcb\x98"	breve
-+<Multi_key> <v> <space>		: "\xcb\x87"	caron
-+<Multi_key> <quotedbl> <space>	: "\xcb\x9d"	doubleacute
-+<Multi_key> <A> <u>		: "\xc4\x82"	Abreve
-+<Multi_key> <C> <apostrophe>	: "\xc4\x86"	Cacute
-+<Multi_key> <L> <apostrophe>	: "\xc4\xb9"	Lacute
-+<Multi_key> <L> <slash>		: "\xc5\x81"	Lstroke
-+<Multi_key> <L> <greater>	: "\xc4\xbd"	Lcaron
-+<Multi_key> <N> <apostrophe>	: "\xc5\x83"	Nacute
-+<Multi_key> <S> <apostrophe>	: "\xc5\x9a"	Sacute
-+<Multi_key> <R> <apostrophe>	: "\xc5\x94"	Racute
-+<Multi_key> <U> <asterisk>	: "\xc5\xae"	Uring
-+<Multi_key> <Z> <apostrophe>	: "\xc5\xb9"	Zacute
-+<Multi_key> <a> <u>		: "\xc4\x83"	abreve
-+<Multi_key> <c> <apostrophe>	: "\xc4\x87"	cacute
-+<Multi_key> <l> <apostrophe>	: "\xc4\xba"	lacute
-+<Multi_key> <l> <slash>		: "\xc5\x82"	lstroke
-+<Multi_key> <l> <greater>	: "\xc4\xbe"	lcaron
-+<Multi_key> <n> <apostrophe>	: "\xc5\x84"	nacute
-+<Multi_key> <s> <apostrophe>	: "\xc5\x9b"	sacute
-+<Multi_key> <r> <apostrophe>	: "\xc5\x95"	racute
-+<Multi_key> <u> <asterisk>	: "\xc5\xaf"	uring
-+<Multi_key> <z> <apostrophe>	: "\xc5\xba"	zacute
-+XCOMM
-+XCOMM Latin-3 sequences
-+<Multi_key> <C> <asciicircum>	: "\xc4\x88"	Ccircumflex
-+<Multi_key> <asciicircum> <C>	: "\xc4\x88"	Ccircumflex
-+<Multi_key> <C> <greater>	: "\xc4\x88"	Ccircumflex
-+<Multi_key> <greater> <C>	: "\xc4\x88"	Ccircumflex
-+
-+<Multi_key> <c> <asciicircum>	: "\xc4\x89"	ccircumflex
-+<Multi_key> <asciicircum> <c>	: "\xc4\x89"	ccircumflex
-+<Multi_key> <c> <greater>	: "\xc4\x89"	ccircumflex
-+<Multi_key> <greater> <c>	: "\xc4\x89"	ccircumflex
-+
-+<Multi_key> <period> <C>	: "\xc4\x8a"	Cabovedot
-+<Multi_key> <C> <period> 	: "\xc4\x8a"	Cabovedot
-+
-+<Multi_key> <period> <c>	: "\xc4\x8b"	cabovedot
-+<Multi_key> <c> <period> 	: "\xc4\x8b"	cabovedot
-+
-+<Multi_key> <G> <asciicircum>	: "\xc4\x9c"	Gcircumflex
-+<Multi_key> <asciicircum> <G>	: "\xc4\x9c"	Gcircumflex
-+<Multi_key> <G> <greater>	: "\xc4\x9c"	Gcircumflex
-+<Multi_key> <greater> <G>	: "\xc4\x9c"	Gcircumflex
-+
-+<Multi_key> <g> <asciicircum>	: "\xc4\x9d"	gcircumflex
-+<Multi_key> <asciicircum> <g>	: "\xc4\x9d"	gcircumflex
-+<Multi_key> <g> <greater>	: "\xc4\x9d"	gcircumflex
-+<Multi_key> <greater> <g>	: "\xc4\x9d"	gcircumflex
-+
-+<Multi_key> <period> <G>	: "\xc4\xa0"	Gabovedot
-+<Multi_key> <G> <period> 	: "\xc4\xa0"	Gabovedot
-+
-+<Multi_key> <period> <g>	: "\xc4\xa1"	gabovedot
-+<Multi_key> <g> <period> 	: "\xc4\xa1"	gabovedot
-+
-+<Multi_key> <H> <asciicircum>	: "\xc4\xa4"	Hcircumflex
-+<Multi_key> <asciicircum> <H>	: "\xc4\xa4"	Hcircumflex
-+<Multi_key> <H> <greater>	: "\xc4\xa4"	Hcircumflex
-+<Multi_key> <greater> <H>	: "\xc4\xa4"	Hcircumflex
-+
-+<Multi_key> <h> <asciicircum>	: "\xc4\xa5"	hcircumflex
-+<Multi_key> <asciicircum> <h>	: "\xc4\xa5"	hcircumflex
-+<Multi_key> <h> <greater>	: "\xc4\xa5"	hcircumflex
-+<Multi_key> <greater> <h>	: "\xc4\xa5"	hcircumflex
-+
-+<Multi_key> <J> <asciicircum>	: "\xc4\xb4"	Jcircumflex
-+<Multi_key> <asciicircum> <J>	: "\xc4\xb4"	Jcircumflex
-+<Multi_key> <J> <greater>	: "\xc4\xb4"	Jcircumflex
-+<Multi_key> <greater> <J>	: "\xc4\xb4"	Jcircumflex
-+
-+<Multi_key> <j> <asciicircum>	: "\xc4\xb5"	jcircumflex
-+<Multi_key> <asciicircum> <j>	: "\xc4\xb5"	jcircumflex
-+<Multi_key> <j> <greater>	: "\xc4\xb5"	jcircumflex
-+<Multi_key> <greater> <j>	: "\xc4\xb5"	jcircumflex
-+
-+<Multi_key> <S> <asciicircum>	: "\xc5\x9c"	Scircumflex
-+<Multi_key> <asciicircum> <S>	: "\xc5\x9c"	Scircumflex
-+<Multi_key> <S> <greater>	: "\xc5\x9c"	Scircumflex
-+<Multi_key> <greater> <S>	: "\xc5\x9c"	Scircumflex
-+
-+<Multi_key> <s> <asciicircum>	: "\xc5\x9d"	scircumflex
-+<Multi_key> <asciicircum> <s>	: "\xc5\x9d"	scircumflex
-+<Multi_key> <s> <greater>	: "\xc5\x9d"	scircumflex
-+<Multi_key> <greater> <s>	: "\xc5\x9d"	scircumflex
-+
-+<Multi_key> <U> <breve>		: "\xc5\xac"	Ubreve
-+<Multi_key> <breve> <U>		: "\xc5\xac"	Ubreve
-+<Multi_key> <U> <u>		: "\xc5\xac"	Ubreve
-+<Multi_key> <u> <U>		: "\xc5\xac"	Ubreve
-+
-+<Multi_key> <u> <breve>		: "\xc5\xad"	ubreve
-+<Multi_key> <breve> <u>		: "\xc5\xad"	ubreve
-+<Multi_key> <u> <u>		: "\xc5\xad"	ubreve
-+XCOMM
-+XCOMM Latin-4 sequences
-+<Multi_key> <N> <N>		: "\xc5\x8a"	ENG
-+<Multi_key> <U> <a>		: "\xc5\xb2"	Uogonek
-+<Multi_key> <u> <a>		: "\xc5\xb3"	uogonek
-+<Multi_key> <k> <k>		: "\xc4\xb8"	kra
-+<Multi_key> <R> <comma>		: "\xc5\x96"	Rcedilla
-+<Multi_key> <comma> <R>		: "\xc5\x96"	Rcedilla
-+<Multi_key> <r> <comma>		: "\xc5\x97"	rcedilla
-+<Multi_key> <comma> <r>		: "\xc5\x97"	rcedilla
-+<Multi_key> <I> <asciitilde>	: "\xc4\xa8"	Itilde
-+<Multi_key> <asciitilde> <I>	: "\xc4\xa8"	Itilde
-+<Multi_key> <i> <asciitilde>	: "\xc4\xa9"	itilde
-+<Multi_key> <asciitilde> <i>	: "\xc4\xa9"	itilde
-+<Multi_key> <L> <comma>		: "\xc4\xbb"	Lcedilla
-+<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
-+<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
-+<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
-+<diaeresis>			: "\xc2\xa8"	diaeresis
-+<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
-+<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
-+<Multi_key> <v> <S>		: "\xc5\xa0"	Scaron
-+<Multi_key> <V> <S>		: "\xc5\xa0"	Scaron
-+<Multi_key> <s> <v>		: "\xc5\xa1"	scaron
-+<Multi_key> <s> <V>		: "\xc5\xa1"	scaron
-+<Multi_key> <v> <s>		: "\xc5\xa1"	scaron
-+<Multi_key> <V> <s>		: "\xc5\xa1"	scaron
-+<Multi_key> <E> <underscore>	: "\xc4\x92"	Emacron
-+<Multi_key> <underscore> <E>	: "\xc4\x92"	Emacron
-+<Multi_key> <e> <underscore>	: "\xc4\x93"	emacron
-+<Multi_key> <underscore> <e>	: "\xc4\x93"	emacron
-+<Multi_key> <G> <comma>		: "\xc4\xa2"	Gcedilla
-+<Multi_key> <comma> <G>		: "\xc4\xa2"	Gcedilla
-+<Multi_key> <g> <comma>		: "\xc4\xa3"	gcedilla
-+<Multi_key> <comma> <g>		: "\xc4\xa3"	gcedilla
-+<Multi_key> <T> <bar>		: "\xc5\xa6"	Tslash
-+<Multi_key> <bar> <T>		: "\xc5\xa6"	Tslash
-+<Multi_key> <t> <bar>		: "\xc5\xa7"	tslash
-+<Multi_key> <bar> <t>		: "\xc5\xa7"	tslash
-+<Multi_key> <n> <n>		: "\xc5\x8b" 	eng
-+<Multi_key> <A> <underscore>	: "\xc4\x80"	Amacron
-+<Multi_key> <underscore> <A>	: "\xc4\x80"	Amacron
-+<Multi_key> <a> <underscore>	: "\xc4\x81"	amacron
-+<Multi_key> <underscore> <a>	: "\xc4\x81"	amacron
-+<Multi_key> <d> <underscore>	: "\xc4\x91"
-+<Multi_key> <underscore> <d> 	: "\xc4\x91"
-+<Multi_key> <N> <comma>		: "\xc5\x85"	Ncedilla
-+<Multi_key> <comma> <N>		: "\xc5\x85"	Ncedilla
-+<Multi_key> <n> <comma>		: "\xc5\x86"	ncedilla
-+<Multi_key> <comma> <n>		: "\xc5\x86"	ncedilla
-+<Multi_key> <O> <underscore>	: "\xc5\x8c"	Omacron
-+<Multi_key> <underscore> <O>	: "\xc5\x8c"	Omacron
-+<Multi_key> <o> <underscore>	: "\xc5\x8d"	omacron
-+<Multi_key> <underscore> <o>	: "\xc5\x8d"	omacron
-+<Multi_key> <K> <comma>		: "\xc4\xb6"	Kcedilla
-+<Multi_key> <comma> <K>		: "\xc4\xb6"	Kcedilla
-+<Multi_key> <k> <comma>		: "\xc4\xb7"	kcedilla
-+<Multi_key> <comma> <k>		: "\xc4\xb7"	kcedilla
-+<Multi_key> <I> <a>		: "\xc4\xae"	Iogonek
-+<Multi_key> <a> <I>		: "\xc4\xae"	Iogonek
-+<Multi_key> <i> <a>		: "\xc4\xaf"	iogonek
-+<Multi_key> <a> <i>		: "\xc4\xaf"	iogonek
-+<Multi_key> <E> <period>	: "\xc4\x96"	Eabovedot
-+<Multi_key> <e> <period>	: "\xc4\x97"	eabovedot
-+<Multi_key> <U> <asciitilde>	: "\xc5\xa8"	Utilde
-+<Multi_key> <asciitilde> <U>	: "\xc5\xa8"	Utilde
-+<Multi_key> <u> <asciitilde>	: "\xc5\xa9"	utilde
-+<Multi_key> <asciitilde> <u>	: "\xc5\xa9"	utilde
-+<Multi_key> <U> <underscore>	: "\xc5\xaa"	Umacron
-+<Multi_key> <underscore> <U>	: "\xc5\xaa"	Umacron
-+<Multi_key> <u> <underscore>	: "\xc5\xab"	umacron
-+<Multi_key> <underscore> <u>	: "\xc5\xab"	umacron
-+<Multi_key> <I> <underscore>	: "\xc4\xaa"	Imacron
-+<Multi_key> <underscore> <I> 	: "\xc4\xaa"	Imacron
-+<Multi_key> <i> <underscore>	: "\xc4\xab"	imacron
-+<Multi_key> <underscore> <i> 	: "\xc4\xab"	imacron
-+
-+XCOMM Ctrl<T> combo
-+Ctrl<T> <a> <A>			: "\xc4\x84"	Aogonek
-+Ctrl<T> <A> <a> 			: "\xc4\x84"	Aogonek
-+Ctrl<T> <a> <a> 			: "\xc4\x85"	aogonek
-+Ctrl<T> <C> <acute> 		: "\xc4\x86"	Cacute
-+Ctrl<T> <c> <acute> 		: "\xc4\x87"	cacute
-+Ctrl<T> <acute> <C>			: "\xc4\x86"	Cacute
-+Ctrl<T> <acute> <c>			: "\xc4\x87"	cacute
-+Ctrl<T> <acute> <N>			: "\xc5\x83"	Nacute
-+Ctrl<T> <N> <acute> 		: "\xc5\x83"	Nacute
-+XCOMM Ctrl<T> <minus> <D>		: "\xc3\x90"	ETH
-+XCOMM Ctrl<T> <minus> <d>		: "\xc3\xb0"	eth
-+Ctrl<T> <slash> <D>			: "\xc4\x90"	Dstroke
-+Ctrl<T> <slash> <d>			: "\xc4\x91"	dstroke
-+Ctrl<T> <caron> <Z>		: "\xc5\xbd"	Zcaron
-+Ctrl<T> <Z> <caron> 	: "\xc5\xbd"	Zcaron
-+Ctrl<T> <v> <Z>		: "\xc5\xbd"	Zcaron
-+Ctrl<T> <Z> <v>		: "\xc5\xbd"	Zcaron
-+Ctrl<T> <caron> <z>		: "\xc5\xbe"	zcaron
-+Ctrl<T> <z> <caron> 	: "\xc5\xbe"	zcaron
-+Ctrl<T> <z> <v>		: "\xc5\xbe"	zcaron
-+Ctrl<T> <v> <z>		: "\xc5\xbe"	zcaron
-+Ctrl<T> <G> <u>		: "\xc4\x9e"	Gbreve
-+Ctrl<T> <u> <G>		: "\xc4\x9e"	Gbreve
-+Ctrl<T> <g> <u>		: "\xc4\x9f"	gbreve
-+Ctrl<T> <u> <g>		: "\xc4\x9f"	gbreve
-+Ctrl<T> <I> <period>	: "\xc4\xb0"	Iabovedot
-+Ctrl<T> <period> <I>	: "\xc4\xb0"	Iabovedot
-+Ctrl<T> <i> <period>	: "\xc4\xb1"	idotless
-+Ctrl<T> <period> <i>	: "\xc4\xb1"	idotless
-+Ctrl<T> <space> <breve>	: "\xcb\x98"	breve
-+Ctrl<T> <space> <degree>	: "\xc2\xb0"	degree
-+Ctrl<T> <space> <ogonek>	: "\xcb\x9b"	ogonek
-+Ctrl<T> <space> <caron>	: "\xcb\x87"	caron
-+Ctrl<T> <space> <v>		: "\xcb\x87"	caron
-+Ctrl<T> <space> <doubleacute> : "\xcb\x9d"	doubleacute
-+Ctrl<T> <diaeresis> <A>	: "\xc3\x84"	Adiaeresis
-+Ctrl<T> <A> <diaeresis> 	: "\xc3\x84"	Adiaeresis
-+Ctrl<T> <diaeresis> <E>	: "\xc3\x8b" 	Ediaeresis
-+Ctrl<T> <E> <diaeresis> 	: "\xc3\x8b" 	Ediaeresis
-+Ctrl<T> <diaeresis> <O>	: "\xc3\x96"	Odiaeresis
-+Ctrl<T> <O> <diaeresis> 	: "\xc3\x96"	Odiaeresis
-+Ctrl<T> <diaeresis> <U>	: "\xc3\x9c"	Udiaeresis
-+Ctrl<T> <U> <diaeresis> 	: "\xc3\x9c"	Udiaeresis
-+Ctrl<T> <diaeresis> <a>	: "\xc3\xa4"	adiaeresis
-+Ctrl<T> <a> <diaeresis> 	: "\xc3\xa4"	adiaeresis
-+Ctrl<T> <diaeresis> <e>	: "\xc3\xab"	ediaeresis
-+Ctrl<T> <e> <diaeresis> 	: "\xc3\xab"	ediaeresis
-+Ctrl<T> <diaeresis> <o>	: "\xc3\xb6"	odiaeresis
-+Ctrl<T> <o> <diaeresis> 	: "\xc3\xb6"	odiaeresis
-+Ctrl<T> <diaeresis> <u>	: "\xc3\xbc"	udiaeresis
-+Ctrl<T> <u> <diaeresis> 	: "\xc3\xbc"	udiaeresis
-+Ctrl<T> <acute> <R>		: "\xc5\x94"	Racute
-+Ctrl<T> <R> <acute> 	: "\xc5\x94"	Racute
-+Ctrl<T> <acute> <S>		: "\xc5\x9a"	Sacute
-+Ctrl<T> <S> <acute> 	: "\xc5\x9a"	Sacute
-+Ctrl<T> <acute> <Z>		: "\xc4\xbe"	Zacute
-+Ctrl<T> <Z> <acute> 	: "\xc4\xbe"	Zacute
-+Ctrl<T> <acute> <n>		: "\xc5\x84"	nacute
-+Ctrl<T> <n> <acute> 	: "\xc5\x84"	nacute
-+Ctrl<T> <acute> <r>		: "\xc5\x95"	racute
-+Ctrl<T> <r> <acute> 	: "\xc5\x95"	racute
-+Ctrl<T> <acute> <s>		: "\xc5\x9b"	sacute
-+Ctrl<T> <s> <acute> 	: "\xc5\x9b"	sacute
-+Ctrl<T> <acute> <z>		: "\xc5\xba"	zacute
-+Ctrl<T> <z> <acute> 	: "\xc5\xba"	zacute
-+Ctrl<T> <0> <O>		: "\xc2\xb0"	degree
-+Ctrl<T> <o> <o> 		: "\xc2\xb0"	degree
-+Ctrl<T> <comma> <S>		: "\xc5\x9e"	Scedilla
-+Ctrl<T> <S> <comma> 	: "\xc5\x9e"	Scedilla
-+Ctrl<T> <comma> <T>		: "\xc5\xa2"	Tcedilla
-+Ctrl<T> <T> <comma> 	: "\xc5\xa2"	Tcedilla
-+Ctrl<T> <comma> <s>		: "\xc5\x9f"	scedilla
-+Ctrl<T> <s> <comma> 	: "\xc5\x9f"	scedilla
-+Ctrl<T> <comma> <t>		: "\xc5\xa3"	tcedilla
-+Ctrl<T> <t> <comma> 	: "\xc5\xa3"	tcedilla
-+Ctrl<T> <caron> <C>		: "\xc4\x8c"	Ccaron
-+Ctrl<T> <C> <caron> 	: "\xc4\x8c"	Ccaron
-+Ctrl<T> <caron> <D>		: "\xc4\x8e"	Dcaron
-+Ctrl<T> <D> <caron> 	: "\xc4\x8e"	Dcaron
-+Ctrl<T> <caron> <E>		: "\xc4\x9a"	Ecaron
-+Ctrl<T> <E> <caron> 	: "\xc4\x9a"	Ecaron
-+Ctrl<T> <caron> <L>		: "\xc4\xbd"	Lcaron
-+Ctrl<T> <L> <caron> 	: "\xc4\xbd"	Lcaron
-+Ctrl<T> <caron> <N>		: "\xc5\x87" 	Ncaron
-+Ctrl<T> <N> <caron>		: "\xc5\x87" 	Ncaron
-+Ctrl<T> <caron> <R>		: "\xc5\x98"	Rcaron
-+Ctrl<T> <R> <caron> 	: "\xc5\x98"	Rcaron
-+Ctrl<T> <caron> <S>		: "\xc5\xa0"	Scaron
-+Ctrl<T> <S> <caron> 	: "\xc5\xa0"	Scaron
-+Ctrl<T> <caron> <T>		: "\xc5\xa4"	Tcaron
-+Ctrl<T> <T> <caron> 	: "\xc5\xa4"	Tcaron
-+Ctrl<T> <caron> <U>		: "\xc5\xae"	Uring
-+Ctrl<T> <U> <caron> 	: "\xc5\xae"	Uring
-+Ctrl<T> <caron> <c>		: "\xc4\x8d"	ccaron
-+Ctrl<T> <c> <caron> 	: "\xc4\x8d"	ccaron
-+Ctrl<T> <caron> <d>		: "\xc4\x8f"	dcaron
-+Ctrl<T> <d> <caron> 	: "\xc4\x8f"	dcaron
-+Ctrl<T> <caron> <e>		: "\xc4\x9b"	ecaron
-+Ctrl<T> <e> <caron> 	: "\xc4\x9b"	ecaron
-+Ctrl<T> <caron> <l>		: "\xc4\xbe"	lcaron
-+Ctrl<T> <l> <caron> 	: "\xc4\xbe"	lcaron
-+Ctrl<T> <caron> <n>		: "\xc5\x88"	ncaron
-+Ctrl<T> <n> <caron> 	: "\xc5\x88"	ncaron
-+Ctrl<T> <caron> <r>		: "\xc5\x99"	rcaron
-+Ctrl<T> <r> <caron> 	: "\xc5\x99"	rcaron
-+Ctrl<T> <caron> <s>		: "\xc5\xa1"	scaron
-+Ctrl<T> <s> <caron> 	: "\xc5\xa1"	scaron
-+Ctrl<T> <caron> <t>		: "\xc5\xa5"	tcaron
-+Ctrl<T> <t> <caron> 	: "\xc5\xa5"	tcaron
-+Ctrl<T> <caron> <u>		: "\xc5\xaf"	uring
-+Ctrl<T> <u> <caron> 	: "\xc5\xaf"	uring
-+Ctrl<T> <v> <C>		: "\xc4\x8c"	Ccaron
-+Ctrl<T> <C> <v> 		: "\xc4\x8c"	Ccaron
-+Ctrl<T> <v> <D>		: "\xc4\x8e"	Dcaron
-+Ctrl<T> <D> <v> 		: "\xc4\x8e"	Dcaron
-+Ctrl<T> <v> <E>		: "\xc4\x9a"	Ecaron
-+Ctrl<T> <E> <v> 		: "\xc4\x9a"	Ecaron
-+Ctrl<T> <v> <N>		: "\xc5\x87" 	Ncaron
-+Ctrl<T> <N> <v>		: "\xc5\x87" 	Ncaron
-+Ctrl<T> <v> <R>		: "\xc5\x98"	Rcaron
-+Ctrl<T> <R> <v> 		: "\xc5\x98"	Rcaron
-+Ctrl<T> <v> <T>		: "\xc5\xa4"	Tcaron
-+Ctrl<T> <T> <v> 		: "\xc5\xa4"	Tcaron
-+Ctrl<T> <v> <U>		: "\xc5\xae"	Uring
-+Ctrl<T> <U> <v> 		: "\xc5\xae"	Uring
-+Ctrl<T> <v> <c>		: "\xc4\x8d"	ccaron
-+Ctrl<T> <c> <v> 		: "\xc4\x8d"	ccaron
-+Ctrl<T> <v> <d>		: "\xc4\x8f"	dcaron
-+Ctrl<T> <d> <v> 		: "\xc4\x8f"	dcaron
-+Ctrl<T> <v> <e>		: "\xc4\x9b"	ecaron
-+Ctrl<T> <e> <v> 		: "\xc4\x9b"	ecaron
-+Ctrl<T> <v> <n>		: "\xc5\x88"	ncaron
-+Ctrl<T> <n> <v> 		: "\xc5\x88"	ncaron
-+Ctrl<T> <v> <r>		: "\xc5\x99"	rcaron
-+Ctrl<T> <r> <v> 		: "\xc5\x99"	rcaron
-+Ctrl<T> <v> <t>		: "\xc5\xa5"	tcaron
-+Ctrl<T> <t> <v> 		: "\xc5\xa5"	tcaron
-+Ctrl<T> <v> <u>		: "\xc5\xaf"	uring
-+Ctrl<T> <u> <v> 		: "\xc5\xaf"	uring
-+Ctrl<T> <breve> <A>		: "\xc4\x82"	Abreve
-+Ctrl<T> <A> <breve> 	: "\xc4\x82"	Abreve
-+Ctrl<T> <breve> <a>		: "\xc4\x83"	abreve
-+Ctrl<T> <a> <breve> 	: "\xc4\x83"	abreve
-+Ctrl<T> <ogonek> <A>	: "\xc4\x84"	Aogonek
-+Ctrl<T> <A> <ogonek> 	: "\xc4\x84"	Aogonek
-+Ctrl<T> <ogonek> <E>	: "\xc4\x98"	Eogonek
-+Ctrl<T> <E> <ogonek> 	: "\xc4\x98"	Eogonek
-+Ctrl<T> <ogonek> <a> 	: "\xc4\x85"	aogonek
-+Ctrl<T> <a> <ogonek> 	: "\xc4\x85"	aogonek
-+Ctrl<T> <ogonek> <e> 	: "\xc4\x99"	eogonek
-+Ctrl<T> <e> <ogonek> 	: "\xc4\x99"	eogonek
-+Ctrl<T> <E> <a> 		: "\xc4\x98"	Eogonek
-+Ctrl<T> <e> <a> 		: "\xc4\x99"	eogonek
-+Ctrl<T> <doubleacute> <O>	: "\xc5\x90"	Odoubleacute
-+Ctrl<T> <O> <doubleacute> 	: "\xc5\x90"	Odoubleacute
-+Ctrl<T> <doubleacute> <U>	: "\xc5\xb0"	Udoubleacute
-+Ctrl<T> <U> <doubleacute> 	: "\xc5\xb0"	Udoubleacute
-+Ctrl<T> <doubleacute> <o>	: "\xc5\x91"	odoubleacute
-+Ctrl<T> <o> <doubleacute> 	: "\xc5\x91"	odoubleacute
-+Ctrl<T> <doubleacute> <u>	: "\xc5\xb1"	udoubleacute
-+Ctrl<T> <u> <doubleacute> 	: "\xc5\xb1"	udoubleacute
-+Ctrl<T> <period> <U>	: "\xc5\xae"	Uring
-+Ctrl<T> <U> <period> 	: "\xc5\xae"	Uring
-+Ctrl<T> <period> <u>	: "\xc5\xaf"	uring
-+Ctrl<T> <u> <period> 	: "\xc5\xaf"	uring
-+Ctrl<T> <period> <z>	: "\xc5\xbc"	zabovedot
-+Ctrl<T> <z> <period> 	: "\xc5\xbc"	zabovedot
-+Ctrl<T> <period> <Z>	: "\xc5\xbb"	Zabovedot
-+Ctrl<T> <Z> <period> 	: "\xc5\xbb"	Zabovedot
-+Ctrl<T> <a> <space>	: "\xcb\x9b"	ogonek
-+Ctrl<T> <u> <space>	: "\xcb\x98"	breve
-+Ctrl<T> <v> <space>	: "\xcb\x87"	caron
-+Ctrl<T> <quotedbl> <space>	: "\xcb\x9d"	doubleacute
-+Ctrl<T> <A> <u>			: "\xc4\x82"	Abreve
-+Ctrl<T> <C> <apostrophe>	: "\xc4\x86"	Cacute
-+Ctrl<T> <L> <apostrophe>	: "\xc4\xb9"	Lacute
-+Ctrl<T> <L> <slash>		: "\xc5\x81"	Lstroke
-+Ctrl<T> <L> <greater>		: "\xc4\xbd"	Lcaron
-+Ctrl<T> <N> <apostrophe>	: "\xc5\x83"	Nacute
-+Ctrl<T> <S> <apostrophe>	: "\xc5\x9a"	Sacute
-+Ctrl<T> <R> <apostrophe>	: "\xc5\x94"	Racute
-+Ctrl<T> <U> <asterisk>		: "\xc5\xae"	Uring
-+Ctrl<T> <Z> <apostrophe>	: "\xc5\xb9"	Zacute
-+Ctrl<T> <a> <u>			: "\xc4\x83"	abreve
-+Ctrl<T> <c> <apostrophe>	: "\xc4\x87"	cacute
-+Ctrl<T> <l> <apostrophe>	: "\xc4\xba"	lacute
-+Ctrl<T> <l> <slash>		: "\xc5\x82"	lstroke
-+Ctrl<T> <l> <greater>		: "\xc4\xbe"	lcaron
-+Ctrl<T> <n> <apostrophe>	: "\xc5\x84"	nacute
-+Ctrl<T> <s> <apostrophe>	: "\xc5\x9b"	sacute
-+Ctrl<T> <r> <apostrophe>	: "\xc5\x95"	racute
-+Ctrl<T> <u> <asterisk>		: "\xc5\xaf"	uring
-+Ctrl<T> <z> <apostrophe>	: "\xc5\xba"	zacute
-+XCOMM
-+XCOMM Latin-3 sequences
-+Ctrl<T> <C> <asciicircum>	: "\xc4\x88"	Ccircumflex
-+Ctrl<T> <asciicircum> <C>	: "\xc4\x88"	Ccircumflex
-+Ctrl<T> <C> <greater>		: "\xc4\x88"	Ccircumflex
-+Ctrl<T> <greater> <C>		: "\xc4\x88"	Ccircumflex
-+
-+Ctrl<T> <c> <asciicircum>	: "\xc4\x89"	ccircumflex
-+Ctrl<T> <asciicircum> <c>	: "\xc4\x89"	ccircumflex
-+Ctrl<T> <c> <greater>		: "\xc4\x89"	ccircumflex
-+Ctrl<T> <greater> <c>		: "\xc4\x89"	ccircumflex
-+
-+Ctrl<T> <period> <C>		: "\xc4\x8a"	Cabovedot
-+Ctrl<T> <C> <period> 		: "\xc4\x8a"	Cabovedot
-+
-+Ctrl<T> <period> <c>		: "\xc4\x8b"	cabovedot
-+Ctrl<T> <c> <period> 		: "\xc4\x8b"	cabovedot
-+
-+Ctrl<T> <G> <asciicircum>	: "\xc4\x9c"	Gcircumflex
-+Ctrl<T> <asciicircum> <G>	: "\xc4\x9c"	Gcircumflex
-+Ctrl<T> <G> <greater>		: "\xc4\x9c"	Gcircumflex
-+Ctrl<T> <greater> <G>		: "\xc4\x9c"	Gcircumflex
-+
-+Ctrl<T> <g> <asciicircum>	: "\xc4\x9d"	gcircumflex
-+Ctrl<T> <asciicircum> <g>	: "\xc4\x9d"	gcircumflex
-+Ctrl<T> <g> <greater>		: "\xc4\x9d"	gcircumflex
-+Ctrl<T> <greater> <g>		: "\xc4\x9d"	gcircumflex
-+
-+Ctrl<T> <period> <G>		: "\xc4\xa0"	Gabovedot
-+Ctrl<T> <G> <period> 		: "\xc4\xa0"	Gabovedot
-+
-+Ctrl<T> <period> <g>		: "\xc4\xa1"	gabovedot
-+Ctrl<T> <g> <period> 		: "\xc4\xa1"	gabovedot
-+
-+Ctrl<T> <H> <asciicircum>	: "\xc4\xa4"	Hcircumflex
-+Ctrl<T> <asciicircum> <H>	: "\xc4\xa4"	Hcircumflex
-+Ctrl<T> <H> <greater>		: "\xc4\xa4"	Hcircumflex
-+Ctrl<T> <greater> <H>		: "\xc4\xa4"	Hcircumflex
-+
-+Ctrl<T> <h> <asciicircum>	: "\xc4\xa5"	hcircumflex
-+Ctrl<T> <asciicircum> <h>	: "\xc4\xa5"	hcircumflex
-+Ctrl<T> <h> <greater>		: "\xc4\xa5"	hcircumflex
-+Ctrl<T> <greater> <h>		: "\xc4\xa5"	hcircumflex
-+
-+Ctrl<T> <J> <asciicircum>	: "\xc4\xb4"	Jcircumflex
-+Ctrl<T> <asciicircum> <J>	: "\xc4\xb4"	Jcircumflex
-+Ctrl<T> <J> <greater>		: "\xc4\xb4"	Jcircumflex
-+Ctrl<T> <greater> <J>		: "\xc4\xb4"	Jcircumflex
-+
-+Ctrl<T> <j> <asciicircum>	: "\xc4\xb5"	jcircumflex
-+Ctrl<T> <asciicircum> <j>	: "\xc4\xb5"	jcircumflex
-+Ctrl<T> <j> <greater>		: "\xc4\xb5"	jcircumflex
-+Ctrl<T> <greater> <j>		: "\xc4\xb5"	jcircumflex
-+
-+Ctrl<T> <S> <asciicircum>	: "\xc5\x9c"	Scircumflex
-+Ctrl<T> <asciicircum> <S>	: "\xc5\x9c"	Scircumflex
-+Ctrl<T> <S> <greater>		: "\xc5\x9c"	Scircumflex
-+Ctrl<T> <greater> <S>		: "\xc5\x9c"	Scircumflex
-+
-+Ctrl<T> <s> <asciicircum>	: "\xc5\x9d"	scircumflex
-+Ctrl<T> <asciicircum> <s>	: "\xc5\x9d"	scircumflex
-+Ctrl<T> <s> <greater>		: "\xc5\x9d"	scircumflex
-+Ctrl<T> <greater> <s>		: "\xc5\x9d"	scircumflex
-+
-+Ctrl<T> <U> <breve>		: "\xc5\xac"	Ubreve
-+Ctrl<T> <breve> <U>		: "\xc5\xac"	Ubreve
-+Ctrl<T> <U> <u>			: "\xc5\xac"	Ubreve
-+Ctrl<T> <u> <U>			: "\xc5\xac"	Ubreve
-+
-+Ctrl<T> <u> <breve>		: "\xc5\xad"	ubreve
-+Ctrl<T> <breve> <u>		: "\xc5\xad"	ubreve
-+Ctrl<T> <u> <u>			: "\xc5\xad"	ubreve
- XCOMM
--XCOMM Khmer digraphs
-+XCOMM Latin-4 sequences
-+Ctrl<T> <N> <N>		: "\xc5\x8a"	ENG
-+Ctrl<T> <U> <a>		: "\xc5\xb2"	Uogonek
-+Ctrl<T> <u> <a>		: "\xc5\xb3"	uogonek
-+Ctrl<T> <k> <k>		: "\xc4\xb8"	kra
-+Ctrl<T> <R> <comma>		: "\xc5\x96"	Rcedilla
-+Ctrl<T> <comma> <R>		: "\xc5\x96"	Rcedilla
-+Ctrl<T> <r> <comma>		: "\xc5\x97"	rcedilla
-+Ctrl<T> <comma> <r>		: "\xc5\x97"	rcedilla
-+Ctrl<T> <I> <asciitilde>	: "\xc4\xa8"	Itilde
-+Ctrl<T> <asciitilde> <I>	: "\xc4\xa8"	Itilde
-+Ctrl<T> <i> <asciitilde>	: "\xc4\xa9"	itilde
-+Ctrl<T> <asciitilde> <i>	: "\xc4\xa9"	itilde
-+Ctrl<T> <L> <comma>		: "\xc4\xbb"	Lcedilla
-+Ctrl<T> <comma> <L>		: "\xc4\xbb"	Lcedilla
-+Ctrl<T> <l> <comma>		: "\xc4\xbc"	lcedilla
-+Ctrl<T> <comma> <l>		: "\xc4\xbc"	lcedilla
-+Ctrl<T> <S> <v>		: "\xc5\xa0"	Scaron
-+Ctrl<T> <S> <V>		: "\xc5\xa0"	Scaron
-+Ctrl<T> <v> <S>		: "\xc5\xa0"	Scaron
-+Ctrl<T> <V> <S>		: "\xc5\xa0"	Scaron
-+Ctrl<T> <s> <v>		: "\xc5\xa1"	scaron
-+Ctrl<T> <s> <V>		: "\xc5\xa1"	scaron
-+Ctrl<T> <v> <s>		: "\xc5\xa1"	scaron
-+Ctrl<T> <V> <s>		: "\xc5\xa1"	scaron
-+Ctrl<T> <E> <underscore>	: "\xc4\x92"	Emacron
-+Ctrl<T> <underscore> <E>	: "\xc4\x92"	Emacron
-+Ctrl<T> <e> <underscore>	: "\xc4\x93"	emacron
-+Ctrl<T> <underscore> <e>	: "\xc4\x93"	emacron
-+Ctrl<T> <G> <comma>		: "\xc4\xa2"	Gcedilla
-+Ctrl<T> <comma> <G>		: "\xc4\xa2"	Gcedilla
-+Ctrl<T> <g> <comma>		: "\xc4\xa3"	gcedilla
-+Ctrl<T> <comma> <g>		: "\xc4\xa3"	gcedilla
-+Ctrl<T> <T> <bar>		: "\xc5\xa6"	Tslash
-+Ctrl<T> <bar> <T>		: "\xc5\xa6"	Tslash
-+Ctrl<T> <t> <bar>		: "\xc5\xa7"	tslash
-+Ctrl<T> <bar> <t>		: "\xc5\xa7"	tslash
-+Ctrl<T> <n> <n>		: "\xc5\x8b" 	eng
-+Ctrl<T> <d> <underscore>	: "\xc4\x91"
-+Ctrl<T> <underscore> <d> 	: "\xc4\x91"
-+Ctrl<T> <N> <comma>		: "\xc5\x85"	Ncedilla
-+Ctrl<T> <comma> <N>		: "\xc5\x85"	Ncedilla
-+Ctrl<T> <n> <comma>		: "\xc5\x86"	ncedilla
-+Ctrl<T> <comma> <n>		: "\xc5\x86"	ncedilla
-+Ctrl<T> <K> <comma>		: "\xc4\xb6"	Kcedilla
-+Ctrl<T> <comma> <K>		: "\xc4\xb6"	Kcedilla
-+Ctrl<T> <k> <comma>		: "\xc4\xb7"	kcedilla
-+Ctrl<T> <comma> <k>		: "\xc4\xb7"	kcedilla
-+Ctrl<T> <I> <a>		: "\xc4\xae"	Iogonek
-+Ctrl<T> <a> <I>		: "\xc4\xae"	Iogonek
-+Ctrl<T> <i> <a>		: "\xc4\xaf"	iogonek
-+Ctrl<T> <a> <i>		: "\xc4\xaf"	iogonek
-+Ctrl<T> <E> <period>	: "\xc4\x96"	Eabovedot
-+Ctrl<T> <e> <period>	: "\xc4\x97"	eabovedot
-+Ctrl<T> <U> <asciitilde>	: "\xc5\xa8"	Utilde
-+Ctrl<T> <asciitilde> <U>	: "\xc5\xa8"	Utilde
-+Ctrl<T> <u> <asciitilde>	: "\xc5\xa9"	utilde
-+Ctrl<T> <asciitilde> <u>	: "\xc5\xa9"	utilde
-+Ctrl<T> <U> <underscore>	: "\xc5\xaa"	Umacron
-+Ctrl<T> <underscore> <U>	: "\xc5\xaa"	Umacron
-+Ctrl<T> <u> <underscore>	: "\xc5\xab"	umacron
-+Ctrl<T> <underscore> <u>	: "\xc5\xab"	umacron
-+Ctrl<T> <I> <underscore>	: "\xc4\xaa"	Imacron
-+Ctrl<T> <underscore> <I> 	: "\xc4\xaa"	Imacron
-+Ctrl<T> <i> <underscore>	: "\xc4\xab"	imacron
-+Ctrl<T> <underscore> <i> 	: "\xc4\xab"	imacron
- XCOMM
-+XCOMM Latin-9 input sequences:
-+<Multi_key> <o> <e> 		: "\xc5\x93"
-+<Multi_key> <O> <E> 		: "\xc5\x92"
-+<Multi_key> <Y> <quotedbl> 	: "\xc5\xb8"
-+<Multi_key> <quotedbl> <Y> 	: "\xc5\xb8"
-+Ctrl<T> <o> <e> 		: "\xc5\x93"
-+Ctrl<T> <O> <E> 		: "\xc5\x92"
-+Ctrl<T> <Y> <quotedbl> 		: "\xc5\xb8"
-+Ctrl<T> <quotedbl> <Y>		: "\xc5\xb8"
-+XCOMM
-+XCOMM Rules for SunXK_FA_* keysyms:
-+<SunFA_Acute> <apostrophe>	: "\xc2\xb4"
-+<SunFA_Acute> <A>		: "\xc3\x81"
-+<SunFA_Acute> <a>		: "\xc3\xa1"
-+<SunFA_Acute> <C>		: "\xc4\x86"
-+<SunFA_Acute> <c>		: "\xc4\x87"
-+<SunFA_Acute> <E>		: "\xc3\x89"
-+<SunFA_Acute> <e>		: "\xc3\xa9"
-+<SunFA_Acute> <I>		: "\xc3\x8d"
-+<SunFA_Acute> <i>		: "\xc3\xad"
-+<SunFA_Acute> <L>		: "\xc4\xb9"
-+<SunFA_Acute> <l>		: "\xc4\xba"
-+<SunFA_Acute> <N>		: "\xc5\x83"
-+<SunFA_Acute> <n>		: "\xc5\x84"
-+<SunFA_Acute> <O>		: "\xc3\x93"
-+<SunFA_Acute> <o>		: "\xc3\xb3"
-+<SunFA_Acute> <R>		: "\xc5\x94"
-+<SunFA_Acute> <r>		: "\xc5\x95"
-+<SunFA_Acute> <space>		: "\x27"
-+<SunFA_Acute> <S>		: "\xc5\x9a"
-+<SunFA_Acute> <s>		: "\xc5\x9b"
-+<SunFA_Acute> <U>		: "\xc3\x9a"
-+<SunFA_Acute> <u>		: "\xc3\xba"
-+<SunFA_Acute> <Y>		: "\xc3\x9d"
-+<SunFA_Acute> <y>		: "\xc3\xbd"
-+<SunFA_Acute> <Z>		: "\xc4\xbe"
-+<SunFA_Acute> <z>		: "\xc5\xba"
-+<SunFA_Cedilla> <comma>		: "\xc2\xb8"
-+<SunFA_Cedilla> <C>		: "\xc3\x87"
-+<SunFA_Cedilla> <c>		: "\xc3\xa7"
-+<SunFA_Cedilla> <G>		: "\xc4\xa2"
-+<SunFA_Cedilla> <g>		: "\xc4\xa3"
-+<SunFA_Cedilla> <K>		: "\xc4\xb6"
-+<SunFA_Cedilla> <k>		: "\xc4\xb7"
-+<SunFA_Cedilla> <L>		: "\xc4\xbb"
-+<SunFA_Cedilla> <l>		: "\xc4\xbc"
-+<SunFA_Cedilla> <minus>		: "\xc2\xac"
-+<SunFA_Cedilla> <N>		: "\xc5\x85"
-+<SunFA_Cedilla> <n>		: "\xc5\x86"
-+<SunFA_Cedilla> <R>		: "\xc5\x96"
-+<SunFA_Cedilla> <r>		: "\xc5\x97"
-+<SunFA_Cedilla> <S>		: "\xc5\x9e"
-+<SunFA_Cedilla> <s>		: "\xc5\x9f"
-+<SunFA_Cedilla> <T>		: "\xc5\xa2"
-+<SunFA_Cedilla> <t>		: "\xc5\xa3"
-+<SunFA_Circum> <0>		: "\xc2\xb0"
-+<SunFA_Circum> <1>		: "\xc2\xb9"
-+<SunFA_Circum> <2>		: "\xc2\xb2"
-+<SunFA_Circum> <3>		: "\xc2\xb3"
-+<SunFA_Circum> <A>		: "\xc3\x82"
-+<SunFA_Circum> <a>		: "\xc3\xa2"
-+<SunFA_Circum> <C>		: "\xc4\x88"
-+<SunFA_Circum> <c>		: "\xc4\x89"
-+<SunFA_Circum> <E>		: "\xc3\x8a"
-+<SunFA_Circum> <e>		: "\xc3\xaa"
-+<SunFA_Circum> <exclam>		: "\xc2\xa6"
-+<SunFA_Circum> <G>		: "\xc4\x9c"
-+<SunFA_Circum> <g>		: "\xc4\x9d"
-+<SunFA_Circum> <H>		: "\xc4\xa4"
-+<SunFA_Circum> <h>		: "\xc4\xa5"
-+<SunFA_Circum> <I>		: "\xc3\x8e"
-+<SunFA_Circum> <i>		: "\xc3\xae"
-+<SunFA_Circum> <J>		: "\xc4\xb4"
-+<SunFA_Circum> <j>		: "\xc4\xb5"
-+<SunFA_Circum> <minus>		: "\xc2\xaf"
-+<SunFA_Circum> <O>		: "\xc3\x94"
-+<SunFA_Circum> <o>		: "\xc3\xb4"
-+<SunFA_Circum> <period>		: "\xc2\xb7"
-+<SunFA_Circum> <slash>		: "\x7c"
-+<SunFA_Circum> <space>		: "\x5e"
-+<SunFA_Circum> <S>		: "\xc5\x9c"
-+<SunFA_Circum> <s>		: "\xc5\x9d"
-+<SunFA_Circum> <underscore>	: "\xc2\xaf"
-+<SunFA_Circum> <U>		: "\xc3\x9b"
-+<SunFA_Circum> <u>		: "\xc3\xbb"
-+<SunFA_Diaeresis> <A>		: "\xc3\x84"
-+<SunFA_Diaeresis> <a>		: "\xc3\xa4"
-+<SunFA_Diaeresis> <E>		: "\xc3\x8b"
-+<SunFA_Diaeresis> <e>		: "\xc3\xab"
-+<SunFA_Diaeresis> <I>		: "\xc3\x8f"
-+<SunFA_Diaeresis> <i>		: "\xc3\xaf"
-+<SunFA_Diaeresis> <O>		: "\xc3\x96"
-+<SunFA_Diaeresis> <o>		: "\xc3\xb6"
-+<SunFA_Diaeresis> <quotedbl>	: "\xc2\xa8"
-+<SunFA_Diaeresis> <space>	: "\xc2\xa8"
-+<SunFA_Diaeresis> <U>		: "\xc3\x9c"
-+<SunFA_Diaeresis> <u>		: "\xc3\xbc"
-+<SunFA_Diaeresis> <y>		: "\xc3\xbf"
-+<SunFA_Diaeresis> <Y>		: "\xc5\xb8"
-+<SunFA_Grave> <A>		: "\xc3\x80"
-+<SunFA_Grave> <a>		: "\xc3\xa0"
-+<SunFA_Grave> <E>		: "\xc3\x88"
-+<SunFA_Grave> <e>		: "\xc3\xa8"
-+<SunFA_Grave> <I>		: "\xc3\x8c"
-+<SunFA_Grave> <i>		: "\xc3\xac"
-+<SunFA_Grave> <O>		: "\xc3\x92"
-+<SunFA_Grave> <o>		: "\xc3\xb2"
-+<SunFA_Grave> <space>		: "\x60"
-+<SunFA_Grave> <U>		: "\xc3\x99"
-+<SunFA_Grave> <u>		: "\xc3\xb9"
-+<SunFA_Tilde> <A>		: "\xc3\x83"
-+<SunFA_Tilde> <a>		: "\xc3\xa3"
-+<SunFA_Tilde> <N>		: "\xc3\x91"
-+<SunFA_Tilde> <n>		: "\xc3\xb1"
-+<SunFA_Tilde> <O>		: "\xc3\x95"
-+<SunFA_Tilde> <o>		: "\xc3\xb5"
-+<SunFA_Tilde> <space>		: "\x7e"
-+END_STATE
-+
-+STATE "[ Cyrillic ]"
-+Ctrl<space>		: SWITCH_STATE_TO "[ English/European ]"
-+<Multi_key> <g> <g>	: SWITCH_STATE_TO "[ Greek ]"
-+<Multi_key> <t> <t>	: SWITCH_STATE_TO "[ Thai ]"
-+<Multi_key> <a> <r>	: SWITCH_STATE_TO "[ Arabic ]"
-+<Multi_key> <h> <i>	: SWITCH_STATE_TO "[ Indic ]"
-+<Multi_key> <i> <n>	: SWITCH_STATE_TO "[ Indic ]"
-+<Multi_key> <h> <h>	: SWITCH_STATE_TO "[ Hebrew ]"
-+<Multi_key> <u> <h>	: SWITCH_STATE_TO "[ Unicode Hex ]"
-+<Multi_key> <u> <o>	: SWITCH_STATE_TO "[ Unicode Octal ]"
-+<Multi_key> <l> <l>	: SWITCH_STATE_TO "[ Lookup ]"
-+<Multi_key> <j>	<a>	: SWITCH_STATE_TO "[ Japanese ]"
-+<Multi_key> <k>	<o>	: SWITCH_STATE_TO "[ Korean ]"
-+<Multi_key> <s>	<c>	: SWITCH_STATE_TO "[ S-Chinese ]"
-+<Multi_key> <t>	<c>	: SWITCH_STATE_TO "[ T-Chinese ]"
-+<Multi_key> <h>	<k>	: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
-+
-+Ctrl<T> <g> <g>		: SWITCH_STATE_TO "[ Greek ]"
-+Ctrl<T> <t> <t>		: SWITCH_STATE_TO "[ Thai ]"
-+Ctrl<T> <a> <r>		: SWITCH_STATE_TO "[ Arabic ]"
-+Ctrl<T> <h> <i>		: SWITCH_STATE_TO "[ Indic ]"
-+Ctrl<T> <i> <n>		: SWITCH_STATE_TO "[ Indic ]"
-+Ctrl<T> <h> <h>		: SWITCH_STATE_TO "[ Hebrew ]"
-+Ctrl<T> <u> <h>		: SWITCH_STATE_TO "[ Unicode Hex ]"
-+Ctrl<T> <u> <o>		: SWITCH_STATE_TO "[ Unicode Octal ]"
-+Ctrl<T> <l> <l>		: SWITCH_STATE_TO "[ Lookup ]"
-+Ctrl<T> <j> <a>		: SWITCH_STATE_TO "[ Japanese ]"
-+Ctrl<T> <k> <o>		: SWITCH_STATE_TO "[ Korean ]"
-+Ctrl<T> <s> <c>		: SWITCH_STATE_TO "[ S-Chinese ]"
-+Ctrl<T> <t> <c>		: SWITCH_STATE_TO "[ T-Chinese ]"
-+Ctrl<T> <h> <k>		: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
-+
-+<at>		: "\x22"	quotedbl
-+<numbersign>	: "\xe2\x84\x96"	numerosign
-+<dollar>	: "\x25"	percent
-+<percent>	: "\x3a"	colon
-+<asciicircum>	: "\x2c"	comma
-+<ampersand>	: "\x2e"	period
-+<asterisk>	: "\x3b"	semicolon
-+<numerosign>	: "\xe2\x84\x96" numerosign
-+<q>		: "\xd0\xb9"	Cyrillic_shorti
-+<w>		: "\xd1\x86"	Cyrillic_tse
-+<e>		: "\xd1\x83"	Cyrillic_u
-+<r>		: "\xd0\xba"	Cyrillic_ka
-+<t>		: "\xd0\xb5"	Cyrillic_ie
-+<y>		: "\xd0\xbd"	Cyrillic_en
-+<u>		: "\xd0\xb3"	Cyrillic_ghe
-+<i>		: "\xd1\x88"	Cyrillic_sha
-+<o>		: "\xd1\x89"	Cyrillic_shcha
-+<p>		: "\xd0\xb7"	Cyrillic_ze
-+<bracketleft>	: "\xd1\x85"	Cyrillic_ha
-+<bracketright>	: "\xd1\x8a"	Cyrillic_hardsign
-+<Q>		: "\xd0\x99"	Cyrillic_SHORTI
-+<W>		: "\xd0\xa6"	Cyrillic_TSE
-+<E>		: "\xd0\xa3"	Cyrillic_U
-+<R>		: "\xd0\x9a"	Cyrillic_KA
-+<T>		: "\xd0\x95"	Cyrillic_IE
-+<Y>		: "\xd0\x9d"	Cyrillic_EN
-+<U>		: "\xd0\x93"	Cyrillic_GHE
-+<I>		: "\xd0\xa8"	Cyrillic_SHA
-+<O>		: "\xd0\xa9"	Cyrillic_SHCHA
-+<P>		: "\xd0\x97"	Cyrillic_ZE
-+Lock<bracketleft> 	: "\xd0\xa5"	Cyrillic_HA
-+Lock<bracketright>	: "\xd0\xaa"	Cyrillic_HARDSIGN
-+<braceleft> 	: "\xd0\xa5"	Cyrillic_HA
-+<braceright>	: "\xd0\xaa"	Cyrillic_HARDSIGN
-+<a>		: "\xd1\x84"	Cyrillic_ef
-+<s>		: "\xd1\x8b"	Cyrillic_yeru
-+<d>		: "\xd0\xb2"	Cyrillic_ve
-+<f>		: "\xd0\xb0"	Cyrillic_a
-+<g>		: "\xd0\xbf"	Cyrillic_pe
-+<h>		: "\xd1\x80"	Cyrillic_er
-+<j>		: "\xd0\xbe"	Cyrillic_o
-+<k>		: "\xd0\xbb"	Cyrillic_el
-+<l>		: "\xd0\xb4"	Cyrillic_de
-+<semicolon>	: "\xd0\xb6"	Cyrillic_zhe
-+<quoteright>	: "\xd1\x8d"	Cyrillic_e
-+<A>		: "\xd0\xa4"	Cyrillic_EF
-+<S>		: "\xd0\xab"	Cyrillic_YERU
-+<D>		: "\xd0\x92"	Cyrillic_VE
-+<F>		: "\xd0\x90"	Cyrillic_A
-+<G>		: "\xd0\x9f"	Cyrillic_PE
-+<H>		: "\xd0\xa0"	Cyrillic_ER
-+<J>		: "\xd0\x9e"	Cyrillic_O
-+<K>		: "\xd0\x9b"	Cyrillic_EL
-+<L>		: "\xd0\x94"	Cyrillic_DE
-+<colon>		: "\xd0\x96"	Cyrillic_ZHE
-+<quotedbl>	: "\xd0\xad"	Cyrillic_E
-+<z>		: "\xd1\x8f"	Cyrillic_ya
-+<x>		: "\xd1\x87"	Cyrillic_che
-+<c>		: "\xd1\x81"	Cyrillic_es
-+<v>		: "\xd0\xbc"	Cyrillic_em
-+<b>		: "\xd0\xb8"	Cyrillic_i
-+<n>		: "\xd1\x82"	Cyrillic_te
-+<m>		: "\xd1\x8c"	Cyrillic_softsign
-+<comma>		: "\xd0\xb1"	Cyrillic_be
-+<period>	: "\xd1\x8e"	Cyrillic_yu
-+<slash>		: "\xd1\x91"	Cyrillic_io
-+<Z>		: "\xd0\xaf"	Cyrillic_YA
-+<X>		: "\xd0\xa7"	Cyrillic_CHE
-+<C>		: "\xd0\xa1"	Cyrillic_ES
-+<V>		: "\xd0\x9c"	Cyrillic_EM
-+<B>		: "\xd0\x98"	Cyrillic_I
-+<N>		: "\xd0\xa2"	Cyrillic_TE
-+<M>		: "\xd0\xac"	Cyrillic_SOFTSIGN
-+<less>		: "\xd0\x91"	Cyrillic_BE
-+<greater>	: "\xd0\xae"	Cyrillic_YU
-+<question>	: "\xd0\x81"	Cyrillic_IO
-+END_STATE
-+
 +STATE "[ Greek ]"
 +Ctrl<space> 		: SWITCH_STATE_TO "[ English/European ]"
 +<Multi_key> <c> <c>	: SWITCH_STATE_TO "[ Cyrillic ]"
@@ -6237,8 +6208,9 @@
 +Ctrl<T> <s> <c>		: SWITCH_STATE_TO "[ S-Chinese ]"
 +Ctrl<T> <t> <c>		: SWITCH_STATE_TO "[ T-Chinese ]"
 +Ctrl<T> <h> <k>		: SWITCH_STATE_TO "[ T-Chinese (Hong Kong) ]"
-+
-+XCOMM
+ 
+ XCOMM
+-XCOMM Khmer digraphs
 +XCOMM Key sequences for euro sign:
 +AltGraph<e>		: "\xe2\x82\xac"
 +AltGraph<E>		: "\xe2\x82\xac"
@@ -6261,15 +6233,9 @@
 +Ctrl<T> <E> <equal>	: "\xe2\x82\xac"
 +Ctrl<T> <equal> <E>	: "\xe2\x82\xac"
 +<EuroSign>		: "\xe2\x82\xac"
- 
--<U17ff> :   "ាំ"
--<U17fe> :   "ោះ"
--<U17fd> :   "េះ"
--<U17fc> :   "ុំ"
--<U17fb> :   "ុះ"
- 
++
++
  XCOMM
--XCOMM Arabic Lam-Alef ligatures
 +XCOMM The following seven mappings are not appropriate here; this kind of mappings
 +XCOMM should be done at the keytable level at /usr/openwin/share/etc/keytables,
 +XCOMM not in the Compose file.
@@ -6280,7 +6246,12 @@
 +XCOMM<asciicircum>	: "\x2c"	comma
 +XCOMM<ampersand>	: "\x2e"	period
 +XCOMM<asterisk>	: "\x3b"	semicolon
-+
+ 
+-<U17ff> :   "ាំ"
+-<U17fe> :   "ោះ"
+-<U17fd> :   "េះ"
+-<U17fc> :   "ុំ"
+-<U17fb> :   "ុះ"
 +<q>		: "\x3b"	semicolon
 +<w>		: "\xcf\x82"	Greek_sigma
 +<e>		: "\xce\xb5"	Greek_epsilon
@@ -6386,8 +6357,9 @@
 +<Greek_NU>	: "\xce\x9d"	Greek_NU
 +<Greek_MU>	: "\xce\x9c"	Greek_MU
 +<periodcentered> : "\xc2\xb7"	periodcentered
-+
+ 
  XCOMM
+-XCOMM Arabic Lam-Alef ligatures
 +XCOMM XK_dead_acute and XK_dead_diaeresis defined in Greece*.kt keytable files.
 +XCOMM XK_Greek_* are not defined in Greece*.kt keytable files. Nonetheless, we
 +XCOMM keep them here for user-defined keytable file possibility.
@@ -6465,12 +6437,8 @@
 +<colon> <semicolon> <y>		:"\xce\xb0"
 +<semicolon> <colon> <i>		:"\xce\x90"
 +<colon> <semicolon> <i>		:"\xce\x90"
- 
--<UFEFB>	:   "لا" # ARABIC LIGATURE LAM WITH ALEF
--<UFEF7>	:   "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
--<UFEF9>	:   "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
--<UFEF5>	:   "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
-+XCOMM
++
+ XCOMM
 +XCOMM The following special key sequences are for Tonos, Diaeresis/Dialytica,
 +XCOMM and Dialytika Tonos.
 +<semicolon> <semicolon>		:"\xce\x84"
@@ -7012,7 +6980,11 @@
 +Ctrl<space>		: SWITCH_STATE_TO "[ English/European ]"
 +LANGUAGE : th_TH
 +END_STATE
-+
+ 
+-<UFEFB>	:   "لا" # ARABIC LIGATURE LAM WITH ALEF
+-<UFEF7>	:   "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
+-<UFEF9>	:   "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
+-<UFEF5>	:   "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
 +STATE "[ Indic ]"
 +STATE_TYPE: REMOTE_IM
 +Ctrl<space>		: SWITCH_STATE_TO "[ English/European ]"
--- a/open-src/lib/libX11/compose-zh_CN.UTF-8.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-zh_CN.UTF-8.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 diff -urp -x '*~' -x '*.orig' nls/zh_CN.UTF-8/Compose.pre nls/zh_CN.UTF-8/Compose.pre
 --- nls/zh_CN.UTF-8/Compose.pre	2010-01-14 17:11:36.000000000 -0800
 +++ nls/zh_CN.UTF-8/Compose.pre	2010-06-07 15:49:40.781722582 -0700
-@@ -0,0 +1,2539 @@
+@@ -0,0 +1,2538 @@
 +XCOMM
 +XCOMM Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved.
 +XCOMM
@@ -1193,7 +1193,6 @@
 +<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
 +<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
 +<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
-+<diaeresis>			: "\xc2\xa8"	diaeresis
 +<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
 +<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
 +<Multi_key> <v> <S>		: "\xc5\xa0"	Scaron
--- a/open-src/lib/libX11/compose-zh_HK.UTF-8.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-zh_HK.UTF-8.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 diff -urp -x '*~' -x '*.orig' nls/zh_HK.UTF-8/Compose.pre nls/zh_HK.UTF-8/Compose.pre
 --- nls/zh_HK.UTF-8/Compose.pre	2010-01-14 17:11:36.000000000 -0800
 +++ nls/zh_HK.UTF-8/Compose.pre	2010-06-07 15:49:41.532854761 -0700
-@@ -0,0 +1,2540 @@
+@@ -0,0 +1,2538 @@
 +XCOMM
 +XCOMM Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
 +XCOMM
@@ -1193,7 +1193,6 @@
 +<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
 +<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
 +<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
-+<diaeresis>			: "\xc2\xa8"	diaeresis
 +<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
 +<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
 +<Multi_key> <v> <S>		: "\xc5\xa0"	Scaron
@@ -2470,7 +2469,6 @@
 +"k - 通用標點符號"       :       0x2000 0x206f
 +"l - 上標符號 下標符號"  :  0x2070 0x209f
 +"m - 貨幣符號"  :       0x20a0 0x20cf
-+"m - 貨幣符號"  :       0x20a0 0x20cf
 +XCOMM 無符號的合併 Diacritical 標記:  0x20d0 0x20ff
 +"n - 像字元的符號"        :  0x2100 0x214f
 +"o - 數字表單"      :       0x2150 0x218f
--- a/open-src/lib/libX11/compose-zh_TW.UTF-8.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/compose-zh_TW.UTF-8.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,7 +24,7 @@
 diff -urp -x '*~' -x '*.orig' nls/zh_TW.UTF-8/Compose.pre nls/zh_TW.UTF-8/Compose.pre
 --- nls/zh_TW.UTF-8/Compose.pre	2010-01-14 17:11:36.000000000 -0800
 +++ nls/zh_TW.UTF-8/Compose.pre	2010-06-07 15:49:42.290526710 -0700
-@@ -0,0 +1,2539 @@
+@@ -0,0 +1,2537 @@
 +XCOMM
 +XCOMM Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
 +XCOMM
@@ -1193,7 +1193,6 @@
 +<Multi_key> <comma> <L>		: "\xc4\xbb"	Lcedilla
 +<Multi_key> <l> <comma>		: "\xc4\xbc"	lcedilla
 +<Multi_key> <comma> <l>		: "\xc4\xbc"	lcedilla
-+<diaeresis>			: "\xc2\xa8"	diaeresis
 +<Multi_key> <S> <v>		: "\xc5\xa0"	Scaron
 +<Multi_key> <S> <V>		: "\xc5\xa0"	Scaron
 +<Multi_key> <v> <S>		: "\xc5\xa0"	Scaron
@@ -2470,7 +2469,6 @@
 +"k - 通用標點符號"       :       0x2000 0x206f
 +"l - 上標符號 下標符號"  :  0x2070 0x209f
 +"m - 貨幣符號"  :       0x20a0 0x20cf
-+"m - 貨幣符號"  :       0x20a0 0x20cf
 +XCOMM 無符號的合併 Diacritical 標記:  0x20d0 0x20ff
 +"n - 像字元的符號"        :  0x2100 0x214f
 +"o - 數字表單"      :       0x2150 0x218f
--- a/open-src/lib/libX11/locale.aliases.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/locale.aliases.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,10 +21,11 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-diff -urp -x '*~' -x '*.orig' nls/locale.alias.pre nls/locale.alias.pre
---- nls/locale.alias.pre	2010-10-29 00:21:12.000000000 -0700
-+++ nls/locale.alias.pre	2010-11-21 18:48:27.884466309 -0800
-@@ -121,7 +121,7 @@ be_BY.MICROSOFT-CP1251:				be_BY.CP1251
+diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
+index 7b35460..069b011 100644
+--- a/nls/locale.alias.pre
++++ b/nls/locale.alias.pre
+@@ -119,7 +119,7 @@ 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
@@ -33,7 +34,7 @@
  bg_BG.cp1251:					bg_BG.CP1251
  bg_BG.microsoftcp1251:				bg_BG.CP1251
  bg_BG.microsoft-cp1251:				bg_BG.CP1251
-@@ -1154,16 +1154,19 @@ yi_US.cp1255:					yi_US.CP1255
+@@ -1135,16 +1135,19 @@ yi_US.cp1255:					yi_US.CP1255
  yi_US.microsoftcp1255:				yi_US.CP1255
  yi_US.microsoft-cp1255:				yi_US.CP1255
  yi_US.MICROSOFT-CP1255:				yi_US.CP1255
@@ -54,7 +55,7 @@
  zh_HK:						zh_HK.big5hkscs
  zh_HK.BIG5HK:					zh_HK.big5hkscs
  zh_HK.Big5hkscs:				zh_HK.big5hkscs
-@@ -1176,7 +1179,7 @@ zh_HK.Big5:					zh_HK.big5
+@@ -1157,7 +1160,7 @@ zh_HK.Big5:					zh_HK.big5
  zh_HK.utf8:					zh_HK.UTF-8
  ZH_HK.UTF-8:					zh_HK.UTF-8
  ZH_SG.UTF-8:					zh_SG.UTF-8
--- a/open-src/lib/libX11/locale.paths.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/locale.paths.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,7 +1,7 @@
 Allow passing multi-directory paths to configure search for locale files
 
 diff --git a/configure.ac b/configure.ac
-index c2f2376..9d85355 100644
+index 5f82e47..b1ee4f6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -414,11 +414,16 @@ AC_ARG_WITH(locale-lib-dir,	AS_HELP_STRING([--with-locale-lib-dir=DIR],
@@ -23,4 +23,4 @@
 +AX_DEFINE_DIR(XLOCALEDIR, XLOCALEDIR, [Location of libX11 locale data])
  AC_SUBST(X11_LOCALEDIR)
  
- XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
+ locales="\
--- a/open-src/lib/libX11/mapfile-vers	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libX11/mapfile-vers	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # libX11 version mapfile
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -753,6 +753,11 @@
 	XFreeEventData;
 } SUNW_1.2;
 
+# New function added in libX11 1.5 for extension request handling
+SUNW_1.4 {
+	_XGetRequest;
+} SUNW_1.3;
+
 SUNWprivate {
     global:
 	XauDisposeAuth 		= FUNCTION FILTER libXau.so.6;
--- a/open-src/lib/libXfixes/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libXfixes/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # Xfixes 1.x Makefile
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,14 +29,14 @@
 MODULE_NAME=libXfixes
 
 # Version number (used in path names)
-MODULE_VERSION=4.0.5
+MODULE_VERSION=5.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 1b4b8386bd5d1751b2c7177223ad4629
-TARBALL_SHA1 = 255dfb9a8c50d795c60711ec4764f76cd0620cbf
+TARBALL_MD5  = 678071bd7f9f7467e2fc712d81022318
+TARBALL_SHA1 = 3e4d374e9026111a04cd669d4b3434273fc34fe0
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = soversion.patch
+SOURCE_PATCHES = soversion.patch,-p1
 
 # Need to autoreconf since soversion.patch changes Makefile.am's
 AUTORECONF=yes
--- a/open-src/lib/libXfixes/soversion.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libXfixes/soversion.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,10 +26,11 @@
 source community shipped as libXfixes.so.3.   This thus maintains ABI
 compatibility with the existing Solaris binaries.
 
-diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am	2010-06-08 19:03:20.000000000 -0700
-+++ src/Makefile.am	2011-02-11 16:45:27.624708354 -0800
-@@ -13,7 +13,7 @@ AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLA
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 544230f..93b58ff 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -13,7 +13,7 @@ AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
  
  INCLUDES = -I$(top_srcdir)/include/X11/extensions
  
@@ -38,10 +39,11 @@
  
  libXfixesincludedir = $(includedir)/X11/extensions
  libXfixesinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xfixes.h 
-diff -urp -x '*~' -x '*.orig' src/Makefile.in src/Makefile.in
---- src/Makefile.in	2010-06-09 20:19:28.000000000 -0700
-+++ src/Makefile.in	2011-02-11 16:45:27.625141798 -0800
-@@ -258,7 +258,7 @@ libXfixes_la_SOURCES = \
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 904f023..17f3d3b 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -259,7 +259,7 @@ libXfixes_la_SOURCES = \
  libXfixes_la_LIBADD = @FIXESEXT_LIBS@
  AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@
  INCLUDES = -I$(top_srcdir)/include/X11/extensions
--- a/open-src/lib/libXfont/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libXfont/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # Xfont Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,12 +29,12 @@
 MODULE_NAME=libXfont
 
 # Version number (used in path names)
-MODULE_VERSION=1.4.4
+MODULE_VERSION=1.4.5
 
 # Checksums for upstream tarball
-TARBALL_MD5	= f9942bc818d39094d7295b156a729393
-TARBALL_SHA1	= 189dd7a3756cb80bcf41b779bf05ec3c366e3041
-TARBALL_SHA256	= a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
+TARBALL_MD5   = 6851da5dae0a6cf5f7c9b9e2b05dd3b4
+TARBALL_SHA1  = 0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e
+TARBALL_SHA256= bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	\
--- a/open-src/lib/libXi/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libXi/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # libXi Makefile
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -29,11 +29,12 @@
 MODULE_NAME=libXi
 
 # Version number (used in path names)
-MODULE_VERSION=1.4.3
+MODULE_VERSION=1.5.99.3
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 792e8a7ddc7175911d69f823d38eaff6
-TARBALL_SHA1 = c66cfdee74e8d169a7992b5f257395e653ca761b
+TARBALL_MD5   = b2b7685a238806375a45f7684cfda813
+TARBALL_SHA1  = 55de70d18b20341f307b80da035400ed0467c920
+TARBALL_SHA256= f065b0bfd55cb1854ab8a5b94c168b37d69d5535ab8ca228d1902b9d72b0cefb
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = solaris-abi.patch,-p1
--- a/open-src/lib/libXi/man-fixme.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libXi/man-fixme.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -9,12 +9,12 @@
  1 files changed, 4 insertions(+), 0 deletions(-)
 
 diff --git a/man/Makefile.am b/man/Makefile.am
-index 2181ea9..d4c37b3 100644
+index 28211a1..7e328a5 100644
 --- a/man/Makefile.am
 +++ b/man/Makefile.am
-@@ -155,6 +155,10 @@ XIFreeDeviceInfo.man: XIQueryDevice.man
- # Unable to use __libmansuffix__ as underscores are lost in txt --> xml conversion
- MAN_SUBSTS += -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g'
+@@ -162,6 +162,10 @@ MAN_SUBSTS += -e 's/\[FIXME: manual\]/XINPUT FUNCTIONS/'
+ # asciidoc generates shadow page references without the man section directory
+ MAN_SUBSTS += -e 's/^\.so X/.so man$(LIB_MAN_SUFFIX)\/X/'
  
 +# asciidoc is generating [FIXME...] values in the .TH line we should fix.
 +MAN_SUBSTS += -e 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/'
@@ -23,6 +23,3 @@
  SUFFIXES = .man .$(LIB_MAN_SUFFIX)
  .man.$(LIB_MAN_SUFFIX):
  	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
--- 
-1.7.3.2
-
--- a/open-src/lib/libXi/shadow-man-pages.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libXi/shadow-man-pages.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -13,10 +13,10 @@
  1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/man/Makefile.am b/man/Makefile.am
-index d4c37b3..28211a1 100644
+index 7e328a5..0af2c5f 100644
 --- a/man/Makefile.am
 +++ b/man/Makefile.am
-@@ -159,6 +159,9 @@ MAN_SUBSTS += -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g'
+@@ -166,6 +166,9 @@ MAN_SUBSTS += -e 's/^\.so X/.so man$(LIB_MAN_SUFFIX)\/X/'
  MAN_SUBSTS += -e 's/\[FIXME: source\]/$(XORG_MAN_PAGE)/'
  MAN_SUBSTS += -e 's/\[FIXME: manual\]/XINPUT FUNCTIONS/'
  
@@ -26,6 +26,3 @@
  SUFFIXES = .man .$(LIB_MAN_SUFFIX)
  .man.$(LIB_MAN_SUFFIX):
  	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
--- 
-1.7.3.2
-
--- a/open-src/lib/libXi/solaris-abi.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libXi/solaris-abi.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,8 +1,8 @@
 diff --git a/src/Makefile.am b/src/Makefile.am
-index c036ae7..91e8029 100644
+index 806265c..ad41371 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -72,7 +72,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
+@@ -73,7 +73,7 @@ AM_CFLAGS = $(XI_CFLAGS) \
              $(CWARNFLAGS)
  
  
@@ -12,10 +12,10 @@
  libXiincludedir = $(includedir)/X11/extensions
  libXiinclude_HEADERS = $(top_srcdir)/include/X11/extensions/XInput.h \
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 4ca3ac7..b66f7b3 100644
+index b3c9830..776ba0c 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -340,7 +340,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
+@@ -343,7 +343,7 @@ AM_CFLAGS = $(XI_CFLAGS) \
              $(MALLOC_ZERO_CFLAGS) \
              $(CWARNFLAGS)
  
--- a/open-src/lib/libdrm/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libdrm/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -31,11 +31,12 @@
 UPSTREAM_SET	= yes
 
 # Version number (used in path names)
-MODULE_VERSION=2.4.25
+MODULE_VERSION=2.4.32
 
 # Checksums for upstream tarball
-TARBALL_MD5  = f53dc4c72109b17908e4113c3b8addfe
-TARBALL_SHA1 = b950f29cd1c4bb9f1c98a926486a47256b0a4194
+TARBALL_MD5  = b731faf4a49f89c318d84378cb563cf8
+TARBALL_SHA1 = 4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842
+TARBALL_SHA256 = 9ba8a1613de57af8f501a162747ed69aff30d63fc1316602770974bdd9ee984e
 
 # Library name (used for specfiles/mapfiles)
 LIBNAME=drm
@@ -82,7 +83,8 @@
 
 # Upstream seems to install in $(X11_SERVERLIBS_SUBDIR)/pkgconfig no matter
 # what, so just move them afterwards
-PC_FILES = libdrm.pc libdrm_intel.pc libkms.pc
+PC_FILES_i386 = libdrm_intel.pc
+PC_FILES = libdrm.pc libkms.pc $(PC_FILES_$(MACH))
 MOVED_PC_FILES = $(PC_FILES:%=$(PROTODIR)/$(PKGCONFIG_DIR)/%)
 XSERVER_PC_DIR = $(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)/pkgconfig
 
--- a/open-src/lib/libdrm/solaris-drm-port.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libdrm/solaris-drm-port.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -196,18 +196,6 @@
  
  #include "internal.h"
  
-diff -urp -x '*~' -x '*.orig' xf86drm.c xf86drm.c
---- xf86drm.c	2010-06-06 18:11:46.000000000 -0700
-+++ xf86drm.c	2011-01-24 19:15:45.547448918 -0800
-@@ -967,7 +967,7 @@ int drmRmMap(int fd, drm_handle_t handle
- {
-     drm_map_t map;
- 
--    map.handle = (void *)handle;
-+    map.handle = (drm_handle_t)handle;
- 
-     if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
- 	return -errno;
 diff -urp -x '*~' -x '*.orig' xf86drm.h xf86drm.h
 --- xf86drm.h	2010-06-06 18:11:46.000000000 -0700
 +++ xf86drm.h	2011-01-24 19:15:45.547758484 -0800
@@ -243,3 +231,14 @@
  
  }
 
+--- xf86drm.c	Mon Dec  5 12:57:15 2011
++++ xf86drm.c	Mon Dec  5 13:03:00 2011
+@@ -984,7 +984,7 @@
+ {
+     drm_map_t map;
+ 
+-    map.handle = (void *)(uintptr_t)handle;
++    map.handle = (drm_handle_t)(uintptr_t)handle;
+ 
+     if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
+ 	return -errno;
--- a/open-src/lib/libpciaccess/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libpciaccess/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # libpciaccess Makefile
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -28,20 +28,18 @@
 MODULE_NAME=libpciaccess
 
 # Version number (used in path names)
-MODULE_VERSION=0.12.1
+MODULE_VERSION=0.13
 
 # Checksums for upstream tarball
-TARBALL_MD5  = d6363ee9f4df79f6fc47cba7c67b0d35
-TARBALL_SHA1 = 4933bda545df37395e57ff6b4bd61e17a5431770
+TARBALL_MD5   = 2604307ba43c76ee8aec11ea137ae1e8
+TARBALL_SHA1  = 7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353
+TARBALL_SHA256= 24368520b0947487ec73729e3c97c95f3d9bf83704a910bb0abe1d5a63df32fd
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
-	pciaccess_private.h.patch \
 	scanpci.man.patch \
-	solx_devfs.c.patch \
-	solx_devfs.c.domain.patch \
-	scanpci_64bit.patch \
-	sparc.patch
+	primary-vga.patch,-p1 \
+	scanpci_64bit.patch,-p1
 
 # Library name
 LIBNAME=libpciaccess
--- a/open-src/lib/libpciaccess/pciaccess_private.h.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -urp -x '*~' -x '*.orig' src/pciaccess_private.h src/pciaccess_private.h
---- src/pciaccess_private.h	2010-02-24 23:36:56.000000000 -0800
-+++ src/pciaccess_private.h	2011-02-02 20:56:47.243743550 -0800
-@@ -128,6 +128,7 @@ struct pci_device_private {
-     struct pci_device_mapping *mappings;
-     unsigned num_mappings;
-     /*@}*/
-+    int is_primary;
- };
- 
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libpciaccess/primary-vga.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,102 @@
+diff --git a/src/pciaccess_private.h b/src/pciaccess_private.h
+index 32f8a75..9d65a51 100644
+--- a/src/pciaccess_private.h
++++ b/src/pciaccess_private.h
+@@ -133,6 +133,7 @@ struct pci_device_private {
+     struct pci_device_mapping *mappings;
+     unsigned num_mappings;
+     /*@}*/
++    int is_primary;
+ };
+ 
+ 
+diff --git a/src/solx_devfs.c b/src/solx_devfs.c
+index 5e91a14..5f0db2d 100644
+--- a/src/solx_devfs.c
++++ b/src/solx_devfs.c
+@@ -791,6 +791,18 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
+ #ifdef __sparc
+ 	di_minor_t minor;
+ #endif
++	int *prop;
++	struct pci_device_private *priv =
++	    (struct pci_device_private *) dev;
++
++	priv->is_primary = 0;
++
++    	if (di_prop_lookup_ints(DDI_DEV_T_ANY,
++	    args.node, "primary-controller", &prop) >= 1) {
++	        if (prop[0])
++			priv->is_primary = 1;
++
++	}
+ 
+ #ifdef __sparc
+ 	if (minor = di_minor_next(args.node, DI_MINOR_NIL))
+@@ -845,22 +857,33 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
+     }
+ 
+     /*
+-     * Solaris has its own BAR index.
++     * Each BAR address get its own region slot in sequence.
++     * 32 bit BAR:
++     * BAR 0x10 -> slot0, BAR 0x14 -> slot1...
++     * 64 bit BAR:
++     * BAR 0x10 -> slot0, BAR 0x18 -> slot2...,
++     * slot1 is part of BAR 0x10
+      * Linux give two region slot for 64 bit address.
+      */
+     for (i = 0; i < len; i = i + CELL_NUMS_1275) {
+ 
+ 	reg = (pci_regspec_t *)&regbuf[i];
+ 	ent = reg->pci_phys_hi & 0xff;
++
++	if (ent > PCI_CONF_BASE5) {
++		fprintf(stderr, "error ent = %d\n", ent);
++		break;
++	}
+ 	/*
+ 	 * G35 broken in BAR0
+ 	 */
+-	ent = (ent - PCI_CONF_BASE0) >> 2;
+-	if (ent >= 6) {
+-	    fprintf(stderr, "error ent = %d\n", ent);
+-	    break;
+-	}
+-
++	if (ent < PCI_CONF_BASE0) {
++	/*
++	 * VGA resource here and ignore it
++	 */                                                             
++		break;
++	} else
++		ent = (ent - PCI_CONF_BASE0) >> 2;
+ 	/*
+ 	 * non relocatable resource is excluded
+ 	 * such like 0xa0000, 0x3b0. If it is met,
+@@ -1122,6 +1145,15 @@ pci_device_solx_devfs_write( struct pci_device * dev, const void * data,
+     return (err);
+ }
+ 
++static int pci_device_solx_devfs_boot_vga(struct pci_device *dev)
++{
++	struct pci_device_private *priv =
++	    (struct pci_device_private *) dev;
++
++	return (priv->is_primary);
++
++}
++
+ 
+ 
+ static const struct pci_system_methods solx_devfs_methods = {
+@@ -1135,7 +1167,8 @@ static const struct pci_system_methods solx_devfs_methods = {
+     .read = pci_device_solx_devfs_read,
+     .write = pci_device_solx_devfs_write,
+ 
+-    .fill_capabilities = pci_fill_capabilities_generic
++    .fill_capabilities = pci_fill_capabilities_generic,
++    .boot_vga = pci_device_solx_devfs_boot_vga
+ };
+ 
+ /*
--- a/open-src/lib/libpciaccess/scanpci_64bit.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/libpciaccess/scanpci_64bit.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,7 +1,29 @@
-diff -urp -x '*~' -x '*.orig' src/solx_devfs.c src/solx_devfs.c
---- src/solx_devfs.c	Fri Jul 15 15:29:25 2011
-+++ src/solx_devfs.c	Mon Jul 25 18:57:29 2011
-@@ -865,14 +865,10 @@
+diff --git a/scanpci/scanpci.c b/scanpci/scanpci.c
+index 1f5f8bd..480e152 100644
+--- a/scanpci/scanpci.c
++++ b/scanpci/scanpci.c
+@@ -151,11 +151,14 @@ print_pci_device( struct pci_device * dev, int verbose )
+ 	pci_device_probe( dev );
+ 	for ( i = 0 ; i < 6 ; i++ ) {
+ 	    if ( dev->regions[i].base_addr != 0 ) {
+-		printf( "  BASE%u     0x%08"PRIxPTR" SIZE %zu  %s",
++		static const char *fmt8 = "  BASE%u     0x%08llx SIZE %d  %s";
++		static const char *fmt16 = "  BASE%u     0x%016llx SIZE %d  %s";
++		printf( dev->regions[i].is_64 ? fmt16 : fmt8,
+ 			i,
+ 			(intptr_t) dev->regions[i].base_addr,
+ 			(size_t) dev->regions[i].size,
+-			(dev->regions[i].is_IO) ? "I/O" : "MEM" );
++			(dev->regions[i].is_IO) ? "I/O" : 
++			((dev->regions[i].is_64) ? "MEM64" : "MEM") );
+ 
+ 		if ( ! dev->regions[i].is_IO ) {
+ 		    if ( dev->regions[i].is_prefetchable ) {
+diff --git a/src/solx_devfs.c b/src/solx_devfs.c
+index 5f0db2d..6b8db2c 100644
+--- a/src/solx_devfs.c
++++ b/src/solx_devfs.c
+@@ -897,14 +897,10 @@ pci_device_solx_devfs_probe( struct pci_device * dev )
  	}
  
  
@@ -20,24 +42,3 @@
  
  	switch (reg->pci_phys_hi & PCI_REG_ADDR_M) {
  	    case PCI_ADDR_IO:
-
-diff -urp -x '*~' -x '*.orig' scanpci/scanpci.c scanpci/scanpci.c
---- scanpci/scanpci.c	Thu Oct  7 14:14:44 2010
-+++ scanpci/scanpci.c	Mon Jul 25 17:16:07 2011
-@@ -132,11 +132,14 @@
- 	pci_device_probe( dev );
- 	for ( i = 0 ; i < 6 ; i++ ) {
- 	    if ( dev->regions[i].base_addr != 0 ) {
--		printf( "  BASE%u     0x%08x SIZE %d  %s",
-+		static const char *fmt8 = "  BASE%u     0x%08llx SIZE %d  %s";
-+		static const char *fmt16 = "  BASE%u     0x%016llx SIZE %d  %s";
-+		printf( dev->regions[i].is_64 ? fmt16 : fmt8,
- 			i,
- 			(intptr_t) dev->regions[i].base_addr,
- 			(size_t) dev->regions[i].size,
--			(dev->regions[i].is_IO) ? "I/O" : "MEM" );
-+			(dev->regions[i].is_IO) ? "I/O" : 
-+			((dev->regions[i].is_64) ? "MEM64" : "MEM") );
- 
- 		if ( ! dev->regions[i].is_IO ) {
- 		    if ( dev->regions[i].is_prefetchable ) {
--- a/open-src/lib/libpciaccess/solx_devfs.c.patch	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-diff -urp -x '*~' -x '*.orig' src/solx_devfs.c src/solx_devfs.c
---- src/solx_devfs.c	2010-11-21 11:13:33.000000000 -0800
-+++ src/solx_devfs.c	2011-02-02 20:56:47.794721917 -0800
-@@ -118,6 +118,8 @@ static int pci_device_solx_devfs_write( 
-     const void * data, pciaddr_t offset, pciaddr_t size,
-     pciaddr_t * bytes_written );
- 
-+static int pci_device_solx_devfs_boot_vga(struct pci_device *dev);
-+
- static int probe_dev(nexus_t *nexus, pcitool_reg_t *prg_p,
- 		     struct pci_system *pci_sys);
- 
-@@ -143,7 +145,8 @@ static const struct pci_system_methods s
-     .read = pci_device_solx_devfs_read,
-     .write = pci_device_solx_devfs_write,
- 
--    .fill_capabilities = pci_fill_capabilities_generic
-+    .fill_capabilities = pci_fill_capabilities_generic,
-+    .boot_vga = pci_device_solx_devfs_boot_vga
- };
- 
- static nexus_t *
-@@ -706,12 +709,12 @@ pci_device_solx_devfs_probe( struct pci_
-     pciaddr_t bytes;
-     int len = 0;
-     uint ent = 0;
-+    struct pci_device_private *priv =
-+	    (struct pci_device_private *) dev;
- 
-     err = pci_device_solx_devfs_read( dev, config, 0, 256, & bytes );
- 
-     if ( bytes >= 64 ) {
--	struct pci_device_private *priv =
--	    (struct pci_device_private *) dev;
- 
- 	dev->vendor_id = (uint16_t)config[0] + ((uint16_t)config[1] << 8);
- 	dev->device_id = (uint16_t)config[2] + ((uint16_t)config[3] << 8);
-@@ -745,6 +748,16 @@ pci_device_solx_devfs_probe( struct pci_
- 	}
-     }
-     if (args.node != DI_NODE_NIL) {
-+	int *prop;
-+
-+	priv->is_primary = 0;
-+
-+    	if (di_prop_lookup_ints(DDI_DEV_T_ANY,
-+	    args.node, "primary-controller", &prop) >= 1) {
-+	        if (prop[0])
-+			priv->is_primary = 1;
-+
-+	}
- 	/*
- 	 * It will succeed for sure, because it was
- 	 * successfully called in find_target_node
-@@ -755,6 +768,7 @@ pci_device_solx_devfs_probe( struct pci_
- 
-     }
- 
-+
-     if (len <= 0)
- 	goto cleanup;
- 
-@@ -785,22 +799,33 @@ pci_device_solx_devfs_probe( struct pci_
-     }
- 
-     /*
--     * Solaris has its own BAR index.
-+     * Each BAR address get its own region slot in sequence.
-+     * 32 bit BAR:
-+     * BAR 0x10 -> slot0, BAR 0x14 -> slot1...
-+     * 64 bit BAR:
-+     * BAR 0x10 -> slot0, BAR 0x18 -> slot2...,
-+     * slot1 is part of BAR 0x10
-      * Linux give two region slot for 64 bit address.
-      */
-     for (i = 0; i < len; i = i + CELL_NUMS_1275) {
- 
- 	reg = (pci_regspec_t *)&regbuf[i];
- 	ent = reg->pci_phys_hi & 0xff;
-+
-+	if (ent > PCI_CONF_BASE5) {
-+		fprintf(stderr, "error ent = %d\n", ent);
-+		break;
-+	}
- 	/*
- 	 * G35 broken in BAR0
- 	 */
--	ent = (ent - PCI_CONF_BASE0) >> 2;
--	if (ent >= 6) {
--	    fprintf(stderr, "error ent = %d\n", ent);
--	    break;
--	}
--
-+	if (ent < PCI_CONF_BASE0) {
-+	/*
-+	 * VGA resource here and ignore it
-+	 */                                                             
-+		break;
-+	} else
-+		ent = (ent - PCI_CONF_BASE0) >> 2;
- 	/*
- 	 * non relocatable resource is excluded
- 	 * such like 0xa0000, 0x3b0. If it is met,
-@@ -1023,3 +1048,11 @@ pci_device_solx_devfs_map_range(struct p
- 
-     return err;
- }
-+static int pci_device_solx_devfs_boot_vga(struct pci_device *dev)
-+{
-+	struct pci_device_private *priv =
-+	    (struct pci_device_private *) dev;
-+
-+	return (priv->is_primary);
-+
-+}
--- a/open-src/lib/mesa/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/mesa/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -40,11 +40,11 @@
 MODULE_ARC_CASES = LSARC/2005/109
 
 # Version number (used in path names)
-MODULE_VERSION=7.10.2
+MODULE_VERSION=7.11.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = f5de82852f1243f42cc004039e10b771
-TARBALL_SHA1 = 71bbb2686230f6334aa625a951b58b4b2d5d6aa0
+TARBALL_MD5  = 0837c52698fe3252369c3fdb5195afcc
+TARBALL_SHA1 = 5981ac2de8438e5f4a1f3561f2044d700c5f0de9
 
 # Source tarball
 SOURCE_TARBALL_NAME=MesaLib-$(MODULE_VERSION).tar.bz2
@@ -63,9 +63,11 @@
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES= \
+	gallium-endian.patch,-p1 \
+	gcc-bitcount.patch,-p1 \
 	install-pc-dir.patch \
 	glu-no-mangled-exports.patch \
-	solaris-port.patch glsl.patch
+	solaris-port.patch bromolow-chipset.patch
 
 # File created by running configure script
 AUTOCONF_TARGET=$(SOURCE_DIR)/configs/autoconf
@@ -80,7 +82,8 @@
 # Command line options to GNU autoconf configure script
 MODULE_CONFIG_OPTS = --with-driver=dri --disable-egl --disable-gallium \
 	--with-dri-driverdir='$(X11_SERVERMODS_DIR)/dri$(ARCHLIBSUBDIR)' \
-	--with-dri-drivers='$(DRI_DRIVER_LIST)'
+	--with-dri-drivers='$(DRI_DRIVER_LIST)' \
+	--with-gallium-drivers=  --disable-gallium-llvm
 
 # Build mesa with this define (CR 7032292)
 MODULE_CFLAGS = -D__EXTENSIONS__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/bromolow-chipset.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,23 @@
+Based on upstream commit e057a56448e2e785f74bc13dbd6ead8572ebed91
+intel: add Ivy Bridge GT2 server variant
+We were missing this one and it is being used by Bromolow. Signed-off-by: Eugeni Dodonov <[email protected]>
+--- src/mesa/drivers/dri/intel/intel_chipset.h	Thu Apr  5 14:17:15 2012
++++ src/mesa/drivers/dri/intel/intel_chipset.h	Thu Apr  5 14:21:27 2012
+@@ -85,6 +85,7 @@
+ #define PCI_CHIP_IVYBRIDGE_M_GT1        0x0156  /* Mobile */
+ #define PCI_CHIP_IVYBRIDGE_M_GT2        0x0166
+ #define PCI_CHIP_IVYBRIDGE_S_GT1        0x015a  /* Server */
++#define PCI_CHIP_IVYBRIDGE_S_GT2 	0x016a  /* server */
+ 
+ #define IS_MOBILE(devid)	(devid == PCI_CHIP_I855_GM || \
+ 				 devid == PCI_CHIP_I915_GM || \
+@@ -147,7 +148,8 @@
+ 				 devid == PCI_CHIP_IVYBRIDGE_S_GT1)
+ 
+ #define IS_IVB_GT2(devid)       (devid == PCI_CHIP_IVYBRIDGE_GT2 || \
+-				 devid == PCI_CHIP_IVYBRIDGE_M_GT2)
++				 devid == PCI_CHIP_IVYBRIDGE_M_GT2 || \
++				 devid == PCI_CHIP_IVYBRIDGE_S_GT2)
+ 
+ #define IS_IVYBRIDGE(devid)     (IS_IVB_GT1(devid) || IS_IVB_GT2(devid))
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/gallium-endian.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,33 @@
+From 0eb30cfa9cbf865828708cfef401974ae4662311 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 18 Oct 2011 14:04:15 -0700
+Subject: [PATCH] Add solaris detection for PIPE_ARCH_LITTLE_ENDIAN/PIPE_ARCH_BIG_ENDIAN
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ src/gallium/include/pipe/p_config.h |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h
+index b3a7b33..7cd42c6 100644
+--- a/src/gallium/include/pipe/p_config.h
++++ b/src/gallium/include/pipe/p_config.h
+@@ -129,6 +129,15 @@
+ # define PIPE_ARCH_BIG_ENDIAN
+ #endif
+ 
++#elif defined(__sun)
++#include <sys/isa_defs.h>
++
++#if defined(_LITTLE_ENDIAN)
++# define PIPE_ARCH_LITTLE_ENDIAN
++#elif defined(_BIG_ENDIAN)
++# define PIPE_ARCH_BIG_ENDIAN
++#endif
++
+ #else
+ 
+ #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
+-- 
+1.7.3.2
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/gcc-bitcount.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,44 @@
+[Backport to Mesa 7.11 of this patch from git master]
+
+From 086f84d9f1c19480a1e09f693bf8a56dd16709d3 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Thu, 20 Oct 2011 17:14:05 -0700
+Subject: [PATCH] Fix _GNUC__ typo in check for gcc 3.x for _mesa_bitcount
+
+Without this fix, builds with gcc 3.4.x end up depending on undefined
+_mesa_bitcount instead of gcc's __builtin_popcount.
+
+NOTE: This is a candidate for the stable branches.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ src/mesa/main/imports.c |    2 +-
+ src/mesa/main/imports.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
+index 0a572ec..098db08 100644
+--- a/src/mesa/main/imports.c
++++ b/src/mesa/main/imports.c
+@@ -514,7 +514,7 @@ _mesa_ffsll(int64_t val)
+ #endif
+ 
+ #if !defined(__GNUC__) ||\
+-   ((_GNUC__ == 3 && __GNUC_MINOR__ < 4) && __GNUC__ < 4)
++   ((__GNUC__ == 3 && __GNUC_MINOR__ < 4) && __GNUC__ < 4)
+ /**
+  * Return number of bits set in given GLuint.
+  */
+diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
+index 3fa1db0..b577874 100644
+--- a/src/mesa/main/imports.h
++++ b/src/mesa/main/imports.h
+@@ -570,7 +570,7 @@ _mesa_init_sqrt_table(void);
+ #define _mesa_ffs(i)  ffs(i)
+ #define _mesa_ffsll(i)  ffsll(i)
+ 
+-#if ((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
++#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
+ #define _mesa_bitcount(i) __builtin_popcount(i)
+ #else
+ extern unsigned int
--- a/open-src/lib/mesa/solaris-port.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/mesa/solaris-port.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
---- src/mesa/drivers/dri/intel/intel_context.h	Thu Feb 10 09:26:20 2011
-+++ src/mesa/drivers/dri/intel/intel_context.h	Thu Feb 10 09:27:22 2011
-@@ -271,9 +271,13 @@
+--- src/mesa/drivers/dri/intel/intel_context.h	Thu Aug 18 08:49:56 2011
++++ src/mesa/drivers/dri/intel/intel_context.h	Thu Aug 18 08:52:57 2011
+@@ -304,9 +304,13 @@
     driOptionCache optionCache;
  };
  
@@ -15,7 +15,7 @@
  #define SUBPIXEL_X 0.125
  #define SUBPIXEL_Y 0.125
  
-@@ -307,7 +311,7 @@
+@@ -364,7 +368,7 @@
   * than COPY_DWORDS would:
   * XXX Put this in src/mesa/main/imports.h ???
   */
@@ -24,47 +24,6 @@
  static INLINE void * __memcpy(void * to, const void * from, size_t n)
  {
     int d0, d1, d2;
---- src/mesa/drivers/dri/intel/intel_batchbuffer.h	Thu Feb 10 09:28:18 2011
-+++ src/mesa/drivers/dri/intel/intel_batchbuffer.h	Thu Feb 10 13:28:05 2011
-@@ -8,9 +8,9 @@
- #include "intel_reg.h"
- 
- #define BATCH_SZ 16384
--#define BATCH_RESERVED 16
-+#define BATCH_RESERVED16 16
-+#define BATCH_RESERVED4k 4096
- 
--
- struct intel_batchbuffer
- {
-    struct intel_context *intel;
-@@ -92,8 +92,12 @@
- static INLINE GLint
- intel_batchbuffer_space(struct intel_batchbuffer *batch)
- {
--   return (batch->state_batch_offset - batch->reserved_space) -
--      (batch->ptr - batch->map);
-+   if (batch->intel->intelScreen->deviceID == PCI_CHIP_I865_G)
-+   	return (batch->state_batch_offset - BATCH_RESERVED16) -
-+      		(batch->ptr - batch->map);
-+   else 
-+   	return (batch->state_batch_offset - BATCH_RESERVED4k) -
-+      		(batch->ptr - batch->map);
- }
- 
- 
---- src/mesa/drivers/dri/Makefile.template	Thu Feb 10 13:58:58 2011
-+++ src/mesa/drivers/dri/Makefile.template	Thu Feb 10 14:01:53 2011
-@@ -1,5 +1,9 @@
- # -*-makefile-*-
- 
-+# Needed to specify symbols which are allowed to be undefined when
-+# linking DRI modules with -z defs
-+DRI_LIB_DEPS += -Wl,-M,$(TOP)/src/mesa/drivers/dri/mapfile.externs
-+
- MESA_MODULES = $(TOP)/src/mesa/libmesa.a
- 
- COMMON_GALLIUM_SOURCES = \
 --- src/mesa/drivers/dri/common/dri_util.h	Thu Feb 10 14:04:16 2011
 +++ src/mesa/drivers/dri/common/dri_util.h	Thu Feb 10 14:04:54 2011
 @@ -58,6 +58,10 @@
@@ -88,20 +47,9 @@
  
  #if defined( __powerpc__ )
  
---- src/mesa/drivers/dri/i915/intel_tris.c	Thu Feb 10 14:07:48 2011
-+++ src/mesa/drivers/dri/i915/intel_tris.c	Thu Feb 10 14:08:17 2011
-@@ -325,7 +325,7 @@
-  *                    Emit primitives as inline vertices               *
-  ***********************************************************************/
- 
--#ifdef __i386__
-+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
- #define COPY_DWORDS( j, vb, vertsize, v )			\
- do {								\
-    int __tmp;							\
---- src/mesa/drivers/dri/i965/brw_draw_upload.c	Thu Feb 10 14:09:00 2011
-+++ src/mesa/drivers/dri/i965/brw_draw_upload.c	Thu Feb 10 14:09:49 2011
-@@ -159,7 +159,24 @@
+--- src/mesa/drivers/dri/i965/brw_draw_upload.c	Thu Aug 18 08:59:09 2011
++++ src/mesa/drivers/dri/i965/brw_draw_upload.c	Thu Aug 18 09:01:56 2011
+@@ -160,7 +160,24 @@
     BRW_SURFACEFORMAT_R8G8B8A8_SSCALED
  };
  
@@ -126,63 +74,20 @@
  /**
   * Given vertex array type/size/format/normalized info, return
   * the appopriate hardware surface type.
---- src/mesa/drivers/dri/intel/intel_batchbuffer.c	Thu Feb 10 14:12:23 2011
-+++ src/mesa/drivers/dri/intel/intel_batchbuffer.c	Thu Feb 10 14:13:06 2011
-@@ -49,7 +49,10 @@
- 
-    batch->size = intel->maxBatchSize;
-    batch->ptr = batch->map;
--   batch->reserved_space = BATCH_RESERVED;
-+   if (batch->intel->intelScreen->deviceID == PCI_CHIP_I865_G)
-+	batch->reserved_space = BATCH_RESERVED16;
-+   else
-+	batch->reserved_space = BATCH_RESERVED4k;
-    batch->dirty_state = ~0;
-    batch->state_batch_offset = batch->size;
- }
---- configure.ac	Thu Mar 24 13:20:29 2011
-+++ configure.ac	Thu Mar 24 13:21:39 2011
-@@ -150,7 +150,7 @@
-     # Enable -fvisibility=hidden if using a gcc that supports it
-     save_CFLAGS="$CFLAGS"
-     AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
--    CFLAGS="$CFLAGS -fvisibility=hidden"
-+    CFLAGS="$CFLAGS"
-     AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
- 		   [CFLAGS="$save_CFLAGS" ; AC_MSG_RESULT([no])]);
+--- src/mesa/drivers/dri/i915/intel_tris.c	Thu Aug 18 08:58:29 2011
++++ src/mesa/drivers/dri/i915/intel_tris.c	Thu Aug 18 09:01:06 2011
+@@ -337,7 +337,7 @@
+  *                    Emit primitives as inline vertices               *
+  ***********************************************************************/
  
-@@ -163,7 +163,7 @@
-     # Enable -fvisibility=hidden if using a gcc that supports it
-     save_CXXFLAGS="$CXXFLAGS"
-     AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
--    CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+    CXXFLAGS="$CXXFLAGS "
-     AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
- 		   [CXXFLAGS="$save_CXXFLAGS" ; AC_MSG_RESULT([no])]);
- 
---- configure	Thu Mar 24 13:20:33 2011
-+++ configure	Thu Mar 24 13:22:08 2011
-@@ -4884,7 +4884,7 @@
-     save_CFLAGS="$CFLAGS"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
- $as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
--    CFLAGS="$CFLAGS -fvisibility=hidden"
-+    CFLAGS="$CFLAGS "
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -4916,7 +4916,7 @@
-     save_CXXFLAGS="$CXXFLAGS"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -fvisibility=hidden" >&5
- $as_echo_n "checking whether $CXX supports -fvisibility=hidden... " >&6; }
--    CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+    CXXFLAGS="$CXXFLAGS "
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
---- src/glx/Makefile	Tue Apr 19 10:57:29 2011
-+++ src/glx/Makefile	Tue Apr 19 10:58:54 2011
-@@ -73,6 +73,10 @@
+-#ifdef __i386__
++#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
+ #define COPY_DWORDS( j, vb, vertsize, v )			\
+ do {								\
+    int __tmp;							\
+--- src/glx/Makefile	Thu Aug 18 09:02:07 2011
++++ src/glx/Makefile	Thu Aug 18 09:04:41 2011
+@@ -80,6 +80,10 @@
  
  default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
  
@@ -193,3 +98,90 @@
  # Make libGL
  $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
  	$(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+--- configure.ac	Thu Aug 18 10:29:24 2011
++++ configure.ac	Thu Aug 18 10:31:37 2011
+@@ -158,7 +158,7 @@
+     # Enable -fvisibility=hidden if using a gcc that supports it
+     save_CFLAGS="$CFLAGS"
+     AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+-    VISIBILITY_CFLAGS="-fvisibility=hidden"
++    VISIBILITY_CFLAGS=""
+     CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+     AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+ 		   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);
+@@ -175,7 +175,7 @@
+     # Enable -fvisibility=hidden if using a gcc that supports it
+     save_CXXFLAGS="$CXXFLAGS"
+     AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
+-    VISIBILITY_CXXFLAGS="-fvisibility=hidden"
++    VISIBILITY_CXXFLAGS=""
+     CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"
+     AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+ 		   [VISIBILITY_CXXFLAGS="" ; AC_MSG_RESULT([no])]);
+--- configure	Thu Aug 18 10:31:34 2011
++++ configure	Thu Aug 18 10:32:15 2011
+@@ -5012,7 +5012,7 @@
+     save_CFLAGS="$CFLAGS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
+ $as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
+-    VISIBILITY_CFLAGS="-fvisibility=hidden"
++    VISIBILITY_CFLAGS=""
+     CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -5048,7 +5048,7 @@
+     save_CXXFLAGS="$CXXFLAGS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -fvisibility=hidden" >&5
+ $as_echo_n "checking whether $CXX supports -fvisibility=hidden... " >&6; }
+-    VISIBILITY_CXXFLAGS="-fvisibility=hidden"
++    VISIBILITY_CXXFLAGS=""
+     CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+--- src/mesa/drivers/dri/Makefile.targets	Fri Jul  8 18:37:10 2011
++++ src/mesa/drivers/dri/Makefile.targets	Thu Aug 18 11:09:47 2011
+@@ -16,7 +16,12 @@
+ 
+ default: subdirs lib
+ 
++DRI_LIB_DEPS += -Wl,-M,$(TOP)/src/mesa/drivers/dri/mapfile.externs
+ 
++MESA_MODULES = $(TOP)/src/mesa/libmesa.a
++
++LIBGLSL_MOBULES = $(TOP)/src/glsl/libglsl.a
++
+ .PHONY: lib
+ lib: symlinks subdirs depend
+ 	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
+@@ -24,7 +29,7 @@
+ $(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \
+ 		$(TOP)/src/mesa/drivers/dri/Makefile.targets $(TOP)/src/mesa/drivers/dri/common/dri_test.o
+ 	$(MKLIB) -o [email protected] -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+-		$(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
++		$(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS) $(MESA_MODULES) $(LIBGLSL_MOBULES)
+ 	$(CXX) $(CFLAGS) -o [email protected] $(TOP)/src/mesa/drivers/dri/common/dri_test.o [email protected] $(DRI_LIB_DEPS)
+ 	@rm -f [email protected]
+ 	mv -f [email protected] $@
+
+--- src/mesa/drivers/dri/intel/intel_context.c	Tue Sep  6 09:26:10 2011
++++ src/mesa/drivers/dri/intel/intel_context.c	Tue Sep  6 09:29:16 2011
+@@ -737,7 +737,7 @@
+    driParseConfigFiles(&intel->optionCache, &intelScreen->optionCache,
+                        sPriv->myNum, (intel->gen >= 4) ? "i965" : "i915");
+    if (intel->gen < 4)
+-      intel->maxBatchSize = 4096;
++      intel->maxBatchSize = 2*4096;
+    else
+       intel->maxBatchSize = sizeof(intel->batch.map);
+ 
+--- src/mesa/drivers/dri/intel/intel_batchbuffer.c	Tue Sep  6 09:28:13 2011
++++ src/mesa/drivers/dri/intel/intel_batchbuffer.c	Tue Sep  6 09:30:56 2011
+@@ -82,7 +82,7 @@
+    intel->batch.bo = drm_intel_bo_alloc(intel->bufmgr, "batchbuffer",
+ 					intel->maxBatchSize, 4096);
+ 
+-   intel->batch.reserved_space = BATCH_RESERVED;
++   intel->batch.reserved_space = 4096;
+    intel->batch.state_batch_offset = intel->batch.bo->size;
+    intel->batch.used = 0;
+ }
--- a/open-src/lib/mesa/sun-src/src/glx/mapfile.scope	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/mesa/sun-src/src/glx/mapfile.scope	Fri Apr 06 21:57:14 2012 -0700
@@ -665,5 +665,6 @@
 	__glConvolutionParameteriv_size;
 	__glPointParameterfvEXT_size;
 	__glPointParameterivNV_size;
+	__indirect_glClampColorARB;
 
 };
--- a/open-src/lib/mesa/sun-src/src/mesa/drivers/dri/mapfile.externs	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/mesa/sun-src/src/mesa/drivers/dri/mapfile.externs	Fri Apr 06 21:57:14 2012 -0700
@@ -22,4 +22,6 @@
     sl_cl_compile = FUNCTION extern;
     
     radeon_gem_get_kernel_name = FUNCTION extern;
+
+    _mesa_bitcount = FUNCTION extern;
 };
--- a/open-src/lib/pixman/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/lib/pixman/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # pixman Makefile
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -28,19 +28,17 @@
 MODULE_NAME=pixman
 
 # Version number (used in path names)
-MODULE_VERSION=0.22.0
+MODULE_VERSION=0.24.4
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 307fe4d7dc83b1a558c362907097c0d0
-TARBALL_SHA1 = d24ea233755d7dce9f0d93136ad99fba8d4e4fa0
+TARBALL_MD5  = 89eb7db8853681bbcea626b161de0488
+TARBALL_SHA1 = 683450f917015366ac7918fc517c76801aeff374
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = 
 
-# Override default CFLAGS for x86 builds to avoid clashes between
-# -xtarget=pentium and the MMX/SSE flags added by configure for specific
-# files in pixman and to work around assertions in Studio 12 when the 
-# -xspace flag is used (Studio bug #6825222)
+# Override default CFLAGS for x86 builds to work around assembler syntax 
+# errors reported by Studio 12.1 when the -xspace flag is used
 include ../../common/Makefile.init
 NO_XSPACE_CFLAGS = $(LIB_CFLAGS:-xspace=)
 MODULE_CONFIG_ENV_i386 = CFLAGS="$(NO_XSPACE_CFLAGS)"
--- a/open-src/proto/dri2proto/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/proto/dri2proto/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -26,11 +26,11 @@
 MODULE_NAME=dri2proto
 
 # Version number (used in path names)
-MODULE_VERSION=2.3
+MODULE_VERSION=2.6
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 3407b494d5e90d584c9af52aa8f9f028
-TARBALL_SHA1 = 6c9e2c822e777db435a43616067f8dd21cc00a53
+TARBALL_MD5  = 2eb74959684f47c862081099059a11ab
+TARBALL_SHA1 = ba65fc53376fd6e6b41bf6ef1e2ea1ba4b12ca96
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	
--- a/open-src/proto/fixesproto/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/proto/fixesproto/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -27,11 +27,11 @@
 MODULE_NAME=fixesproto
 
 # Version number (used in path names)
-MODULE_VERSION=4.1.2
+MODULE_VERSION=5.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = bdb58ecc313b509247036d5c11fa99df
-TARBALL_SHA1 = c9cda7ff37849250c328f8dc52dc0f6e546df3a5
+TARBALL_MD5  = e7431ab84d37b2678af71e29355e101d
+TARBALL_SHA1 = ab605af5da8c98c0c2f8b2c578fed7c864ee996a
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	
--- a/open-src/proto/glproto/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/proto/glproto/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -27,11 +27,11 @@
 MODULE_NAME=glproto
 
 # Version number (used in path names)
-MODULE_VERSION=1.4.12
+MODULE_VERSION=1.4.14
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 55edc5ff2efb734215c868f72f7cf27e
-TARBALL_SHA1 = 50f8bdae2c71b4bc4df421102f5f08a3fc417779
+TARBALL_MD5  = f48257daf0017f7a7667e5bf48ca3578
+TARBALL_SHA1 = ab1941ad184a76c023858dd1623edd625d70fc2c
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	
--- a/open-src/proto/inputproto/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/proto/inputproto/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -27,11 +27,12 @@
 MODULE_NAME=inputproto
 
 # Version number (used in path names)
-MODULE_VERSION=2.0.2
+MODULE_VERSION=2.1.99.6
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 07d54ae098ed4e6dce472f6ef3de05ce
-TARBALL_SHA1 = a34c01c67aa2ed9058ff19ace0041978b1d8d711
+TARBALL_MD5   = f131c9b60d4fff33ae4a44e4813e13d6
+TARBALL_SHA1  = 36d5ff554c9edc6eb116f3f08d32cd2acd75e9b5
+TARBALL_SHA256= 88f8206bd7f181df4b83510fbfd85400a48a16b081d1d6bb97d5cba880aa5da1
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES= 
--- a/open-src/util/util-macros/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/util/util-macros/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -31,11 +31,12 @@
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
-MODULE_VERSION=1.15.0
+MODULE_VERSION=1.16.2
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 357efdfa69f3e092de3b7000b90f6f4a
-TARBALL_SHA1 = 1c4871ba4b4c6cac894b64489053d85e0a122e60
+TARBALL_MD5   = b54342201bb8fef7bafaf335ce8c9c52
+TARBALL_SHA1  = 17340193e7ba5d9fd5a787a9401e84d223fcc918
+TARBALL_SHA256= 70986a05efab7557f54d719f55b8d65bc459ed13048f8a59e2d9e5efdb9af9e5
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	
--- a/open-src/xserver/xorg/IA.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/IA.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -19,10 +19,10 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 diff --git a/Makefile.am b/Makefile.am
-index 62c8d95..4d2e2ca 100644
+index cea140b..b1408f2 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -36,6 +36,7 @@ SUBDIRS = \
+@@ -37,6 +37,7 @@ SUBDIRS = \
  	damageext \
  	$(COMPOSITE_DIR) \
  	$(GLX_DIR) \
@@ -31,10 +31,10 @@
  	config \
  	hw \
 diff --git a/configure.ac b/configure.ac
-index d960d4c..c6cbb69 100644
+index 9e07c44..460da17 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1147,6 +1147,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input extension])
+@@ -1191,6 +1191,10 @@ AC_DEFINE(XINPUT, 1, [Support X Input extension])
  XI_LIB='$(top_builddir)/Xi/libXi.la'
  XI_INC='-I$(top_srcdir)/Xi'
  
@@ -45,15 +45,15 @@
  AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
  AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
  AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
-@@ -2276,3 +2280,6 @@ test/Makefile
- test/xi2/Makefile
+@@ -2240,3 +2244,6 @@ test/xi2/Makefile
+ xserver.ent
  xorg-server.pc
  ])
 +
 +# Add Sun IA extension
 +AC_OUTPUT([IA/Makefile])
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 387c134..e1d24e4 100644
+index aa3d97e..87004df 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
 @@ -125,6 +125,7 @@ static ModuleDefault ModuleDefaults[] = {
@@ -65,13 +65,13 @@
  };
  
 diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
-index 365f006..ea065fa 100644
+index a5be3ae..02a6d0d 100644
 --- a/hw/xfree86/dixmods/Makefile.am
 +++ b/hw/xfree86/dixmods/Makefile.am
-@@ -66,3 +66,11 @@ libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
+@@ -65,3 +65,11 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
+ libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
  
  libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
- libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
 +
 +
 +# Sun IA extension module additions
@@ -81,7 +81,7 @@
 +libia_la_LIBADD = $(top_builddir)/IA/libIA.la
 +libia_la_SOURCES = iamodule.c
 diff --git a/mi/miinitext.c b/mi/miinitext.c
-index 4499f37..ee04b05 100644
+index 8836992..b3c29fb 100644
 --- a/mi/miinitext.c
 +++ b/mi/miinitext.c
 @@ -94,6 +94,7 @@ SOFTWARE.
--- a/open-src/xserver/xorg/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -2,7 +2,7 @@
 #
 # Xorg server Makefile
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -28,13 +28,13 @@
 # Package name used in tarballs
 MODULE_NAME=xorg-server
 
-# Version number (used in path names)
+# Version number (used in path names) - set in open-src/common/Makefile.init
 MODULE_VERSION=$(XORGSERVER_VERS)
 
 # Checksums for upstream tarball
-TARBALL_MD5  = fc1bb18a09244cd43a998625a6a1b071
-TARBALL_SHA1 = 1699be5c0edeca553cfa3ee6caa228483465136b
-TARBALL_SHA256 = 05ec05fbc8ec336127071db38cfb61c618e43b720edbd8d51d171c0cd359e290
+TARBALL_MD5   = 3a3c4281f32c8702749e8f129372a355
+TARBALL_SHA1  = 5f48db767f71e9f58ded6ff356f3b8340820e524
+TARBALL_SHA256= 280a14c5de8697a4aab18dca85429671286e69e5ada0c1535f03666e56f07799
 
 # Patches to apply to source after unpacking, in order
 # *** Moved to patch-list file so they can be shared between Xorg & Xvnc builds
@@ -80,13 +80,13 @@
 
 # Man pages to apply Sun footer to & attributes to list
 SUNTOUCHED_MANPAGES= \
-	doc/man/Xserver.man \
+	man/Xserver.man \
 	hw/kdrive/ephyr/man/Xephyr.man \
 	hw/xfree86/utils/man/cvt.man \
 	hw/xfree86/utils/man/gtf.man \
-	hw/xfree86/doc/man/Xorg.man \
-	hw/xfree86/doc/man/xorg.conf.man \
-	hw/xfree86/doc/man/xorg.conf.d.man \
+	hw/xfree86/man/Xorg.man \
+	hw/xfree86/man/xorg.conf.man \
+	hw/xfree86/man/xorg.conf.d.man \
 	hw/vfb/man/Xvfb.man
 
 MODULE_STABILITY=Volatile
@@ -111,8 +111,8 @@
 # Solaris doesn't bundle the xmlto tool used upstream
 MODULE_DOC_DIR  = $(MODULE_PREFIX)/share/doc/Xserver
 MODULE_DOC_DIR_SET=yes
-MODULE_XML_PATH = $(SOURCE_DIR)/doc/xml
-DTRACE_DOC_DIR  = $(SOURCE_DIR)/doc/xml/dtrace
+MODULE_XML_PATH = $(SOURCE_DIR)/doc
+DTRACE_DOC_DIR  = $(MODULE_XML_PATH)/dtrace
 DTRACE_DOCS     = $(DTRACE_DOC_DIR)/Xserver-DTrace.html
 DTRACE_DOCS    += $(DTRACE_DOC_DIR)/Xserver-DTrace.txt
 BUILD_TARGETS  += $(DTRACE_DOCS)
@@ -203,8 +203,8 @@
 	       $(SOURCE_DIR)/hw/xfree86/os-support/bus/xf86Sbus.h \
 	       $(SOURCE_DIR)/hw/xfree86/dri/*.h $(SDK_INCLUDES_DIR)/
 	mkdir -p $(PROTODIR)$(X11_MAN_DIR)/man1
-	cp -pf $(SOURCE_DIR)/hw/xfree86/doc/man/xorgcfg.1 \
-	       $(SOURCE_DIR)/hw/xfree86/doc/man/xorgconfig.1 \
+	cp -pf $(SOURCE_DIR)/hw/xfree86/man/xorgcfg.1 \
+	       $(SOURCE_DIR)/hw/xfree86/man/xorgconfig.1 \
 	       $(PROTODIR)$(X11_MAN_DIR)/man1
 	mkdir -p $(PROTODIR)/etc/hal/fdi/preprobe/10osvendor
 	cp -pf $(SOURCE_DIR)/config/x11-input.fdi \
--- a/open-src/xserver/xorg/amd64-loader-path.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/amd64-loader-path.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -20,10 +20,10 @@
 # DEALINGS IN THE SOFTWARE.
 
 diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
-index eaa99e8..0c8b21c 100644
+index 5b9f8d1..d1dd595 100644
 --- a/hw/xfree86/loader/loadmod.c
 +++ b/hw/xfree86/loader/loadmod.c
-@@ -166,6 +166,13 @@ InitPathList(const char *path)
+@@ -168,6 +168,13 @@ InitPathList(const char *path)
  		list[n][len - 1] = '/';
  		list[n][len] = '\0';
  	    }
@@ -37,7 +37,7 @@
  	    n++;
  	}
  	elem = strtok(NULL, ",");
-@@ -387,6 +394,24 @@ FindModuleInSubdir(const char *dirpath, const char *module)
+@@ -389,6 +396,24 @@ FindModuleInSubdir(const char *dirpath, const char *module)
      char *ret = NULL, tmpBuf[PATH_MAX];
      struct stat stat_buf;
  
@@ -62,7 +62,7 @@
      dir = opendir(dirpath);
      if (!dir)
          return NULL;
-@@ -394,6 +419,13 @@ FindModuleInSubdir(const char *dirpath, const char *module)
+@@ -396,6 +421,13 @@ FindModuleInSubdir(const char *dirpath, const char *module)
      while ((direntry = readdir(dir))) {
          if (direntry->d_name[0] == '.')
              continue;
@@ -76,7 +76,7 @@
          snprintf(tmpBuf, PATH_MAX, "%s%s/", dirpath, direntry->d_name);
  	/* the stat with the appended / fails for normal files,
  	   and works for sub dirs fine, looks a bit strange in strace
-@@ -403,6 +435,12 @@ FindModuleInSubdir(const char *dirpath, const char *module)
+@@ -405,6 +437,12 @@ FindModuleInSubdir(const char *dirpath, const char *module)
                  break;
              continue;
          }
--- a/open-src/xserver/xorg/autoconfig.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/autoconfig.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,10 +21,10 @@
 6385111: Xorg auto-configuration Improvement
 
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 3c3735e..764fe7e 100644
+index 86aedba..eef2f24 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
-@@ -2019,7 +2019,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
+@@ -1947,7 +1947,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
      cmodep = conf_monitor->mon_modeline_lst;
      while( cmodep ) {
          mode = xnfcalloc(1, sizeof(DisplayModeRec));
--- a/open-src/xserver/xorg/cli-nobanner.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/cli-nobanner.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -20,10 +20,10 @@
 # DEALINGS IN THE SOFTWARE.
 
 diff --git a/os/utils.c b/os/utils.c
-index 0cf4d37..55c0ecf 100644
+index 0644e6a..c650db0 100644
 --- a/os/utils.c
 +++ b/os/utils.c
-@@ -770,6 +770,12 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -760,6 +760,12 @@ ProcessCommandLine(int argc, char *argv[])
  	    nolock = TRUE;
  	}
  #endif
--- a/open-src/xserver/xorg/cli-nolock.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/cli-nolock.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -19,10 +19,10 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 diff --git a/os/utils.c b/os/utils.c
-index 18fd911..0cf4d37 100644
+index 6461ed5..0644e6a 100644
 --- a/os/utils.c
 +++ b/os/utils.c
-@@ -509,7 +509,9 @@ void UseMsg(void)
+@@ -498,7 +498,9 @@ void UseMsg(void)
  #ifdef RLIMIT_STACK
      ErrorF("-ls int                limit stack space to N Kb\n");
  #endif
@@ -32,7 +32,7 @@
      ErrorF("-nolisten string       don't listen on protocol\n");
      ErrorF("-noreset               don't reset after last client exists\n");
      ErrorF("-background [none]     create root window with no background\n");
-@@ -757,6 +759,7 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -747,6 +749,7 @@ ProcessCommandLine(int argc, char *argv[])
  		UseMsg();
  	}
  #endif
@@ -40,7 +40,7 @@
  	else if ( strcmp ( argv[i], "-nolock") == 0)
  	{
  #if !defined(WIN32) && !defined(__CYGWIN__)
-@@ -766,6 +769,7 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -756,6 +759,7 @@ ProcessCommandLine(int argc, char *argv[])
  #endif
  	    nolock = TRUE;
  	}
--- a/open-src/xserver/xorg/dixmods-deps.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/dixmods-deps.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,39 +1,65 @@
+diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
+index 72be889..38afb02 100644
+--- a/hw/xfree86/Makefile.am
++++ b/hw/xfree86/Makefile.am
+@@ -27,8 +27,8 @@ endif
+ 
+ SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
+ 	  ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
+-	  loader dixmods exa modes \
+-	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) doc man
++	  loader $(DRI_SUBDIR) $(DRI2_SUBDIR) dixmods exa modes \
++	  $(XF86UTILS_SUBDIR) doc man
+ 
+ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
+                parser ramdac shadowfb vbe vgahw xaa \
+@@ -38,7 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
+ bin_PROGRAMS = Xorg
+ nodist_Xorg_SOURCES = sdksyms.c
+ 
+-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
++AM_CFLAGS = $(DIX_CFLAGS) $(PIXMAN_CFLAGS) @XORG_CFLAGS@
+ INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
+ 	-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac
+ 
 diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
-index 60697e7..fa9048d 100644
+index 35f46c8..cd9e744 100644
 --- a/hw/xfree86/dixmods/Makefile.am
 +++ b/hw/xfree86/dixmods/Makefile.am
 @@ -35,7 +35,9 @@ libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
  libdbe_la_SOURCES = dbemodule.c
  
- libfb_la_LDFLAGS = -avoid-version
+ libfb_la_LDFLAGS = -module -avoid-version
 +libfb_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
  libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
 +libfb_la_LIBADD += -lpixman-1
  libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
  libfb_la_CFLAGS = $(AM_CFLAGS)
  
-@@ -45,8 +47,10 @@ libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
+@@ -45,8 +47,11 @@ libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
  libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
  
- libglx_la_LDFLAGS = -avoid-version
+ libglx_la_LDFLAGS = -module -avoid-version
 +libglx_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
- if AIGLX
+ if AIGLX_DRI_LOADER
  GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
-+libglx_la_LDFLAGS += -R$(extsmoduledir) -Wl,-N,libdri.so -Wl,-N,libdri2.so
++libglx_la_LDFLAGS += -R$(extsmoduledir) -Wl,../dri/.libs/libdri.so
++libglx_la_LDFLAGS += -Wl,../dri2/.libs/libdri2.so $(LIBDRM_LIBS)
  endif
  libglx_la_LIBADD = \
  	$(top_builddir)/glx/libglx.la \
-@@ -59,6 +64,8 @@ librecord_la_SOURCES = recordmod.c
+@@ -59,6 +63,9 @@ librecord_la_SOURCES = recordmod.c
  
- libshadow_la_LDFLAGS = -avoid-version
+ libshadow_la_LDFLAGS = -module -avoid-version
  libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
-+libshadow_la_LIBADD += libfb.la
++libshadow_la_DEPENDENCIES = libfb.la
++libshadow_la_LDFLAGS += -R$(moduledir) -Wl,.libs/libfb.so
 +libshadow_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
  libshadow_la_SOURCES = shmodule.c
  
  libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
 diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
-index cce19f7..617a663 100644
+index 87c28a4..81e8345 100644
 --- a/hw/xfree86/dixmods/extmod/Makefile.am
 +++ b/hw/xfree86/dixmods/extmod/Makefile.am
 @@ -28,3 +28,5 @@ libextmod_la_SOURCES = modinit.c \
@@ -43,7 +69,7 @@
 +
 +libextmod_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
 diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am
-index 0b80cc8..f67cd7b 100644
+index 0b80cc8..1d7e6e4 100644
 --- a/hw/xfree86/i2c/Makefile.am
 +++ b/hw/xfree86/i2c/Makefile.am
 @@ -22,22 +22,30 @@ sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h
@@ -78,7 +104,7 @@
 +uda1380_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
  uda1380_drv_la_SOURCES = uda1380.c uda1380.h uda1380_module.c
 diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am
-index 02d2dd4..0af8e05 100644
+index 39c6610..a45ad24 100644
 --- a/hw/xfree86/shadowfb/Makefile.am
 +++ b/hw/xfree86/shadowfb/Makefile.am
 @@ -7,3 +7,6 @@ sdk_HEADERS = shadowfb.h
@@ -89,7 +115,7 @@
 +libshadowfb_la_LDFLAGS += -z ignore $(XORG_EXTERNS_FLAG)
 +libshadowfb_la_LIBADD = $(XSERVER_SYS_LIBS) -lXfont
 diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
-index 85c6fd8..101e954 100644
+index 4b794e6..4c2a47a 100644
 --- a/hw/xfree86/vbe/Makefile.am
 +++ b/hw/xfree86/vbe/Makefile.am
 @@ -8,3 +8,6 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
--- a/open-src/xserver/xorg/dtlogin-userinfo.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/dtlogin-userinfo.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -19,10 +19,10 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 diff --git a/configure.ac b/configure.ac
-index d59ea4a..d960d4c 100644
+index c4262ef..9e07c44 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1464,6 +1464,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
+@@ -1457,6 +1457,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
  XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"
  XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"
  XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
@@ -31,10 +31,10 @@
  AC_SUBST([XSERVER_SYS_LIBS])
  
 diff --git a/dix/main.c b/dix/main.c
-index f79e861..148fb08 100644
+index 94be6a9..5631d02 100644
 --- a/dix/main.c
 +++ b/dix/main.c
-@@ -115,6 +115,11 @@ Equipment Corporation.
+@@ -116,6 +116,11 @@ Equipment Corporation.
  #include "dpmsproc.h"
  #endif
  
@@ -46,7 +46,7 @@
  extern void Dispatch(void);
  
  #ifdef XQUARTZ
-@@ -165,6 +170,13 @@ int main(int argc, char *argv[], char *envp[])
+@@ -164,6 +169,13 @@ int main(int argc, char *argv[], char *envp[])
  	InitBlockAndWakeupHandlers();
  	/* Perform any operating system dependent initializations you'd like */
  	OsInit();
@@ -73,21 +73,21 @@
  
  	/* Now free up whatever must be freed */
 diff --git a/os/Makefile.am b/os/Makefile.am
-index 725691d..c41954d 100644
+index c4825ad..27d70ca 100644
 --- a/os/Makefile.am
 +++ b/os/Makefile.am
-@@ -41,6 +41,9 @@ if NEED_STRLCAT
- libos_la_SOURCES += $(STRLCAT_SRCS)
+@@ -35,6 +35,9 @@ if XDMCP
+ libos_la_SOURCES += $(XDMCP_SRCS)
  endif
  
 +libos_la_SOURCES += dtlogin.c
 +libos_la_LIBADD += -lproject
 +
- EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
-      $(XDMCP_SRCS) $(STRLCAT_SRCS)
+ EXTRA_DIST = $(SECURERPC_SRCS) $(XDMCP_SRCS)
  
+ if SPECIAL_DTRACE_OBJECTS
 diff --git a/os/auth.c b/os/auth.c
-index 7685751..995235e 100644
+index 6669c14..f9207d8 100644
 --- a/os/auth.c
 +++ b/os/auth.c
 @@ -290,6 +290,19 @@ AddAuthorization (unsigned name_length, const char *name,
--- a/open-src/xserver/xorg/fontmod.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/fontmod.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -18,18 +18,19 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
+
 Add Sun's old "bitstream" font module to the list of obsolete modules
 to ignore in xorg.conf files.
 
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 7c548eb..7638e5c 100644
+index 1455dae..f02a7ba 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
-@@ -253,6 +253,7 @@ xf86ModulelistFromConfig(pointer **optlist)
+@@ -252,6 +252,7 @@ xf86ModulelistFromConfig(pointer **optlist)
      char **modulearray;
-     char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
- 		       "freetype", "type1",
-+		       "bitstream",
- 		       NULL };
+     const char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
+                              "freetype", "type1",
++                             "bitstream",
+                              NULL };
      pointer *optarray;
      XF86LoadPtr modp;
--- a/open-src/xserver/xorg/hotkey.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/hotkey.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,8 +1,8 @@
 diff --git a/Xi/exevents.c b/Xi/exevents.c
-index 9bd9d60..e41fa74 100644
+index 6b2db4b..16ae210 100644
 --- a/Xi/exevents.c
 +++ b/Xi/exevents.c
-@@ -187,7 +187,16 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
+@@ -230,7 +230,16 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
  {
      KeyClassPtr mk = master->key;
  
@@ -20,10 +20,10 @@
  
      mk->sourceid = device->id;
 diff --git a/Xi/extinit.c b/Xi/extinit.c
-index 7f09dfe..d81ca33 100644
+index a81c8f1..2171d82 100644
 --- a/Xi/extinit.c
 +++ b/Xi/extinit.c
-@@ -372,6 +372,10 @@ extern XExtensionVersion XIVersion;
+@@ -370,6 +370,10 @@ extern XExtensionVersion XIVersion;
  
  Mask PropagateMask[MAXDEVICES];
  
@@ -47,10 +47,10 @@
          FatalError("Failed to add callback to XI.\n");
  
 diff --git a/config/hal.c b/config/hal.c
-index 297520a..44c1582 100644
+index 088c993..98934d3 100644
 --- a/config/hal.c
 +++ b/config/hal.c
-@@ -123,6 +123,63 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
+@@ -123,6 +123,49 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
      return ret;
  }
  
@@ -60,38 +60,30 @@
 +{
 +    DeviceIntPtr	dev;
 +    char		*config_info = NULL;
-+    InputOption 	*options = NULL, *tmpo = NULL;
++    InputOption 	*input_options = NULL;
 +    InputAttributes	attrs = {0};
 +
-+    options = xcalloc(sizeof(*options), 1);
-+    if (!options){
-+	LogMessage(X_ERROR, "config/hal: couldn't allocate space for input options!\n");
-+        goto unwind;
-+    }
-+
-+    options->key = xstrdup("_source");
-+    options->value = xstrdup("server/hal");
-+    if (!options->key || !options->value) {
++    input_options = input_option_new(NULL, "_source", "server/hal");
++    if (!input_options){
 +	LogMessage(X_ERROR, "config/hal: couldn't allocate first key/value pair\n");
 +	goto unwind;
 +    }
 +
-+    add_option(&options, "driver", driver);
-+    add_option(&options, "name", driver);
++    input_options = input_option_new(input_options, "driver", driver);
++    input_options = input_option_new(input_options, "name", driver);
 +
-+    config_info = xalloc(strlen(driver) + 5); /* "hal:" and NULL */
-+    if (!config_info) {
++    if (!asprintf(&config_info, "hal:%s", driver) == -1) {
++	config_info = NULL;
 +	LogMessage(X_ERROR, "config/hal: couldn't allocate name\n");
 +	goto unwind;
 +    }
-+    sprintf(config_info, "hal:%s", driver);
 +
 +    /* Check for duplicate devices */
 +    if (device_is_duplicate(config_info))
 +	goto unwind;
 +
 +    LogMessage(X_INFO, "config/hal: Adding input device %s\n", driver);
-+    if (NewInputDeviceRequest(options, &attrs, &dev) != Success) {
++    if (NewInputDeviceRequest(input_options, &attrs, &dev) != Success) {
 +	LogMessage(X_ERROR, "config/hal: NewInputDeviceRequest failed\n");
 +	dev = NULL;
 +	goto unwind;
@@ -100,47 +92,29 @@
 +    dev->config_info = xstrdup(config_info);
 +
 +unwind:
-+    if (config_info)
-+	xfree(config_info);
-+    while (!dev && (tmpo = options)) {
-+	options = tmpo->next;
-+	xfree(tmpo->key);
-+	xfree(tmpo->value);
-+	xfree(tmpo);
-+    }
++    xfree(config_info);
++    input_option_free_list(&input_options);
 +}
 +#endif
 +
  static void
  device_added(LibHalContext *hal_ctx, const char *udi)
  {
-@@ -134,6 +191,9 @@ device_added(LibHalContext *hal_ctx, const char *udi)
-     DBusError error;
-     struct xkb_options xkb_opts = {0};
-     int rc;
-+#ifdef SUNSOFT
-+    char *mdriver = NULL;
-+#endif
- 
-     LibHalPropertySet *set = NULL;
- 	LibHalPropertySetIterator set_iter;
-@@ -377,6 +437,16 @@ device_added(LibHalContext *hal_ctx, const char *udi)
-         add_option(&options, "xkb_options", xkb_opts.options);
-     add_option(&options, "config_info", config_info);
+@@ -371,6 +414,14 @@ device_added(LibHalContext *hal_ctx, const char *udi)
+         input_options = input_option_new(input_options, "xkb_options", xkb_opts.options);
+     input_options = input_option_new(input_options, "config_info", config_info);
  
 +#ifdef SUNSOFT
-+    for (tmpo = options; tmpo; tmpo = tmpo->next) {
-+	if (!strcmp(tmpo->key, "mdriver") && (tmpo->value))
-+	    mdriver = tmpo->value;
++    InputOption *md = input_option_find(input_options, "mdriver");
++    if (md) {
++	char *mdriver = input_option_get_key(md);
++	add_extra_device (mdriver);
 +    }
-+ 
-+    if (mdriver)
-+	add_extra_device (mdriver);
 +#endif
 +   
      /* this isn't an error, but how else do you output something that the user can see? */
      LogMessage(X_INFO, "config/hal: Adding input device %s\n", name);
-     if ((rc = NewInputDeviceRequest(options, &attrs, &dev)) != Success) {
+     if ((rc = NewInputDeviceRequest(input_options, &attrs, &dev)) != Success) {
 diff --git a/config/x11-input.fdi b/config/x11-input.fdi
 index b263f36..425aec2 100644
 --- a/config/x11-input.fdi
@@ -159,10 +133,10 @@
        <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
               string="Linux">
 diff --git a/include/inputstr.h b/include/inputstr.h
-index 2ee2fd8..1c3711c 100644
+index c3297db..3d7f83d 100644
 --- a/include/inputstr.h
 +++ b/include/inputstr.h
-@@ -57,6 +57,11 @@ SOFTWARE.
+@@ -59,6 +59,11 @@ SOFTWARE.
  #include "geext.h"
  #include "privates.h"
  
@@ -171,6 +145,6 @@
 +#define HotkeyMapDevicePrivateKey (&HotkeyMapDevicePrivateKeyRec)
 +#endif
 +
- #define BitIsOn(ptr, bit) (!!(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
+ #define BitIsOn(ptr, bit) (!!(((const BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
  #define SetBit(ptr, bit)  (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
  #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
--- a/open-src/xserver/xorg/make_xkm_output_dir.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/make_xkm_output_dir.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -68,9 +68,9 @@
 +    gid_t	usr_gid = getgid();
 +
 +    if (setregid(0, usr_gid) < 0)
-+        Error("Error in setting regid to 0");
++        ErrorF("Error in setting regid to 0: %s\n", strerror(errno));
 +    if (setegid(0) < 0)
-+        Error("Error in setting egid to 0");
++        ErrorF("Error in setting egid to 0: %s\n", strerror(errno));
 +    
      snprintf(keymap, sizeof(keymap), "server-%s", display);
  
@@ -81,9 +81,9 @@
  #endif
 +
 +    if (setregid(usr_gid, 0) < 0)
-+        Error("Error in resetting regid");
++        ErrorF("Error in resetting regid: %s\n", strerror(errno));
 +    if (setegid(usr_gid) < 0)
-+        Error("Error in resetting egid");
++        ErrorF("Error in resetting egid: %s\n", strerror(errno));
      
      if (out!=NULL) {
  #ifdef DEBUG
--- a/open-src/xserver/xorg/mapfile-Xorg-externs.i386	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/mapfile-Xorg-externs.i386	Fri Apr 06 21:57:14 2012 -0700
@@ -173,6 +173,7 @@
 		DamageRegionProcessPending               { FLAGS = EXTERN };
 		DamageRegionRendered                     { FLAGS = EXTERN };
 		DamageRegister                           { FLAGS = EXTERN };
+		DamageReportDamage                       { FLAGS = EXTERN };
 		DamageSetPostRenderingFunctions          { FLAGS = EXTERN };
 		DamageSetReportAfterOp                   { FLAGS = EXTERN };
 		DamageSetup                              { FLAGS = EXTERN };
@@ -195,7 +196,10 @@
 		DeleteWindowFromAnySelections            { FLAGS = EXTERN };
 		DeliverEvents                            { FLAGS = EXTERN };
 		DeliverEventsToWindow                    { FLAGS = EXTERN };
+		DeliverRawEvent                          { FLAGS = EXTERN };
 		DestroySubwindows                        { FLAGS = EXTERN };
+		DetermineClientCmd                       { FLAGS = EXTERN };
+		DetermineClientPid                       { FLAGS = EXTERN };
 		DeviceEventCallback                      { FLAGS = EXTERN };
 		DisableDevice                            { FLAGS = EXTERN };
 		DisableLocalHost                         { FLAGS = EXTERN };
@@ -210,7 +214,6 @@
 		EnableDisableExtensionError              { FLAGS = EXTERN };
 		EnableLocalHost                          { FLAGS = EXTERN };
 		EnableMapUnmapEvents                     { FLAGS = EXTERN };
-		Error                                    { FLAGS = EXTERN };
 		ErrorF                                   { FLAGS = EXTERN };
 		EstablishNewConnections                  { FLAGS = EXTERN };
 		EventCallback                            { FLAGS = EXTERN };
@@ -276,11 +279,13 @@
 		GERegisterExtension                      { FLAGS = EXTERN };
 		GenerateAuthorization                    { FLAGS = EXTERN };
 		GetAccessControl                         { FLAGS = EXTERN };
+		GetClientCmdArgs                         { FLAGS = EXTERN };
+		GetClientCmdName                         { FLAGS = EXTERN };
+		GetClientPid                             { FLAGS = EXTERN };
 		GetClientResolutions                     { FLAGS = EXTERN };
 		GetCurrentRootWindow                     { FLAGS = EXTERN };
 		GetDefaultPointSize                      { FLAGS = EXTERN };
 		GetDevicePredictableAccelData            { FLAGS = EXTERN };
-		GetEventList                             { FLAGS = EXTERN };
 		GetExtensionEntry                        { FLAGS = EXTERN };
 		GetFontPath                              { FLAGS = EXTERN };
 		GetGeometry                              { FLAGS = EXTERN };
@@ -293,6 +298,7 @@
 		GetNewFontClientID                       { FLAGS = EXTERN };
 		GetPairedDevice                          { FLAGS = EXTERN };
 		GetPointerEvents                         { FLAGS = EXTERN };
+		GetProximityEvents                       { FLAGS = EXTERN };
 		GetScratchGC                             { FLAGS = EXTERN };
 		GetScratchPixmapHeader                   { FLAGS = EXTERN };
 		GetSpriteCursor                          { FLAGS = EXTERN };
@@ -323,7 +329,6 @@
 		IBMramdacSave                            { FLAGS = EXTERN };
 		IgnoreClient                             { FLAGS = EXTERN };
 		ImageText                                { FLAGS = EXTERN };
-		InitAbsoluteClassDeviceStruct            { FLAGS = EXTERN };
 		InitAtoms                                { FLAGS = EXTERN };
 		InitAuthorization                        { FLAGS = EXTERN };
 		InitBellFeedbackClassDeviceStruct        { FLAGS = EXTERN };
@@ -350,6 +355,7 @@
 		InitRootWindow                           { FLAGS = EXTERN };
 		InitSelections                           { FLAGS = EXTERN };
 		InitStringFeedbackClassDeviceStruct      { FLAGS = EXTERN };
+		InitTouchClassDeviceStruct               { FLAGS = EXTERN };
 		InitTrackers                             { FLAGS = EXTERN };
 		InitValuatorAxisStruct                   { FLAGS = EXTERN };
 		InitValuatorClassDeviceStruct            { FLAGS = EXTERN };
@@ -357,6 +363,7 @@
 		InitialVector                            { FLAGS = EXTERN };
 		InsertFakeRequest                        { FLAGS = EXTERN };
 		InvalidHost                              { FLAGS = EXTERN };
+		IsFloating                               { FLAGS = EXTERN };
 		IsKeyboardDevice                         { FLAGS = EXTERN };
 		IsMapInstalled                           { FLAGS = EXTERN };
 		IsMaster                                 { FLAGS = EXTERN };
@@ -378,25 +385,23 @@
 		LocalClientCred                          { FLAGS = EXTERN };
 		LockServer                               { FLAGS = EXTERN };
 		LogClose                                 { FLAGS = EXTERN };
+		LogHdrMessage                            { FLAGS = EXTERN };
+		LogHdrMessageVerb                        { FLAGS = EXTERN };
 		LogInit                                  { FLAGS = EXTERN };
 		LogMessage                               { FLAGS = EXTERN };
 		LogMessageVerb                           { FLAGS = EXTERN };
 		LogPrintMarkers                          { FLAGS = EXTERN };
 		LogSetParameter                          { FLAGS = EXTERN };
+		LogVHdrMessageVerb                       { FLAGS = EXTERN };
 		LogVMessageVerb                          { FLAGS = EXTERN };
 		LogVWrite                                { FLAGS = EXTERN };
 		LogWrite                                 { FLAGS = EXTERN };
-		LookupClient                             { FLAGS = EXTERN };
 		LookupClientResourceComplex              { FLAGS = EXTERN };
-		LookupDrawable                           { FLAGS = EXTERN };
 		LookupErrorName                          { FLAGS = EXTERN };
 		LookupEventName                          { FLAGS = EXTERN };
-		LookupIDByClass                          { FLAGS = EXTERN };
-		LookupIDByType                           { FLAGS = EXTERN };
 		LookupMajorName                          { FLAGS = EXTERN };
 		LookupRequestName                        { FLAGS = EXTERN };
 		LookupResourceName                       { FLAGS = EXTERN };
-		LookupWindow                             { FLAGS = EXTERN };
 		MakeAtom                                 { FLAGS = EXTERN };
 		MakeClientGrabImpervious                 { FLAGS = EXTERN };
 		MakeClientGrabPervious                   { FLAGS = EXTERN };
@@ -408,7 +413,6 @@
 		MaxClients                               { FLAGS = EXTERN };
 		MaybeDeliverEventsToClient               { FLAGS = EXTERN };
 		MaybeStopHint                            { FLAGS = EXTERN };
-		MinorOpcodeOfRequest                     { FLAGS = EXTERN };
 		MoveWindowInStack                        { FLAGS = EXTERN };
 		NameForAtom                              { FLAGS = EXTERN };
 		NewCurrentScreen                         { FLAGS = EXTERN };
@@ -460,7 +464,6 @@
 		PictureGetFilterId                       { FLAGS = EXTERN };
 		PictureGetFilterName                     { FLAGS = EXTERN };
 		PictureGetSubpixelOrder                  { FLAGS = EXTERN };
-		PictureGradientColor                     { FLAGS = EXTERN };
 		PictureInit                              { FLAGS = EXTERN };
 		PictureInitIndexedFormat                 { FLAGS = EXTERN };
 		PictureMatchFormat                       { FLAGS = EXTERN };
@@ -478,10 +481,12 @@
 		PictureWindowPrivateKeyRec               { FLAGS = EXTERN };
 		PixmapWidthPaddingInfo                   { FLAGS = EXTERN };
 		PointInWindowIsVisible                   { FLAGS = EXTERN };
+		PointerBarrierType                       { FLAGS = EXTERN };
 		PointerConfinedToScreen                  { FLAGS = EXTERN };
 		PolyText                                 { FLAGS = EXTERN };
 		Popen                                    { FLAGS = EXTERN };
 		PostSyntheticMotion                      { FLAGS = EXTERN };
+		PrintWindowTree                          { FLAGS = EXTERN };
 		ProcAllowEvents                          { FLAGS = EXTERN };
 		ProcBadRequest                           { FLAGS = EXTERN };
 		ProcChangeActivePointerGrab              { FLAGS = EXTERN };
@@ -537,6 +542,9 @@
 		QueryFont                                { FLAGS = EXTERN };
 		QueryMinMaxKeyCodes                      { FLAGS = EXTERN };
 		QueueFontWakeup                          { FLAGS = EXTERN };
+		QueueKeyboardEvents                      { FLAGS = EXTERN };
+		QueuePointerEvents                       { FLAGS = EXTERN };
+		QueueProximityEvents                     { FLAGS = EXTERN };
 		QueueWorkProc                            { FLAGS = EXTERN };
 		RRChangeOutputProperty                   { FLAGS = EXTERN };
 		RRClientKnowsRates                       { FLAGS = EXTERN };
@@ -632,7 +640,6 @@
 		RegionAppend                             { FLAGS = EXTERN };
 		RegionBreak                              { FLAGS = EXTERN };
 		RegionBrokenData                         { FLAGS = EXTERN };
-		RegionClipSpans                          { FLAGS = EXTERN };
 		RegionCreate                             { FLAGS = EXTERN };
 		RegionDestroy                            { FLAGS = EXTERN };
 		RegionEmptyBox                           { FLAGS = EXTERN };
@@ -813,10 +820,7 @@
 		ScreenSaverBlanking                      { FLAGS = EXTERN };
 		ScreenSaverInterval                      { FLAGS = EXTERN };
 		ScreenSaverTime                          { FLAGS = EXTERN };
-		SecurityLookupDrawable                   { FLAGS = EXTERN };
-		SecurityLookupIDByClass                  { FLAGS = EXTERN };
-		SecurityLookupIDByType                   { FLAGS = EXTERN };
-		SecurityLookupWindow                     { FLAGS = EXTERN };
+		SeatId                                   { FLAGS = EXTERN };
 		SelectionCallback                        { FLAGS = EXTERN };
 		SendErrorToClient                        { FLAGS = EXTERN };
 		SendShapeNotify                          { FLAGS = EXTERN };
@@ -844,7 +848,9 @@
 		SetPictureToDefaults                     { FLAGS = EXTERN };
 		SetPictureTransform                      { FLAGS = EXTERN };
 		SetResourceTypeErrorValue                { FLAGS = EXTERN };
+		SetRootClip                              { FLAGS = EXTERN };
 		SetScreenSaverTimer                      { FLAGS = EXTERN };
+		SetScrollValuator                        { FLAGS = EXTERN };
 		SetTimeSinceLastInputEvent               { FLAGS = EXTERN };
 		SetVendorRelease                         { FLAGS = EXTERN };
 		SetVendorString                          { FLAGS = EXTERN };
@@ -1153,7 +1159,6 @@
 		Xvasprintf                               { FLAGS = EXTERN };
 		Xvprintf                                 { FLAGS = EXTERN };
 		_CallCallbacks                           { FLAGS = EXTERN };
-		_XkbDupString                            { FLAGS = EXTERN };
 		_XkbKSCheckCase                          { FLAGS = EXTERN };
 		_XkbLookupAnyDevice                      { FLAGS = EXTERN };
 		_XkbLookupBellDevice                     { FLAGS = EXTERN };
@@ -1228,6 +1233,14 @@
 		init_fs_handlers                         { FLAGS = EXTERN };
 		inl                                      { FLAGS = EXTERN };
 		inputInfo                                { FLAGS = EXTERN };
+		input_option_find                        { FLAGS = EXTERN };
+		input_option_free_element                { FLAGS = EXTERN };
+		input_option_free_list                   { FLAGS = EXTERN };
+		input_option_get_key                     { FLAGS = EXTERN };
+		input_option_get_value                   { FLAGS = EXTERN };
+		input_option_new                         { FLAGS = EXTERN };
+		input_option_set_key                     { FLAGS = EXTERN };
+		input_option_set_value                   { FLAGS = EXTERN };
 		inw                                      { FLAGS = EXTERN };
 		isItTimeToYield                          { FLAGS = EXTERN };
 		lastDeviceEventTime                      { FLAGS = EXTERN };
@@ -1254,7 +1267,6 @@
 		miCopyGC                                 { FLAGS = EXTERN };
 		miCopyPlane                              { FLAGS = EXTERN };
 		miCopyRegion                             { FLAGS = EXTERN };
-		miCreateAlphaPicture                     { FLAGS = EXTERN };
 		miCreateDefColormap                      { FLAGS = EXTERN };
 		miCreateETandAET                         { FLAGS = EXTERN };
 		miCreatePicture                          { FLAGS = EXTERN };
@@ -1364,11 +1376,9 @@
 		miSyncSetup                              { FLAGS = EXTERN };
 		miSyncTriggerFence                       { FLAGS = EXTERN };
 		miTrapezoidBounds                        { FLAGS = EXTERN };
-		miTrapezoids                             { FLAGS = EXTERN };
 		miTriFan                                 { FLAGS = EXTERN };
 		miTriStrip                               { FLAGS = EXTERN };
 		miTriangleBounds                         { FLAGS = EXTERN };
-		miTriangles                              { FLAGS = EXTERN };
 		miUninstallColormap                      { FLAGS = EXTERN };
 		miUnrealizeGlyph                         { FLAGS = EXTERN };
 		miUpdateIndexed                          { FLAGS = EXTERN };
@@ -1419,7 +1429,6 @@
 		pSecHook                                 { FLAGS = EXTERN };
 		party_like_its_1989                      { FLAGS = EXTERN };
 		pciSlotClaimed                           { FLAGS = EXTERN };
-		pciTag                                   { FLAGS = EXTERN };
 		remove_fs_handlers                       { FLAGS = EXTERN };
 		rootCursor                               { FLAGS = EXTERN };
 		rrPrivKeyRec                             { FLAGS = EXTERN };
@@ -1431,12 +1440,16 @@
 		setClientTrustLevel                      { FLAGS = EXTERN };
 		set_font_authorizations                  { FLAGS = EXTERN };
 		valuator_mask_copy                       { FLAGS = EXTERN };
+		valuator_mask_fetch                      { FLAGS = EXTERN };
+		valuator_mask_fetch_double               { FLAGS = EXTERN };
 		valuator_mask_free                       { FLAGS = EXTERN };
 		valuator_mask_get                        { FLAGS = EXTERN };
+		valuator_mask_get_double                 { FLAGS = EXTERN };
 		valuator_mask_isset                      { FLAGS = EXTERN };
 		valuator_mask_new                        { FLAGS = EXTERN };
 		valuator_mask_num_valuators              { FLAGS = EXTERN };
 		valuator_mask_set                        { FLAGS = EXTERN };
+		valuator_mask_set_double                 { FLAGS = EXTERN };
 		valuator_mask_set_range                  { FLAGS = EXTERN };
 		valuator_mask_size                       { FLAGS = EXTERN };
 		valuator_mask_unset                      { FLAGS = EXTERN };
@@ -1523,6 +1536,7 @@
 		xf86CrtcSetOrigin                        { FLAGS = EXTERN };
 		xf86CrtcSetScreenSubpixelOrder           { FLAGS = EXTERN };
 		xf86CrtcSetSizeRange                     { FLAGS = EXTERN };
+		xf86CrtcTransformCursorPos               { FLAGS = EXTERN };
 		xf86CursorScreenKeyRec                   { FLAGS = EXTERN };
 		xf86DDCApplyQuirks                       { FLAGS = EXTERN };
 		xf86DDCGetModes                          { FLAGS = EXTERN };
@@ -1572,7 +1586,6 @@
 		xf86EnableVTSwitch                       { FLAGS = EXTERN };
 		xf86ErrorF                               { FLAGS = EXTERN };
 		xf86ErrorFVerb                           { FLAGS = EXTERN };
-		xf86Events                               { FLAGS = EXTERN };
 		xf86FBManagerRunning                     { FLAGS = EXTERN };
 		xf86FbBpp                                { FLAGS = EXTERN };
 		xf86FindOption                           { FLAGS = EXTERN };
@@ -1583,7 +1596,6 @@
 		xf86FlipPixels                           { FLAGS = EXTERN };
 		xf86FlushInput                           { FLAGS = EXTERN };
 		xf86ForceHWCursor                        { FLAGS = EXTERN };
-		xf86FormatPciBusNumber                   { FLAGS = EXTERN };
 		xf86FreeOffscreenArea                    { FLAGS = EXTERN };
 		xf86FreeOffscreenLinear                  { FLAGS = EXTERN };
 		xf86GARTCloseScreen                      { FLAGS = EXTERN };
@@ -1592,7 +1604,6 @@
 		xf86GetAGPInfo                           { FLAGS = EXTERN };
 		xf86GetAllowMouseOpenFail                { FLAGS = EXTERN };
 		xf86GetBppFromDepth                      { FLAGS = EXTERN };
-		xf86GetClocks                            { FLAGS = EXTERN };
 		xf86GetDefaultModes                      { FLAGS = EXTERN };
 		xf86GetDepth                             { FLAGS = EXTERN };
 		xf86GetDevFromEntity                     { FLAGS = EXTERN };
@@ -1671,7 +1682,6 @@
 		xf86IsEntitySharable                     { FLAGS = EXTERN };
 		xf86IsEntityShared                       { FLAGS = EXTERN };
 		xf86IsOptionSet                          { FLAGS = EXTERN };
-		xf86IsPc98                               { FLAGS = EXTERN };
 		xf86IsPrimInitDone                       { FLAGS = EXTERN };
 		xf86IsPrimaryPci                         { FLAGS = EXTERN };
 		xf86IsScreenPrimary                      { FLAGS = EXTERN };
@@ -1695,7 +1705,6 @@
 		xf86LookupInputDriver                    { FLAGS = EXTERN };
 		xf86LookupMode                           { FLAGS = EXTERN };
 		xf86MakeNewMapping                       { FLAGS = EXTERN };
-		xf86MapDomainMemory                      { FLAGS = EXTERN };
 		xf86MapLegacyIO                          { FLAGS = EXTERN };
 		xf86MapReadSideEffects                   { FLAGS = EXTERN };
 		xf86MapVidMem                            { FLAGS = EXTERN };
@@ -1764,12 +1773,14 @@
 		xf86PostProximityEvent                   { FLAGS = EXTERN };
 		xf86PostProximityEventM                  { FLAGS = EXTERN };
 		xf86PostProximityEventP                  { FLAGS = EXTERN };
+		xf86PostTouchEvent                       { FLAGS = EXTERN };
 		xf86PrintBacktrace                       { FLAGS = EXTERN };
 		xf86PrintChipsets                        { FLAGS = EXTERN };
 		xf86PrintDepthBpp                        { FLAGS = EXTERN };
 		xf86PrintEDID                            { FLAGS = EXTERN };
 		xf86PrintModeline                        { FLAGS = EXTERN };
 		xf86PrintModes                           { FLAGS = EXTERN };
+		xf86PrivsElevated                        { FLAGS = EXTERN };
 		xf86ProbeOutputModes                     { FLAGS = EXTERN };
 		xf86ProcessActionEvent                   { FLAGS = EXTERN };
 		xf86ProcessArgument                      { FLAGS = EXTERN };
@@ -1882,6 +1893,7 @@
 		xf86UnblockSIGIO                         { FLAGS = EXTERN };
 		xf86UnclaimPciSlot                       { FLAGS = EXTERN };
 		xf86UnloadSubModule                      { FLAGS = EXTERN };
+		xf86UnmapLegacyIO                        { FLAGS = EXTERN };
 		xf86UseMsg                               { FLAGS = EXTERN };
 		xf86VDrvMsgVerb                          { FLAGS = EXTERN };
 		xf86VGAarbiterAllowDRI                   { FLAGS = EXTERN };
@@ -1906,7 +1918,6 @@
 		xf86Wakeup                               { FLAGS = EXTERN };
 		xf86Weight                               { FLAGS = EXTERN };
 		xf86WriteSerial                          { FLAGS = EXTERN };
-		xf86XInputSetScreen                      { FLAGS = EXTERN };
 		xf86XVAllocateVideoAdaptorRec            { FLAGS = EXTERN };
 		xf86XVClipVideoHelper                    { FLAGS = EXTERN };
 		xf86XVCopyPacked                         { FLAGS = EXTERN };
--- a/open-src/xserver/xorg/mapfile-Xorg-externs.sparc	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/mapfile-Xorg-externs.sparc	Fri Apr 06 21:57:14 2012 -0700
@@ -173,6 +173,7 @@
 		DamageRegionProcessPending               { FLAGS = EXTERN };
 		DamageRegionRendered                     { FLAGS = EXTERN };
 		DamageRegister                           { FLAGS = EXTERN };
+		DamageReportDamage                       { FLAGS = EXTERN };
 		DamageSetPostRenderingFunctions          { FLAGS = EXTERN };
 		DamageSetReportAfterOp                   { FLAGS = EXTERN };
 		DamageSetup                              { FLAGS = EXTERN };
@@ -195,7 +196,10 @@
 		DeleteWindowFromAnySelections            { FLAGS = EXTERN };
 		DeliverEvents                            { FLAGS = EXTERN };
 		DeliverEventsToWindow                    { FLAGS = EXTERN };
+		DeliverRawEvent                          { FLAGS = EXTERN };
 		DestroySubwindows                        { FLAGS = EXTERN };
+		DetermineClientCmd                       { FLAGS = EXTERN };
+		DetermineClientPid                       { FLAGS = EXTERN };
 		DeviceEventCallback                      { FLAGS = EXTERN };
 		DisableDevice                            { FLAGS = EXTERN };
 		DisableLocalHost                         { FLAGS = EXTERN };
@@ -210,7 +214,6 @@
 		EnableDisableExtensionError              { FLAGS = EXTERN };
 		EnableLocalHost                          { FLAGS = EXTERN };
 		EnableMapUnmapEvents                     { FLAGS = EXTERN };
-		Error                                    { FLAGS = EXTERN };
 		ErrorF                                   { FLAGS = EXTERN };
 		EstablishNewConnections                  { FLAGS = EXTERN };
 		EventCallback                            { FLAGS = EXTERN };
@@ -276,11 +279,13 @@
 		GERegisterExtension                      { FLAGS = EXTERN };
 		GenerateAuthorization                    { FLAGS = EXTERN };
 		GetAccessControl                         { FLAGS = EXTERN };
+		GetClientCmdArgs                         { FLAGS = EXTERN };
+		GetClientCmdName                         { FLAGS = EXTERN };
+		GetClientPid                             { FLAGS = EXTERN };
 		GetClientResolutions                     { FLAGS = EXTERN };
 		GetCurrentRootWindow                     { FLAGS = EXTERN };
 		GetDefaultPointSize                      { FLAGS = EXTERN };
 		GetDevicePredictableAccelData            { FLAGS = EXTERN };
-		GetEventList                             { FLAGS = EXTERN };
 		GetExtensionEntry                        { FLAGS = EXTERN };
 		GetFontPath                              { FLAGS = EXTERN };
 		GetGeometry                              { FLAGS = EXTERN };
@@ -293,6 +298,7 @@
 		GetNewFontClientID                       { FLAGS = EXTERN };
 		GetPairedDevice                          { FLAGS = EXTERN };
 		GetPointerEvents                         { FLAGS = EXTERN };
+		GetProximityEvents                       { FLAGS = EXTERN };
 		GetScratchGC                             { FLAGS = EXTERN };
 		GetScratchPixmapHeader                   { FLAGS = EXTERN };
 		GetSpriteCursor                          { FLAGS = EXTERN };
@@ -323,7 +329,6 @@
 		IBMramdacSave                            { FLAGS = EXTERN };
 		IgnoreClient                             { FLAGS = EXTERN };
 		ImageText                                { FLAGS = EXTERN };
-		InitAbsoluteClassDeviceStruct            { FLAGS = EXTERN };
 		InitAtoms                                { FLAGS = EXTERN };
 		InitAuthorization                        { FLAGS = EXTERN };
 		InitBellFeedbackClassDeviceStruct        { FLAGS = EXTERN };
@@ -350,6 +355,7 @@
 		InitRootWindow                           { FLAGS = EXTERN };
 		InitSelections                           { FLAGS = EXTERN };
 		InitStringFeedbackClassDeviceStruct      { FLAGS = EXTERN };
+		InitTouchClassDeviceStruct               { FLAGS = EXTERN };
 		InitTrackers                             { FLAGS = EXTERN };
 		InitValuatorAxisStruct                   { FLAGS = EXTERN };
 		InitValuatorClassDeviceStruct            { FLAGS = EXTERN };
@@ -357,6 +363,7 @@
 		InitialVector                            { FLAGS = EXTERN };
 		InsertFakeRequest                        { FLAGS = EXTERN };
 		InvalidHost                              { FLAGS = EXTERN };
+		IsFloating                               { FLAGS = EXTERN };
 		IsKeyboardDevice                         { FLAGS = EXTERN };
 		IsMapInstalled                           { FLAGS = EXTERN };
 		IsMaster                                 { FLAGS = EXTERN };
@@ -378,25 +385,23 @@
 		LocalClientCred                          { FLAGS = EXTERN };
 		LockServer                               { FLAGS = EXTERN };
 		LogClose                                 { FLAGS = EXTERN };
+		LogHdrMessage                            { FLAGS = EXTERN };
+		LogHdrMessageVerb                        { FLAGS = EXTERN };
 		LogInit                                  { FLAGS = EXTERN };
 		LogMessage                               { FLAGS = EXTERN };
 		LogMessageVerb                           { FLAGS = EXTERN };
 		LogPrintMarkers                          { FLAGS = EXTERN };
 		LogSetParameter                          { FLAGS = EXTERN };
+		LogVHdrMessageVerb                       { FLAGS = EXTERN };
 		LogVMessageVerb                          { FLAGS = EXTERN };
 		LogVWrite                                { FLAGS = EXTERN };
 		LogWrite                                 { FLAGS = EXTERN };
-		LookupClient                             { FLAGS = EXTERN };
 		LookupClientResourceComplex              { FLAGS = EXTERN };
-		LookupDrawable                           { FLAGS = EXTERN };
 		LookupErrorName                          { FLAGS = EXTERN };
 		LookupEventName                          { FLAGS = EXTERN };
-		LookupIDByClass                          { FLAGS = EXTERN };
-		LookupIDByType                           { FLAGS = EXTERN };
 		LookupMajorName                          { FLAGS = EXTERN };
 		LookupRequestName                        { FLAGS = EXTERN };
 		LookupResourceName                       { FLAGS = EXTERN };
-		LookupWindow                             { FLAGS = EXTERN };
 		MakeAtom                                 { FLAGS = EXTERN };
 		MakeClientGrabImpervious                 { FLAGS = EXTERN };
 		MakeClientGrabPervious                   { FLAGS = EXTERN };
@@ -408,7 +413,6 @@
 		MaxClients                               { FLAGS = EXTERN };
 		MaybeDeliverEventsToClient               { FLAGS = EXTERN };
 		MaybeStopHint                            { FLAGS = EXTERN };
-		MinorOpcodeOfRequest                     { FLAGS = EXTERN };
 		MoveWindowInStack                        { FLAGS = EXTERN };
 		NameForAtom                              { FLAGS = EXTERN };
 		NewCurrentScreen                         { FLAGS = EXTERN };
@@ -460,7 +464,6 @@
 		PictureGetFilterId                       { FLAGS = EXTERN };
 		PictureGetFilterName                     { FLAGS = EXTERN };
 		PictureGetSubpixelOrder                  { FLAGS = EXTERN };
-		PictureGradientColor                     { FLAGS = EXTERN };
 		PictureInit                              { FLAGS = EXTERN };
 		PictureInitIndexedFormat                 { FLAGS = EXTERN };
 		PictureMatchFormat                       { FLAGS = EXTERN };
@@ -478,10 +481,12 @@
 		PictureWindowPrivateKeyRec               { FLAGS = EXTERN };
 		PixmapWidthPaddingInfo                   { FLAGS = EXTERN };
 		PointInWindowIsVisible                   { FLAGS = EXTERN };
+		PointerBarrierType                       { FLAGS = EXTERN };
 		PointerConfinedToScreen                  { FLAGS = EXTERN };
 		PolyText                                 { FLAGS = EXTERN };
 		Popen                                    { FLAGS = EXTERN };
 		PostSyntheticMotion                      { FLAGS = EXTERN };
+		PrintWindowTree                          { FLAGS = EXTERN };
 		ProcAllowEvents                          { FLAGS = EXTERN };
 		ProcBadRequest                           { FLAGS = EXTERN };
 		ProcChangeActivePointerGrab              { FLAGS = EXTERN };
@@ -537,6 +542,9 @@
 		QueryFont                                { FLAGS = EXTERN };
 		QueryMinMaxKeyCodes                      { FLAGS = EXTERN };
 		QueueFontWakeup                          { FLAGS = EXTERN };
+		QueueKeyboardEvents                      { FLAGS = EXTERN };
+		QueuePointerEvents                       { FLAGS = EXTERN };
+		QueueProximityEvents                     { FLAGS = EXTERN };
 		QueueWorkProc                            { FLAGS = EXTERN };
 		RRChangeOutputProperty                   { FLAGS = EXTERN };
 		RRClientKnowsRates                       { FLAGS = EXTERN };
@@ -632,7 +640,6 @@
 		RegionAppend                             { FLAGS = EXTERN };
 		RegionBreak                              { FLAGS = EXTERN };
 		RegionBrokenData                         { FLAGS = EXTERN };
-		RegionClipSpans                          { FLAGS = EXTERN };
 		RegionCreate                             { FLAGS = EXTERN };
 		RegionDestroy                            { FLAGS = EXTERN };
 		RegionEmptyBox                           { FLAGS = EXTERN };
@@ -813,10 +820,7 @@
 		ScreenSaverBlanking                      { FLAGS = EXTERN };
 		ScreenSaverInterval                      { FLAGS = EXTERN };
 		ScreenSaverTime                          { FLAGS = EXTERN };
-		SecurityLookupDrawable                   { FLAGS = EXTERN };
-		SecurityLookupIDByClass                  { FLAGS = EXTERN };
-		SecurityLookupIDByType                   { FLAGS = EXTERN };
-		SecurityLookupWindow                     { FLAGS = EXTERN };
+		SeatId                                   { FLAGS = EXTERN };
 		SelectionCallback                        { FLAGS = EXTERN };
 		SendErrorToClient                        { FLAGS = EXTERN };
 		SendShapeNotify                          { FLAGS = EXTERN };
@@ -844,7 +848,9 @@
 		SetPictureToDefaults                     { FLAGS = EXTERN };
 		SetPictureTransform                      { FLAGS = EXTERN };
 		SetResourceTypeErrorValue                { FLAGS = EXTERN };
+		SetRootClip                              { FLAGS = EXTERN };
 		SetScreenSaverTimer                      { FLAGS = EXTERN };
+		SetScrollValuator                        { FLAGS = EXTERN };
 		SetTimeSinceLastInputEvent               { FLAGS = EXTERN };
 		SetVendorRelease                         { FLAGS = EXTERN };
 		SetVendorString                          { FLAGS = EXTERN };
@@ -1153,7 +1159,6 @@
 		Xvasprintf                               { FLAGS = EXTERN };
 		Xvprintf                                 { FLAGS = EXTERN };
 		_CallCallbacks                           { FLAGS = EXTERN };
-		_XkbDupString                            { FLAGS = EXTERN };
 		_XkbKSCheckCase                          { FLAGS = EXTERN };
 		_XkbLookupAnyDevice                      { FLAGS = EXTERN };
 		_XkbLookupBellDevice                     { FLAGS = EXTERN };
@@ -1228,6 +1233,14 @@
 		init_fs_handlers                         { FLAGS = EXTERN };
 		inl                                      { FLAGS = EXTERN };
 		inputInfo                                { FLAGS = EXTERN };
+		input_option_find                        { FLAGS = EXTERN };
+		input_option_free_element                { FLAGS = EXTERN };
+		input_option_free_list                   { FLAGS = EXTERN };
+		input_option_get_key                     { FLAGS = EXTERN };
+		input_option_get_value                   { FLAGS = EXTERN };
+		input_option_new                         { FLAGS = EXTERN };
+		input_option_set_key                     { FLAGS = EXTERN };
+		input_option_set_value                   { FLAGS = EXTERN };
 		inw                                      { FLAGS = EXTERN };
 		isItTimeToYield                          { FLAGS = EXTERN };
 		lastDeviceEventTime                      { FLAGS = EXTERN };
@@ -1254,7 +1267,6 @@
 		miCopyGC                                 { FLAGS = EXTERN };
 		miCopyPlane                              { FLAGS = EXTERN };
 		miCopyRegion                             { FLAGS = EXTERN };
-		miCreateAlphaPicture                     { FLAGS = EXTERN };
 		miCreateDefColormap                      { FLAGS = EXTERN };
 		miCreateETandAET                         { FLAGS = EXTERN };
 		miCreatePicture                          { FLAGS = EXTERN };
@@ -1365,11 +1377,9 @@
 		miSyncSetup                              { FLAGS = EXTERN };
 		miSyncTriggerFence                       { FLAGS = EXTERN };
 		miTrapezoidBounds                        { FLAGS = EXTERN };
-		miTrapezoids                             { FLAGS = EXTERN };
 		miTriFan                                 { FLAGS = EXTERN };
 		miTriStrip                               { FLAGS = EXTERN };
 		miTriangleBounds                         { FLAGS = EXTERN };
-		miTriangles                              { FLAGS = EXTERN };
 		miUninstallColormap                      { FLAGS = EXTERN };
 		miUnrealizeGlyph                         { FLAGS = EXTERN };
 		miUpdateIndexed                          { FLAGS = EXTERN };
@@ -1420,7 +1430,6 @@
 		pSecHook                                 { FLAGS = EXTERN };
 		party_like_its_1989                      { FLAGS = EXTERN };
 		pciSlotClaimed                           { FLAGS = EXTERN };
-		pciTag                                   { FLAGS = EXTERN };
 		promGetBool                              { FLAGS = EXTERN };
 		promGetChild                             { FLAGS = EXTERN };
 		promGetProperty                          { FLAGS = EXTERN };
@@ -1447,12 +1456,16 @@
 		sparcPromNode2Pathname                   { FLAGS = EXTERN };
 		sparcPromPathname2Node                   { FLAGS = EXTERN };
 		valuator_mask_copy                       { FLAGS = EXTERN };
+		valuator_mask_fetch                      { FLAGS = EXTERN };
+		valuator_mask_fetch_double               { FLAGS = EXTERN };
 		valuator_mask_free                       { FLAGS = EXTERN };
 		valuator_mask_get                        { FLAGS = EXTERN };
+		valuator_mask_get_double                 { FLAGS = EXTERN };
 		valuator_mask_isset                      { FLAGS = EXTERN };
 		valuator_mask_new                        { FLAGS = EXTERN };
 		valuator_mask_num_valuators              { FLAGS = EXTERN };
 		valuator_mask_set                        { FLAGS = EXTERN };
+		valuator_mask_set_double                 { FLAGS = EXTERN };
 		valuator_mask_set_range                  { FLAGS = EXTERN };
 		valuator_mask_size                       { FLAGS = EXTERN };
 		valuator_mask_unset                      { FLAGS = EXTERN };
@@ -1539,6 +1552,7 @@
 		xf86CrtcSetOrigin                        { FLAGS = EXTERN };
 		xf86CrtcSetScreenSubpixelOrder           { FLAGS = EXTERN };
 		xf86CrtcSetSizeRange                     { FLAGS = EXTERN };
+		xf86CrtcTransformCursorPos               { FLAGS = EXTERN };
 		xf86CursorScreenKeyRec                   { FLAGS = EXTERN };
 		xf86DDCApplyQuirks                       { FLAGS = EXTERN };
 		xf86DDCGetModes                          { FLAGS = EXTERN };
@@ -1588,7 +1602,6 @@
 		xf86EnableVTSwitch                       { FLAGS = EXTERN };
 		xf86ErrorF                               { FLAGS = EXTERN };
 		xf86ErrorFVerb                           { FLAGS = EXTERN };
-		xf86Events                               { FLAGS = EXTERN };
 		xf86FBManagerRunning                     { FLAGS = EXTERN };
 		xf86FbBpp                                { FLAGS = EXTERN };
 		xf86FindOption                           { FLAGS = EXTERN };
@@ -1599,7 +1612,6 @@
 		xf86FlipPixels                           { FLAGS = EXTERN };
 		xf86FlushInput                           { FLAGS = EXTERN };
 		xf86ForceHWCursor                        { FLAGS = EXTERN };
-		xf86FormatPciBusNumber                   { FLAGS = EXTERN };
 		xf86FreeOffscreenArea                    { FLAGS = EXTERN };
 		xf86FreeOffscreenLinear                  { FLAGS = EXTERN };
 		xf86GARTCloseScreen                      { FLAGS = EXTERN };
@@ -1608,7 +1620,6 @@
 		xf86GetAGPInfo                           { FLAGS = EXTERN };
 		xf86GetAllowMouseOpenFail                { FLAGS = EXTERN };
 		xf86GetBppFromDepth                      { FLAGS = EXTERN };
-		xf86GetClocks                            { FLAGS = EXTERN };
 		xf86GetDefaultModes                      { FLAGS = EXTERN };
 		xf86GetDepth                             { FLAGS = EXTERN };
 		xf86GetDevFromEntity                     { FLAGS = EXTERN };
@@ -1689,7 +1700,6 @@
 		xf86IsEntitySharable                     { FLAGS = EXTERN };
 		xf86IsEntityShared                       { FLAGS = EXTERN };
 		xf86IsOptionSet                          { FLAGS = EXTERN };
-		xf86IsPc98                               { FLAGS = EXTERN };
 		xf86IsPrimInitDone                       { FLAGS = EXTERN };
 		xf86IsPrimaryPci                         { FLAGS = EXTERN };
 		xf86IsScreenPrimary                      { FLAGS = EXTERN };
@@ -1713,7 +1723,6 @@
 		xf86LookupInputDriver                    { FLAGS = EXTERN };
 		xf86LookupMode                           { FLAGS = EXTERN };
 		xf86MakeNewMapping                       { FLAGS = EXTERN };
-		xf86MapDomainMemory                      { FLAGS = EXTERN };
 		xf86MapLegacyIO                          { FLAGS = EXTERN };
 		xf86MapReadSideEffects                   { FLAGS = EXTERN };
 		xf86MapSbusMem                           { FLAGS = EXTERN };
@@ -1784,12 +1793,14 @@
 		xf86PostProximityEvent                   { FLAGS = EXTERN };
 		xf86PostProximityEventM                  { FLAGS = EXTERN };
 		xf86PostProximityEventP                  { FLAGS = EXTERN };
+		xf86PostTouchEvent                       { FLAGS = EXTERN };
 		xf86PrintBacktrace                       { FLAGS = EXTERN };
 		xf86PrintChipsets                        { FLAGS = EXTERN };
 		xf86PrintDepthBpp                        { FLAGS = EXTERN };
 		xf86PrintEDID                            { FLAGS = EXTERN };
 		xf86PrintModeline                        { FLAGS = EXTERN };
 		xf86PrintModes                           { FLAGS = EXTERN };
+		xf86PrivsElevated                        { FLAGS = EXTERN };
 		xf86ProbeOutputModes                     { FLAGS = EXTERN };
 		xf86ProcessActionEvent                   { FLAGS = EXTERN };
 		xf86ProcessArgument                      { FLAGS = EXTERN };
@@ -1913,6 +1924,7 @@
 		xf86UnblockSIGIO                         { FLAGS = EXTERN };
 		xf86UnclaimPciSlot                       { FLAGS = EXTERN };
 		xf86UnloadSubModule                      { FLAGS = EXTERN };
+		xf86UnmapLegacyIO                        { FLAGS = EXTERN };
 		xf86UnmapSbusMem                         { FLAGS = EXTERN };
 		xf86UseMsg                               { FLAGS = EXTERN };
 		xf86VDrvMsgVerb                          { FLAGS = EXTERN };
@@ -1948,7 +1960,6 @@
 		xf86WriteMmio8                           { FLAGS = EXTERN };
 		xf86WriteMmio8NB                         { FLAGS = EXTERN };
 		xf86WriteSerial                          { FLAGS = EXTERN };
-		xf86XInputSetScreen                      { FLAGS = EXTERN };
 		xf86XVAllocateVideoAdaptorRec            { FLAGS = EXTERN };
 		xf86XVClipVideoHelper                    { FLAGS = EXTERN };
 		xf86XVCopyPacked                         { FLAGS = EXTERN };
--- a/open-src/xserver/xorg/nvidia-autoconfig.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/nvidia-autoconfig.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -19,10 +19,10 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 7638e5c..d5e2097 100644
+index f02a7ba..86aedba 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
-@@ -523,6 +523,25 @@ fixup_video_driver_list(char **drivers)
+@@ -522,6 +522,25 @@ fixup_video_driver_list(char **drivers)
              }
          }
      }
--- a/open-src/xserver/xorg/osaudit.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/osaudit.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -24,10 +24,10 @@
 7010804 Xorg should audit connections and disconnections.
 
 diff --git a/configure.ac b/configure.ac
-index 122396b..d59ea4a 100644
+index 6de92b4..c6ce0fc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -312,6 +312,12 @@ AC_CHECK_HEADER([execinfo.h],[
+@@ -306,6 +306,12 @@ AC_CHECK_HEADER([execinfo.h],[
      ])]
  )
  
@@ -41,10 +41,10 @@
  dnl Bus options and CPU capabilities.  Replaces logic in
  dnl hw/xfree86/os-support/bus/Makefile.am, among others.
 diff --git a/dix/main.c b/dix/main.c
-index e20ffd6..f79e861 100644
+index 16575ce..94be6a9 100644
 --- a/dix/main.c
 +++ b/dix/main.c
-@@ -202,6 +202,7 @@ int main(int argc, char *argv[], char *envp[])
+@@ -201,6 +201,7 @@ int main(int argc, char *argv[], char *envp[])
  	dixResetRegistry();
  	ResetFontPrivateIndex();
  	InitCallbackManager();
@@ -53,10 +53,10 @@
  
  	if (screenInfo.numScreens < 1)
 diff --git a/include/dix-config.h.in b/include/dix-config.h.in
-index d81264d..25bedef 100644
+index 3fb6413..93f5ce5 100644
 --- a/include/dix-config.h.in
 +++ b/include/dix-config.h.in
-@@ -133,6 +133,9 @@
+@@ -115,6 +115,9 @@
  /* Build a standalone xpbproxy */
  #undef STANDALONE_XPBPROXY
  
@@ -67,10 +67,10 @@
  #undef HAVE_LIBM
  
 diff --git a/include/os.h b/include/os.h
-index d747040..40635cf 100644
+index 48ce329..e0fd97c 100644
 --- a/include/os.h
 +++ b/include/os.h
-@@ -536,4 +536,7 @@ extern _X_EXPORT void LogPrintMarkers(void);
+@@ -560,4 +560,7 @@ extern _X_EXPORT void LogPrintMarkers(void);
  
  extern _X_EXPORT void xorg_backtrace(void);
  
@@ -79,7 +79,7 @@
 +
  #endif /* OS_H */
 diff --git a/os/Makefile.am b/os/Makefile.am
-index 66a4a0f..725691d 100644
+index 8891485..c4825ad 100644
 --- a/os/Makefile.am
 +++ b/os/Makefile.am
 @@ -15,6 +15,7 @@ libos_la_SOURCES = 	\
--- a/open-src/xserver/xorg/patch-list	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/patch-list	Fri Apr 06 21:57:14 2012 -0700
@@ -1,9 +1,3 @@
-oslog-race.patch,-p1
-dtrace-doc.patch,-p1
-CVE-2011-4028.patch,-p1
-CVE-2011-4029.patch,-p1
-loadmod.patch,-p1
-dmx-glxproxy.patch,-p1
 osaudit.patch,-p1
 sun-paths.patch,-p1
 sun-extramodes.patch,-p1
@@ -29,5 +23,4 @@
 6912996.patch,-p1
 record-regset.patch,-p1
 autodetect-kernel-dev-fb.patch,-p1
-trim-fallbacks.patch,-p1
-CR7054054.patch,-p1
+workaround-7154410.patch,-p1
--- a/open-src/xserver/xorg/record-regset.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/record-regset.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,8 +1,8 @@
 diff --git a/record/record.c b/record/record.c
-index facaebb..8256738 100644
+index b956b4a..d0604e0 100644
 --- a/record/record.c
 +++ b/record/record.c
-@@ -1470,6 +1470,9 @@ typedef struct
+@@ -1475,6 +1475,9 @@ typedef struct
      short first, last;	/* if for extension, major opcode interval */
  } SetInfoRec, *SetInfoPtr;
  
--- a/open-src/xserver/xorg/signal-handler.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/signal-handler.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,8 +1,8 @@
 diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
-index 3c64ae4..62e6c7f 100644
+index 1726960..7182ad2 100644
 --- a/hw/xfree86/dri/dri.c
 +++ b/hw/xfree86/dri/dri.c
-@@ -2489,7 +2489,11 @@ int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
+@@ -2483,7 +2483,11 @@ int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
      entry     = drmGetEntry(fd);
      entry->f  = f;
  
@@ -14,7 +14,7 @@
  }
  
  int drmRemoveSIGIOHandler(int fd)
-@@ -2498,5 +2502,9 @@ int drmRemoveSIGIOHandler(int fd)
+@@ -2492,5 +2496,9 @@ int drmRemoveSIGIOHandler(int fd)
  
      entry->f = NULL;
  
--- a/open-src/xserver/xorg/sun-manpage.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-manpage.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,7 +1,7 @@
-diff --git a/doc/man/Xserver.man b/doc/man/Xserver.man
-index b725949..c562b3f 100644
---- a/doc/man/Xserver.man
-+++ b/doc/man/Xserver.man
+diff --git a/man/Xserver.man b/man/Xserver.man
+index 0cd9b94..4af64aa 100644
+--- a/man/Xserver.man
++++ b/man/Xserver.man
 @@ -1,3 +1,25 @@
 +.\" 
 +.\" Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -53,7 +53,7 @@
  This utility is run from the system boot files and takes care of keeping
  the server running, prompting for usernames and passwords, and starting up
  the user sessions.
-@@ -182,6 +212,13 @@ with
+@@ -188,6 +218,13 @@ with
  .BR "\-nolisten tcp" .
  This option may be issued multiple times to disable listening to different
  transport types.
@@ -67,7 +67,7 @@
  .TP 8
  .B \-noreset
  prevents a server reset when the last client connection is closed.  This
-@@ -373,7 +410,7 @@ located in the XKB base directory or a subdirectory, and specified as the
+@@ -385,7 +422,7 @@ located in the XKB base directory or a subdirectory, and specified as the
  relative path from the XKB base directory.  The default XKB base directory is
  .IR __projectroot__/lib/X11/xkb .
  .TP 8
@@ -76,7 +76,7 @@
  enables(+) or disables(-) AccessX key sequences.
  .TP 8
  .B \-xkbdir \fIdirectory\fP
-@@ -529,6 +566,110 @@ the following font path:
+@@ -541,6 +578,110 @@ the following font path:
      /usr/share/fonts/default/Type1,
      /usr/share/fonts/default/ghostscript
  .fi
@@ -187,7 +187,7 @@
  
  .SH FILES
  .TP 30
-@@ -544,8 +685,12 @@ Outline font directories
+@@ -556,8 +697,12 @@ Outline font directories
  .I /tmp/.X11-unix/X\fBn\fP
  Unix domain socket for display number \fBn\fP
  .TP 30
@@ -202,7 +202,7 @@
  .TP 30
  .I __projectroot__/lib/X11/xdm/xdm-errors
  Default error log file if the server is run from \fIxdm\fP(1)
-@@ -565,14 +710,22 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
+@@ -579,14 +724,22 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
  \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
  .I "Security Extension Specification"
  .PP
--- a/open-src/xserver/xorg/sun-paths.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-paths.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,11 +1,11 @@
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 5312ca6..9622eab 100644
+index f51be7e..aa3d97e 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
 @@ -74,9 +74,9 @@
   */
- #ifndef ROOT_CONFIGPATH
- #define ROOT_CONFIGPATH	"%A," "%R," \
+ #ifndef ALL_CONFIGPATH
+ #define ALL_CONFIGPATH	"%A," "%R," \
 -			"/etc/X11/%R," "%P/etc/X11/%R," \
 +			"/etc/X11/%R," "%P/lib/X11/%R," \
  			"%E," "%F," \
@@ -17,19 +17,19 @@
 @@ -84,8 +84,8 @@
  			"%P/lib/X11/%X"
  #endif
- #ifndef USER_CONFIGPATH
--#define USER_CONFIGPATH	"/etc/X11/%S," "%P/etc/X11/%S," \
+ #ifndef RESTRICTED_CONFIGPATH
+-#define RESTRICTED_CONFIGPATH	"/etc/X11/%S," "%P/etc/X11/%S," \
 -			"/etc/X11/%G," "%P/etc/X11/%G," \
-+#define USER_CONFIGPATH	"/etc/X11/%S," "%P/lib/X11/%S," \
++#define RESTRICTED_CONFIGPATH	"/etc/X11/%S," "%P/lib/X11/%S," \
 +			"/etc/X11/%G," "%P/lib/X11/%G," \
  			"/etc/X11/%X," "/etc/%X," \
  			"%P/etc/X11/%X.%H," \
  			"%P/etc/X11/%X," \
 diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index 16d5557..f87c1eb 100644
+index d576fb9..2c19c54 100644
 --- a/hw/xfree86/common/xf86Globals.c
 +++ b/hw/xfree86/common/xf86Globals.c
-@@ -138,7 +138,8 @@ xf86InfoRec xf86Info = {
+@@ -135,7 +135,8 @@ xf86InfoRec xf86Info = {
  };
  const char *xf86ConfigFile = NULL;
  const char *xf86ConfigDir = NULL;
@@ -39,10 +39,10 @@
  MessageType xf86ModPathFrom = X_DEFAULT;
  const char *xf86LogFile = DEFAULT_LOGPREFIX;
  MessageType xf86LogFileFrom = X_DEFAULT;
-diff --git a/hw/xfree86/doc/man/xorg.conf.man b/hw/xfree86/doc/man/xorg.conf.man
-index e3fd0ea..dac9a10 100644
---- a/hw/xfree86/doc/man/xorg.conf.man
-+++ b/hw/xfree86/doc/man/xorg.conf.man
+diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
+index 5790185..ac9d626 100644
+--- a/hw/xfree86/man/xorg.conf.man
++++ b/hw/xfree86/man/xorg.conf.man
 @@ -36,9 +36,9 @@ server is started as a normal user:
  .RS 4
  .nf
@@ -69,10 +69,10 @@
  .I /etc/__xconfigfile__
  .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
 diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
-index b10b994..feaedfc 100644
+index 8086f32..37b9315 100644
 --- a/include/xorg-server.h.in
 +++ b/include/xorg-server.h.in
-@@ -184,6 +184,7 @@
+@@ -205,6 +205,7 @@
  /* X Access Control Extension */
  #undef XACE
  
--- a/open-src/xserver/xorg/sun-src/IA/interactive.c	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/IA/interactive.c	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1993, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1993, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -61,6 +61,7 @@
 #include <X11/extensions/interactive.h>
 #include <X11/Xfuncproto.h>
 #include "dix.h"
+#include "client.h"
 
 #include "interactive_srv.h"
 
@@ -265,13 +266,12 @@
 
     case ClientStateInitial:
 	IAInitClientPrivate(pClient);
-	if (GetLocalClientCreds(pClient, &lcc) != -1) {
-	    if (lcc->fieldsSet & LCC_PID_SET) {
-		ConnectionPidRec clientPid = lcc->pid;
+	{
+	    ConnectionPidRec clientPid = GetClientPid(pClient);
+	    if (clientPid != -1) {
 		SetClientPrivate(pClient, &clientPid, 1);
 		ChangeInteractive(pClient);
 	    }
-	    FreeLocalClientCreds(lcc);
 	}
 	break;
 
@@ -557,7 +557,7 @@
     }
 
     if ( setegid(0) < 0 ) {
-	Error("Error in setting egid to 0");
+	ErrorF("Error in setting egid to 0: %s\n", strerror(errno));
     }
 
     for (i = 0; i < cpp->count ; i++) {
@@ -566,7 +566,7 @@
 	pcinfo.pc_cid = PC_CLNULL;
 	if ((priocntl(P_PID, pid, PC_GETPARMS, (caddr_t)&pcinfo)) < 0) {
 	    if ( setegid(usr_egid) < 0 ) {
-		Error("Error in resetting egid");
+		ErrorF("Error in resetting egid: %s\n", strerror(errno));
 	    }
 	    return ~Success; /* Scary time; punt */
 	}
@@ -614,7 +614,7 @@
     }
 
     if (setegid(usr_egid) < 0)
-	Error("Error in resetting egid");
+	ErrorF("Error in resetting egid: %s\n", strerror(errno));
 
     if (ret == Success) {
 	if (cmd == SET_PRIORITY) {
--- a/open-src/xserver/xorg/sun-src/hw/xfree86/doc/man/xorgcfg.1	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-.so man1/xorgconfig.1
--- a/open-src/xserver/xorg/sun-src/hw/xfree86/doc/man/xorgconfig.1	Thu Mar 29 13:35:26 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-.\"
-.\" Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a
-.\" copy of this software and associated documentation files (the "Software"),
-.\" to deal in the Software without restriction, including without limitation
-.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-.\" and/or sell copies of the Software, and to permit persons to whom the
-.\" Software is furnished to do so, subject to the following conditions:
-.\"
-.\" The above copyright notice and this permission notice (including the next
-.\" paragraph) shall be included in all copies or substantial portions of the
-.\" Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-.\" DEALINGS IN THE SOFTWARE.
-.\"
-.\"
-.TH xorgconfig 1 "24 Jun 2009"
-.SH NAME
-.PP
-xorgconfig, xorgcfg \- generate an xorg.conf file
-.SH DESCRIPTION
-.PP
-The
-.BR xorgcfg (1)
-and
-.BR xorgconfig (1)
-utilities for generating
-.BR xorg.conf (4)
-files are no longer included in this release.
-.PP
-The
-.BR Xorg (1)
-server does not require a configuration file in many cases,
-and will autoconfigure itself if one is not present.  If the
-default configuration does not meet your needs, you may use one of
-these alternative methods to generate an xorg.conf file for
-customization:
-.IP " * "
-When Xorg is started without a configuration file, the xorg.conf
-data it generates automatically is logged in /var/log/Xorg.0.log
-and may be copied to an xorg.conf file for customization.
-.IP " * "
-/usr/X11/bin/Xorg -configure, when the server is not already running,
-will provide a sample configuration file for the currently detected
-hardware in the system.
-.IP " * "
-Users of Nvidia graphics devices may use the provided
-.BR nvidia-settings (1)
-and
-.BR nvidia-xconfig (1)
-utilities to generate or update device-specific configurations.
-.IP " * "
-Users of Sun graphics devices for the SPARC platform may use the
-.BR fbconfig (1)
-utility to generate or update device-specific
-configurations.
-.PP
-Input device settings formerly found in xorg.conf have in most cases
-been replaced by settings made via the
-.BR hal (5)
-configuration framework in
-.BR fdi (4)
-configuration files.
-.SH FILES
-.IP /etc/hal/fdi/preprobe/10osvendor/10-x11-input.fdi
-Default system configuration for input devices
-.SH "SEE ALSO"
-.IR Xorg (1),
-.IR xorg.conf (4),
-.IR hal (5),
-.IR fdi (4),
-.IR nvidia-settings (1),
-.IR nvidia-xconfig (1),
-.IR fbconfig (1).
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/sun-src/hw/xfree86/man/xorgcfg.1	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,1 @@
+.so man1/xorgconfig.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/sun-src/hw/xfree86/man/xorgconfig.1	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,81 @@
+.\"
+.\" Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\"
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+.\" DEALINGS IN THE SOFTWARE.
+.\"
+.\"
+.TH xorgconfig 1 "24 Jun 2009"
+.SH NAME
+.PP
+xorgconfig, xorgcfg \- generate an xorg.conf file
+.SH DESCRIPTION
+.PP
+The
+.BR xorgcfg (1)
+and
+.BR xorgconfig (1)
+utilities for generating
+.BR xorg.conf (4)
+files are no longer included in this release.
+.PP
+The
+.BR Xorg (1)
+server does not require a configuration file in many cases,
+and will autoconfigure itself if one is not present.  If the
+default configuration does not meet your needs, you may use one of
+these alternative methods to generate an xorg.conf file for
+customization:
+.IP " * "
+When Xorg is started without a configuration file, the xorg.conf
+data it generates automatically is logged in /var/log/Xorg.0.log
+and may be copied to an xorg.conf file for customization.
+.IP " * "
+/usr/X11/bin/Xorg -configure, when the server is not already running,
+will provide a sample configuration file for the currently detected
+hardware in the system.
+.IP " * "
+Users of Nvidia graphics devices may use the provided
+.BR nvidia-settings (1)
+and
+.BR nvidia-xconfig (1)
+utilities to generate or update device-specific configurations.
+.IP " * "
+Users of Sun graphics devices for the SPARC platform may use the
+.BR fbconfig (1)
+utility to generate or update device-specific
+configurations.
+.PP
+Input device settings formerly found in xorg.conf have in most cases
+been replaced by settings made via the
+.BR hal (5)
+configuration framework in
+.BR fdi (4)
+configuration files.
+.SH FILES
+.IP /etc/hal/fdi/preprobe/10osvendor/10-x11-input.fdi
+Default system configuration for input devices
+.SH "SEE ALSO"
+.IR Xorg (1),
+.IR xorg.conf (4),
+.IR hal (5),
+.IR fdi (4),
+.IR nvidia-settings (1),
+.IR nvidia-xconfig (1),
+.IR fbconfig (1).
--- a/open-src/xserver/xorg/sun-src/os/osaudit.c	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/os/osaudit.c	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -68,31 +68,32 @@
     if (saveid != 0) {
 	/* reset privs back to root */
         if (seteuid(0) < 0) {
-	    Error("OSAuditClientInit: seteuid(0)");
+	    ErrorF("OSAuditClientInit: seteuid(0): %s\n", strerror(errno));
 	    saveid = 0;
 	}
     }
     
     if (adt_start_session(&ah, NULL, 0) != 0) {
-	Error("OSAuditClientInit: adt_start_session");
+	ErrorF("OSAuditClientInit: adt_start_session: %s\n", strerror(errno));
 	goto end;
     }
 
     if (pClient->osPrivate == NULL) {
-	Error("OSAuditClientInit: NULL osPrivate");
+	ErrorF("OSAuditClientInit: NULL osPrivate: %s\n", strerror(errno));
 	goto end;
     }
     ci = ((OsCommPtr)pClient->osPrivate)->trans_conn;
     peer = _XSERVTransGetConnectionNumber(ci);
     if (getpeerucred(peer, &uc) == 0) {
 	if (adt_set_from_ucred(ah, uc, ADT_NEW) != 0) {
-	    Error("OSAuditClientInit: adt_set_from_ucred");
+	    ErrorF("OSAuditClientInit: adt_set_from_ucred: %s\n",
+		   strerror(errno));
 	}
 	ucred_free(uc);
     } else {
 	if (adt_set_user(ah, ADT_NO_ATTRIB, ADT_NO_ATTRIB, ADT_NO_ATTRIB,
 			 ADT_NO_ATTRIB, NULL, ADT_NEW) != 0) {
-	    Error("OSAuditClientInit: adt_set_user");
+	    ErrorF("OSAuditClientInit: adt_set_user: %s\n", strerror(errno));
 	}
     }
 
@@ -102,7 +103,7 @@
     if (saveid != 0) {
 	/* set privs back to user */
         if (seteuid(saveid) < 0) {
-	    Error("OSAuditClientInit: seteuid(saveid)");
+	    ErrorF("OSAuditClientInit: seteuid(saveid): %s\n", strerror(errno));
 	}
     }
 
@@ -119,12 +120,12 @@
     OSAuditClientPrivatePtr	 priv = GetOSAuditClient(pClient);
 
     if (priv->ah == NULL) {
-	Error("OSAudit: NULL adt_session_data");
+	ErrorF("OSAudit: NULL adt_session_data: %s\n", strerror(errno));
 	return;
     }
 
     if ((event = adt_alloc_event(priv->ah, event_id)) == NULL) {
-	Error("OSAudit: adt_set_from_ucred");
+	ErrorF("OSAudit: adt_set_from_ucred: %s\n", strerror(errno));
 	return;
     }
 
@@ -144,26 +145,26 @@
 	event->adt_xdisconnect.client = pClient->index;
 	break;
     default:
-	Error("OSAudit: unknown event_id");
+	ErrorF("OSAudit: unknown event_id: %s\n", strerror(errno));
     }
 
     saveid = geteuid();
     if (saveid != 0) {
 	/* reset privs back to root */
         if (seteuid(0) < 0) {
-	    Error("OSAuditClientInit: seteuid(0)");
+	    ErrorF("OSAuditClientInit: seteuid(0): %s\n", strerror(errno));
 	    saveid = 0;
 	}
     }
     
     if (adt_put_event(event, status, reason) != 0) {
-	Error("OSAudit: adt_put_event");
+	ErrorF("OSAudit: adt_put_event: %s\n", strerror(errno));
     }
 
     if (saveid != 0) {
 	/* set privs back to user */
         if (seteuid(saveid) < 0) {
-	    Error("OSAuditClientInit: seteuid(saveid)");
+	    ErrorF("OSAuditClientInit: seteuid(saveid): %s\n", strerror(errno));
 	}
     }    
     
--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/README	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/README	Fri Apr 06 21:57:14 2012 -0700
@@ -151,6 +151,8 @@
 
 	::client_pids - prints information about a ClientRec entry
 	   in the X server's array of currently connected X clients.
+	   Switches: 
+	     -w    Print arguments with process name when available.
 
 	::inputdev_grabs - prints information about a DeviceIntRec entry
 	   in the X server's list of currently connected input devices.
@@ -175,21 +177,20 @@
 1b7dc0
 [...]
 > 1b7dc0  ::client_pids
-CLIENT SEQUENCE #  FD  PIDS
-    2           9  16 9721
+CLIENT SEQUENCE #   FD  PROCESS
+    2          20   21   1285 /usr/bin/dbus-launch
 
 If you run one of the commands (such as ::client_pids) without an address in
 front, it will automatically call the associated walker to list the
 information for all the entries in the list.
 
 For more information about using mdb, see the Solaris Modular Debugger Guide
-on http://www.oracle.com/technetwork/indexes/documentation/index.html and 
-the mdb OpenSolaris Community website at
+on http://docs.oracle.com and the mdb OpenSolaris Community website at
 http://hub.opensolaris.org/bin/view/Community+Group+mdb/
 
 =============================================================================
 
-Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_clients.c	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_clients.c	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,11 +23,13 @@
 
 
 #include <sys/mdb_modapi.h>
+#include <sys/procfs.h>
 #include "Xserver_mdb.h"
 
 #include "xorg-server.h"
 #include "dixstruct.h"
 #include "misc.h"
+#include "client.h"
 #include "os/osdep.h"
 #include "IA/interactive_srv.h"
 
@@ -143,13 +145,35 @@
 	mdb_free(wsp->walk_data, sizeof (ClientRec));
 }
 
+_X_HIDDEN void
+client_pids_help(void)
+{
+    mdb_printf(
+	"Prints information about a ClientRec entry in the X server's array\n"
+	"of currently connected X clients.  Prints process pid and name that\n"
+	"was recorded at connection time for each client, if available.\n"
+	"\n"
+	"If no %<u>addr%</u> is specified, uses ::client_walk to walk the linked list\n"
+	"of ClientRec entries stored in the global array \"clients\" and print\n"
+	"information about each one.\n"
+	"\n");
+    (void) mdb_dec_indent(2);
+    mdb_printf("%<b>OPTIONS%</b>\n");
+    (void) mdb_inc_indent(2);
+    mdb_printf(
+	"-w\tPrint arguments with process name when available.\n");
+}
+
 _X_HIDDEN int
 client_pids(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
     uintptr_t clientP;
     ClientRec client_data;
+    uint_t show_cmd_args = FALSE;
 
-    if (argc != 0)
+    if (mdb_getopts(argc, argv,
+		    'w', MDB_OPT_SETBITS, TRUE, &show_cmd_args,
+		    NULL) != argc)
 	return (DCMD_USAGE);
 
     /*
@@ -171,7 +195,7 @@
      * header line for the output that will follow.
      */
     if (DCMD_HDRSPEC(flags))
-	mdb_printf("CLIENT SEQUENCE #  FD  PIDS\n");
+	mdb_printf("CLIENT SEQUENCE #   FD  PROCESS\n");
 
 
     if (mdb_vread(&clientP, sizeof (clientP), addr) != sizeof (clientP)) {
@@ -181,87 +205,137 @@
 	    != sizeof (client_data)) {
 	    mdb_warn("failed to read ClientRec at %p", clientP);
 	} else {
-	    mdb_printf("%5d  %10d", client_data.index, client_data.sequence);
+	    int client_pid = -1;
+
+	    mdb_printf("%5d  %10d ", client_data.index, client_data.sequence);
 
-	    if (client_data.osPrivate == NULL) {
-		mdb_printf(" ??? - NULL ClientPtr->osPrivate\n");
-	    } else {
+	    /* Find file descriptor for this client */
+	    if (client_data.osPrivate != NULL) {
 		OsCommRec oscomm;
-
+	    
 		if (mdb_vread(&oscomm, sizeof (oscomm),
 			      (uintptr_t)client_data.osPrivate)
 		    != sizeof (oscomm)) {
 		    mdb_warn("failed to read struct OsCommRec at %p",
 			     client_data.osPrivate);
 		} else {
-		    ClientProcessPtr cpp = NULL;
+		    mdb_printf("%4d ", oscomm.fd);
+		}
+	    } else {
+		mdb_printf("NULL ");
+	    }
 
-		    /* Xorg 1.9 or later */
-		    DevPrivateKeyRec IAPrivKeyRec;
-		    GElf_Sym privkey_sym;
+	    /* Find client pid & cmd recorded on connection setup by
+	       Xorg 1.11 and later */
+	    if (client_data.clientIds != NULL) {
+		ClientIdRec cir;
 
-		    mdb_printf("%4d ", oscomm.fd);
+		if (mdb_vread(&cir, sizeof (cir),
+			      (uintptr_t)client_data.clientIds)
+		    != sizeof (cir)) {
+		    mdb_warn("failed to read struct ClientIdRec at %p",
+			     client_data.clientIds);
+		} else {
+		    char cmd[PRARGSZ];
 
-		    if (mdb_lookup_by_obj("libia.so", "IAPrivKeyRec",
-					  &privkey_sym) == -1) {
-			mdb_warn("failed to lookup 'libia.so`IAPrivKeyRec'");
+		    if (mdb_readstr(cmd, sizeof(cmd),
+				    (uintptr_t)cir.cmdname) == -1) {
+			mdb_warn("failed to read cmdname at %p", cir.cmdname);
+			cmd[0] = '\0';
+		    }
+		    mdb_printf("%6d %s", cir.pid, cmd);
+		    client_pid = cir.pid;
+		    if (show_cmd_args && (cir.cmdargs != NULL)) {
+			if (mdb_readstr(cmd, sizeof(cmd),
+					(uintptr_t)cir.cmdargs) == -1) {
+			    mdb_warn("failed to read cmdargs at %p",
+				     cir.cmdargs);
+			    cmd[0] = '\0';
+			}
+			mdb_printf(" %s\n", cmd);
 		    } else {
-			if (mdb_vread(&IAPrivKeyRec, sizeof(DevPrivateKeyRec),
-				      privkey_sym.st_value)
-			    != sizeof(DevPrivateKeyRec)) {
-			    mdb_warn("failed to read 'IAPrivKeyRec'");
-			} else if (!IAPrivKeyRec.initialized) {
-			    mdb_warn("IAPrivKeyRec is uninitialized");
-			} else {
-			    uintptr_t dpaddr
-				= ((uintptr_t)client_data.devPrivates)
-				+ IAPrivKeyRec.offset;
-			    uintptr_t cppaddr = (uintptr_t) NULL;
+			mdb_printf("\n", cmd);
+		    }
+		}
+	    } else {
+		mdb_printf(" ???? - NULL ClientPtr->clientIds\n");
+	    }
+	    
+	    /* Check to see if any additional pids were registered
+	       with SolarisIA extension. */
+	    static GElf_Sym iaprivkey_sym;
+
+	    if ((iaprivkey_sym.st_value == 0) &&
+		(mdb_lookup_by_obj("libia.so", "IAPrivKeyRec", &iaprivkey_sym)
+		 == -1)) {
+		mdb_warn("failed to lookup 'libia.so`IAPrivKeyRec'");
+	    }
+
+	    if (iaprivkey_sym.st_value != 0) {
+		ClientProcessPtr cpp = NULL;
+		DevPrivateKeyRec IAPrivKeyRec;
+
+		if (mdb_vread(&IAPrivKeyRec, sizeof(DevPrivateKeyRec),
+			      iaprivkey_sym.st_value)
+		    != sizeof(DevPrivateKeyRec)) {
+		    mdb_warn("failed to read 'IAPrivKeyRec'");
+		} else if (!IAPrivKeyRec.initialized) {
+		    mdb_warn("IAPrivKeyRec is uninitialized");
+		} else {
+		    uintptr_t dpaddr =	((uintptr_t)client_data.devPrivates)
+			+ IAPrivKeyRec.offset;
+		    uintptr_t cppaddr = (uintptr_t) NULL;
 
-			    /*
-			     * ClientProcessPtr is the first entry in the
-			     * IAClientPrivatePtr that devPrivates points to
-			     */
-			    if (mdb_vread(&cppaddr, sizeof (cppaddr), dpaddr)
-				!= sizeof (cppaddr)) {
-				mdb_warn("failed to read "
-					 " client_data.devPrivates+offset");
-			    } else if (cppaddr == NULL) {
-				mdb_warn("no ClientProcessPtr found");
-			    } else if (mdb_vread(&cpp, sizeof (cpp), cppaddr)
-				       != sizeof (cpp)) {
-				cpp = NULL;
-				mdb_warn("failed to read IAClientPrivatePtr");
+		    /*
+		     * ClientProcessPtr is the first entry in the
+		     * IAClientPrivatePtr that devPrivates points to
+		     */
+		    if (mdb_vread(&cppaddr, sizeof (cppaddr), dpaddr)
+			!= sizeof (cppaddr)) {
+			mdb_warn("failed to read "
+				 " client_data.devPrivates+offset");
+		    } else if (cppaddr == NULL) {
+			/*
+			 * if osPrivate is NULL, client connection is closed,
+			 * and it's no surprise we can't find ClientProcessPtr
+			 */
+			if (client_data.osPrivate != NULL)
+			    mdb_warn("no ClientProcessPtr found");
+		    } else if (mdb_vread(&cpp, sizeof (cpp), cppaddr)
+			       != sizeof (cpp)) {
+			cpp = NULL;
+			mdb_warn("failed to read IAClientPrivatePtr");
+		    }
+		}
+
+		if (cpp != NULL) {
+		    ClientProcessRec cpr;
+		    ConnectionPidRec pid;
+
+		    if (mdb_vread(&cpr, sizeof (cpr), (uintptr_t)cpp)
+			!= sizeof (cpr)) {
+			mdb_warn("failed to read struct ClientProcessRec"
+				 " at %p", client_data.osPrivate);
+		    } else {
+			int i, num_printed = 0;
+			uintptr_t pidP = (uintptr_t) cpr.pids;
+
+			for (i = 0; i < cpr.count; i++, pidP += sizeof(pid)) {
+			    if (mdb_vread(&pid, sizeof (pid), pidP)
+				== sizeof (pid)) {
+				if (pid != client_pid) {
+				    if (num_printed == 0)
+					mdb_printf("%22s", "+");
+				    num_printed++;
+				    mdb_printf(" %6d", pid);
+				}
+			    } else {
+				mdb_warn("failed to read pid #%d from %p",
+					 i, pidP);
 			    }
 			}
-		    }
-
-		    if (cpp == NULL) {
-			mdb_printf(" ??? - NULL ClientProcessPtr\n");
-		    } else {
-			ClientProcessRec cpr;
-			ConnectionPidRec pid;
-
-			if (mdb_vread(&cpr, sizeof (cpr), (uintptr_t)cpp)
-			    != sizeof (cpr)) {
-			    mdb_warn("failed to read struct ClientProcessRec"
-				     " at %p", client_data.osPrivate);
-			} else {
-			    int i;
-			    uintptr_t pidP = (uintptr_t) cpr.pids;
-
-			    for (i = 0; i < cpr.count;
-				 i++, pidP += sizeof(pid)) {
-				if (mdb_vread(&pid, sizeof (pid), pidP)
-				    == sizeof (pid)) {
-				    mdb_printf("%d ", pid);
-				} else {
-				    mdb_warn("failed to read pid #%d from %p",
-					     i, pidP);
-				}
-			    }
+			if (num_printed != 0)
 			    mdb_printf("\n");
-			}
 		    }
 		}
 	    }
--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_device_grabs.c	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_device_grabs.c	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -99,6 +99,19 @@
     mdb_free(wsp->walk_data, sizeof (struct inputdev_walk_data));
 }
 
+_X_HIDDEN void
+inputdev_grabs_help(void)
+{
+    mdb_printf(
+	"Prints information about a DeviceIntRec entry in the X server's list\n"
+	"of currently connected input devices.\n"
+	"\n"
+	"If no %<u>addr%</u> is specified, uses ::inputdev_walk to walk the linked list\n"
+	"of DeviceIntRec entries starting at the entry stored in the global\n"
+	"variable \"InputInfo\" and print information about each one.\n"
+	);
+}
+
 _X_HIDDEN int
 inputdev_grabs(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_mdb.h	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Xserver_mdb.h	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -45,12 +45,14 @@
 _X_HIDDEN void	client_walk_fini(mdb_walk_state_t *wsp);
 _X_HIDDEN int	client_pids(uintptr_t addr, uint_t flags,
 			    int argc, const mdb_arg_t *argv);
-
+_X_HIDDEN void	client_pids_help(void);
+			    
 /* Xserver_device_grabs.c */
 _X_HIDDEN int	inputdev_walk_init(mdb_walk_state_t *wsp);
 _X_HIDDEN int	inputdev_walk_step(mdb_walk_state_t *wsp);
 _X_HIDDEN void	inputdev_walk_fini(mdb_walk_state_t *wsp);
 _X_HIDDEN int	inputdev_grabs(uintptr_t addr, uint_t flags,
 			       int argc, const mdb_arg_t *argv);
+_X_HIDDEN void	inputdev_grabs_help(void);
 
 #endif /* _XSERVER_MDB_H */
--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/mapfile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/mapfile	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -34,7 +34,10 @@
 # contain entries found in the ON gate's master copy of the mdb mapfile
 # in usr/src/cmd/mdb/common/modules/conf/mapfile-extern
 		mdb_alloc			{ FLAGS = EXTERN };
+		mdb_dec_indent			{ FLAGS = EXTERN };
 		mdb_free			{ FLAGS = EXTERN };
+		mdb_getopts			{ FLAGS = EXTERN };
+		mdb_inc_indent			{ FLAGS = EXTERN };
 		mdb_lookup_by_name		{ FLAGS = EXTERN };
 		mdb_lookup_by_obj		{ FLAGS = EXTERN };
 		mdb_printf			{ FLAGS = EXTERN };
--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/mdb_module.c	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/mdb_module.c	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -34,8 +34,10 @@
  */
 
 static const mdb_dcmd_t dcmds[] = {
-	{ "client_pids", NULL, "client process list", client_pids },
-	{ "inputdev_grabs", NULL, "inputdev grab list", inputdev_grabs },
+	{ "client_pids", "?[-w]", "client process list",
+	  client_pids, client_pids_help },
+	{ "inputdev_grabs", "?", "inputdev grab list",
+	  inputdev_grabs, inputdev_grabs_help },
 	{ NULL }
 };
 
--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/scripts/list_Xserver_clients	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/scripts/list_Xserver_clients	Fri Apr 06 21:57:14 2012 -0700
@@ -1,6 +1,6 @@
 #!/usr/bin/ksh93
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -39,7 +39,14 @@
 
 print '::client_pids' | mdb "$@" | tee ${MDBOUT}
 
-for p in $(awk '/^[^\#\?]*$/ { for (i = 4 ; i <= NF ; i++) print $i}' ${MDBOUT})
+# Skip first two lines of output
+awk_filter='NR <= 2 {next}'
+# Print all pids in lines starting with whitespace, then +
+awk_filter+='/^[ \t]+\+/ { for (i = 2 ; i <= NF ; i++) print $i; next}'
+# Print only the pid (4th column) in other lines (most of them)
+awk_filter+='{ print $4 }'
+
+for p in $(awk "${awk_filter}" ${MDBOUT})
 do
 	ptree $p >> ${PIDOUT}
 done
--- a/open-src/xserver/xorg/vt.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/vt.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -1,5 +1,5 @@
 diff --git a/dix/main.c b/dix/main.c
-index 9c3951a..86afa8c 100644
+index 5631d02..69eb5f3 100644
 --- a/dix/main.c
 +++ b/dix/main.c
 @@ -79,6 +79,8 @@ Equipment Corporation.
@@ -11,7 +11,7 @@
  #include <X11/X.h>
  #include <X11/Xos.h>   /* for unistd.h  */
  #include <X11/Xproto.h>
-@@ -122,6 +124,30 @@ extern void DtloginCloseDown(void);
+@@ -123,6 +125,30 @@ extern void DtloginCloseDown(void);
  
  extern void Dispatch(void);
  
@@ -42,7 +42,7 @@
  #ifdef XQUARTZ
  #include <pthread.h>
  
-@@ -138,6 +164,9 @@ int main(int argc, char *argv[], char *envp[])
+@@ -139,6 +165,9 @@ int main(int argc, char *argv[], char *envp[])
  {
      int		i;
      HWEventQueueType	alwaysCheckForInput[2];
@@ -52,7 +52,7 @@
  
      display = "0";
  
-@@ -153,6 +182,12 @@ int main(int argc, char *argv[], char *envp[])
+@@ -152,6 +181,12 @@ int main(int argc, char *argv[], char *envp[])
  
      ProcessCommandLine(argc, argv);
  
@@ -66,7 +66,7 @@
      alwaysCheckForInput[1] = 1;
      while(1)
 diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
-index 281a6df..42e20ac 100644
+index 800fc1c..4fe40ca 100644
 --- a/hw/xfree86/os-support/solaris/sun_init.c
 +++ b/hw/xfree86/os-support/solaris/sun_init.c
 @@ -45,6 +45,9 @@
@@ -79,7 +79,7 @@
  static Bool KeepTty = FALSE;
  static Bool Protect0 = FALSE;
  static Bool UseConsole = FALSE;
-@@ -234,6 +237,8 @@ OPENCONSOLE:
+@@ -254,6 +257,8 @@ OPENCONSOLE:
  
  	    if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0)
  		xf86Msg(X_WARNING, "xf86OpenConsole: VT_SETDISPINFO failed\n");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/workaround-7154410.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,21 @@
+--- a/glx/glapi_gentable.c.orig  Tue Mar 27 09:06:48 2012
++++ b/glx/glapi_gentable.c       Tue Mar 27 09:07:56 2012
+@@ -57,6 +57,18 @@
+ #include "os.h"
+ #endif
+ 
++#if defined(__sparc__) || defined(__sparc)
++#define WORKAROUND_7154410
++#endif
++
++#ifdef WORKAROUND_7154410
++static void *
++workaround_dlsym(void *handle, const char *name) {
++    return dlsym(handle, name);
++}
++#define dlsym workaround_dlsym
++#endif
++
+ static void
+ __glapi_gentable_NoOp(void) {
+     const char *fstr = "Unknown";
--- a/open-src/xserver/xorg/xtsol.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/xtsol.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -20,7 +20,7 @@
 # DEALINGS IN THE SOFTWARE.
 
 diff --git a/Makefile.am b/Makefile.am
-index 4d2e2ca..e14a6e3 100644
+index b1408f2..54d64ab 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -17,6 +17,10 @@ if RECORD
@@ -33,8 +33,8 @@
 +
  SUBDIRS = \
  	doc \
- 	include \
-@@ -37,6 +41,7 @@ SUBDIRS = \
+ 	man \
+@@ -38,6 +42,7 @@ SUBDIRS = \
  	$(COMPOSITE_DIR) \
  	$(GLX_DIR) \
  	IA \
@@ -43,10 +43,10 @@
  	config \
  	hw \
 diff --git a/Xext/security.c b/Xext/security.c
-index 8673880..14bb5cd 100644
+index df5bd58..8825bb6 100644
 --- a/Xext/security.c
 +++ b/Xext/security.c
-@@ -1144,3 +1144,27 @@ SecurityExtensionInit(INITARGS)
+@@ -1138,3 +1138,27 @@ SecurityExtensionInit(INITARGS)
      /* Label objects that were created before we could register ourself */
      SecurityLabelInitial();
  }
@@ -88,12 +88,12 @@
 +
  #endif /* _SECURITY_SRV_H */
 diff --git a/configure.ac b/configure.ac
-index c6cbb69..32a3cce 100644
+index 460da17..c3b310d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -227,6 +227,14 @@ dnl Find the math libary
+@@ -221,6 +221,14 @@ dnl Find the math libary, then check for cbrt function in it.
  AC_CHECK_LIB(m, sqrt)
- AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
+ AC_CHECK_FUNCS([cbrt])
  
 +dnl Check for libtsol for Solaris Trusted Extensions module
 +AC_CHECK_LIB(tsol, bsllow, [BUILD_TSOL_MODULE=yes], [BUILD_TSOL_MODULE=no])
@@ -106,7 +106,7 @@
  AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
  
  dnl AGPGART headers
-@@ -1507,6 +1515,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
+@@ -1500,6 +1508,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
  if test "x$XVFB" = xyes; then
  	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
  	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
@@ -115,16 +115,16 @@
  	AC_SUBST([XVFB_LIBS])
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
-@@ -1528,6 +1538,8 @@ if test "x$XNEST" = xyes; then
+@@ -1521,6 +1531,8 @@ if test "x$XNEST" = xyes; then
  	fi
- 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
+ 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"
  	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
 +	XNEST_LIBS="$XNEST_LIBS $TSOL_LIB"
 +	XNEST_SYS_LIBS="$XNEST_SYS_LIBS $TSOL_SYS_LIBS"
  	AC_SUBST([XNEST_LIBS])
  	AC_SUBST([XNEST_SYS_LIBS])
  fi
-@@ -2092,6 +2104,7 @@ if test "$KDRIVE" = yes; then
+@@ -2057,6 +2069,7 @@ if test "$KDRIVE" = yes; then
      KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
  
      KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
@@ -132,7 +132,7 @@
      KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
      case $host_os in
  	*linux*)
-@@ -2283,3 +2296,6 @@ xorg-server.pc
+@@ -2247,3 +2260,6 @@ xorg-server.pc
  
  # Add Sun IA extension
  AC_OUTPUT([IA/Makefile])
@@ -140,7 +140,7 @@
 +# Add Sun Trusted Extensions extension
 +AC_OUTPUT([tsol/Makefile])
 diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 7b2132d..63a2378 100644
+index 44c2433..e710ea4 100644
 --- a/dix/dispatch.c
 +++ b/dix/dispatch.c
 @@ -74,8 +74,8 @@ Equipment Corporation.
@@ -154,7 +154,7 @@
   *
   * Permission is hereby granted, free of charge, to any person obtaining a
   * copy of this software and associated documentation files (the "Software"),
-@@ -162,6 +162,10 @@ int connBlockScreenStart;
+@@ -163,6 +163,10 @@ int connBlockScreenStart;
  
  static void KillAllClients(void);
  
@@ -165,7 +165,7 @@
  static int nextFreeClientID; /* always MIN free client ID */
  
  static int	nClients;	/* number of authorized clients */
-@@ -896,7 +900,12 @@ ProcCirculateWindow(ClientPtr client)
+@@ -904,7 +908,12 @@ ProcCirculateWindow(ClientPtr client)
      return Success;
  }
  
@@ -179,7 +179,7 @@
  GetGeometry(ClientPtr client, xGetGeometryReply *rep)
  {
      DrawablePtr pDraw;
-@@ -1990,7 +1999,12 @@ ProcPutImage(ClientPtr client)
+@@ -1997,7 +2006,12 @@ ProcPutImage(ClientPtr client)
       return Success;
  }
  
@@ -194,10 +194,10 @@
             int x, int y, int width, int height, 
             Mask planemask, xGetImageReply **im_return)
 diff --git a/dix/events.c b/dix/events.c
-index eefcdef..a945411 100644
+index 04d7fb5..e39b4f9 100644
 --- a/dix/events.c
 +++ b/dix/events.c
-@@ -2544,6 +2544,9 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
+@@ -2842,6 +2842,9 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
   *
   * @returns the window at the given coordinates.
   */
@@ -208,7 +208,7 @@
  XYToWindow(SpritePtr pSprite, int x, int y)
  {
 diff --git a/dix/window.c b/dix/window.c
-index 41306b3..6d4db39 100644
+index 823294b..78cc845 100644
 --- a/dix/window.c
 +++ b/dix/window.c
 @@ -97,6 +97,33 @@ Equipment Corporation.
@@ -245,7 +245,7 @@
  
  #ifdef HAVE_DIX_CONFIG_H
  #include <dix-config.h>
-@@ -175,6 +202,11 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
+@@ -183,6 +210,11 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
  
  #define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
  
@@ -254,10 +254,10 @@
 +extern SecurityHookPtr pSecHook;
 +#endif /* TSOL */
 +
- #ifdef DEBUG
- /******
-  * PrintWindowTree
-@@ -1837,7 +1869,12 @@ IsSiblingAboveMe(
+ #ifdef COMPOSITE
+ static const char *overlay_win_name = "<composite overlay>";
+ #endif
+@@ -1934,7 +1966,12 @@ IsSiblingAboveMe(
      return Below;
  }
  
@@ -271,7 +271,7 @@
  WindowExtents(
      WindowPtr pWin,
      BoxPtr pBox)
-@@ -1867,7 +1904,12 @@ MakeBoundingRegion (
+@@ -1964,7 +2001,12 @@ MakeBoundingRegion (
      return pRgn;
  }
  
@@ -285,7 +285,7 @@
  ShapeOverlap (
      WindowPtr	pWin,
      BoxPtr	pWinBox,
-@@ -2067,7 +2109,12 @@ WhereDoIGoInTheStack(
+@@ -2164,7 +2206,12 @@ WhereDoIGoInTheStack(
      }
  }
  
@@ -300,7 +300,7 @@
      WindowPtr pWin,
      WindowPtr pSib,
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index e1d24e4..9827e4f 100644
+index 87004df..1455dae 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
 @@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] = {
@@ -312,10 +312,10 @@
  };
  
 diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
-index ea065fa..5e5725e 100644
+index 02a6d0d..00f8021 100644
 --- a/hw/xfree86/dixmods/Makefile.am
 +++ b/hw/xfree86/dixmods/Makefile.am
-@@ -74,3 +74,11 @@ libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA
+@@ -73,3 +73,11 @@ libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA
  libia_la_LDFLAGS = -avoid-version
  libia_la_LIBADD = $(top_builddir)/IA/libIA.la
  libia_la_SOURCES = iamodule.c
@@ -328,7 +328,7 @@
 +libxtsol_la_SOURCES = tsolmodule.c
 +endif
 diff --git a/include/dix.h b/include/dix.h
-index 12e4b59..50c20ed 100644
+index f3f68d3..45e4834 100644
 --- a/include/dix.h
 +++ b/include/dix.h
 @@ -172,6 +172,15 @@ extern _X_EXPORT void MarkClientException(
@@ -348,7 +348,7 @@
  
  extern _X_EXPORT int CompareISOLatin1Lowered(
 diff --git a/include/extnsionst.h b/include/extnsionst.h
-index bb66dfb..3a51180 100644
+index aeefa99..de5e448 100644
 --- a/include/extnsionst.h
 +++ b/include/extnsionst.h
 @@ -45,6 +45,34 @@ SOFTWARE.
@@ -420,10 +420,10 @@
  #endif /* EXTENSIONSTRUCT_H */
  
 diff --git a/include/input.h b/include/input.h
-index 95aae43..3f8a884 100644
+index fb45617..93039c9 100644
 --- a/include/input.h
 +++ b/include/input.h
-@@ -408,7 +408,7 @@ extern void NoteLedState(
+@@ -422,7 +422,7 @@ extern void NoteLedState(
      int /*led*/,
      Bool /*on*/);
  
@@ -433,12 +433,12 @@
      ClientPtr /*client*/);
  
 diff --git a/include/window.h b/include/window.h
-index 6fb2f8c..29e4364 100644
+index e13598b..8860dc7 100644
 --- a/include/window.h
 +++ b/include/window.h
-@@ -266,4 +266,9 @@ extern _X_EXPORT void DisableMapUnmapEvents(
- extern _X_EXPORT void EnableMapUnmapEvents(
-     WindowPtr /* pWin */ );
+@@ -269,4 +269,9 @@ extern _X_EXPORT void EnableMapUnmapEvents(
+ extern _X_EXPORT void SetRootClip(ScreenPtr pScreen, Bool enable);
+ extern _X_EXPORT void PrintWindowTree(void);
  
 +#ifdef TSOL
 +# include "validate.h" /* needed for VTKind enum definition */
@@ -447,7 +447,7 @@
 +
  #endif /* WINDOW_H */
 diff --git a/mi/miinitext.c b/mi/miinitext.c
-index ee04b05..82a4d2e 100644
+index b3c29fb..f3d5a33 100644
 --- a/mi/miinitext.c
 +++ b/mi/miinitext.c
 @@ -66,6 +66,7 @@ SOFTWARE.
@@ -501,7 +501,7 @@
  
  #else /* XFree86LOADER */
 diff --git a/os/connection.c b/os/connection.c
-index 5580fab..c69d4fe 100644
+index 0e557a5..bb911f4 100644
 --- a/os/connection.c
 +++ b/os/connection.c
 @@ -44,6 +44,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
@@ -550,7 +550,7 @@
  static XtransConnInfo
  lookup_trans_conn (int fd)
  {
-@@ -646,6 +678,12 @@ ClientAuthorized(ClientPtr client,
+@@ -645,6 +677,12 @@ ClientAuthorized(ClientPtr client,
      priv = (OsCommPtr)client->osPrivate;
      trans_conn = priv->trans_conn;
  
--- a/open-src/xserver/xvnc/Makefile	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xvnc/Makefile	Fri Apr 06 21:57:14 2012 -0700
@@ -64,6 +64,7 @@
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
 	$(SOURCE_DIR)/unix/xserver110.patch,'-p0 -d unix' \
+	tigervnc11-xorg111.patch,-p1 \
 	no-nasm.patch,-p1 \
 	applet-html.patch \
 	icon.patch \
@@ -184,6 +185,9 @@
 	-I$(PWD)/$(SOURCE_DIR)/common \
 	-I$(PWD)/$(SOURCE_DIR)/unix/vncconfig
 
+# Workaround for Java failure with JDK 7 in S11U1b12 - continue using JDK 6 for now
+MODULE_BUILD_ENV = PATH="/usr/jdk/instances/jdk1.6.0/bin:$$PATH"
+
 CFLAGS_gcc += -fPIC
 
 # Needed by unix/xorg-x11-server-source/hw/vnc/Makefile.am to find libpixman
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/tigervnc11-xorg111.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -0,0 +1,254 @@
+Downloaded from:
+http://pkgs.fedoraproject.org/gitweb/?p=tigervnc.git;a=blob_plain;f=tigervnc11-xorg111.patch;hb=HEAD
+
+commit eba8cb45c6383117ffc99ef89b0691a33daeaa7c - Fri, 11 Nov 2011 13:47:47
+
+diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc
+--- tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111	2011-08-09 23:16:36.000000000 +0200
++++ tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc	2011-11-11 11:59:14.226819903 +0100
+@@ -82,10 +82,11 @@ static KeyCode KeysymToKeycode(KeySymsPt
+ /* Event queue is shared between all devices. */
+ #if XORG == 15
+ static xEvent *eventq = NULL;
+-#else
++#elif XORG < 111
+ static EventList *eventq = NULL;
+ #endif
+ 
++#if XORG < 111
+ static void initEventq(void)
+ {
+ 	/* eventq is never free()-ed because it exists during server life. */
+@@ -100,7 +101,9 @@ static void initEventq(void)
+ #endif
+ 	}
+ }
++#endif /* XORG < 111 */
+ 
++#if XORG < 111
+ static void enqueueEvents(DeviceIntPtr dev, int n)
+ {
+ 	int i;
+@@ -122,6 +125,7 @@ static void enqueueEvents(DeviceIntPtr d
+ 			   );
+ 	}
+ }
++#endif /* XORG < 111 */
+ 
+ InputDevice::InputDevice(rfb::VNCServerST *_server)
+ 	: server(_server), oldButtonMask(0)
+@@ -141,12 +145,17 @@ InputDevice::InputDevice(rfb::VNCServerS
+ 				     keyboardProc, TRUE);
+ 	RegisterKeyboardDevice(keyboardDev);
+ #endif
++#if XORG < 111
+ 	initEventq();
++#endif
+ }
+ 
+ void InputDevice::PointerButtonAction(int buttonMask)
+ {
+-	int i, n;
++	int i;
++#if XORG < 111
++	int n;
++#endif
+ #if XORG >= 110
+ 	ValuatorMask mask;
+ #endif
+@@ -160,13 +169,17 @@ void InputDevice::PointerButtonAction(in
+ #if XORG < 110
+ 			n = GetPointerEvents(eventq, pointerDev, action, i + 1,
+ 					     POINTER_RELATIVE, 0, 0, NULL);
+-#else
++			enqueueEvents(pointerDev, n);
++#elif XORG < 111
+ 			valuator_mask_set_range(&mask, 0, 0, NULL);
+ 			n = GetPointerEvents(eventq, pointerDev, action, i + 1,
+ 					     POINTER_RELATIVE, &mask);
+-#endif
+ 			enqueueEvents(pointerDev, n);
+-
++#else
++			valuator_mask_set_range(&mask, 0, 0, NULL);
++			QueuePointerEvents(pointerDev, action, i + 1,
++					   POINTER_RELATIVE, &mask);
++#endif
+ 		}
+ 	}
+ 
+@@ -175,7 +188,10 @@ void InputDevice::PointerButtonAction(in
+ 
+ void InputDevice::PointerMove(const rfb::Point &pos)
+ {
+-	int n, valuators[2];
++	int valuators[2];
++#if XORG < 111
++	int n;
++#endif
+ #if XORG >= 110
+ 	ValuatorMask mask;
+ #endif
+@@ -190,12 +206,16 @@ void InputDevice::PointerMove(const rfb:
+ #if XORG < 110
+ 	n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, 0,
+ 			     2, valuators);
+-#else
++	enqueueEvents(pointerDev, n);
++#elif XORG < 111
+ 	valuator_mask_set_range(&mask, 0, 2, valuators);
+ 	n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE,
+ 			     &mask);
+-#endif
+ 	enqueueEvents(pointerDev, n);
++#else
++	valuator_mask_set_range(&mask, 0, 2, valuators);
++	QueuePointerEvents(pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, &mask);
++#endif
+ 
+ 	cursorPos = pos;
+ }
+@@ -299,14 +319,20 @@ void InputDevice::initInputDevice(void)
+ static inline void pressKey(DeviceIntPtr dev, int kc, bool down, const char *msg)
+ {
+ 	int action;
++#if XORG < 111
+ 	unsigned int n;
++#endif
+ 
+ 	if (msg != NULL)
+ 		vlog.debug("%s %d %s", msg, kc, down ? "down" : "up");
+ 
+ 	action = down ? KeyPress : KeyRelease;
+-	n = GetKeyboardEvents(eventq, dev, action, kc);
++#if XORG < 111
++	n = GetKeyboardEvents(eventq, dev, action, kc, NULL);
+ 	enqueueEvents(dev, n);
++#else
++	QueueKeyboardEvents(dev, action, kc, NULL);
++#endif
+ }
+ 
+ #define IS_PRESSED(keyc, keycode) \
+@@ -341,8 +367,11 @@ public:
+ 		int state, maxKeysPerMod, keycode;
+ #if XORG >= 17
+ 		KeyCode *modmap = NULL;
+-
++#if XORG >= 111
++		state = XkbStateFieldFromRec(&dev->master->key->xkbInfo->state);
++#else /* XORG >= 111 */
+ 		state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
++#endif /* XORG >= 111 */
+ #else
+ 		KeyClassPtr keyc = dev->key;
+ 		state = keyc->state;
+@@ -380,7 +409,11 @@ public:
+ #if XORG >= 17
+ 		KeyCode *modmap = NULL;
+ 
++#if XORG >= 111
++		keyc = dev->master->key;
++#else /* XORG >= 111 */
+ 		keyc = dev->u.master->key;
++#endif /* XORG >= 111 */
+ 		state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
+ #else
+ 		keyc = dev->key;
+@@ -596,7 +629,11 @@ void InputDevice::keyEvent(rdr::U32 keys
+ 	}
+ 
+ #if XORG >= 17
++#if XORG >= 111
++	keyc = keyboardDev->master->key;
++#else /* XORG >= 111 */
+ 	keyc = keyboardDev->u.master->key;
++#endif /* XORG >= 111 */
+ 
+ 	keymap = XkbGetCoreMap(keyboardDev);
+ 	if (!keymap) {
+@@ -753,7 +790,11 @@ ModeSwitchFound:
+ 			XkbApplyMappingChange(keyboardDev, keymap, minKeyCode,
+ 					      maxKeyCode - minKeyCode + 1,
+ 					      NULL, serverClient);
++#if XORG >= 111
++			XkbCopyDeviceKeymap(keyboardDev->master, keyboardDev);
++#else
+ 			XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);
++#endif
+ #endif /* XORG < 17 */
+ 			break;
+ 		}
+diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111	2011-08-09 23:16:36.000000000 +0200
++++ tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h	2011-11-11 11:55:32.255835319 +0100
+@@ -36,6 +36,10 @@
+ #define XORG 19
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (10 * 100000) + (99 * 1000))
+ #define XORG 110
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000))
++#define XORG 111
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000))
++#define XORG 112
+ #else
+ #error "X.Org newer than 1.10 is not supported"
+ #endif
+diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc
+--- tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111	2011-08-09 23:16:36.000000000 +0200
++++ tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc	2011-11-11 11:55:32.256835319 +0100
+@@ -211,7 +211,11 @@ static void vfbFreeFramebufferMemory(vfb
+ 
+ extern "C" {
+ 
++#if XORG < 111
+ void ddxGiveUp()
++#else
++void ddxGiveUp(enum ExitCode error)
++#endif
+ {
+     int i;
+ 
+@@ -221,9 +225,17 @@ void ddxGiveUp()
+ }
+ 
+ void
++#if XORG < 111
+ AbortDDX()
++#else
++AbortDDX(enum ExitCode error)
++#endif
+ {
++#if XORG < 111
+     ddxGiveUp();
++#else
++    ddxGiveUp(error);
++#endif
+ }
+ 
+ #ifdef __DARWIN__
+@@ -668,8 +680,13 @@ vfbUninstallColormap(ColormapPtr pmap)
+     {
+ 	if (pmap->mid != pmap->pScreen->defColormap)
+ 	{
++#if XORG < 111
+ 	    curpmap = (ColormapPtr) LookupIDByType(pmap->pScreen->defColormap,
+ 						   RT_COLORMAP);
++#else
++	    dixLookupResourceByType((pointer *) &curpmap, pmap->pScreen->defColormap,
++				    RT_COLORMAP, serverClient, DixUnknownAccess);
++#endif
+ 	    (*pmap->pScreen->InstallColormap)(curpmap);
+ 	}
+     }
+
+--- tigervnc-1.1.0/unix/xserver/hw/xfree86/common/xf86Opt.h	Thu Feb 23 07:52:46 2012
++++ tigervnc-1.1.0/unix/xserver/hw/xfree86/common/xf86Opt.h	Thu Feb 23 07:53:10 2012
+@@ -91,7 +91,7 @@
+ extern _X_EXPORT char *xf86OptionValue(XF86OptionPtr opt);
+ extern _X_EXPORT void xf86OptionListReport(XF86OptionPtr parm);
+ extern _X_EXPORT XF86OptionPtr xf86FindOption(XF86OptionPtr options, const char *name);
+-extern _X_EXPORT const char *xf86FindOptionValue(XF86OptionPtr options, const char *name);
++extern _X_EXPORT char *xf86FindOptionValue(pointer options, const char *name);
+ extern _X_EXPORT void xf86MarkOptionUsed(XF86OptionPtr option);
+ extern _X_EXPORT void xf86MarkOptionUsedByName(XF86OptionPtr options, const char *name);
+ extern _X_EXPORT Bool xf86CheckIfOptionUsed(XF86OptionPtr option);
--- a/pkg/manifests/x11-demo-mesa-demos.p5m	Thu Mar 29 13:35:26 2012 -0700
+++ b/pkg/manifests/x11-demo-mesa-demos.p5m	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -24,6 +24,7 @@
 set name=pkg.description \
     value="glxinfo lists information about the GLX extension, OpenGL capable visuals, and the OpenGL renderer on an X server.  glxgears is a GLX demo that draws three rotating gears, and prints out framerate information."
 link path=usr/X11/bin/glxinfo target=../../bin/glxinfo
+dir  path=usr/bin/$(ARCH64)
 file path=usr/bin/$(ARCH64)/glxgears
 file path=usr/bin/$(ARCH64)/glxinfo
 file path=usr/bin/glxgears
--- a/pkg/manifests/x11-header-x11-protocols.p5m	Thu Mar 29 13:35:26 2012 -0700
+++ b/pkg/manifests/x11-header-x11-protocols.p5m	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -179,13 +179,12 @@
 file path=usr/share/doc/compositeproto/compositeproto.txt
 dir  path=usr/share/doc/damageproto
 file path=usr/share/doc/damageproto/damageproto.txt
+dir  path=usr/share/doc/dri2proto
+file path=usr/share/doc/dri2proto/dri2proto.txt
 dir  path=usr/share/doc/fixesproto
 file path=usr/share/doc/fixesproto/fixesproto.txt
 dir  path=usr/share/doc/fontsproto
 file path=usr/share/doc/fontsproto/fsproto.xml
-dir  path=usr/share/doc/inputproto
-file path=usr/share/doc/inputproto/XI2proto.txt
-file path=usr/share/doc/inputproto/XIproto.txt
 dir  path=usr/share/doc/randrproto
 file path=usr/share/doc/randrproto/randrproto.txt
 dir  path=usr/share/doc/recordproto
--- a/pkg/manifests/x11-library-libdrm.p5m	Thu Mar 29 13:35:26 2012 -0700
+++ b/pkg/manifests/x11-library-libdrm.p5m	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -28,10 +28,12 @@
 link path=usr/include/drm target=libdrm
 dir  path=usr/include/libdrm
 file path=usr/include/libdrm/drm.h
+file path=usr/include/libdrm/drm_fourcc.h
 file path=usr/include/libdrm/drm_mode.h
 file path=usr/include/libdrm/drm_sarea.h
 file path=usr/include/libdrm/i915_drm.h
-file path=usr/include/libdrm/intel_bufmgr.h
+$(i386_ONLY)file path=usr/include/libdrm/intel_bufmgr.h
+$(i386_ONLY)file path=usr/include/libdrm/intel_debug.h
 file path=usr/include/libdrm/mach64_drm.h
 file path=usr/include/libdrm/mga_drm.h
 file path=usr/include/libdrm/nouveau_drm.h
--- a/pkg/manifests/x11-library-libx11.p5m	Thu Mar 29 13:35:26 2012 -0700
+++ b/pkg/manifests/x11-library-libx11.p5m	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -65,8 +65,6 @@
 file path=usr/lib/$(ARCH64)/llib-lX11.ln
 file path=usr/lib/$(ARCH64)/pkgconfig/x11-xcb.pc
 file path=usr/lib/$(ARCH64)/pkgconfig/x11.pc
-
-
 dir  path=usr/lib/X11
 file path=usr/lib/X11/Xcms.txt
 dir  path=usr/lib/X11/locale
@@ -362,7 +360,6 @@
 file path=usr/share/X11/locale/zh_TW/XI18N_OBJS
 file path=usr/share/X11/locale/zh_TW/XLC_LOCALE
 dir  path=usr/share/doc/libX11
-dir  path=usr/share/doc/libX11/Compose
 dir  path=usr/share/doc/libX11/XIM
 file path=usr/share/doc/libX11/XIM/dynamicflow.svg
 file path=usr/share/doc/libX11/XIM/dynamicflowsampleseq.svg
@@ -420,6 +417,68 @@
 file path=usr/share/doc/libX11/XKB/glossary.xml
 file path=usr/share/doc/libX11/XKB/xkblib.xml
 dir  path=usr/share/doc/libX11/i18n
+dir  path=usr/share/doc/libX11/i18n/compose
+file path=usr/share/doc/libX11/i18n/compose/C.xml
+file path=usr/share/doc/libX11/i18n/compose/am_ET.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/armscii-8.xml
+file path=usr/share/doc/libX11/i18n/compose/el_GR.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/en_US.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/fi_FI.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/georgian-academy.xml
+file path=usr/share/doc/libX11/i18n/compose/georgian-ps.xml
+file path=usr/share/doc/libX11/i18n/compose/ibm-cp1133.xml
+file path=usr/share/doc/libX11/i18n/compose/iscii-dev.xml
+file path=usr/share/doc/libX11/i18n/compose/isiri-3342.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-1.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-10.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-11.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-13.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-14.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-15.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-2.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-3.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-4.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-5.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-6.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-7.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-8.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-9.xml
+file path=usr/share/doc/libX11/i18n/compose/iso8859-9e.xml
+file path=usr/share/doc/libX11/i18n/compose/ja.JIS.xml
+file path=usr/share/doc/libX11/i18n/compose/ja.S90.xml
+file path=usr/share/doc/libX11/i18n/compose/ja.SJIS.xml
+file path=usr/share/doc/libX11/i18n/compose/ja.U90.xml
+file path=usr/share/doc/libX11/i18n/compose/ja.xml
+file path=usr/share/doc/libX11/i18n/compose/ja_JP.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/ko.xml
+file path=usr/share/doc/libX11/i18n/compose/ko_KR.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/koi8-c.xml
+file path=usr/share/doc/libX11/i18n/compose/koi8-r.xml
+file path=usr/share/doc/libX11/i18n/compose/koi8-u.xml
+file path=usr/share/doc/libX11/i18n/compose/libX11-keys.xml
+file path=usr/share/doc/libX11/i18n/compose/microsoft-cp1251.xml
+file path=usr/share/doc/libX11/i18n/compose/microsoft-cp1255.xml
+file path=usr/share/doc/libX11/i18n/compose/microsoft-cp1256.xml
+file path=usr/share/doc/libX11/i18n/compose/mulelao-1.xml
+file path=usr/share/doc/libX11/i18n/compose/nokhchi-1.xml
+file path=usr/share/doc/libX11/i18n/compose/pt_BR.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/ru_RU.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/tatar-cyr.xml
+file path=usr/share/doc/libX11/i18n/compose/th_TH.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/th_TH.xml
+file path=usr/share/doc/libX11/i18n/compose/tscii-0.xml
+file path=usr/share/doc/libX11/i18n/compose/vi_VN.tcvn.xml
+file path=usr/share/doc/libX11/i18n/compose/vi_VN.viscii.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_CN.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_CN.gb18030.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_CN.gbk.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_CN.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_HK.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_HK.big5.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_HK.big5hkscs.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_TW.UTF-8.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_TW.big5.xml
+file path=usr/share/doc/libX11/i18n/compose/zh_TW.xml
 dir  path=usr/share/doc/libX11/i18n/framework
 file path=usr/share/doc/libX11/i18n/framework/framework.svg
 file path=usr/share/doc/libX11/i18n/framework/framework.xml
--- a/pkg/manifests/x11-library-libxi.p5m	Thu Mar 29 13:35:26 2012 -0700
+++ b/pkg/manifests/x11-library-libxi.p5m	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -37,10 +37,9 @@
 file path=usr/lib/libXi.so.5
 file path=usr/lib/pkgconfig/xi.pc
 dir  path=usr/share/doc/libXi
-dir  path=usr/share/doc/libXi/specs
-file path=usr/share/doc/libXi/specs/encoding.xml
-file path=usr/share/doc/libXi/specs/inputlib.xml
-file path=usr/share/doc/libXi/specs/library.xml
+file path=usr/share/doc/libXi/encoding.xml
+file path=usr/share/doc/libXi/inputlib.xml
+file path=usr/share/doc/libXi/library.xml
 dir  path=usr/share/man/man3xi
 file path=usr/share/man/man3xi/XAllowDeviceEvents.3xi
 file path=usr/share/man/man3xi/XChangeDeviceControl.3xi
--- a/pkg/manifests/x11-library-mesa.p5m	Thu Mar 29 13:35:26 2012 -0700
+++ b/pkg/manifests/x11-library-mesa.p5m	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -111,6 +111,7 @@
 file path=usr/lib/pkgconfig/gl.pc
 file path=usr/lib/pkgconfig/glu.pc
 file path=usr/lib/pkgconfig/glw.pc
+dir  path=usr/lib/xorg/modules/dri/$(ARCH64)
 file path=usr/lib/xorg/modules/dri/$(ARCH64)/swrast_dri.so
 file path=usr/lib/xorg/modules/dri/swrast_dri.so
 legacy pkg=SUNWxorg-mesa \
--- a/pkg/manifests/x11-server-xorg-driver-xorg-video-vmware.p5m	Thu Mar 29 13:35:26 2012 -0700
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-video-vmware.p5m	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -26,5 +26,4 @@
 set name=pkg.description value="Xorg driver for VMware virtual video cards"
 set name=variant.arch value=i386
 file path=usr/lib/xorg/modules/drivers/vmware_drv.so
-file path=usr/lib/xorg/modules/drivers/vmwlegacy_drv.so
 file path=usr/share/man/man7/vmware.7
--- a/pkg/manifests/x11-server-xorg.p5m	Thu Mar 29 13:35:26 2012 -0700
+++ b/pkg/manifests/x11-server-xorg.p5m	Fri Apr 06 21:57:14 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -48,6 +48,7 @@
 file path=usr/include/xorg/Xprintf.h
 file path=usr/include/xorg/bt829.h
 file path=usr/include/xorg/callback.h
+file path=usr/include/xorg/client.h
 file path=usr/include/xorg/closestr.h
 file path=usr/include/xorg/closure.h
 file path=usr/include/xorg/colormap.h
@@ -117,6 +118,7 @@
 file path=usr/include/xorg/mizerarc.h
 file path=usr/include/xorg/msp3430.h
 file path=usr/include/xorg/opaque.h
+file path=usr/include/xorg/optionstr.h
 file path=usr/include/xorg/os.h
 file path=usr/include/xorg/panoramiX.h
 file path=usr/include/xorg/panoramiXsrv.h
@@ -173,6 +175,7 @@
 file path=usr/include/xorg/xf86Modes.h
 file path=usr/include/xorg/xf86Module.h
 file path=usr/include/xorg/xf86Opt.h
+file path=usr/include/xorg/xf86Optionstr.h
 file path=usr/include/xorg/xf86Optrec.h
 file path=usr/include/xorg/xf86Parser.h
 file path=usr/include/xorg/xf86Pci.h