summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libX11/ChangeLog1081
-rw-r--r--lib/libX11/Makefile.in9
-rw-r--r--lib/libX11/aclocal.m4745
-rw-r--r--lib/libX11/configure1922
-rw-r--r--lib/libX11/configure.ac45
-rw-r--r--lib/libX11/include/Makefile.in9
-rw-r--r--lib/libX11/ltmain.sh277
-rw-r--r--lib/libX11/man/Makefile.in10
-rw-r--r--lib/libX11/man/XAddHost.man14
-rw-r--r--lib/libX11/man/XAllocSizeHints.man32
-rw-r--r--lib/libX11/man/XAllocStandardColormap.man4
-rw-r--r--lib/libX11/man/XAllocWMHints.man29
-rw-r--r--lib/libX11/man/XAnyEvent.man8
-rw-r--r--lib/libX11/man/XButtonEvent.man78
-rw-r--r--lib/libX11/man/XChangeKeyboardControl.man12
-rw-r--r--lib/libX11/man/XChangeKeyboardMapping.man4
-rw-r--r--lib/libX11/man/XCirculateEvent.man10
-rw-r--r--lib/libX11/man/XCirculateRequestEvent.man10
-rw-r--r--lib/libX11/man/XClientMessageEvent.man8
-rw-r--r--lib/libX11/man/XColormapEvent.man12
-rw-r--r--lib/libX11/man/XConfigureEvent.man8
-rw-r--r--lib/libX11/man/XConfigureRequestEvent.man10
-rw-r--r--lib/libX11/man/XConfigureWindow.man4
-rw-r--r--lib/libX11/man/XCreateColormap.man6
-rw-r--r--lib/libX11/man/XCreateGC.man44
-rw-r--r--lib/libX11/man/XCreateWindow.man34
-rw-r--r--lib/libX11/man/XCreateWindowEvent.man20
-rw-r--r--lib/libX11/man/XCrossingEvent.man30
-rw-r--r--lib/libX11/man/XDestroyWindowEvent.man8
-rw-r--r--lib/libX11/man/XDrawArc.man25
-rw-r--r--lib/libX11/man/XDrawText.man16
-rw-r--r--lib/libX11/man/XErrorEvent.man12
-rw-r--r--lib/libX11/man/XExposeEvent.man10
-rw-r--r--lib/libX11/man/XFocusChangeEvent.man14
-rw-r--r--lib/libX11/man/XFontSetExtents.man4
-rw-r--r--lib/libX11/man/XGetVisualInfo.man6
-rw-r--r--lib/libX11/man/XGetWindowAttributes.man47
-rw-r--r--lib/libX11/man/XGraphicsExposeEvent.man26
-rw-r--r--lib/libX11/man/XGravityEvent.man8
-rw-r--r--lib/libX11/man/XIfEvent.man2
-rw-r--r--lib/libX11/man/XKeymapEvent.man10
-rw-r--r--lib/libX11/man/XLoadFont.man93
-rw-r--r--lib/libX11/man/XMapEvent.man26
-rw-r--r--lib/libX11/man/XMapRequestEvent.man8
-rw-r--r--lib/libX11/man/XOpenIM.man10
-rw-r--r--lib/libX11/man/XPropertyEvent.man10
-rw-r--r--lib/libX11/man/XQueryColor.man10
-rw-r--r--lib/libX11/man/XQueryExtension.man3
-rw-r--r--lib/libX11/man/XReparentEvent.man8
-rw-r--r--lib/libX11/man/XResizeRequestEvent.man8
-rw-r--r--lib/libX11/man/XSelectionClearEvent.man8
-rw-r--r--lib/libX11/man/XSelectionEvent.man10
-rw-r--r--lib/libX11/man/XSelectionRequestEvent.man8
-rw-r--r--lib/libX11/man/XSetScreenSaver.man2
-rw-r--r--lib/libX11/man/XStringListToTextProperty.man8
-rw-r--r--lib/libX11/man/XUnmapEvent.man8
-rw-r--r--lib/libX11/man/XVisibilityEvent.man8
-rw-r--r--lib/libX11/man/XcmsCIELabQueryMaxC.man2
-rw-r--r--lib/libX11/man/XcmsCIELuvQueryMaxC.man2
-rw-r--r--lib/libX11/man/XcmsColor.man132
-rw-r--r--lib/libX11/man/XmbDrawText.man16
-rw-r--r--lib/libX11/man/XmbTextListToTextProperty.man18
-rw-r--r--lib/libX11/man/XrmGetFileDatabase.man17
-rw-r--r--lib/libX11/man/XrmInitialize.man24
-rw-r--r--lib/libX11/man/XrmUniqueQuark.man16
-rw-r--r--lib/libX11/man/xkb/Makefile.in10
-rw-r--r--lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man2
-rw-r--r--lib/libX11/modules/Makefile.in9
-rw-r--r--lib/libX11/modules/im/Makefile.in9
-rw-r--r--lib/libX11/modules/im/ximcp/Makefile.in9
-rw-r--r--lib/libX11/modules/im/ximcp/imDefIc.c4
-rw-r--r--lib/libX11/modules/im/ximcp/imDefLkup.c11
-rw-r--r--lib/libX11/modules/im/ximcp/imTrX.c2
-rw-r--r--lib/libX11/modules/lc/Makefile.in9
-rw-r--r--lib/libX11/modules/lc/Utf8/Makefile.in9
-rw-r--r--lib/libX11/modules/lc/def/Makefile.in9
-rw-r--r--lib/libX11/modules/lc/gen/Makefile.in9
-rw-r--r--lib/libX11/modules/lc/xlocale/Makefile.in9
-rw-r--r--lib/libX11/modules/om/Makefile.in9
-rw-r--r--lib/libX11/modules/om/generic/Makefile.in9
-rw-r--r--lib/libX11/nls/C/Makefile.in10
-rw-r--r--lib/libX11/nls/Makefile.am1
-rw-r--r--lib/libX11/nls/Makefile.in11
-rw-r--r--lib/libX11/nls/am_ET.UTF-8/Compose.pre341
-rw-r--r--lib/libX11/nls/am_ET.UTF-8/Makefile.am3
-rw-r--r--lib/libX11/nls/am_ET.UTF-8/Makefile.in480
-rw-r--r--lib/libX11/nls/am_ET.UTF-8/XI18N_OBJS0
-rw-r--r--lib/libX11/nls/am_ET.UTF-8/XLC_LOCALE.pre0
-rw-r--r--lib/libX11/nls/armscii-8/Makefile.in10
-rw-r--r--lib/libX11/nls/compose.dir.pre9
-rw-r--r--lib/libX11/nls/el_GR.UTF-8/Compose.pre870
-rw-r--r--lib/libX11/nls/el_GR.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/en_US.UTF-8/Compose.pre4938
-rw-r--r--lib/libX11/nls/en_US.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/georgian-academy/Makefile.in10
-rw-r--r--lib/libX11/nls/georgian-ps/Makefile.in10
-rw-r--r--lib/libX11/nls/ibm-cp1133/Makefile.in10
-rw-r--r--lib/libX11/nls/iscii-dev/Makefile.in10
-rw-r--r--lib/libX11/nls/isiri-3342/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-1/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-10/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-11/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-13/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-14/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-15/Compose.pre4
-rw-r--r--lib/libX11/nls/iso8859-15/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-2/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-3/Compose.pre4
-rw-r--r--lib/libX11/nls/iso8859-3/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-4/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-5/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-6/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-7/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-8/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-9/Compose.pre4
-rw-r--r--lib/libX11/nls/iso8859-9/Makefile.in10
-rw-r--r--lib/libX11/nls/iso8859-9e/Compose.pre4
-rw-r--r--lib/libX11/nls/iso8859-9e/Makefile.in10
-rw-r--r--lib/libX11/nls/ja.JIS/Makefile.in10
-rw-r--r--lib/libX11/nls/ja.S90/Makefile.in10
-rw-r--r--lib/libX11/nls/ja.SJIS/Makefile.in10
-rw-r--r--lib/libX11/nls/ja.U90/Makefile.in10
-rw-r--r--lib/libX11/nls/ja/Makefile.in10
-rw-r--r--lib/libX11/nls/ja_JP.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/ko/Makefile.in10
-rw-r--r--lib/libX11/nls/ko_KR.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/koi8-c/Makefile.in10
-rw-r--r--lib/libX11/nls/koi8-r/Makefile.in10
-rw-r--r--lib/libX11/nls/koi8-u/Makefile.in10
-rw-r--r--lib/libX11/nls/locale.alias.pre30
-rw-r--r--lib/libX11/nls/locale.dir.pre13
-rw-r--r--lib/libX11/nls/microsoft-cp1251/Makefile.in10
-rw-r--r--lib/libX11/nls/microsoft-cp1255/Makefile.in10
-rw-r--r--lib/libX11/nls/microsoft-cp1256/Makefile.in10
-rw-r--r--lib/libX11/nls/mulelao-1/Makefile.in10
-rw-r--r--lib/libX11/nls/nokhchi-1/Makefile.in10
-rw-r--r--lib/libX11/nls/pt_BR.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/tatar-cyr/Makefile.in10
-rw-r--r--lib/libX11/nls/th_TH.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/th_TH/Makefile.in10
-rw-r--r--lib/libX11/nls/tscii-0/Makefile.in10
-rw-r--r--lib/libX11/nls/vi_VN.tcvn/Makefile.in10
-rw-r--r--lib/libX11/nls/vi_VN.viscii/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_CN.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_CN.gb18030/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_CN.gbk/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_CN/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_HK.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_HK.big5/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_HK.big5hkscs/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_TW.UTF-8/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_TW.big5/Makefile.in10
-rw-r--r--lib/libX11/nls/zh_TW/Makefile.in10
-rw-r--r--lib/libX11/src/ConnDis.c12
-rw-r--r--lib/libX11/src/CrCmap.c12
-rw-r--r--lib/libX11/src/FreeCmap.c3
-rw-r--r--lib/libX11/src/GetColor.c2
-rw-r--r--lib/libX11/src/LookupCol.c2
-rw-r--r--lib/libX11/src/Makefile.am15
-rw-r--r--lib/libX11/src/Makefile.in62
-rw-r--r--lib/libX11/src/ParseCol.c2
-rw-r--r--lib/libX11/src/SetLocale.c4
-rw-r--r--lib/libX11/src/SetStCmap.c13
-rw-r--r--lib/libX11/src/StNColor.c2
-rw-r--r--lib/libX11/src/WMProps.c22
-rw-r--r--lib/libX11/src/XErrorDB26
-rw-r--r--lib/libX11/src/XKeysymDB5
-rw-r--r--lib/libX11/src/Xrm.c2
-rw-r--r--lib/libX11/src/config.h.in9
-rw-r--r--lib/libX11/src/util/Makefile.in9
-rw-r--r--lib/libX11/src/xcb_disp.c21
-rw-r--r--lib/libX11/src/xcb_io.c171
-rw-r--r--lib/libX11/src/xcms/Makefile.in9
-rw-r--r--lib/libX11/src/xkb/Makefile.in9
-rw-r--r--lib/libX11/src/xkb/XKBBind.c2
-rw-r--r--lib/libX11/src/xlibi18n/Makefile.in9
-rw-r--r--lib/libX11/src/xlibi18n/XimintP.h8
-rw-r--r--lib/libX11/src/xlibi18n/XlcPubI.h2
178 files changed, 9172 insertions, 3780 deletions
diff --git a/lib/libX11/ChangeLog b/lib/libX11/ChangeLog
index 8354daa9e..4affb5d43 100644
--- a/lib/libX11/ChangeLog
+++ b/lib/libX11/ChangeLog
@@ -1,3 +1,1084 @@
+commit 8e085971dc661da9f80ff6b67747459c0fb15c08
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Feb 28 20:17:41 2008 -0800
+
+ Man page typo fixes
+
+commit 1a1a42a3ca1dfaf42f1094936b71c140fc030fcb
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Feb 24 20:03:35 2008 -0500
+
+ XIM: Fix a hand when switching input context.
+
+ Red Hat bug #201284.
+
+commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2
+Author: Adam Jackson <ajax@redhat.com>
+Date: Sun Feb 24 20:00:43 2008 -0500
+
+ Bug #14029: Don't LockDisplay() recursively.
+
+ See also Red Hat bugzilla #326461.
+
+commit e5892467ae3308c8651be76e06db322dcbc08522
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Feb 15 17:27:53 2008 -0800
+
+ Add support for building lint library with --enable-lint-library
+
+commit e3eb83ec6a9bffa63cdffd94f077c12f85ad7240
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Feb 11 20:11:43 2008 -0800
+
+ Spell out number in XkbGetKeyVirtualModMap man page to avoid cpp errors from #
+
+commit d5ceed7a73a6b61758ddb6ff4e194955fbd5c185
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Feb 8 16:46:46 2008 -0800
+
+ Add WM_LOCALE_NAME to list of properties set in XSetWMProperties comment
+
+commit 416a812200f24d19149dcc497e5c51a0608120f6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Feb 8 15:31:31 2008 -0800
+
+ XErrorDB updates for Render 0.9 & XFixes 4.0
+
+commit 16a76091cd632e5a3708e235ff864b58f3e4613e
+Author: Kim Woelders <kim@woelders.dk>
+Date: Sat Dec 22 21:45:23 2007 +0100
+
+ Fix bs_BA entries in locale.dir.pre
+
+ X.Org bug#13786 <http://bugs.freedesktop.org/show_bug.cgi?id=13786>
+
+commit 32115c563b87d2f37e3f9de70fbd0f4d9e424aea
+Merge: 8f0bd3f... e8d4cef...
+Author: James Cloos <cloos@jhcloos.com>
+Date: Fri Dec 14 22:43:47 2007 -0500
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11
+
+commit 8f0bd3f445cbdcc67650f6e8e3baf2ed89cb3695
+Author: James Cloos <cloos@jhcloos.com>
+Date: Fri Dec 14 22:42:59 2007 -0500
+
+ add a comment to en_US.UTF-8/Compose
+
+commit 4d6c45e60ed13d3b0fea10413873d6a74f9d6a3b
+Author: James Cloos <cloos@jhcloos.com>
+Date: Fri Dec 14 22:40:13 2007 -0500
+
+ Add <dead_stroke> compose sequences
+
+ The added sequences match the existing <Multi_key> <slash> sequences.
+
+ This is related to bug #12765¹.
+
+ 1] https://bugs.freedesktop.org/show_bug.cgi?id=12765
+
+commit e8d4cefa0837afa149a10e981528b368485a9e38
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date: Mon Dec 10 23:00:44 2007 -0800
+
+ Added launchd support.
+
+commit 13ac80469f6958cabac596834e203bd9cb6d4c94
+Author: James Cloos <cloos@jhcloos.com>
+Date: Wed Dec 5 20:14:03 2007 -0500
+
+ Update the currency symbols block of en_US.UTF-8/Compose.pre
+ Add XCOMM lines a la the existing NEW SHEQEL SIGN entry for
+ the KIP, TUGRIK, DRACHMA. GERMAN PENNY, PESO, GUARANI,
+ AUSTRAL, HRYVNIA and CEDI SIGNs.
+
+commit b0a8f2ec4ba698841683f8ce389f9d72e6bce53e
+Author: Anton Zinoviev <anton@lml.bas.bg>
+Date: Wed Dec 5 19:56:03 2007 -0500
+
+ Additions to the Compose file for UTF-8
+ From bug #5371¹
+
+ Commit 5cf5bc76642bfece7cb5b76faf414bf445f14489 left out this change
+ from those in attachment #4122². The post³ on xorg resulted in only
+ a positive reply⁴ from Daniel, so this block is now also commited.
+
+ 1] https://bugs.freedesktop.org/show_bug.cgi?id=5371
+ 2] https://bugs.freedesktop.org/attachment.cgi?id=4122
+ 3] http://article.gmane.org/gmane.comp.freedesktop.xorg/20628
+ 4] http://article.gmane.org/gmane.comp.freedesktop.xorg/23966
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+ Acked-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 438d02ebc08ee171cf1d3936f4c81050d428ab92
+Author: James Cloos <cloos@jhcloos.com>
+Date: Tue Dec 4 17:25:39 2007 -0500
+
+ Fix the <U\x+> keysyms in the en_US.UTF-8 Compose file
+
+ Based on src/KeysymStr.c and src/StrKeysym.c and comments in
+ bugs #11930¹ and #5129² it is clear that <U100XXXXX> is invalid;
+ those should be in the form U plus the hex of the UCS Code Point.
+
+ The 0x01000000 is ORed in by the code.
+
+ This update fixes all of those.
+
+ 1] https://bugs.freedesktop.org/show_bug.cgi?id=11930
+ 2] https://bugs.freedesktop.org/show_bug.cgi?id=5129
+
+commit 02e04059c89e175f51647e3b031344f743286b34
+Merge: 1254c57... b57129e...
+Author: James Cloos <cloos@jhcloos.com>
+Date: Tue Dec 4 06:55:04 2007 -0500
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11
+
+commit 1254c57dd3a8d6ea87041b2f63024f99094f290f
+Author: James Cloos <cloos@jhcloos.com>
+Date: Tue Dec 4 06:53:55 2007 -0500
+
+ Use the new dead_psili and dead_dasia keysyms added to proto/x11proto 7.0.11
+ Inspired by bug 11930¹:
+
+ Commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b to x11proto added dead_psili
+ and dead_dasia keysyms. Make use of them in the en_US.UTF-8 and el_GR.UTF-8
+ Compose files.
+
+ This was done with a pair of perl scripts based on the one quoted in the
+ log for commit c76d30253f1483ac8200ad5c032a818907e65030.
+
+ 1] https://bugs.freedesktop.org/show_bug.cgi?id=11930
+
+commit b57129ef324c73ee91c2a796b800c4b45f4d4855
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date: Mon Dec 3 20:04:19 2007 -0800
+
+ Use __APPLE__ instead of __DARWIN__
+
+commit b9c032e1d5ed08510863dfb91b8bda588e6c8c9e
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date: Wed Nov 28 16:43:49 2007 -0800
+
+ Define __DARWIN__ when host_os == darwin* as needed in SetLocale.c
+
+commit 4b91ed099554626f1ec17d5bdf7bd77ce1a70037
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Nov 21 16:50:04 2007 -0800
+
+ X.Org Bug #4312: incorrect comment asterisk in XAnyEvent.3x man page
+
+ X.Org Bugzilla #4312 <http://bugs.freedesktop.org/show_bug.cgi?id=4312>
+
+ Protect /* sequences from cpp pre-processor removal without transforming
+ to Unicode mathematical asterisk character
+
+commit 2af660c2fcd15c86c66459bfc074c190ea1462e6
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Mon Oct 29 10:46:20 2007 -0700
+
+ Two threads can request sequence sync and XID fetch simultaneously.
+
+ So don't assert that they can't.
+
+ This makes the Xlib/XCB implementation of _XAllocID more closely
+ resemble the traditional Xlib version.
+
+commit 6e5485e0a5e3ab738becad12193e760c5fee83a4
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Oct 28 04:44:00 2007 -0800
+
+ X.Org Bug #12983: Typos in ./man/XChangeKeyboardControl.man
+
+ <http://bugs.freedesktop.org/show_bug.cgi?id=12983>
+
+commit 24527c92fd1f433ea135e85ec876a94a529fe500
+Author: Yann Droneaud <ydroneaud@mandriva.com>
+Date: Wed Oct 24 19:26:07 2007 +0300
+
+ XIM: Properly initialise client event
+
+ Make sure all ClientMessage fields are initialised to 0 before we send it.
+
+commit e41477f37b0d9b74a056d22dbf0073a94eecb9d6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Oct 24 19:22:22 2007 +0300
+
+ Colours: Fix --disable-xcms
+
+ Disable large tracts of colour management code when passing
+ --disable-xcms.
+
+commit 11ea09745efa8de7dc82fe30ebd2393f08390957
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 31 17:30:33 2007 -0700
+
+ Bug #2081: Note the range limitation of XSetScreenSaver arguments.
+
+commit 31540f1438ec63faf37044f2fd654b335ddf80f0
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Aug 29 19:50:57 2007 -0400
+
+ Add GLX 1.4 requests and errors.
+
+commit 7c996f78914c77fe17e9f4feede980d895d9df51
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Aug 28 15:15:11 2007 -0700
+
+ Add XF86 keyboard/monitor brightness keysyms to the keysymbdb.
+
+commit fa4effe82759f864a22a2dc6c920fa72ddb175a8
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Sun Jan 14 10:48:00 2007 -0800
+
+ Bug #9658: Bad markup on XIfEvent.3x
+
+ X.Org Bugzilla #9658 <https://bugs.freedesktop.org/show_bug.cgi?id=9658>
+
+commit 74cba78daa738ef4d92096107d95c1a585933666
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Sun Jan 14 10:43:00 2007 -0800
+
+ Bug #9655: Bad markup in XrmUniqueQuark.3x
+
+ X.Org Bugzilla #9655 <https://bugs.freedesktop.org/show_bug.cgi?id=9655>
+
+commit 4341d1a34b2a2e460b58131b6fd81935f3355bbc
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Sun Jan 14 10:43:00 2007 -0800
+
+ Bug #9654: Bad markup in XrmGetFileDatabase.3x
+
+ X.Org Bugzilla #9654 <https://bugs.freedesktop.org/show_bug.cgi?id=9654>
+
+commit 2db713252090cae08f0200fecad4fc25fb64c8b1
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Sun Jan 14 10:40:00 2007 -0800
+
+ Bug #9653: Bad markup in XQueryColor.3x
+
+ X.Org Bugzilla #9653 <https://bugs.freedesktop.org/show_bug.cgi?id=9653>
+
+commit 9d3ceea4b902e0471824c1e07ad64342b9a1114e
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Sun Jan 14 10:40:00 2007 -0800
+
+ Bug #9652: Bad markup in XDrawArc.3x
+
+ X.Org Bugzilla #9652 <https://bugs.freedesktop.org/show_bug.cgi?id=9652>
+
+commit 2e7e0748d353d7f53bbd65ec6bf0df8758528ddc
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Sun Jan 14 10:39:00 2007 -0800
+
+ Bug #9651: Bad markup in XcmsColor.3x
+
+ X.Org Bugzilla #9651 <https://bugs.freedesktop.org/show_bug.cgi?id=9651>
+
+commit c316aaf0aab06951db9dc5c9c1148bfea835d885
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Sun Jan 14 10:38:00 2007 -0800
+
+ Bug #9650: Bad markup in XLoadFont.3x manual page
+
+ X.Org Bugzilla #9650 <https://bugs.freedesktop.org/show_bug.cgi?id=9650>
+
+commit ca5d9a625ea0965853fa9e74a448b8c29c78ec95
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Tue Jan 2 10:18:00 2007 -0800
+
+ Bug 9523: Markup problems in XQueryExtension.3x
+
+ X.Org Bugzilla #9523 <https://bugs.freedesktop.org/show_bug.cgi?id=9523>
+
+commit fe713c616e29ba19c179b43c18eca1035079ce18
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Tue Aug 21 14:56:33 2007 -0700
+
+ Make sure nls/am_ET.UTF-8/Makefile is created by configure.
+
+commit e3430616f26b68e1439143cbe10732f3fc329d20
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date: Tue Jan 2 08:40:00 2007 -0800
+
+ Bug #9516: Markup error in XAllocWMHints.3x
+
+ X.Org Bugzilla #9516 <https://bugs.freedesktop.org/show_bug.cgi?id=9516>
+
+commit d8fe979fc929833e8c754aed32641786d5a0622b
+Merge: 21ca953... 4ec1723...
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Aug 20 15:34:50 2007 -0400
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11
+
+commit 21ca953337fb221b85345bf35ce1a98a0dcb2bf2
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Aug 20 15:34:03 2007 -0400
+
+ Fix typo
+ The code <U1000000D> was used where <U10000DC> was obviously intended.
+
+ It is possible that <Udiaeresis> should be used instead, if that will
+ not break anyone’s setup.
+
+commit 4ec1723fff729440cd3349c1f95d87d2a6ba89cf
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Aug 20 15:25:48 2007 -0400
+
+ Add compose file for Ethiopic to match new keyboard in xkeyboard-config
+ From bug report:
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=11307
+
+commit eff33ae525337ce2026be135a26464c7b1237113
+Author: James Cloos <cloos@jhcloos.com>
+Date: Sat Aug 18 17:58:23 2007 -0400
+
+ Patch for Catalan locales
+ From bugzilla bug 10943¹:
+
+ There are several Catalan locale codes which presently can
+ be used in X11 systems; especially after they were accepted
+ in belocs-locale-data².
+
+ In the following patches, I³ add ca_AD, ca_FR and ca_IT Catalan
+ locale codes. For instance, without this, using ca_AD (actually
+ a quite used locale⁴) some applications (eg. Emacs or Skype)
+ cannot display Catalan diacritic marks as you type them.
+
+ 1] https://bugs.freedesktop.org/show_bug.cgi?id=10943
+ 2] http://lists.debian.org/debian-devel-changes/2005/07/msg01429.html
+ 3] Toni Hermoso Pulido <toniher@softcatala.org>
+ 4] https://launchpad.net/~ubuntu.cat/+members
+
+commit 1f980cb7d022f53d0aee9e793b08203fb888e86e
+Author: James Cloos <cloos@jhcloos.com>
+Date: Sat Aug 18 17:47:04 2007 -0400
+
+ Add additional Euro signs to compose
+ Inspired by bug 7419¹ make all of:
+
+ C=, =C, c=, =c, E=, =E, e=, E=
+
+ after <Multi_key> generate € U+20AC EURO SIGN.
+
+ 1] https://bugs.freedesktop.org/show_bug.cgi?id=7419
+
+commit 4b0a14521449dfce8b4347bd17243efd1d3eae2d
+Author: James Cloos <cloos@jhcloos.com>
+Date: Sat Aug 18 17:29:08 2007 -0400
+
+ Compose fix for Latin-1 (from Debian)
+ The description from bugzilla bug 7417¹ is:
+
+ We've been shipping this patch for some time in Debian now. The
+ problem description from the patch header is reproduced below. You
+ may want to note the licensing issue mentioned below, but we've been
+ shipping it because the method by which this particular patch was
+ generated and updated was also given below.
+
+ This patch by Denis Barbier.
+
+ The X11 protocol states that Unicode keysyms are in the range
+ 0x01000100 - 0x0110FFFF. If the result of composing characters is a
+ Unicode codepoint, X returns the corresponding Unicode keysym, which
+ is its Unicode codepoint augmented by 0x01000000. Latin-1
+ characters must not appear with their Unicode codepoints in compose
+ files, otherwise the returned composed character lies in the range
+ 0x01000000 - 0x010000FF which is not valid.
+
+ There are two solutions: either fix composing routines to return
+ 0xZZ instead of 0x010000ZZ (where Z is an hexadecimal digit), or
+ replace U00ZZ by their corresponding keysyms in compose files. The
+ latter is more logical and less error prone, so compose files will
+ be patched. Many applications accept these invalid Unicode keysyms,
+ but few of them don't, most notably xemacs. Only UTF-8 locales are
+ affected.
+
+ This has been fixed very recently in XFree86 CVS (but not xorg), but
+ for licensing reasons, this patch is not grabbed. Instead automatic
+ conversion is performed by:
+
+ sed -e '/XK_LATIN1/,/XK_LATIN1/!d' /usr/include/X11/keysymdef.h \
+ | grep -v deprecated | grep 0x0 \
+ | sed -e 's/0x0/U0/' -e 's/XK_//' \
+ | awk '{ printf "s/\\b%s\\b/%s/ig\n", $3, $2; }' > sedfile
+ for f in nls/*.UTF-8/Compose.pre
+ do
+ sed -f sedfile $f > $f.tmp && mv $f.tmp $f
+ done
+
+ [I edited the quoted script to update it for the current location of
+ the installed keysymdef.h and the current layout of the libX11
+ repo. -JimC]
+
+ I applied the script, not the patch attached to the bugreport.
+
+ 1] https://bugs.freedesktop.org/show_bug.cgi?id=7417
+
+commit 5cf5bc76642bfece7cb5b76faf414bf445f14489
+Author: James Cloos <cloos@jhcloos.com>
+Date: Sat Aug 18 17:13:41 2007 -0400
+
+ Add some compose sequences
+
+ Add some compose sequences from the patch in bug 5371 (attachment 4122).
+
+ Cf:
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=5371
+ https://bugs.freedesktop.org/attachment.cgi?id=4122
+
+commit d4002e389dd69780dfc7c2f7bd3cb0c57f05d4f8
+Author: James Cloos <cloos@jhcloos.com>
+Date: Sat Aug 18 13:57:31 2007 -0400
+
+ Fix SMP Compose targets
+ The compose targets from the SMP (plane 1) were incorrect.
+
+ At some point the 0x10000 bit had been lost.
+
+commit f1ed3da9a30a1f0264fdc7d1c6466f27fe2a3d7d
+Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
+Date: Thu Aug 16 17:37:22 2007 -0500
+
+ Fix a mutex reference-counting bug.
+
+ I was told that some systems have a much more permissive libpthread.
+ I was asked to commit this. This is from NetBSD's X source.
+ (I didn't receive any feedback on xorg list for over two weeks
+ about this.)
+
+commit ac00a44b4875de70382da5a40dd87f976e5b9327
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Wed Aug 1 20:36:03 2007 +0200
+
+ Bumped version to 1.1.3.
+
+commit 76fae9cba1e9bdf7f0eb2ff2b90153d622136cf0
+Author: Joerg Sonnenberger <joerg@netbsd.org>
+Date: Fri Jul 27 11:15:47 2007 -0700
+
+ Fail properly on errors in recursive make.
+
+commit 1a18319b3bde08dd9ef69c7cd735a76000cf3177
+Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
+Date: Thu Jul 26 23:31:15 2007 +0200
+
+ Add missing override parameter in XrmCombineDatabase prototype in the manpage
+
+ Reported by Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
+ in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=393434
+ and https://bugs.freedesktop.org/show_bug.cgi?id=9948
+
+ Also add the type of the second argument in XrmMergeDatabases.
+
+commit 6f0764d4b56f64786b4980839ca262f10a51af6f
+Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
+Date: Thu Jul 26 22:53:52 2007 +0200
+
+ Clarify return value of XGetCommand in case of error in the manpage
+
+ Reported by Sean Perry <shalehperry@attbi.com>
+ in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=133348
+ and https://bugs.freedesktop.org/show_bug.cgi?id=9828
+
+commit b8bef57342632cc2d25580bb7daa3839bae04d89
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jul 25 17:44:06 2007 -0700
+
+ Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4
+
+commit 590cde811a79375231c59ed8583e02b111ed567c
+Author: Kean Johnston <kean@armory.com>
+Date: Thu Jul 19 16:44:20 2007 -0700
+
+ Reset hostname when falling back from :0 to hostname/localhost:0 as well
+
+commit d334665e619e9db657a2ea2764a8b852401d4a3f
+Author: Kean Johnston <kean@armory.com>
+Date: Tue Jul 17 16:34:30 2007 -0700
+
+ LOCALCONN fallback changes DisplayString() output, breaks KDE
+
+ See <http://lists.freedesktop.org/archives/xorg/2007-July/026443.html>
+
+commit 8e76bcf3cafda85058ce5f35f1f81929f4772f72
+Author: Olivier Blin <blino@mandriva.org>
+Date: Mon Jun 11 18:32:09 2007 +1000
+
+ fix XGetMotionEvents arguments order - Fixes bug 11222
+
+commit c2f88cdf5cd9c94b77e5bfdac572b5ac06ab4aa8
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Jun 10 16:19:59 2007 -0700
+
+ Fix locking in _XimGetWindowEventmask.
+
+ Now that XFilterEvent drops the Display lock before invoking callback
+ functions, _XimGetWindowEventmask is called without the lock held. So
+ when it called _XGetWindowAttributes, a variant of XGetWindowAttributes
+ that does not lock the Display, Xlib/XCB would assert:
+
+ xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
+
+ Should fix Gentoo #156367, Ubuntu #87947, Debian #427296. And others?
+
+commit 65f0ab5d46d80d55fc04d4eb14fa05f130eb8b9c
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Jun 3 21:41:47 2007 -0700
+
+ Move security fixes to the top of NEWS, and fix spacing.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit a549a258b8fcb1ba9d0c1b01b72967e385f67cab
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Jun 3 21:29:40 2007 -0700
+
+ Add NEWS item for bugfix in commit e2c1d788d1fe7bd2d34756493951552441e59b8c.
+
+ Commit by Josh Triplett and Jamey Sharp
+
+commit 5123b77a3d32d3ad479462f319762c328278aed9
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Jun 3 21:24:54 2007 -0700
+
+ Xlib/XCB: Inline and simplify handle_event, since only process_responses calls it now.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 582ca690ea4f3ffd2b94826c4db97229bd3c7238
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Jun 3 20:59:12 2007 -0700
+
+ Xlib/XCB: Fix _XReadEvents to always enqueue a new event, even if an error occurs
+
+ Commit c337f9de7cfd89f983f83956b7457a274dd412f3 broke the invariant that
+ _XReadEvents always enqueues at least one event even if an error occurred,
+ because the one call to xcb_wait_for_event would then return an error, not an
+ event, and nothing else ensured that process_responses would obtain an event.
+ Fix this by reverting most of c337f9de7cfd89f983f83956b7457a274dd412f3 and
+ f417570735aac865eb6b576d1ea76b5bfcd8573b and implementing the correct fix. In
+ process_responses, wait_for_first_event now serves as a flag, cleared when
+ actually handling an event.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit e2c1d788d1fe7bd2d34756493951552441e59b8c
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Jun 3 17:33:23 2007 -0700
+
+ Xlib/XCB: Only remove pending_requests when there are provably no more responses.
+
+commit 7a6dbd4b07ca0a49c30ca7a1d2437eafb2e15eab
+Author: Josh Triplett <josh@freedesktop.org>
+Date: Sun Jun 3 15:39:39 2007 -0700
+
+ Bump version number to 1.1.2, and add NEWS entry for 1.1.2
+
+ Signed-off-by: Josh Triplett <josh@freedesktop.org>
+
+commit 416f38f2e67ee1979b3d2feac6f06b3670238804
+Author: Josh Triplett <josh@freedesktop.org>
+Date: Sun Jun 3 12:13:44 2007 -0700
+
+ Revert "Revert "include: don't distribute XlibConf.h""
+
+ This reverts commit 79fa3d8070d95b960ba486f2439225872471dadd.
+
+ Re-revert the XlibConf.h change, which prevented distribution, not
+ installation.
+
+commit 79fa3d8070d95b960ba486f2439225872471dadd
+Author: Josh Triplett <josh@freedesktop.org>
+Date: Sat Jun 2 22:05:16 2007 -0700
+
+ Revert "include: don't distribute XlibConf.h"
+
+ This reverts commit c9e28e05ae01ce8a29bea09df759b6271865b44c.
+
+ The installed XlibInt.h includes XlibConf.h , so libX11 should ship
+ XlibConf.h. (Commit c9e28e05ae01ce8a29bea09df759b6271865b44c didn't actually
+ prevent automake from shipping XlibConf.h, because it used
+ nodist_x11include_HEADERS rather than nodist_HEADERS.)
+
+commit f417570735aac865eb6b576d1ea76b5bfcd8573b
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Jun 2 17:59:15 2007 -0700
+
+ Xlib/XCB: inline wait_or_poll_for_event, which now had only one caller.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit c337f9de7cfd89f983f83956b7457a274dd412f3
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Jun 2 17:46:41 2007 -0700
+
+ Xlib/XCB: Ensure _XReadEvents reads at least one new event and blocks for exactly one event.
+
+ Commit by Jamey Sharp and Josh Triplett.
+
+commit 7f66c897f04806b75e574b55b48921b48045e3f9
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Jun 2 16:43:39 2007 -0700
+
+ Update _XReply's copy of _XCBUnlockDisplay's guts.
+
+ We introduced this bug in 6b81cbbedfb521ce046b77ee3cc54e884a1dc0c5.
+
+ Also add a comment in _XCBUnlockDisplay to discourage this problem from
+ respawning.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 740ead23512f8d2eaafaa69e514f1ebafad475b9
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Jun 2 16:01:01 2007 -0700
+
+ Xlib/XCB: Avoid re-crashing after _XIOError.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 6b81cbbedfb521ce046b77ee3cc54e884a1dc0c5
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Jun 2 12:30:30 2007 -0700
+
+ Hold XCB's Xlib lock even when only the user lock (XLockDisplay) is held.
+
+ An Xlib client can query Display state, such as with NextRequest, while
+ it holds only the Xlib user lock (between XLockDisplay and
+ XUnlockDisplay), so XCB requests in other threads should be blocked when
+ the Xlib user lock is held.
+
+ We acquire the lock even when XInitThreads was not called, so that pure
+ XCB code can use multiple threads even in an otherwise single-threaded
+ Xlib application.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 95523387d619af5b400748898d722e080b5ce1a6
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Jun 2 11:57:39 2007 -0700
+
+ Allow re-entrant Xlib calls from _XIOError.
+
+ Some libraries try to clean up X resources from atexit handlers, _fini,
+ or C++ destructors. To make these work, the Display lock should be
+ downgraded to a user lock (as in XLockDisplay) before calling exit(3).
+ This blocks Xlib calls from threads other than the one calling exit(3)
+ while still allowing the exit handlers to call Xlib.
+
+ This assumes that the thread calling exit will call any atexit handlers.
+ If this does not hold, then an alternate solution would involve
+ registering an atexit handler to take over the lock, which would only
+ assume that the same thread calls all the atexit handlers.
+
+ Commit by Josh Triplett and Jamey Sharp.
+
+commit 91b02b8064f4e0bcc56019f0722914850008a597
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Thu May 17 19:07:34 2007 +0200
+
+ More constification.
+
+commit a4f3841940158351f9424c3f59b305cce877177d
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Thu May 17 00:29:43 2007 +0200
+
+ Constified composite text charset table.
+
+commit 0581c0aa6039e6b2abb9f7b0a4f9904d8e01f00e
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Wed May 16 23:19:22 2007 +0200
+
+ Have the compiler fill in hexTable so we don't have to do it at runtime.
+
+commit 0e8d9ca47dab0d069e305d5784d05f2ade04f0a8
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Wed May 16 19:36:23 2007 +0200
+
+ More constification.
+
+commit 6d2bed8f04942b4de086a519ac693e729c9fdeea
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Wed May 16 19:18:20 2007 +0200
+
+ Constify and clean up token table.
+
+commit 6c508eab5df5d517f7e4cbe6087308cd53a564b2
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Wed May 16 18:24:42 2007 +0200
+
+ Constified more tables.
+
+commit e699c4231c205ef00d687b6412308d031b99806b
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Wed May 16 18:01:23 2007 +0200
+
+ Constified error list.
+
+commit c76d30253f1483ac8200ad5c032a818907e65030
+Author: Jan Willem Stumpel <jstumpel@planet.nl>
+Date: Fri May 4 12:00:49 2007 -0700
+
+ Update el_GR.UTF-8/Compose.pre to match changes in xkeyboard-config cvs
+
+ Cf:
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=10851
+ https://bugs.freedesktop.org/show_bug.cgi?id=10824
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=386385
+
+ The greek keyboard definition was changed to replace dead_horn and
+ dead_ogonek with U0313 COMBINING COMMA ABOVE (aka Psili) and U0314
+ COMBINING REVERSED COMMA ABOVE (aka Dasia).
+
+ This patch modifies the Greek Compose.pre to match.
+
+ It is generated by the script Jan Willem Stumpel <jstumpel@planet.nl>
+ posted to 386385@bugs.debian.org:
+
+ #!/usr/bin/perl
+ while (<>) {
+ print $_;
+ if (/dead_horn/) {
+ s/dead_horn/U0313/;
+ print $_;
+ }
+ elsif (/dead_ogonek/) {
+ s/dead_ogonek/U0314/;
+ print $_;
+ }
+ }
+
+commit a48386ce6b5f8fd2d9dc11a966c9bf5da59f3831
+Author: Magnus Kessler <Magnus.Kessler@gmx.net>
+Date: Tue May 1 15:20:08 2007 +0200
+
+ Switched function definitions from K&R to ANSI style.
+
+commit 605d357074d556a05a3fba2e85cbea36a3204248
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Tue May 1 14:47:03 2007 +0200
+
+ Tweaked configure output about the man pages suffix.
+
+commit 9824b40d2af4ca2376512c1be7743da0d5065900
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Apr 28 00:42:18 2007 -0700
+
+ Fix typo in nroff macro in XkbAddGeomOverlayKey.man
+
+commit f93849dcc68bd5042ea0884e5190dc7c35b31d68
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Apr 28 00:30:55 2007 -0700
+
+ Protect C comments and #defines in XKB man pages from being mangled by cpp
+
+commit f2f27d4763c7665e422fab10b96b4cf5ad6c0a6f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Apr 28 00:14:50 2007 -0700
+
+ Add Makefile to process/install XKB man pages
+
+commit d9954c6f6f3a8c406b946acd0d034ff83c656156
+Author: Dennis Arellano <Dennis.Arellano@Sun.COM>
+Date: Thu Aug 19 00:00:00 1999 -0700
+
+ Add man pages for XKB API's
+
+ Man pages originally written for X11R6.4 integration to Solaris 7 11/99
+ Sun bug id 4258344: Add new XKB API manpages for 6.4 upgrade
+ <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258344>
+
+ (Volunteer needed to convert prototypes in man pages to ANSI C style...)
+
+commit f640a49b5e2ebf29f9d655df544c63bf826f619a
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Fri Apr 20 18:39:59 2007 +0200
+
+ Markup tweak for XOpenIM.
+
+commit e972b0bb255af4f3258217852542faf5afa60b28
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Apr 20 18:35:09 2007 +0200
+
+ Bug #9695: Fixed a few argument types in the XOpenIM manpage.
+
+commit b4e2276f329fa42397cb8609cfcd34ebafd3d96b
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Apr 20 18:28:52 2007 +0200
+
+ Bug #9697: Fixed documentation of XVisualInfo struct.
+
+ The "depth" member was said to be unsigned int, but it's signed.
+
+commit 4068f3dae01c630f825002673b1d3a047ad61863
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Apr 20 16:41:21 2007 +0200
+
+ Bug #9696: refer to XDefineCursor() instead of XDefineCusor().
+
+commit 603c2f88d4e57ce1a3c16e8b6246866e6edd8fa8
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sat Apr 7 14:42:55 2007 +0200
+
+ Use unistd.h to get getresuid() and friends.
+
+ This works since we now have _GNU_SOURCE defined.
+
+commit 0300f295bbd3a0c7c46baac8e0a27aeaf53c9d9b
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sat Apr 7 14:27:12 2007 +0200
+
+ Bug #10562: Define _GNU_SOURCE on glibc systems.
+
+commit a225a0be48770beb689d5ac5da97073634f7deab
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Fri Apr 6 12:46:25 2007 +0200
+
+ For nls/*.pre, allow people to comment lines by starting them with '##'.
+
+ This fixes a bunch of cpp warnings from nls/en_US.UTF-8/Compose.pre.
+ Fixing that file would have been a larger diff, and using ## may be
+ nicer to use anyway.
+
+commit 1c75a9479011e5f1ad01c950628d0ef5a302d8b6
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Fri Apr 6 11:59:31 2007 +0200
+
+ Bug #10475: Fixed lots of char*/const char* mixups.
+
+ I didn't fix all of them, as that would require touching
+ public headers.
+
+commit 680dd50193b5b3fcabdd3f1fcbd6a889d5a95c54
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Thu Apr 5 11:53:18 2007 +0200
+
+ Fix 64bit issues with reallocation.
+
+commit 4d38aeaca42d0bdfe34a833a142ee4d895de03bf
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Wed Apr 4 18:41:18 2007 +0200
+
+ Fixed a few warnings.
+
+commit 7dc7ef398b6ad90ccd1680ed9cd1cfdd47312f5a
+Author: Matthieu Herrb <matthieu@roadrock.(none)>
+Date: Tue Apr 3 15:39:52 2007 +0200
+
+ Multiple integer overflows in the XGetPixel() and XInitImage functions
+
+ CVE-2007-1667
+
+commit 0284b144340a455a4b5b5011d81ac5a610372291
+Author: David Baron <dbaron@dbaron.org>
+Date: Fri Mar 30 17:07:46 2007 +0200
+
+ Bug #7703: Fixed XSetSizeHints() et al wrt use of uninitialized data.
+
+ Now only those fields of the respective hint struct are set that
+ are actually valid in the input data.
+ The changed functions are:
+ XSetSizeHints(), XSetWMHints() and XSetWMSizeHints().
+
+commit 0994faa0c76c45b106442db461b8a30a3e1c9395
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Thu Mar 29 17:31:25 2007 +0200
+
+ Fixed the change from the previous SendEvent commit.
+
+ Testing a different patch than the one you commit is bad, right?
+
+commit 398d75528a84f4b8414eb0e363cf53b1b16f6fdf
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Wed Mar 28 22:23:44 2007 +0200
+
+ Bug #10292: Fixed a memory leak related to XOpenDisplay() in the XCB code.
+
+commit ab0bcd07957cecc8e7c0e75d5160a625e91264fe
+Author: David Baron <dbaron@dbaron.org>
+Date: Wed Mar 28 22:21:40 2007 +0200
+
+ Bug #7713: Initialize all of the event's fields before sending it.
+
+commit bc80f9fe3ccce40ee41246b97470c4f0519756ad
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Mar 18 13:14:48 2007 +0100
+
+ Bug #9279: Fixed a file descriptor leak.
+
+commit c9e28e05ae01ce8a29bea09df759b6271865b44c
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat Dec 16 00:45:19 2006 +0200
+
+ include: don't distribute XlibConf.h
+
+ Since XlibConf.h is built by configure, don't distribute it.
+
+commit dd1705ced2cac6b4b6b21e79272fcf9bed4bf376
+Merge: 129bbb9... 769b985...
+Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
+Date: Thu Dec 14 14:23:20 2006 -0600
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libX11
+
+commit 129bbb9f9114a571556fa3a24f15ba58a5cdb2de
+Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
+Date: Thu Dec 14 14:21:19 2006 -0600
+
+ For NetBSD, define the XTHREADLIB and XTHREAD_CFLAGS.
+
+commit 769b9854f7eb1d6d20dd0b4a1c1215ad8e1b77b6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Dec 6 18:53:00 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+
+ Make ChangeLog hook as safe as possible.
+ (cherry picked from f5d6a3d24095c7ffed86705995d0874c885e7676 commit)
+
+commit 8a8185a649e93b90ffa820387ffdca831227f5a9
+Author: Josh Triplett <josh@freedesktop.org>
+Date: Thu Nov 30 18:33:13 2006 -0800
+
+ Add autogen.sh to EXTRA_DIST.
+
+commit efe817f95ef8d05e863c83147e903140bc860de4
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Thu Nov 30 17:58:35 2006 -0800
+
+ Release libX11 1.1.1.
+
+commit f637a5b03164263a3af2e644cf655e52b015f1bb
+Author: Ross Combs <rocombs@cs.nmsu.edu>
+Date: Sat Nov 25 14:45:17 2006 -0800
+
+ Debian bug #354315: Clarify return value in XGetWindowAttributes man page
+
+ This man page does not discuss the actual return values of the
+ function, but says they are of type "Status". One might assume
+ that this means you could compare it with the "Success" macro.
+ One would be wrong.
+
+ The X functions seem to have two three types representing status.
+ If it is an "int" there are a number of error codes or "Success"
+ which can be compared against. If it is a bool, the result can be
+ compared with "True" or "False". If the return type is "Status" it
+ appears that the return type is either 0 or 1. Unfortunately the
+ value for Success is zero, so it is important to distinguish
+ between the first two types of return values and the third;
+ otherwise the conditional will be inverted.
+
+ XGetWindowAttributes() is one of the functions which returns zero
+ for failure. The man page should make this clear.
+
+commit c6a0b0f18ed1242eeb908f5cf767ab8381edd456
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Nov 25 14:23:45 2006 -0800
+
+ Bug #9154: Always process an event for _XReadEvents, even if an error occurs
+
+ Previously, process_responses (in the wait_for_first_event case called
+ from _XReadEvents) considered any return from xcb_wait_for_event
+ sufficient to think it had processed an event. If xcb_wait_for_event
+ returned an error, and no more events occurred before process_responses
+ called xcb_poll_for_event, process_responses would try to return with
+ dpy->head NULL, and would fail an assertion for the _XReadEvents
+ postcondition. Now, process_responses continues using xcb_wait_for_event
+ until it gets an event.
+
+commit d56e78acce9b2aa1dd1bf172afedaa3bccd5e1c8
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sat Nov 25 05:29:31 2006 -0800
+
+ Bug #9153: Fix access to freed memory.
+
+ The fix for bug #8622 introduced a smaller bug where _XReply would
+ read memory shortly after freeing it. This patch caches the needed
+ value in a stack-allocated variable before the heap-allocated memory
+ is freed.
+
+commit 934ca763bbc0dd7ae460469bfc000ba101602bcc
+Author: Josh Triplett <josh@freedesktop.org>
+Date: Fri Nov 24 19:57:58 2006 -0800
+
+ libx11 doesn't use inputproto in public headers; don't require it in x11.pc
+
+ Based on a Debian patch.
+
+commit 4255997ef2d92740d51f6e63e9eabcfa089683f0
+Author: Josh Triplett <josh@freedesktop.org>
+Date: Thu Nov 23 07:19:32 2006 -0800
+
+ Release libX11 1.1
+
+commit a1168e11ec9377307c51a7271faec3bf88a63a66
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Tue Nov 21 17:52:34 2006 -0800
+
+ Add note in man-page that XListFontsWithInfo is not thread-safe.
+
+ _XReply drops the Display lock, so the value of dpy->request may change
+ before _XReply is called again.
+
+ I discovered this by inspection a year or two ago. I'm pretty confident
+ in the claim, and nobody has come up with an argument for why it's safe
+ despite appearances.
+
+commit 67abe024268c6b1fdee516e5d3a046ccffd7e80a
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Nov 18 15:39:26 2006 -0800
+
+ Bug #8622: Fix response processing order for threaded apps
+
+ Previously, process_responses (the common code for _XReply,
+ _XReadEvents, and _XEventsQueued) took the current request sequence
+ number as an argument, and did some highly complicated processing to
+ attempt to process responses in order across threads. This didn't
+ actually work.
+
+ Now, process_responses handles responses in order, by adding condition
+ variables to the list of outstanding requests in
+ dpy->xcb->pending_requests, and blocking on them when those requests
+ should get processed to allow _XReply to process them; if actually
+ called from _XReply, it returns when _XReply's request should get
+ processed. _XReply broadcasts on the condition variable after it has
+ read its reply and re-acquired the display lock.
+
+ Another great commit brought to you by Jamey Sharp, Josh Triplett, the
+ Gobby collaborative text editor, conspy, and ridiculous amounts of SSH
+ forwarding.
+
+ Signed-off-by: Josh Triplett <josh@freedesktop.org>
+ Signed-off-by: Jamey Sharp <jamey@minilop.net>
+
+commit 941f02ede63baa46f93ed8abccebe76fb29c0789
+Author: Lars Knoll <lars@trolltech.com>
+Date: Wed Nov 8 12:17:41 2006 -0800
+
+ Don't hold the display lock around callbacks to the application.
+
+ This fixes an XCB locking assertion failure, particularly with emacs.
+
+commit e494ecaac1ec8a22bd9a85f800fca74d02e9d358
+Author: Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>
+Date: Tue Nov 7 09:32:00 2006 -0800
+
+ Add xcb-xlib dependency to x11.pc when built against XCB.
+
+commit 2302008a3793eb4df8ede777d54fe06505c47eaf
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Nov 6 17:11:42 2006 -0800
+
+ XCB: Allocate the right amount of memory for dpy->lock_fns.
+
+ Fixes a crash I was experiencing on startup of anything using gdk.
+
commit 5f860655be88108b03ccd97470a0814819254bf0
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Nov 2 17:55:31 2006 -0800
diff --git a/lib/libX11/Makefile.in b/lib/libX11/Makefile.in
index c27950a9b..2f405d48a 100644
--- a/lib/libX11/Makefile.in
+++ b/lib/libX11/Makefile.in
@@ -115,6 +115,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -131,6 +132,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -138,6 +140,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -147,11 +150,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -166,6 +172,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -214,7 +221,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/aclocal.m4 b/lib/libX11/aclocal.m4
index 4f1f04f98..0b54127e5 100644
--- a/lib/libX11/aclocal.m4
+++ b/lib/libX11/aclocal.m4
@@ -13,7 +13,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -101,7 +101,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -176,7 +175,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
@@ -203,6 +202,8 @@ file_magic*)
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -263,8 +264,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
@@ -276,13 +278,85 @@ $rm conftest*
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@ -293,12 +367,20 @@ $rm conftest*
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
@@ -529,13 +611,17 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -552,6 +638,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
;;
*64-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -592,7 +681,11 @@ sparc*-*solaris*)
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -623,7 +716,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -664,11 +757,12 @@ fi
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
[$2=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $3"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -684,7 +778,7 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
$2=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -782,24 +876,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
fi
;;
*)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
- new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ lt_cv_sys_max_cmd_len=$new_result &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on massive
+ # amounts of additional arguments before passing them to the linker.
+ # It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
])
@@ -952,7 +1049,7 @@ else
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -960,7 +1057,7 @@ else
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
])
])
])
@@ -1026,7 +1123,8 @@ fi
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1034,7 +1132,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
mkdir conftest
cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -1174,6 +1272,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -1191,7 +1290,8 @@ fi
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -1205,20 +1305,58 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+ case $host_os in
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -1236,7 +1374,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[[4-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1375,12 +1513,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
+ m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -1397,18 +1531,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -1446,7 +1568,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
- freebsd*) # from 4.6 on
+ *) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
@@ -1509,7 +1631,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
-interix3*)
+interix[[3-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1564,7 +1686,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1580,7 +1702,7 @@ linux*)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -1593,18 +1715,6 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -1686,6 +1796,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
+rdos*)
+ dynamic_linker=no
+ ;;
+
solaris*)
version_type=linux
need_lib_prefix=no
@@ -1781,6 +1895,13 @@ esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -1791,7 +1912,8 @@ fi
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
@@ -2052,7 +2174,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
# AC_PATH_TOOL_PREFIX
# -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
@@ -2115,7 +2237,7 @@ fi
# AC_PATH_MAGIC
# -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2262,7 +2384,7 @@ esac
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
@@ -2279,7 +2401,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2301,16 +2423,22 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -2348,7 +2476,7 @@ hpux10.20* | hpux11*)
esac
;;
-interix3*)
+interix[[3-9]]*)
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
@@ -2364,7 +2492,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2398,6 +2526,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -2450,7 +2582,7 @@ AC_DEFUN([AC_PROG_NM],
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
@@ -2666,10 +2798,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
_LT_AC_SYS_COMPILER
@@ -2705,7 +2837,7 @@ aix3*)
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -2762,6 +2894,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -2771,10 +2904,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2871,7 +3004,7 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -2884,7 +3017,7 @@ case $host_os in
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -2920,7 +3053,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ :
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3030,59 +3163,31 @@ case $host_os in
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -3116,7 +3221,7 @@ case $host_os in
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3165,9 +3270,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
- ;;
+ hppa*64*|ia64*) ;;
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3235,7 +3338,7 @@ case $host_os in
;;
esac
;;
- interix3*)
+ interix[[3-9]]*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3275,7 +3378,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3327,7 +3430,7 @@ case $host_os in
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3355,6 +3458,29 @@ case $host_os in
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ esac
+ ;;
esac
;;
lynxos*)
@@ -3399,9 +3525,9 @@ case $host_os in
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
output_verbose_link_cmd='echo'
else
@@ -3568,15 +3694,10 @@ case $host_os in
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
- # linker. We must also pass each convience library through
- # to the system linker between allextract/defaultextract.
- # The C++ compiler will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -3623,6 +3744,12 @@ case $host_os in
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
fi
;;
esac
@@ -3738,7 +3865,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
@@ -3863,10 +3991,15 @@ fi
$rm -f confest.$objext
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
-interix3*)
+interix[[3-9]]*)
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
_LT_AC_TAGVAR(predep_objects,$1)=
@@ -3874,19 +4007,51 @@ interix3*)
_LT_AC_TAGVAR(postdeps,$1)=
;;
+linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ #
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
solaris*)
case $cc_basename in
CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+
# Adding this requires a known-good setup of shared libraries for
# Sun compiler versions before 5.6, else PIC objects from an old
# archive will be linked into the output, leading to subtle bugs.
- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
;;
esac
;;
esac
])
-
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -3929,10 +4094,17 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
+lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
# Code to be used in simple link tests
-lt_simple_link_test_code=" program t\n end\n"
+lt_simple_link_test_code="\
+ program t
+ end
+"
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -3964,7 +4136,7 @@ aix3*)
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -4011,10 +4183,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -4067,7 +4239,7 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4141,6 +4313,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4156,6 +4329,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
@@ -4202,7 +4376,7 @@ ifelse([$1], [],
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -4439,6 +4613,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4527,7 +4705,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -4610,6 +4788,7 @@ fi
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4646,7 +4825,7 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4787,7 +4966,7 @@ EOF
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -4836,13 +5015,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | os2* | pw32*)
+ mingw* | cygwin* | os2* | pw32*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -4853,7 +5035,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
- interix3*)
+ interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -4879,7 +5061,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -4919,7 +5101,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -4962,7 +5144,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4975,7 +5157,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -4989,6 +5171,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+ esac
;;
esac
;;
@@ -5109,14 +5299,17 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
@@ -5125,7 +5318,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
- interix3*)
+ interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -5183,10 +5376,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
esac
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
hpux9* | hpux10* | hpux11*)
@@ -5216,7 +5410,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5235,6 +5429,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+ ;;
+ esac
+ ;;
esac
;;
@@ -5244,6 +5454,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
+ rdos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5303,7 +5517,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
@@ -5327,7 +5541,7 @@ esac
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5338,11 +5552,12 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5355,12 +5570,13 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5391,12 +5607,14 @@ ifelse([$1],[CXX],[
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
@@ -5446,7 +5664,7 @@ ifelse([$1],[CXX],[
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5494,7 +5712,7 @@ EOF
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5512,7 +5730,7 @@ EOF
fi
;;
- interix3*)
+ interix[[3-9]]*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -5527,7 +5745,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -5545,13 +5763,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
if test $supports_anon_versioning = yes; then
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5591,7 +5818,7 @@ EOF
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -5656,7 +5883,7 @@ _LT_EOF
fi
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -5676,7 +5903,7 @@ _LT_EOF
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -5710,7 +5937,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ :
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5803,7 +6030,7 @@ _LT_EOF
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
@@ -5836,19 +6063,18 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -5888,7 +6114,7 @@ _LT_EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6011,15 +6237,15 @@ _LT_EOF
openbsd*)
if test -f /usr/libexec/ld.so; then
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- else
- case $host_os in
+ else
+ case $host_os in
openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
@@ -6028,10 +6254,10 @@ _LT_EOF
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
- esac
+ esac
fi
else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
@@ -6090,17 +6316,16 @@ _LT_EOF
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- # The compiler driver will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl, iff we do not link with $LD.
- # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- case $wlarc in
- '')
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- *)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- esac ;;
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -6157,7 +6382,7 @@ _LT_EOF
fi
;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6232,7 +6457,7 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
@@ -6335,6 +6560,30 @@ AC_DEFUN([LT_AC_PROG_RC],
[AC_CHECK_TOOL(RC, windres, no)
])
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+ as_executable_p='test -x'
+else
+ as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
@@ -6355,12 +6604,13 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
fi
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6393,6 +6643,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
@@ -7427,7 +7678,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.5
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7576,7 +7827,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -7848,14 +8103,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -7918,6 +8173,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
#include <sys/socket.h>
#include <netinet/in.h>
])
+
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ AC_CHECK_TYPES([socklen_t], [], [], [
+AC_INCLUDES_DEFAULT
+#include <sys/socket.h>])
+
]) # XTRANS_TCP_FLAGS
# XTRANS_CONNECTION_FLAGS()
@@ -7927,17 +8188,21 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_TYPE_SIGNAL])
+ [case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac]
AC_ARG_ENABLE(unix-transport,
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
- [UNIXCONN=$enableval], [UNIXCONN=yes])
- AC_ARG_ENABLE(tcp-transport,
- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
- [TCPCONN=$enableval], [TCPCONN=yes])
+ [UNIXCONN=$enableval], [UNIXCONN=$unixdef])
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
if test "$UNIXCONN" = "yes"; then
AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
fi
AC_MSG_RESULT($UNIXCONN)
+ AC_ARG_ENABLE(tcp-transport,
+ AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
+ [TCPCONN=$enableval], [TCPCONN=yes])
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
AC_MSG_RESULT($TCPCONN)
if test "$TCPCONN" = "yes"; then
diff --git a/lib/libX11/configure b/lib/libX11/configure
index 8afcfd54b..bcef69905 100644
--- a/lib/libX11/configure
+++ b/lib/libX11/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libX11 1.1.3.
+# Generated by GNU Autoconf 2.59 for libX11 1.1.4.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libX11'
PACKAGE_TARNAME='libX11'
-PACKAGE_VERSION='1.1.3'
-PACKAGE_STRING='libX11 1.1.3'
+PACKAGE_VERSION='1.1.4'
+PACKAGE_STRING='libX11 1.1.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -465,7 +465,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RAWCPP RAWCPPFLAGS XCB_TRUE XCB_FALSE PKG_CONFIG ac_pt_PKG_CONFIG XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS X11_EXTRA_DEPS X11_CFLAGS X11_LIBS I18N_MODULE_LIBS XLIB_LOADABLE_I18N_TRUE XLIB_LOADABLE_I18N_FALSE WCHAR32 OS2_TRUE OS2_FALSE XTHREADS XUSE_MTSAFE_API THRSTUBS_TRUE THRSTUBS_FALSE XTHREADLIB XTHREAD_CFLAGS KEYSYMDEF UDC_TRUE UDC_FALSE XCMS_TRUE XCMS_FALSE XLOCALE_TRUE XLOCALE_FALSE BIGFONT_CFLAGS BIGFONT_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR MANPAGES_TRUE MANPAGES_FALSE XKB_TRUE XKB_FALSE XKBPROTO_CFLAGS XKBPROTO_LIBS XKBPROTO_REQUIRES LINT LINT_FLAGS LINT_TRUE LINT_FALSE X11_DATADIR X11_LIBDIR XLOCALEDATADIR X11_LOCALEDATADIR XLOCALELIBDIR X11_LOCALELIBDIR XLOCALEDIR X11_LOCALEDIR XKEYSYMDB XERRORDB MALLOC_ZERO_CFLAGS XMALLOC_ZERO_CFLAGS XTMALLOC_ZERO_CFLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RAWCPP RAWCPPFLAGS XCB_TRUE XCB_FALSE PKG_CONFIG ac_pt_PKG_CONFIG XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS X11_EXTRA_DEPS X11_CFLAGS X11_LIBS I18N_MODULE_LIBS XLIB_LOADABLE_I18N_TRUE XLIB_LOADABLE_I18N_FALSE WCHAR32 OS2_TRUE OS2_FALSE LAUNCHD XTHREADS XUSE_MTSAFE_API THRSTUBS_TRUE THRSTUBS_FALSE XTHREADLIB XTHREAD_CFLAGS KEYSYMDEF UDC_TRUE UDC_FALSE XCMS_TRUE XCMS_FALSE XLOCALE_TRUE XLOCALE_FALSE BIGFONT_CFLAGS BIGFONT_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR MANPAGES_TRUE MANPAGES_FALSE XKB_TRUE XKB_FALSE XKBPROTO_CFLAGS XKBPROTO_LIBS XKBPROTO_REQUIRES LINT LINT_FLAGS LINT_TRUE LINT_FALSE LINTLIB MAKE_LINT_LIB_TRUE MAKE_LINT_LIB_FALSE X11_DATADIR X11_LIBDIR XLOCALEDATADIR X11_LOCALEDATADIR XLOCALELIBDIR X11_LOCALELIBDIR XLOCALEDIR X11_LOCALEDIR XKEYSYMDB XERRORDB MALLOC_ZERO_CFLAGS XMALLOC_ZERO_CFLAGS XTMALLOC_ZERO_CFLAGS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -998,7 +998,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libX11 1.1.3 to adapt to many kinds of systems.
+\`configure' configures libX11 1.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1064,7 +1064,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libX11 1.1.3:";;
+ short | recursive ) echo "Configuration of libX11 1.1.4:";;
esac
cat <<\_ACEOF
@@ -1095,6 +1095,7 @@ Optional Features:
--enable-man-pages=section
Choose manual section for installing man pages
--disable-composecache Disable compose table cache support
+ --enable-lint-library Create lint library (default: disabled)
--enable-malloc0returnsnull
malloc(0) returns NULL (default: auto)
@@ -1107,6 +1108,8 @@ Optional Packages:
--with-tags[=TAGS]
include additional configurations [automatic]
--with-xcb use XCB for low-level protocol implementation
+ --with-launchd Build with support for Apple's launchd (default:
+ auto)
--with-lint Use a lint-style source code checker (default:
disabled)
--with-release-version=STRING
@@ -1242,7 +1245,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libX11 configure 1.1.3
+libX11 configure 1.1.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1256,7 +1259,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libX11 $as_me 1.1.3, which was
+It was created by libX11 $as_me 1.1.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1855,7 +1858,7 @@ fi
# Define the identity of the package.
PACKAGE='libX11'
- VERSION='1.1.3'
+ VERSION='1.1.4'
cat >>confdefs.h <<_ACEOF
@@ -2016,6 +2019,31 @@ fi
ac_config_headers="$ac_config_headers include/X11/XlibConf.h"
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+
+
+ XORG_MACROS_needed_version=1.1
+ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
+ XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
+ echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5
+echo $ECHO_N "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... $ECHO_C" >&6
+ XORG_MACROS_version=1.1.6
+ XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
+ XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
+ if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
+ { { echo "$as_me:$LINENO: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&5
+echo "$as_me: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
+ { { echo "$as_me:$LINENO: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&5
+echo "$as_me: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ echo "$as_me:$LINENO: result: yes, $XORG_MACROS_version" >&5
+echo "${ECHO_T}yes, $XORG_MACROS_version" >&6
+
+
# Checks for programs.
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
@@ -3267,6 +3295,7 @@ do
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3301,6 +3330,7 @@ done
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -3515,8 +3545,8 @@ else
echo "${ECHO_T}no, using $LN_S" >&6
fi
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3535,7 +3565,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3557,16 +3587,22 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3604,7 +3640,7 @@ hpux10.20* | hpux11*)
esac
;;
-interix3*)
+interix[3-9]*)
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
@@ -3620,7 +3656,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3654,6 +3690,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3741,7 +3781,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3744 "configure"' > conftest.$ac_ext
+ echo '#line 3784 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -3776,7 +3816,8 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3787,6 +3828,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
@@ -3803,6 +3847,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
;;
*64-bit*)
case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
@@ -3909,7 +3956,11 @@ sparc*-*solaris*)
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -5340,7 +5391,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:5343:" \
+echo "$as_me:5394:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5487,7 +5538,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
# find the maximum length of command line arguments
echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
@@ -5574,24 +5624,27 @@ else
fi
;;
*)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
= "XX$teststring") >/dev/null 2>&1 &&
- new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ lt_cv_sys_max_cmd_len=$new_result &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on massive
+ # amounts of additional arguments before passing them to the linker.
+ # It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
@@ -5608,6 +5661,7 @@ fi
+
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
@@ -5645,7 +5699,7 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -5798,7 +5852,7 @@ EOF
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -6148,7 +6202,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
@@ -6310,6 +6364,289 @@ fi
;;
esac
+
+ case $host_os in
+ rhapsody* | darwin*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_ac_ct_DSYMUTIL" && ac_cv_prog_ac_ct_DSYMUTIL=":"
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+ echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ DSYMUTIL=$ac_ct_DSYMUTIL
+else
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+ echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_ac_ct_NMEDIT" && ac_cv_prog_ac_ct_NMEDIT=":"
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+ echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ NMEDIT=$ac_ct_NMEDIT
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+ echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi
+fi
+echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6
+ echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ lt_cv_ld_exported_symbols_list=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+lt_cv_ld_exported_symbols_list=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6
+ case $host_os in
+ rhapsody* | darwin1.[0123])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[012]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+
+
enable_dlopen=no
enable_win32_dll=no
@@ -6348,10 +6685,10 @@ objext=o
objext=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
# If no C compiler was specified, use CC.
@@ -6366,16 +6703,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
@@ -6392,7 +6729,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -6403,11 +6740,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6406: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6743: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6410: \$? = $ac_status" >&5
+ echo "$as_me:6747: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6458,13 +6795,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
@@ -6474,7 +6813,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_pic='-fno-common'
;;
- interix3*)
+ interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -6532,7 +6871,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
esac
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -6565,7 +6904,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
@@ -6584,6 +6923,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl=''
+ ;;
+ esac
+ ;;
esac
;;
@@ -6593,6 +6948,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static='-non_shared'
;;
+ rdos*)
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
@@ -6655,12 +7014,12 @@ if test -n "$lt_prog_compiler_pic"; then
echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works=no
+ lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -6671,27 +7030,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6674: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7033: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6678: \$? = $ac_status" >&5
+ echo "$as_me:7037: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works=yes
+ lt_cv_prog_compiler_pic_works=yes
fi
fi
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -6718,13 +7077,13 @@ esac
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works=no
+ lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6734,20 +7093,20 @@ else
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works=yes
+ lt_cv_prog_compiler_static_works=yes
fi
else
- lt_prog_compiler_static_works=yes
+ lt_cv_prog_compiler_static_works=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
else
lt_prog_compiler_static=
@@ -6764,7 +7123,7 @@ else
mkdir conftest
cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -6775,11 +7134,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6778: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7137: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6782: \$? = $ac_status" >&5
+ echo "$as_me:7141: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -6859,12 +7218,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -6923,7 +7283,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
@@ -6971,7 +7331,7 @@ EOF
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -6989,7 +7349,7 @@ EOF
fi
;;
- interix3*)
+ interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -7004,7 +7364,7 @@ EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -7022,13 +7382,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
if test $supports_anon_versioning = yes; then
archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
else
ld_shlibs=no
@@ -7133,7 +7502,7 @@ _LT_EOF
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -7153,7 +7522,7 @@ _LT_EOF
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -7187,7 +7556,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- hardcode_direct=yes
+ :
else
# We have old collect2
hardcode_direct=unsupported
@@ -7265,11 +7634,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7326,11 +7702,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7382,7 +7765,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
@@ -7415,19 +7798,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -7467,7 +7849,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -7590,15 +7972,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
openbsd*)
if test -f /usr/libexec/ld.so; then
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
- else
- case $host_os in
+ else
+ case $host_os in
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='-R$libdir'
@@ -7607,10 +7989,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
- esac
+ esac
fi
else
- ld_shlibs=no
+ ld_shlibs=no
fi
;;
@@ -7669,17 +8051,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- # The compiler driver will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl, iff we do not link with $LD.
- # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- case $wlarc in
- '')
- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- *)
- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- esac ;;
+ if test "$GCC" = yes; then
+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
esac
link_all_deplibs=yes
;;
@@ -7736,7 +8117,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
fi
;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
@@ -7813,7 +8194,7 @@ x|xyes)
echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
$rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
@@ -7871,17 +8252,55 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+ case $host_os in
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@ -7902,7 +8321,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -8041,12 +8460,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -8063,18 +8478,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -8112,7 +8515,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
- freebsd*) # from 4.6 on
+ *) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
@@ -8175,7 +8578,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
-interix3*)
+interix[3-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -8230,7 +8633,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -8246,7 +8649,7 @@ linux*)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -8259,18 +8662,6 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8352,6 +8743,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
+rdos*)
+ dynamic_linker=no
+ ;;
+
solaris*)
version_type=linux
need_lib_prefix=no
@@ -8448,6 +8843,21 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -8505,6 +8915,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
@@ -8781,7 +9192,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
@@ -9075,7 +9486,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -9124,7 +9535,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9127 "configure"
+#line 9538 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9224,7 +9635,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9227 "configure"
+#line 9638 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9351,7 +9762,7 @@ aix3*)
fi
;;
-aix4* | aix5*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -9407,6 +9818,7 @@ if test -f "$ltmain"; then
predeps \
postdeps \
compiler_lib_search_path \
+ compiler_lib_search_dirs \
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
@@ -9422,6 +9834,7 @@ if test -f "$ltmain"; then
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
+ fix_srcfile_path \
exclude_expsyms \
include_expsyms; do
@@ -9466,7 +9879,7 @@ echo "$as_me: creating $ofile" >&6;}
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -9702,6 +10115,10 @@ predeps=$lt_predeps
# shared library.
postdeps=$lt_postdeps
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -9790,7 +10207,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
@@ -9950,6 +10367,7 @@ postdep_objects_CXX=
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -9959,10 +10377,10 @@ objext=o
objext_CXX=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
@@ -9978,16 +10396,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -10194,7 +10612,7 @@ case $host_os in
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -10207,7 +10625,7 @@ case $host_os in
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -10243,7 +10661,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- hardcode_direct_CXX=yes
+ :
else
# We have old collect2
hardcode_direct_CXX=unsupported
@@ -10321,11 +10739,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10383,11 +10808,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10455,59 +10887,31 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
archive_cmds_need_lc_CXX=no
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
whole_archive_flag_spec_CXX=''
link_all_deplibs_CXX=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -10541,7 +10945,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
@@ -10590,9 +10994,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_separator_CXX=:
case $host_cpu in
- hppa*64*|ia64*)
- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
- ;;
+ hppa*64*|ia64*) ;;
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
@@ -10660,7 +11062,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
esac
;;
- interix3*)
+ interix[3-9]*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -10700,7 +11102,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -10752,7 +11154,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -10780,6 +11182,29 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ no_undefined_flag_CXX=' -zdefs'
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ esac
+ ;;
esac
;;
lynxos*)
@@ -10824,9 +11249,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- export_dynamic_flag_spec_CXX='${wl}-E'
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
output_verbose_link_cmd='echo'
else
@@ -10993,15 +11418,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
- # linker. We must also pass each convience library through
- # to the system linker between allextract/defaultextract.
- # The C++ compiler will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
;;
esac
link_all_deplibs_CXX=yes
@@ -11048,6 +11468,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
fi
;;
esac
@@ -11135,7 +11561,6 @@ test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
LD_CXX="$LD"
-
cat > conftest.$ac_ext <<EOF
class Foo
{
@@ -11237,9 +11662,14 @@ fi
$rm -f confest.$objext
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
# PORTME: override above test on systems where it is broken
case $host_os in
-interix3*)
+interix[3-9]*)
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
@@ -11247,19 +11677,51 @@ interix3*)
postdeps_CXX=
;;
+linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ #
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+ if test "$solaris_use_stlport4" != yes; then
+ postdeps_CXX='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
solaris*)
case $cc_basename in
CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+
# Adding this requires a known-good setup of shared libraries for
# Sun compiler versions before 5.6, else PIC objects from an old
# archive will be linked into the output, leading to subtle bugs.
- postdeps_CXX='-lCstd -lCrun'
+ if test "$solaris_use_stlport4" != yes; then
+ postdeps_CXX='-library=Cstd -library=Crun'
+ fi
;;
esac
;;
esac
-
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
@@ -11290,12 +11752,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | os2* | pw32*)
+ mingw* | cygwin* | os2* | pw32*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -11307,7 +11771,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
- interix3*)
+ interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -11333,7 +11797,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -11373,7 +11837,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
;;
esac
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -11416,7 +11880,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -11429,7 +11893,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
@@ -11443,6 +11907,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ lt_prog_compiler_wl_CXX='-Qoption ld '
+ ;;
+ esac
;;
esac
;;
@@ -11552,12 +12024,12 @@ if test -n "$lt_prog_compiler_pic_CXX"; then
echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_CXX=no
+ lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -11568,27 +12040,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11571: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12043: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11575: \$? = $ac_status" >&5
+ echo "$as_me:12047: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_CXX=yes
+ lt_cv_prog_compiler_pic_works_CXX=yes
fi
fi
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -11615,13 +12087,13 @@ esac
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works_CXX=no
+ lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11631,20 +12103,20 @@ else
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_CXX=yes
+ lt_cv_prog_compiler_static_works_CXX=yes
fi
else
- lt_prog_compiler_static_works_CXX=yes
+ lt_cv_prog_compiler_static_works_CXX=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
else
lt_prog_compiler_static_CXX=
@@ -11661,7 +12133,7 @@ else
mkdir conftest
cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -11672,11 +12144,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11675: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12147: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11679: \$? = $ac_status" >&5
+ echo "$as_me:12151: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11729,7 +12201,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -11742,12 +12214,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6
@@ -11773,7 +12246,7 @@ x|xyes)
echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
$rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
@@ -11831,20 +12304,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -11862,7 +12322,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -12001,12 +12461,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
+
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -12023,18 +12478,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -12072,7 +12515,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
- freebsd*) # from 4.6 on
+ *) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
@@ -12135,7 +12578,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
-interix3*)
+interix[3-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -12190,7 +12633,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -12206,7 +12649,7 @@ linux*)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -12219,18 +12662,6 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -12312,6 +12743,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
+rdos*)
+ dynamic_linker=no
+ ;;
+
solaris*)
version_type=linux
need_lib_prefix=no
@@ -12408,6 +12843,21 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -12491,6 +12941,7 @@ if test -f "$ltmain"; then
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
+ compiler_lib_search_dirs_CXX \
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
@@ -12506,6 +12957,7 @@ if test -f "$ltmain"; then
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
+ fix_srcfile_path_CXX \
exclude_expsyms_CXX \
include_expsyms_CXX; do
@@ -12738,6 +13190,10 @@ predeps=$lt_predeps_CXX
# shared library.
postdeps=$lt_postdeps_CXX
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -12826,7 +13282,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
@@ -12917,10 +13373,17 @@ objext=o
objext_F77=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
+lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
# Code to be used in simple link tests
-lt_simple_link_test_code=" program t\n end\n"
+lt_simple_link_test_code="\
+ program t
+ end
+"
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
@@ -12936,16 +13399,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -12983,7 +13446,7 @@ aix3*)
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4* | aix5*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -13029,13 +13492,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
@@ -13045,7 +13510,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_pic_F77='-fno-common'
;;
- interix3*)
+ interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -13103,7 +13568,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
esac
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -13136,7 +13601,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static_F77='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
@@ -13155,6 +13620,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ lt_prog_compiler_wl_F77='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+ lt_prog_compiler_wl_F77=''
+ ;;
+ esac
+ ;;
esac
;;
@@ -13164,6 +13645,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static_F77='-non_shared'
;;
+ rdos*)
+ lt_prog_compiler_static_F77='-non_shared'
+ ;;
+
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
@@ -13226,12 +13711,12 @@ if test -n "$lt_prog_compiler_pic_F77"; then
echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_F77=no
+ lt_cv_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -13242,27 +13727,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13245: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13730: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13249: \$? = $ac_status" >&5
+ echo "$as_me:13734: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_F77=yes
+ lt_cv_prog_compiler_pic_works_F77=yes
fi
fi
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -13289,13 +13774,13 @@ esac
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works_F77=no
+ lt_cv_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13305,20 +13790,20 @@ else
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_F77=yes
+ lt_cv_prog_compiler_static_works_F77=yes
fi
else
- lt_prog_compiler_static_works_F77=yes
+ lt_cv_prog_compiler_static_works_F77=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
:
else
lt_prog_compiler_static_F77=
@@ -13335,7 +13820,7 @@ else
mkdir conftest
cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -13346,11 +13831,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13349: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13834: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13353: \$? = $ac_status" >&5
+ echo "$as_me:13838: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13430,12 +13915,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -13494,7 +13980,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
@@ -13542,7 +14028,7 @@ EOF
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -13560,7 +14046,7 @@ EOF
fi
;;
- interix3*)
+ interix[3-9]*)
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -13575,7 +14061,7 @@ EOF
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -13593,13 +14079,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
if test $supports_anon_versioning = yes; then
archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
else
ld_shlibs_F77=no
@@ -13704,7 +14199,7 @@ _LT_EOF
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -13724,7 +14219,7 @@ _LT_EOF
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -13758,7 +14253,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- hardcode_direct_F77=yes
+ :
else
# We have old collect2
hardcode_direct_F77=unsupported
@@ -13826,11 +14321,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13877,11 +14379,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13933,7 +14442,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
@@ -13966,19 +14475,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -14018,7 +14526,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
@@ -14141,15 +14649,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
openbsd*)
if test -f /usr/libexec/ld.so; then
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_direct_F77=yes
+ hardcode_shlibpath_var_F77=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
- else
- case $host_os in
+ else
+ case $host_os in
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
@@ -14158,10 +14666,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
- esac
+ esac
fi
else
- ld_shlibs_F77=no
+ ld_shlibs_F77=no
fi
;;
@@ -14220,17 +14728,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- # The compiler driver will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl, iff we do not link with $LD.
- # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- case $wlarc in
- '')
- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- *)
- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- esac ;;
+ if test "$GCC" = yes; then
+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
esac
link_all_deplibs_F77=yes
;;
@@ -14287,7 +14794,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
fi
;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
@@ -14364,7 +14871,7 @@ x|xyes)
echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
$rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
@@ -14422,20 +14929,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -14453,7 +14947,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -14592,12 +15086,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
+
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -14614,18 +15103,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -14663,7 +15140,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
- freebsd*) # from 4.6 on
+ *) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
@@ -14726,7 +15203,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
-interix3*)
+interix[3-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -14781,7 +15258,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -14797,7 +15274,7 @@ linux*)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -14810,18 +15287,6 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -14903,6 +15368,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
+rdos*)
+ dynamic_linker=no
+ ;;
+
solaris*)
version_type=linux
need_lib_prefix=no
@@ -14999,6 +15468,21 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -15082,6 +15566,7 @@ if test -f "$ltmain"; then
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
+ compiler_lib_search_dirs_F77 \
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
@@ -15097,6 +15582,7 @@ if test -f "$ltmain"; then
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
+ fix_srcfile_path_F77 \
exclude_expsyms_F77 \
include_expsyms_F77; do
@@ -15329,6 +15815,10 @@ predeps=$lt_predeps_F77
# shared library.
postdeps=$lt_postdeps_F77
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -15417,7 +15907,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
@@ -15476,10 +15966,10 @@ objext=o
objext_GCJ=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
@@ -15495,16 +15985,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -15542,7 +16032,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -15553,11 +16043,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15556: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16046: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15560: \$? = $ac_status" >&5
+ echo "$as_me:16050: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15608,14 +16098,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+
;;
darwin* | rhapsody*)
@@ -15624,7 +16116,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_pic_GCJ='-fno-common'
;;
- interix3*)
+ interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
@@ -15682,10 +16174,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
esac
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
;;
hpux9* | hpux10* | hpux11*)
@@ -15715,7 +16207,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static_GCJ='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
@@ -15734,6 +16226,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ lt_prog_compiler_wl_GCJ=''
+ ;;
+ esac
+ ;;
esac
;;
@@ -15743,6 +16251,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
lt_prog_compiler_static_GCJ='-non_shared'
;;
+ rdos*)
+ lt_prog_compiler_static_GCJ='-non_shared'
+ ;;
+
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
@@ -15805,12 +16317,12 @@ if test -n "$lt_prog_compiler_pic_GCJ"; then
echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_GCJ=no
+ lt_cv_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -15821,27 +16333,27 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15824: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16336: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15828: \$? = $ac_status" >&5
+ echo "$as_me:16340: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works_GCJ=yes
+ lt_cv_prog_compiler_pic_works_GCJ=yes
fi
fi
$rm conftest*
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -15868,13 +16380,13 @@ esac
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works_GCJ=no
+ lt_cv_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15884,20 +16396,20 @@ else
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works_GCJ=yes
+ lt_cv_prog_compiler_static_works_GCJ=yes
fi
else
- lt_prog_compiler_static_works_GCJ=yes
+ lt_cv_prog_compiler_static_works_GCJ=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
:
else
lt_prog_compiler_static_GCJ=
@@ -15914,7 +16426,7 @@ else
mkdir conftest
cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -15925,11 +16437,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15928: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16440: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15932: \$? = $ac_status" >&5
+ echo "$as_me:16444: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16009,12 +16521,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -16073,7 +16586,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
@@ -16121,7 +16634,7 @@ EOF
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -16139,7 +16652,7 @@ EOF
fi
;;
- interix3*)
+ interix[3-9]*)
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -16154,7 +16667,7 @@ EOF
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -16172,13 +16685,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
if test $supports_anon_versioning = yes; then
archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
else
ld_shlibs_GCJ=no
@@ -16283,7 +16805,7 @@ _LT_EOF
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -16303,7 +16825,7 @@ _LT_EOF
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -16337,7 +16859,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
- hardcode_direct_GCJ=yes
+ :
else
# We have old collect2
hardcode_direct_GCJ=unsupported
@@ -16415,11 +16937,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16476,11 +17005,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16532,7 +17068,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
@@ -16565,19 +17101,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
@@ -16617,7 +17152,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
@@ -16740,15 +17275,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
openbsd*)
if test -f /usr/libexec/ld.so; then
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_direct_GCJ=yes
+ hardcode_shlibpath_var_GCJ=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
- else
- case $host_os in
+ else
+ case $host_os in
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
@@ -16757,10 +17292,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
- esac
+ esac
fi
else
- ld_shlibs_GCJ=no
+ ld_shlibs_GCJ=no
fi
;;
@@ -16819,17 +17354,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- # The compiler driver will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl, iff we do not link with $LD.
- # Luckily, gcc supports the same syntax we need for Sun Studio.
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- case $wlarc in
- '')
- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- *)
- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- esac ;;
+ if test "$GCC" = yes; then
+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
esac
link_all_deplibs_GCJ=yes
;;
@@ -16886,7 +17420,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
fi
;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
@@ -16963,7 +17497,7 @@ x|xyes)
echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
$rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
@@ -17021,20 +17555,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -17052,7 +17573,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -17191,12 +17712,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
+
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -17213,18 +17729,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -17262,7 +17766,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
- freebsd*) # from 4.6 on
+ *) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
@@ -17325,7 +17829,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
-interix3*)
+interix[3-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -17380,7 +17884,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -17396,7 +17900,7 @@ linux*)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -17409,18 +17913,6 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -17502,6 +17994,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
+rdos*)
+ dynamic_linker=no
+ ;;
+
solaris*)
version_type=linux
need_lib_prefix=no
@@ -17598,6 +18094,21 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -17681,6 +18192,7 @@ if test -f "$ltmain"; then
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
+ compiler_lib_search_dirs_GCJ \
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
@@ -17696,6 +18208,7 @@ if test -f "$ltmain"; then
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
+ fix_srcfile_path_GCJ \
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
@@ -17928,6 +18441,10 @@ predeps=$lt_predeps_GCJ
# shared library.
postdeps=$lt_postdeps_GCJ
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -18016,7 +18533,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
@@ -18074,7 +18591,7 @@ objext=o
objext_RC=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -18093,16 +18610,16 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -18162,6 +18679,7 @@ if test -f "$ltmain"; then
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
+ compiler_lib_search_dirs_RC \
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
@@ -18177,6 +18695,7 @@ if test -f "$ltmain"; then
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
+ fix_srcfile_path_RC \
exclude_expsyms_RC \
include_expsyms_RC; do
@@ -18409,6 +18928,10 @@ predeps=$lt_predeps_RC
# shared library.
postdeps=$lt_postdeps_RC
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -18497,7 +19020,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
@@ -20099,19 +20622,16 @@ fi
+ case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac
# Check whether --enable-unix-transport or --disable-unix-transport was given.
if test "${enable_unix_transport+set}" = set; then
enableval="$enable_unix_transport"
UNIXCONN=$enableval
else
- UNIXCONN=yes
-fi;
- # Check whether --enable-tcp-transport or --disable-tcp-transport was given.
-if test "${enable_tcp_transport+set}" = set; then
- enableval="$enable_tcp_transport"
- TCPCONN=$enableval
-else
- TCPCONN=yes
+ UNIXCONN=$unixdef
fi;
echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket connections" >&5
echo $ECHO_N "checking if Xtrans should support UNIX socket connections... $ECHO_C" >&6
@@ -20124,6 +20644,13 @@ _ACEOF
fi
echo "$as_me:$LINENO: result: $UNIXCONN" >&5
echo "${ECHO_T}$UNIXCONN" >&6
+ # Check whether --enable-tcp-transport or --disable-tcp-transport was given.
+if test "${enable_tcp_transport+set}" = set; then
+ enableval="$enable_tcp_transport"
+ TCPCONN=$enableval
+else
+ TCPCONN=yes
+fi;
echo "$as_me:$LINENO: checking if Xtrans should support TCP socket connections" >&5
echo $ECHO_N "checking if Xtrans should support TCP socket connections... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $TCPCONN" >&5
@@ -20625,6 +21152,77 @@ _ACEOF
fi
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+if test "${ac_cv_type_socklen_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+$ac_includes_default
+#include <sys/socket.h>
+
+int
+main ()
+{
+if ((socklen_t *) 0)
+ return 0;
+if (sizeof (socklen_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_socklen_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_socklen_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+if test $ac_cv_type_socklen_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
+
+
+fi
+
+
+
fi
case $host_os in
solaris*|sco*|sysv4*) localdef="yes" ;;
@@ -22144,6 +22742,67 @@ else
fi
+
+# Check whether --with-launchd or --without-launchd was given.
+if test "${with_launchd+set}" = set; then
+ withval="$with_launchd"
+ LAUNCHD=$withval
+else
+ LAUNCHD=auto
+fi;
+if test "x$LAUNCHD" = xauto; then
+ unset LAUNCHD
+ # Extract the first word of "launchd", so it can be a program name with args.
+set dummy launchd; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_LAUNCHD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$LAUNCHD"; then
+ ac_cv_prog_LAUNCHD="$LAUNCHD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_LAUNCHD="yes"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_LAUNCHD" && ac_cv_prog_LAUNCHD="no"
+fi
+fi
+LAUNCHD=$ac_cv_prog_LAUNCHD
+if test -n "$LAUNCHD"; then
+ echo "$as_me:$LINENO: result: $LAUNCHD" >&5
+echo "${ECHO_T}$LAUNCHD" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+
+if test "x$LAUNCHD" = xyes ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LAUNCHD 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define TRANS_REOPEN 1
+_ACEOF
+
+fi
+
# Check whether --enable-xthreads or --disable-xthreads was given.
if test "${enable_xthreads+set}" = set; then
enableval="$enable_xthreads"
@@ -23481,6 +24140,41 @@ fi
+
+
+# Build lint "library" for more indepth checks of programs calling this library
+# Check whether --enable-lint-library or --disable-lint-library was given.
+if test "${enable_lint_library+set}" = set; then
+ enableval="$enable_lint_library"
+ make_lint_lib=$enableval
+else
+ make_lint_lib=no
+fi;
+if test "x$make_lint_lib" != "xno" ; then
+ if test "x$LINT" = "xno" ; then
+ { { echo "$as_me:$LINENO: error: Cannot make lint library without --with-lint" >&5
+echo "$as_me: error: Cannot make lint library without --with-lint" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test "x$make_lint_lib" = "xyes" ; then
+ LINTLIB=llib-lX11.ln
+ else
+ LINTLIB=$make_lint_lib
+ fi
+fi
+
+
+
+if test x$make_lint_lib != xno; then
+ MAKE_LINT_LIB_TRUE=
+ MAKE_LINT_LIB_FALSE='#'
+else
+ MAKE_LINT_LIB_TRUE='#'
+ MAKE_LINT_LIB_FALSE=
+fi
+
+
+
LINT_FLAGS="${LINT_FLAGS} ${X11_CFLAGS} ${XPROTO_CFLAGS}"
if test "x$GCC" = "xyes"; then
@@ -23588,6 +24282,7 @@ X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS"
+
#
# Yes, it would be nice to put the locale data in
# /usr/share, but the locale stuff includes loadable
@@ -23788,7 +24483,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -23797,7 +24492,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -23808,7 +24503,7 @@ _ACEOF
- ac_config_files="$ac_config_files Makefile include/Makefile man/Makefile man/xkb/Makefile src/Makefile src/util/Makefile src/xcms/Makefile src/xlibi18n/Makefile modules/Makefile modules/im/Makefile modules/im/ximcp/Makefile modules/lc/Makefile modules/lc/def/Makefile modules/lc/gen/Makefile modules/lc/Utf8/Makefile modules/lc/xlocale/Makefile modules/om/Makefile modules/om/generic/Makefile src/xkb/Makefile nls/Makefile nls/armscii-8/Makefile nls/C/Makefile nls/el_GR.UTF-8/Makefile nls/en_US.UTF-8/Makefile nls/georgian-academy/Makefile nls/georgian-ps/Makefile nls/ibm-cp1133/Makefile nls/iscii-dev/Makefile nls/isiri-3342/Makefile nls/iso8859-1/Makefile nls/iso8859-10/Makefile nls/iso8859-11/Makefile nls/iso8859-13/Makefile nls/iso8859-14/Makefile nls/iso8859-15/Makefile nls/iso8859-2/Makefile nls/iso8859-3/Makefile nls/iso8859-4/Makefile nls/iso8859-5/Makefile nls/iso8859-6/Makefile nls/iso8859-7/Makefile nls/iso8859-8/Makefile nls/iso8859-9/Makefile nls/iso8859-9e/Makefile nls/ja/Makefile nls/ja.JIS/Makefile nls/ja_JP.UTF-8/Makefile nls/ja.S90/Makefile nls/ja.SJIS/Makefile nls/ja.U90/Makefile nls/ko/Makefile nls/koi8-c/Makefile nls/koi8-r/Makefile nls/koi8-u/Makefile nls/ko_KR.UTF-8/Makefile nls/microsoft-cp1251/Makefile nls/microsoft-cp1255/Makefile nls/microsoft-cp1256/Makefile nls/mulelao-1/Makefile nls/nokhchi-1/Makefile nls/pt_BR.UTF-8/Makefile nls/tatar-cyr/Makefile nls/th_TH/Makefile nls/th_TH.UTF-8/Makefile nls/tscii-0/Makefile nls/vi_VN.tcvn/Makefile nls/vi_VN.viscii/Makefile nls/zh_CN/Makefile nls/zh_CN.gb18030/Makefile nls/zh_CN.gbk/Makefile nls/zh_CN.UTF-8/Makefile nls/zh_HK.big5/Makefile nls/zh_HK.big5hkscs/Makefile nls/zh_HK.UTF-8/Makefile nls/zh_TW/Makefile nls/zh_TW.big5/Makefile nls/zh_TW.UTF-8/Makefile x11.pc x11-xcb.pc"
+ ac_config_files="$ac_config_files Makefile include/Makefile man/Makefile man/xkb/Makefile src/Makefile src/util/Makefile src/xcms/Makefile src/xlibi18n/Makefile modules/Makefile modules/im/Makefile modules/im/ximcp/Makefile modules/lc/Makefile modules/lc/def/Makefile modules/lc/gen/Makefile modules/lc/Utf8/Makefile modules/lc/xlocale/Makefile modules/om/Makefile modules/om/generic/Makefile src/xkb/Makefile nls/Makefile nls/am_ET.UTF-8/Makefile nls/armscii-8/Makefile nls/C/Makefile nls/el_GR.UTF-8/Makefile nls/en_US.UTF-8/Makefile nls/georgian-academy/Makefile nls/georgian-ps/Makefile nls/ibm-cp1133/Makefile nls/iscii-dev/Makefile nls/isiri-3342/Makefile nls/iso8859-1/Makefile nls/iso8859-10/Makefile nls/iso8859-11/Makefile nls/iso8859-13/Makefile nls/iso8859-14/Makefile nls/iso8859-15/Makefile nls/iso8859-2/Makefile nls/iso8859-3/Makefile nls/iso8859-4/Makefile nls/iso8859-5/Makefile nls/iso8859-6/Makefile nls/iso8859-7/Makefile nls/iso8859-8/Makefile nls/iso8859-9/Makefile nls/iso8859-9e/Makefile nls/ja/Makefile nls/ja.JIS/Makefile nls/ja_JP.UTF-8/Makefile nls/ja.S90/Makefile nls/ja.SJIS/Makefile nls/ja.U90/Makefile nls/ko/Makefile nls/koi8-c/Makefile nls/koi8-r/Makefile nls/koi8-u/Makefile nls/ko_KR.UTF-8/Makefile nls/microsoft-cp1251/Makefile nls/microsoft-cp1255/Makefile nls/microsoft-cp1256/Makefile nls/mulelao-1/Makefile nls/nokhchi-1/Makefile nls/pt_BR.UTF-8/Makefile nls/tatar-cyr/Makefile nls/th_TH/Makefile nls/th_TH.UTF-8/Makefile nls/tscii-0/Makefile nls/vi_VN.tcvn/Makefile nls/vi_VN.viscii/Makefile nls/zh_CN/Makefile nls/zh_CN.gb18030/Makefile nls/zh_CN.gbk/Makefile nls/zh_CN.UTF-8/Makefile nls/zh_HK.big5/Makefile nls/zh_HK.big5hkscs/Makefile nls/zh_HK.UTF-8/Makefile nls/zh_TW/Makefile nls/zh_TW.big5/Makefile nls/zh_TW.UTF-8/Makefile x11.pc x11-xcb.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -24005,6 +24700,13 @@ echo "$as_me: error: conditional \"LINT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${MAKE_LINT_LIB_TRUE}" && test -z "${MAKE_LINT_LIB_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"MAKE_LINT_LIB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAKE_LINT_LIB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -24276,7 +24978,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by libX11 $as_me 1.1.3, which was
+This file was extended by libX11 $as_me 1.1.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24339,7 +25041,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libX11 config.status 1.1.3
+libX11 config.status 1.1.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -24469,6 +25171,7 @@ do
"modules/om/generic/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/om/generic/Makefile" ;;
"src/xkb/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/xkb/Makefile" ;;
"nls/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/Makefile" ;;
+ "nls/am_ET.UTF-8/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/am_ET.UTF-8/Makefile" ;;
"nls/armscii-8/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/armscii-8/Makefile" ;;
"nls/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/C/Makefile" ;;
"nls/el_GR.UTF-8/Makefile" ) CONFIG_FILES="$CONFIG_FILES nls/el_GR.UTF-8/Makefile" ;;
@@ -24665,6 +25368,7 @@ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
@@ -24672,6 +25376,10 @@ s,@AR@,$AR,;t t
s,@ac_ct_AR@,$ac_ct_AR,;t t
s,@RANLIB@,$RANLIB,;t t
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@DSYMUTIL@,$DSYMUTIL,;t t
+s,@ac_ct_DSYMUTIL@,$ac_ct_DSYMUTIL,;t t
+s,@NMEDIT@,$NMEDIT,;t t
+s,@ac_ct_NMEDIT@,$ac_ct_NMEDIT,;t t
s,@CPP@,$CPP,;t t
s,@CXX@,$CXX,;t t
s,@CXXFLAGS@,$CXXFLAGS,;t t
@@ -24703,6 +25411,7 @@ s,@XLIB_LOADABLE_I18N_FALSE@,$XLIB_LOADABLE_I18N_FALSE,;t t
s,@WCHAR32@,$WCHAR32,;t t
s,@OS2_TRUE@,$OS2_TRUE,;t t
s,@OS2_FALSE@,$OS2_FALSE,;t t
+s,@LAUNCHD@,$LAUNCHD,;t t
s,@XTHREADS@,$XTHREADS,;t t
s,@XUSE_MTSAFE_API@,$XUSE_MTSAFE_API,;t t
s,@THRSTUBS_TRUE@,$THRSTUBS_TRUE,;t t
@@ -24741,6 +25450,9 @@ s,@LINT@,$LINT,;t t
s,@LINT_FLAGS@,$LINT_FLAGS,;t t
s,@LINT_TRUE@,$LINT_TRUE,;t t
s,@LINT_FALSE@,$LINT_FALSE,;t t
+s,@LINTLIB@,$LINTLIB,;t t
+s,@MAKE_LINT_LIB_TRUE@,$MAKE_LINT_LIB_TRUE,;t t
+s,@MAKE_LINT_LIB_FALSE@,$MAKE_LINT_LIB_FALSE,;t t
s,@X11_DATADIR@,$X11_DATADIR,;t t
s,@X11_LIBDIR@,$X11_LIBDIR,;t t
s,@XLOCALEDATADIR@,$XLOCALEDATADIR,;t t
diff --git a/lib/libX11/configure.ac b/lib/libX11/configure.ac
index 032e7614a..1567a5601 100644
--- a/lib/libX11/configure.ac
+++ b/lib/libX11/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libX11],
- 1.0.99.2,
+ 1.1.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -14,6 +14,10 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER([src/config.h])
AC_CONFIG_HEADER([include/X11/XlibConf.h])
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
@@ -40,10 +44,12 @@ no)
;;
*)
X11_REQUIRES="xcb-xlib >= 0.9.92"
+ X11_EXTRA_DEPS="xcb-xlib"
xdmauth="no" # XCB handles all auth
AC_DEFINE(USE_XCB, 1, [Use XCB for low-level protocol implementation])
;;
esac
+AC_SUBST(X11_EXTRA_DEPS)
PKG_CHECK_MODULES(X11, xextproto xtrans $X11_REQUIRES)
dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
@@ -142,6 +148,17 @@ AC_SUBST(WCHAR32)
AM_CONDITIONAL(OS2, test x$os2 = xtrue)
+AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
+if test "x$LAUNCHD" = xauto; then
+ unset LAUNCHD
+ AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
+fi
+
+if test "x$LAUNCHD" = xyes ; then
+ AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
+ AC_DEFINE(TRANS_REOPEN, 1, [launchd support available])
+fi
+
AC_ARG_ENABLE(xthreads,
AC_HELP_STRING([--disable-xthreads],
[Disable Xlib support for Multithreading]),
@@ -171,6 +188,9 @@ if test x$xthreads = xyes ; then
case $host_os in
linux*|openbsd*|gnu*|k*bsd*-gnu)
XTHREADLIB=-lpthread ;;
+ netbsd*)
+ XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
+ XTHREADLIB="-lpthread" ;;
freebsd*)
XTHREAD_CFLAGS="-D_THREAD_SAFE"
XTHREADLIB="-pthread" ;;
@@ -292,8 +312,8 @@ AM_CONDITIONAL(MANPAGES, [ test x$LIBMAN '!=' xno ])
AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])
if test x"$XKB" = "xyes"; then
- XKBPROTO_REQUIRES="kbproto inputproto"
- PKG_CHECK_MODULES(XKBPROTO, $XKBPROTO_REQUIRES)
+ XKBPROTO_REQUIRES="kbproto"
+ PKG_CHECK_MODULES(XKBPROTO, kbproto inputproto)
AC_DEFINE(XKB,1,[Use XKB])
X11_CFLAGS="$X11_CFLAGS $XKBPROTO_CFLAGS"
X11_LIBS="$X11_LIBS $XKBPROTO_LIBS"
@@ -315,6 +335,7 @@ fi
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
+XORG_LINT_LIBRARY([X11])
LINT_FLAGS="${LINT_FLAGS} ${X11_CFLAGS} ${XPROTO_CFLAGS}"
if test "x$GCC" = "xyes"; then
@@ -324,6 +345,14 @@ if test "x$GCC" = "xyes"; then
X11_CFLAGS="$GCC_WARNINGS $X11_CFLAGS"
fi
+AC_TRY_COMPILE([
+#include <features.h>
+#ifndef __GLIBC__
+#error not glibc
+#endif
+], [], [AC_DEFINE(_GNU_SOURCE, 1,
+ [ Enable GNU and other extensions to the C environment for glibc])])
+
X11_DATADIR="${datadir}/X11"
AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
AC_SUBST(X11_DATADIR)
@@ -333,6 +362,7 @@ AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS"
+
AC_SUBST(X11_CFLAGS)
AC_SUBST(X11_LIBS)
@@ -369,6 +399,7 @@ XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
include/Makefile
man/Makefile
+ man/xkb/Makefile
src/Makefile
src/util/Makefile
src/xcms/Makefile
@@ -385,6 +416,7 @@ AC_OUTPUT([Makefile
modules/om/generic/Makefile
src/xkb/Makefile
nls/Makefile
+ nls/am_ET.UTF-8/Makefile
nls/armscii-8/Makefile
nls/C/Makefile
nls/el_GR.UTF-8/Makefile
@@ -445,6 +477,11 @@ AC_OUTPUT([Makefile
x11.pc
x11-xcb.pc])
+man_pages_suffix=$LIBMAN_SUFFIX
+if test -z "$man_pages_suffix"; then
+ man_pages_suffix=none
+fi
+
echo ""
echo "X11 will be built with the following settings:"
echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N
@@ -458,6 +495,6 @@ echo " Internationalization support: "$XLOCALE
echo " XF86BigFont support: "$XF86BIGFONT
echo " XKB support: "$XKB
echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR
-echo " Manual pages installed: "$LIBMAN_SUFFIX
+echo " Manual pages suffix: "$man_pages_suffix
echo " Compose table cache enabled: "$COMPOSECACHE
echo ""
diff --git a/lib/libX11/include/Makefile.in b/lib/libX11/include/Makefile.in
index 6ba84e71a..2d7a82905 100644
--- a/lib/libX11/include/Makefile.in
+++ b/lib/libX11/include/Makefile.in
@@ -97,6 +97,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -113,6 +114,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -120,6 +122,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -129,11 +132,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -148,6 +154,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -196,7 +203,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/ltmain.sh b/lib/libX11/ltmain.sh
index 85faf0734..248cd4047 100644
--- a/lib/libX11/ltmain.sh
+++ b/lib/libX11/ltmain.sh
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+VERSION=1.5.26
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@@ -105,11 +113,19 @@ esac
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+ $lt_var=C
+ export $lt_var
+ fi"
+done
+
+if test -n "$lt_env"; then
+ lt_env="env $lt_env"
fi
# Make sure IFS has a sensible default
@@ -136,6 +152,8 @@ duplicate_deps=no
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -196,7 +214,13 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+ $SED -n -e '1,100{
+ / I /{
+ s,.*,import,
+ p
+ q
+ }
+ }'`
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -327,7 +351,17 @@ func_extract_archives ()
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -454,11 +488,12 @@ do
;;
--version)
- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
- $echo
- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
- $echo "This is free software; see the source for copying conditions. There is NO"
- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $?
;;
@@ -755,9 +790,11 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
- *.f90) xform=f90 ;;
+ *.[fF][09]?) xform=[fF][09]. ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
+ *.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -926,7 +963,7 @@ EOF
$run $rm "$lobj" "$output_obj"
$show "$command"
- if $run eval "$command"; then :
+ if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE
@@ -998,7 +1035,7 @@ EOF
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
- if $run eval "$command"; then :
+ if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
exit $EXIT_FAILURE
@@ -1131,6 +1168,7 @@ EOF
thread_safe=no
vinfo=
vinfo_number=no
+ single_module="${wl}-single_module"
func_infer_tag $base_compile
@@ -1138,8 +1176,9 @@ EOF
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1186,20 @@ EOF
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1600,7 +1647,7 @@ EOF
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -1608,6 +1655,11 @@ EOF
continue
;;
+ -multi_module)
+ single_module="${wl}-multi_module"
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -1621,10 +1673,11 @@ EOF
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
- # -pg pass through profiling flag for GCC
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # -F/path gives path to uninstalled frameworks, gcc on darwin
# @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
- -t[45]*|-txscale*|@*)
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
@@ -1652,9 +1705,9 @@ EOF
-no-install)
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
# The PATH hackery in wrapper scripts is required on Windows
- # in order for the loader to find any dlls it needs.
+ # and Darwin in order for the loader to find any dlls it needs.
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
@@ -1713,7 +1766,7 @@ EOF
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2106,7 +2159,7 @@ EOF
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@@ -2122,7 +2175,12 @@ EOF
continue
fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ if test "$linkmode" = lib; then
+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+ else
+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+ fi
+ for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@@ -2503,7 +2561,9 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -2916,12 +2976,18 @@ EOF
# we do not want to link against static libs,
# but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
- if test -f "$path/$depdepl" ; then
+ if test -f "$deplibdir/$depdepl" ; then
+ depdepl="$deplibdir/$depdepl"
+ elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
+ else
+ # Can't find it, oh well...
+ depdepl=
fi
# do not add paths which are already there
case " $newlib_search_path " in
@@ -3069,9 +3135,10 @@ EOF
case $linkmode in
oldlib)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
- fi
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+ esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -3199,7 +3266,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3210,9 +3277,10 @@ EOF
age="0"
;;
irix|nonstopux)
- current=`expr $number_major + $number_minor - 1`
+ current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_minor"
+ lt_irix_increment=no
;;
esac
;;
@@ -3271,7 +3339,8 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
freebsd-aout)
@@ -3285,8 +3354,11 @@ EOF
;;
irix | nonstopux)
- major=`expr $current - $age + 1`
-
+ if test "X$lt_irix_increment" = "Xno"; then
+ major=`expr $current - $age`
+ else
+ major=`expr $current - $age + 1`
+ fi
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
@@ -3437,11 +3509,11 @@ EOF
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+ #for path in $notinst_path; do
+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+ #done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3542,13 +3614,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3587,9 +3658,7 @@ EOF
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3621,7 +3690,7 @@ EOF
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -3907,7 +3976,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+ case $archive_cmds in
+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+ esac
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
@@ -4217,9 +4289,10 @@ EOF
;;
obj)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
- fi
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+ esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -4266,12 +4339,14 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4719,16 +4794,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4743,13 +4818,13 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4836,7 +4911,7 @@ static const void *lt_preloaded_setup() {
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4873,7 +4948,7 @@ static const void *lt_preloaded_setup() {
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5280,6 +5355,20 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5422,7 +5511,7 @@ else
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5608,7 +5697,7 @@ fi\
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5957,9 +6046,9 @@ relink_command=\"$relink_command\""
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6168,7 +6257,7 @@ relink_command=\"$relink_command\""
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6345,8 +6434,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
- exit $EXIT_FAILURE
+ if test ! -f "$dir/$dlname"; then
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+ exit $EXIT_FAILURE
+ fi
fi
;;
@@ -6410,12 +6501,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ fi"
+ done
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6772,9 +6863,9 @@ The following components of LINK-COMMAND are treated specially:
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6788,9 +6879,11 @@ The following components of LINK-COMMAND are treated specially:
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
diff --git a/lib/libX11/man/Makefile.in b/lib/libX11/man/Makefile.in
index 1190a4bb9..c322983a9 100644
--- a/lib/libX11/man/Makefile.in
+++ b/lib/libX11/man/Makefile.in
@@ -105,6 +105,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -121,6 +122,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -128,6 +130,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -137,11 +140,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -156,6 +162,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -204,7 +211,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -442,7 +451,6 @@ libman_PRE = \
@MANPAGES_TRUE@BUILT_SOURCES = shadows.DONE
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
-SED = sed
SUFFIXES = .pre .$(LIB_MAN_SUFFIX) .man
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/man/XAddHost.man b/lib/libX11/man/XAddHost.man
index b9f0aa72c..fe95c7ddc 100644
--- a/lib/libX11/man/XAddHost.man
+++ b/lib/libX11/man/XAddHost.man
@@ -305,9 +305,9 @@ structure contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int family; /\(** for example FamilyInternet */
- int length; /\(** length of address, in bytes */
- char *address; /\(** pointer to where to find the address */
+ int family; /\&* for example FamilyInternet */
+ int length; /\&* length of address, in bytes */
+ char *address; /\&* pointer to where to find the address */
} XHostAddress;
.De
.LP
@@ -331,10 +331,10 @@ structure which contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int typelength; /\(** length of type string, in bytes */
- int valuelength; /\(** length of value string, in bytes */
- char *type; /\(** pointer to where to find the type string */
- char *value; /\(** pointer to where to find the address */
+ int typelength; /\&* length of type string, in bytes */
+ int valuelength; /\&* length of value string, in bytes */
+ char *type; /\&* pointer to where to find the type string */
+ char *value; /\&* pointer to where to find the address */
} XServerInterpretedAddress;
.De
.LP
diff --git a/lib/libX11/man/XAllocSizeHints.man b/lib/libX11/man/XAllocSizeHints.man
index e957214d4..226b9d5f2 100644
--- a/lib/libX11/man/XAllocSizeHints.man
+++ b/lib/libX11/man/XAllocSizeHints.man
@@ -324,7 +324,7 @@ The
.ZN XSizeHints
structure contains:
.LP
-/\(** Size hints mask bits */
+/\&* Size hints mask bits */
.TS
lw(.5i) lw(1.1i) lw(1.5i) lw(3.1i).
T{
@@ -334,7 +334,7 @@ T} T{
T} T{
(1L << 0)
T} T{
-/\(** user specified x, y */
+/\&* user specified x, y */
T}
T{
\&#define
@@ -343,7 +343,7 @@ T} T{
T} T{
(1L << 1)
T} T{
-/\(** user specified width, height */
+/\&* user specified width, height */
T}
T{
\&#define
@@ -352,7 +352,7 @@ T} T{
T} T{
(1L << 2)
T} T{
-/\(** program specified position */
+/\&* program specified position */
T}
T{
\&#define
@@ -361,7 +361,7 @@ T} T{
T} T{
(1L << 3)
T} T{
-/\(** program specified size */
+/\&* program specified size */
T}
T{
\&#define
@@ -370,7 +370,7 @@ T} T{
T} T{
(1L << 4)
T} T{
-/\(** program specified minimum size */
+/\&* program specified minimum size */
T}
T{
\&#define
@@ -379,7 +379,7 @@ T} T{
T} T{
(1L << 5)
T} T{
-/\(** program specified maximum size */
+/\&* program specified maximum size */
T}
T{
\&#define
@@ -388,7 +388,7 @@ T} T{
T} T{
(1L << 6)
T} T{
-/\(** program specified resize increments */
+/\&* program specified resize increments */
T}
T{
\&#define
@@ -397,7 +397,7 @@ T} T{
T} T{
(1L << 7)
T} T{
-/\(** program specified min and max aspect ratios */
+/\&* program specified min and max aspect ratios */
T}
T{
\&#define
@@ -430,22 +430,22 @@ T}
.Ds 0
.TA .5i 2.5i
.ta .5i 2.5i
-/\(** Values */
+/\&* Values */
typedef struct {
- long flags; /\(** marks which fields in this structure are defined */
- int x, y; /\(** Obsolete */
- int width, height; /\(** Obsolete */
+ long flags; /\&* marks which fields in this structure are defined */
+ int x, y; /\&* Obsolete */
+ int width, height; /\&* Obsolete */
int min_width, min_height;
int max_width, max_height;
int width_inc, height_inc;
struct {
- int x; /\(** numerator */
- int y; /\(** denominator */
+ int x; /\&* numerator */
+ int y; /\&* denominator */
} min_aspect, max_aspect;
int base_width, base_height;
int win_gravity;
- /\(** this structure may be extended in the future */
+ /\&* this structure may be extended in the future */
} XSizeHints;
.De
.LP
diff --git a/lib/libX11/man/XAllocStandardColormap.man b/lib/libX11/man/XAllocStandardColormap.man
index 29039e538..0baf05ca5 100644
--- a/lib/libX11/man/XAllocStandardColormap.man
+++ b/lib/libX11/man/XAllocStandardColormap.man
@@ -284,7 +284,7 @@ The
.ZN XStandardColormap
structure contains:
.LP
-/\(** Hints */
+/\&* Hints */
.TS
lw(.5i) lw(2i) lw(1i).
T{
@@ -295,7 +295,7 @@ T} T{
( (XID) 1L)
T}
.TE
-/\(** Values */
+/\&* Values */
.IN "XStandardColormap" "" "@DEF@"
.Ds 0
.TA .5i 2.5i
diff --git a/lib/libX11/man/XAllocWMHints.man b/lib/libX11/man/XAllocWMHints.man
index 4c3fe1d75..9afaa7dfc 100644
--- a/lib/libX11/man/XAllocWMHints.man
+++ b/lib/libX11/man/XAllocWMHints.man
@@ -46,8 +46,7 @@
.\"
.ds xT X Toolkit Intrinsics \- C Language Interface
.ds xW Athena X Widgets \- C Language X Toolkit Interface
-.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, Sebastopol,
-1991.
+.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, Sebastopol, 1991.
.ds xC Inter-Client Communication Conventions Manual
.na
.de Ds
@@ -218,7 +217,7 @@ The
.ZN XWMHints
structure contains:
.LP
-/\(** Window manager hints mask bits */
+/\&* Window manager hints mask bits */
.TS
lw(.5i) lw(2.5i) lw(2.5i).
T{
@@ -293,19 +292,19 @@ T}
.Ds 0
.TA .5i 2.5i
.ta .5i 2.5i
-/\(** Values */
+/\&* Values */
typedef struct {
- long flags; /\(** marks which fields in this structure are defined */
- Bool input; /\(** does this application rely on the window manager to
+ long flags; /\&* marks which fields in this structure are defined */
+ Bool input; /\&* does this application rely on the window manager to
get keyboard input? */
- int initial_state; /\(** see below */
- Pixmap icon_pixmap; /\(** pixmap to be used as icon */
- Window icon_window; /\(** window to be used as icon */
- int icon_x, icon_y; /\(** initial position of icon */
- Pixmap icon_mask; /\(** pixmap to be used as mask for icon_pixmap */
- XID window_group; /\(** id of related window group */
- /\(** this structure may be extended in the future */
+ int initial_state; /\&* see below */
+ Pixmap icon_pixmap; /\&* pixmap to be used as icon */
+ Window icon_window; /\&* window to be used as icon */
+ int icon_x, icon_y; /\&* initial position of icon */
+ Pixmap icon_mask; /\&* pixmap to be used as mask for icon_pixmap */
+ XID window_group; /\&* id of related window group */
+ /\&* this structure may be extended in the future */
} XWMHints;
.De
.LP
@@ -359,7 +358,7 @@ T} T{
T} T{
1
T} T{
-/\(** most applications start this way */
+/\&* most applications start this way */
T}
T{
\&#define
@@ -368,7 +367,7 @@ T} T{
T} T{
3
T} T{
-/\(** application wants to start as an icon */
+/\&* application wants to start as an icon */
T}
.TE
The icon_mask specifies which pixels of the icon_pixmap should be used as the
diff --git a/lib/libX11/man/XAnyEvent.man b/lib/libX11/man/XAnyEvent.man
index f095958ea..40be01eea 100644
--- a/lib/libX11/man/XAnyEvent.man
+++ b/lib/libX11/man/XAnyEvent.man
@@ -153,9 +153,9 @@ have the following common members:
.ta .5i 3i
typedef struct {
int type;
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
} XAnyEvent;
.De
@@ -186,7 +186,7 @@ structure is a union of the individual structures declared for each event type:
.TA .5i 3i
.ta .5i 3i
typedef union _XEvent {
- int type; /\(** must not be changed */
+ int type; /\&* must not be changed */
XAnyEvent xany;
XKeyEvent xkey;
XButtonEvent xbutton;
diff --git a/lib/libX11/man/XButtonEvent.man b/lib/libX11/man/XButtonEvent.man
index 4a28ea8fb..7cc3e540e 100644
--- a/lib/libX11/man/XButtonEvent.man
+++ b/lib/libX11/man/XButtonEvent.man
@@ -158,19 +158,19 @@ events contain:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** ButtonPress or ButtonRelease */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
- Window window; /\(** ``event'' window it is reported relative to */
- Window root; /\(** root window that the event occurred on */
- Window subwindow; /\(** child window */
- Time time; /\(** milliseconds */
- int x, y; /\(** pointer x, y coordinates in event window */
- int x_root, y_root; /\(** coordinates relative to root */
- unsigned int state; /\(** key or button mask */
- unsigned int button; /\(** detail */
- Bool same_screen; /\(** same screen flag */
+ int type; /\&* ButtonPress or ButtonRelease */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
+ Window window; /\&* ``event'' window it is reported relative to */
+ Window root; /\&* root window that the event occurred on */
+ Window subwindow; /\&* child window */
+ Time time; /\&* milliseconds */
+ int x, y; /\&* pointer x, y coordinates in event window */
+ int x_root, y_root; /\&* coordinates relative to root */
+ unsigned int state; /\&* key or button mask */
+ unsigned int button; /\&* detail */
+ Bool same_screen; /\&* same screen flag */
} XButtonEvent;
typedef XButtonEvent XButtonPressedEvent;
typedef XButtonEvent XButtonReleasedEvent;
@@ -180,19 +180,19 @@ typedef XButtonEvent XButtonReleasedEvent;
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** KeyPress or KeyRelease */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
- Window window; /\(** ``event'' window it is reported relative to */
- Window root; /\(** root window that the event occurred on */
- Window subwindow; /\(** child window */
- Time time; /\(** milliseconds */
- int x, y; /\(** pointer x, y coordinates in event window */
- int x_root, y_root; /\(** coordinates relative to root */
- unsigned int state; /\(** key or button mask */
- unsigned int keycode; /\(** detail */
- Bool same_screen; /\(** same screen flag */
+ int type; /\&* KeyPress or KeyRelease */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
+ Window window; /\&* ``event'' window it is reported relative to */
+ Window root; /\&* root window that the event occurred on */
+ Window subwindow; /\&* child window */
+ Time time; /\&* milliseconds */
+ int x, y; /\&* pointer x, y coordinates in event window */
+ int x_root, y_root; /\&* coordinates relative to root */
+ unsigned int state; /\&* key or button mask */
+ unsigned int keycode; /\&* detail */
+ Bool same_screen; /\&* same screen flag */
} XKeyEvent;
typedef XKeyEvent XKeyPressedEvent;
typedef XKeyEvent XKeyReleasedEvent;
@@ -202,19 +202,19 @@ typedef XKeyEvent XKeyReleasedEvent;
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** MotionNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
- Window window; /\(** ``event'' window reported relative to */
- Window root; /\(** root window that the event occurred on */
- Window subwindow; /\(** child window */
- Time time; /\(** milliseconds */
- int x, y; /\(** pointer x, y coordinates in event window */
- int x_root, y_root; /\(** coordinates relative to root */
- unsigned int state; /\(** key or button mask */
- char is_hint; /\(** detail */
- Bool same_screen; /\(** same screen flag */
+ int type; /\&* MotionNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
+ Window window; /\&* ``event'' window reported relative to */
+ Window root; /\&* root window that the event occurred on */
+ Window subwindow; /\&* child window */
+ Time time; /\&* milliseconds */
+ int x, y; /\&* pointer x, y coordinates in event window */
+ int x_root, y_root; /\&* coordinates relative to root */
+ unsigned int state; /\&* key or button mask */
+ char is_hint; /\&* detail */
+ Bool same_screen; /\&* same screen flag */
} XMotionEvent;
typedef XMotionEvent XPointerMovedEvent;
.De
diff --git a/lib/libX11/man/XChangeKeyboardControl.man b/lib/libX11/man/XChangeKeyboardControl.man
index 58a5c9b20..dd3225d97 100644
--- a/lib/libX11/man/XChangeKeyboardControl.man
+++ b/lib/libX11/man/XChangeKeyboardControl.man
@@ -149,9 +149,9 @@ XChangeKeyboardControl, XGetKeyboardControl, XAutoRepeatOn, XAutoRepeatOff, XBel
.SH SYNTAX
.HP
int XChangeKeyboardControl\^(\^Display *\fIdisplay\fP, unsigned long
-\fIvalue_mask\fP\^, XKeyBoardControl *\fIvalues\fP\^);
+\fIvalue_mask\fP\^, XKeyboardControl *\fIvalues\fP\^);
.HP
-int XGetKeyboardControl\^(\^Display *\fIdisplay\fP, XKeyBoardState
+int XGetKeyboardControl\^(\^Display *\fIdisplay\fP, XKeyboardState
*\fIvalues_return\fP\^);
.HP
int XAutoRepeatOn\^(\^Display *\fIdisplay\fP\^);
@@ -251,7 +251,7 @@ The
structure contains:
.LP
.LP
-/\(** Mask bits for ChangeKeyboardControl */
+/\&* Mask bits for ChangeKeyboardControl */
.TS
lw(.5i) lw(2.5i) lw(.8i).
T{
@@ -315,7 +315,7 @@ T}
.Ds 0
.TA .5i 2.5i
.ta .5i 2.5i
-/\(** Values */
+/\&* Values */
typedef struct {
int key_click_percent;
@@ -323,9 +323,9 @@ typedef struct {
int bell_pitch;
int bell_duration;
int led;
- int led_mode; /\(** LedModeOn, LedModeOff */
+ int led_mode; /\&* LedModeOn, LedModeOff */
int key;
- int auto_repeat_mode; /\(** AutoRepeatModeOff, AutoRepeatModeOn,
+ int auto_repeat_mode; /\&* AutoRepeatModeOff, AutoRepeatModeOn,
AutoRepeatModeDefault */
} XKeyboardControl;
.De
diff --git a/lib/libX11/man/XChangeKeyboardMapping.man b/lib/libX11/man/XChangeKeyboardMapping.man
index 67b030a76..e157ec926 100644
--- a/lib/libX11/man/XChangeKeyboardMapping.man
+++ b/lib/libX11/man/XChangeKeyboardMapping.man
@@ -428,8 +428,8 @@ structure contains:
.TA .5i 2.5i
.ta .5i 2.5i
typedef struct {
- int max_keypermod; /\(** This server's max number of keys per modifier */
- KeyCode *modifiermap; /\(** An 8 by max_keypermod array of the modifiers */
+ int max_keypermod; /\&* This server's max number of keys per modifier */
+ KeyCode *modifiermap; /\&* An 8 by max_keypermod array of the modifiers */
} XModifierKeymap;
.De
.SH DIAGNOSTICS
diff --git a/lib/libX11/man/XCirculateEvent.man b/lib/libX11/man/XCirculateEvent.man
index b3e4d8db0..1ac71f85d 100644
--- a/lib/libX11/man/XCirculateEvent.man
+++ b/lib/libX11/man/XCirculateEvent.man
@@ -153,13 +153,13 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** CirculateNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* CirculateNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window event;
Window window;
- int place; /\(** PlaceOnTop, PlaceOnBottom */
+ int place; /\&* PlaceOnTop, PlaceOnBottom */
} XCirculateEvent;
.De
.LP
diff --git a/lib/libX11/man/XCirculateRequestEvent.man b/lib/libX11/man/XCirculateRequestEvent.man
index ce97c2648..6c9ac80a4 100644
--- a/lib/libX11/man/XCirculateRequestEvent.man
+++ b/lib/libX11/man/XCirculateRequestEvent.man
@@ -153,13 +153,13 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** CirculateRequest */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* CirculateRequest */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window parent;
Window window;
- int place; /\(** PlaceOnTop, PlaceOnBottom */
+ int place; /\&* PlaceOnTop, PlaceOnBottom */
} XCirculateRequestEvent;
.De
.LP
diff --git a/lib/libX11/man/XClientMessageEvent.man b/lib/libX11/man/XClientMessageEvent.man
index 915cc55c1..da786af9a 100644
--- a/lib/libX11/man/XClientMessageEvent.man
+++ b/lib/libX11/man/XClientMessageEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 1i 3i
.ta .5i 1i 3i
typedef struct {
- int type; /\(** ClientMessage */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* ClientMessage */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
Atom message_type;
int format;
diff --git a/lib/libX11/man/XColormapEvent.man b/lib/libX11/man/XColormapEvent.man
index 95de9c9b0..8920c7fa2 100644
--- a/lib/libX11/man/XColormapEvent.man
+++ b/lib/libX11/man/XColormapEvent.man
@@ -153,14 +153,14 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** ColormapNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* ColormapNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
- Colormap colormap; /\(** colormap or None */
+ Colormap colormap; /\&* colormap or None */
Bool new;
- int state; /\(** ColormapInstalled, ColormapUninstalled */
+ int state; /\&* ColormapInstalled, ColormapUninstalled */
} XColormapEvent;
.De
.LP
diff --git a/lib/libX11/man/XConfigureEvent.man b/lib/libX11/man/XConfigureEvent.man
index 5cc65cf49..47c8ea4c0 100644
--- a/lib/libX11/man/XConfigureEvent.man
+++ b/lib/libX11/man/XConfigureEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** ConfigureNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* ConfigureNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window event;
Window window;
int x, y;
diff --git a/lib/libX11/man/XConfigureRequestEvent.man b/lib/libX11/man/XConfigureRequestEvent.man
index dbf6c99f9..07c6709c9 100644
--- a/lib/libX11/man/XConfigureRequestEvent.man
+++ b/lib/libX11/man/XConfigureRequestEvent.man
@@ -153,17 +153,17 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** ConfigureRequest */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* ConfigureRequest */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window parent;
Window window;
int x, y;
int width, height;
int border_width;
Window above;
- int detail; /\(** Above, Below, TopIf, BottomIf, Opposite */
+ int detail; /\&* Above, Below, TopIf, BottomIf, Opposite */
unsigned long value_mask;
} XConfigureRequestEvent;
.De
diff --git a/lib/libX11/man/XConfigureWindow.man b/lib/libX11/man/XConfigureWindow.man
index 54059c801..254194276 100644
--- a/lib/libX11/man/XConfigureWindow.man
+++ b/lib/libX11/man/XConfigureWindow.man
@@ -334,7 +334,7 @@ The
structure contains:
.LP
.LP
-/\(** Configure window value mask bits */
+/\&* Configure window value mask bits */
.TS
lw(.5i) lw(2.5i) lw(.8i).
T{
@@ -391,7 +391,7 @@ T}
.Ds 0
.TA .5i 3i
.ta .5i 3i
-/\(** Values */
+/\&* Values */
typedef struct {
int x, y;
diff --git a/lib/libX11/man/XCreateColormap.man b/lib/libX11/man/XCreateColormap.man
index 17c6dbf1a..0901775d6 100644
--- a/lib/libX11/man/XCreateColormap.man
+++ b/lib/libX11/man/XCreateColormap.man
@@ -313,9 +313,9 @@ structure contains:
.TA .5i 2.5i
.ta .5i 2.5i
typedef struct {
- unsigned long pixel; /\(** pixel value */
- unsigned short red, green, blue; /\(** rgb values */
- char flags; /\(** DoRed, DoGreen, DoBlue */
+ unsigned long pixel; /\&* pixel value */
+ unsigned short red, green, blue; /\&* rgb values */
+ char flags; /\&* DoRed, DoGreen, DoBlue */
char pad;
} XColor;
.De
diff --git a/lib/libX11/man/XCreateGC.man b/lib/libX11/man/XCreateGC.man
index 91897a03b..9b698e631 100644
--- a/lib/libX11/man/XCreateGC.man
+++ b/lib/libX11/man/XCreateGC.man
@@ -311,7 +311,7 @@ The
structure contains:
.LP
.LP
-/\(** GC attribute value mask bits */
+/\&* GC attribute value mask bits */
.TS
lw(.5i) lw(2.5i) lw(.75i).
T{
@@ -480,31 +480,31 @@ T}
.Ds 0
.TA .5i 3i
.ta .5i 3i
-/\(** Values */
+/\&* Values */
typedef struct {
- int function; /\(** logical operation */
- unsigned long plane_mask; /\(** plane mask */
- unsigned long foreground; /\(** foreground pixel */
- unsigned long background; /\(** background pixel */
- int line_width; /\(** line width (in pixels) */
- int line_style; /\(** LineSolid, LineOnOffDash, LineDoubleDash */
- int cap_style; /\(** CapNotLast, CapButt, CapRound, CapProjecting */
- int join_style; /\(** JoinMiter, JoinRound, JoinBevel */
- int fill_style; /\(** FillSolid, FillTiled, FillStippled FillOpaqueStippled*/
- int fill_rule; /\(** EvenOddRule, WindingRule */
- int arc_mode; /\(** ArcChord, ArcPieSlice */
- Pixmap tile; /\(** tile pixmap for tiling operations */
- Pixmap stipple; /\(** stipple 1 plane pixmap for stippling */
- int ts_x_origin; /\(** offset for tile or stipple operations */
+ int function; /\&* logical operation */
+ unsigned long plane_mask; /\&* plane mask */
+ unsigned long foreground; /\&* foreground pixel */
+ unsigned long background; /\&* background pixel */
+ int line_width; /\&* line width (in pixels) */
+ int line_style; /\&* LineSolid, LineOnOffDash, LineDoubleDash */
+ int cap_style; /\&* CapNotLast, CapButt, CapRound, CapProjecting */
+ int join_style; /\&* JoinMiter, JoinRound, JoinBevel */
+ int fill_style; /\&* FillSolid, FillTiled, FillStippled FillOpaqueStippled*/
+ int fill_rule; /\&* EvenOddRule, WindingRule */
+ int arc_mode; /\&* ArcChord, ArcPieSlice */
+ Pixmap tile; /\&* tile pixmap for tiling operations */
+ Pixmap stipple; /\&* stipple 1 plane pixmap for stippling */
+ int ts_x_origin; /\&* offset for tile or stipple operations */
int ts_y_origin;
- Font font; /\(** default text font for text operations */
- int subwindow_mode; /\(** ClipByChildren, IncludeInferiors */
- Bool graphics_exposures; /\(** boolean, should exposures be generated */
- int clip_x_origin; /\(** origin for clipping */
+ Font font; /\&* default text font for text operations */
+ int subwindow_mode; /\&* ClipByChildren, IncludeInferiors */
+ Bool graphics_exposures; /\&* boolean, should exposures be generated */
+ int clip_x_origin; /\&* origin for clipping */
int clip_y_origin;
- Pixmap clip_mask; /\(** bitmap clipping; other calls for rects */
- int dash_offset; /\(** patterned/dashed line information */
+ Pixmap clip_mask; /\&* bitmap clipping; other calls for rects */
+ int dash_offset; /\&* patterned/dashed line information */
char dashes;
} XGCValues;
.De
diff --git a/lib/libX11/man/XCreateWindow.man b/lib/libX11/man/XCreateWindow.man
index 18c66df77..c8e03ea91 100644
--- a/lib/libX11/man/XCreateWindow.man
+++ b/lib/libX11/man/XCreateWindow.man
@@ -319,7 +319,7 @@ The
structure contains:
.LP
.LP
-/\(** Window attribute value mask bits */
+/\&* Window attribute value mask bits */
.TS
lw(.5i) lw(2.5i) lw(.8i).
T{
@@ -432,24 +432,24 @@ T}
.Ds 0
.TA .5i 3i
.ta .5i 3i
-/\(** Values */
+/\&* Values */
typedef struct {
- Pixmap background_pixmap; /\(** background, None, or ParentRelative */
- unsigned long background_pixel; /\(** background pixel */
- Pixmap border_pixmap; /\(** border of the window or CopyFromParent */
- unsigned long border_pixel; /\(** border pixel value */
- int bit_gravity; /\(** one of bit gravity values */
- int win_gravity; /\(** one of the window gravity values */
- int backing_store; /\(** NotUseful, WhenMapped, Always */
- unsigned long backing_planes; /\(** planes to be preserved if possible */
- unsigned long backing_pixel; /\(** value to use in restoring planes */
- Bool save_under; /\(** should bits under be saved? (popups) */
- long event_mask; /\(** set of events that should be saved */
- long do_not_propagate_mask; /\(** set of events that should not propagate */
- Bool override_redirect; /\(** boolean value for override_redirect */
- Colormap colormap; /\(** color map to be associated with window */
- Cursor cursor; /\(** cursor to be displayed (or None) */
+ Pixmap background_pixmap; /\&* background, None, or ParentRelative */
+ unsigned long background_pixel; /\&* background pixel */
+ Pixmap border_pixmap; /\&* border of the window or CopyFromParent */
+ unsigned long border_pixel; /\&* border pixel value */
+ int bit_gravity; /\&* one of bit gravity values */
+ int win_gravity; /\&* one of the window gravity values */
+ int backing_store; /\&* NotUseful, WhenMapped, Always */
+ unsigned long backing_planes; /\&* planes to be preserved if possible */
+ unsigned long backing_pixel; /\&* value to use in restoring planes */
+ Bool save_under; /\&* should bits under be saved? (popups) */
+ long event_mask; /\&* set of events that should be saved */
+ long do_not_propagate_mask; /\&* set of events that should not propagate */
+ Bool override_redirect; /\&* boolean value for override_redirect */
+ Colormap colormap; /\&* color map to be associated with window */
+ Cursor cursor; /\&* cursor to be displayed (or None) */
} XSetWindowAttributes;
.De
.LP
diff --git a/lib/libX11/man/XCreateWindowEvent.man b/lib/libX11/man/XCreateWindowEvent.man
index 9fb2ce296..8574f4e0b 100644
--- a/lib/libX11/man/XCreateWindowEvent.man
+++ b/lib/libX11/man/XCreateWindowEvent.man
@@ -153,16 +153,16 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** CreateNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
- Window parent; /\(** parent of the window */
- Window window; /\(** window id of window created */
- int x, y; /\(** window location */
- int width, height; /\(** size of window */
- int border_width; /\(** border width */
- Bool override_redirect; /\(** creation should be overridden */
+ int type; /\&* CreateNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
+ Window parent; /\&* parent of the window */
+ Window window; /\&* window id of window created */
+ int x, y; /\&* window location */
+ int width, height; /\&* size of window */
+ int border_width; /\&* border width */
+ Bool override_redirect; /\&* creation should be overridden */
} XCreateWindowEvent;
.De
.LP
diff --git a/lib/libX11/man/XCrossingEvent.man b/lib/libX11/man/XCrossingEvent.man
index 9721a2ce9..1556b4887 100644
--- a/lib/libX11/man/XCrossingEvent.man
+++ b/lib/libX11/man/XCrossingEvent.man
@@ -155,25 +155,25 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** EnterNotify or LeaveNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
- Window window; /\(** ``event'' window reported relative to */
- Window root; /\(** root window that the event occurred on */
- Window subwindow; /\(** child window */
- Time time; /\(** milliseconds */
- int x, y; /\(** pointer x, y coordinates in event window */
- int x_root, y_root; /\(** coordinates relative to root */
- int mode; /\(** NotifyNormal, NotifyGrab, NotifyUngrab */
+ int type; /\&* EnterNotify or LeaveNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
+ Window window; /\&* ``event'' window reported relative to */
+ Window root; /\&* root window that the event occurred on */
+ Window subwindow; /\&* child window */
+ Time time; /\&* milliseconds */
+ int x, y; /\&* pointer x, y coordinates in event window */
+ int x_root, y_root; /\&* coordinates relative to root */
+ int mode; /\&* NotifyNormal, NotifyGrab, NotifyUngrab */
int detail;
- /\(**
+ /\&*
* NotifyAncestor, NotifyVirtual, NotifyInferior,
* NotifyNonlinear,NotifyNonlinearVirtual
*/
- Bool same_screen; /\(** same screen flag */
- Bool focus; /\(** boolean focus */
- unsigned int state; /\(** key or button mask */
+ Bool same_screen; /\&* same screen flag */
+ Bool focus; /\&* boolean focus */
+ unsigned int state; /\&* key or button mask */
} XCrossingEvent;
typedef XCrossingEvent XEnterWindowEvent;
typedef XCrossingEvent XLeaveWindowEvent;
diff --git a/lib/libX11/man/XDestroyWindowEvent.man b/lib/libX11/man/XDestroyWindowEvent.man
index 9c5a2615c..91c024b60 100644
--- a/lib/libX11/man/XDestroyWindowEvent.man
+++ b/lib/libX11/man/XDestroyWindowEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** DestroyNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* DestroyNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window event;
Window window;
} XDestroyWindowEvent;
diff --git a/lib/libX11/man/XDrawArc.man b/lib/libX11/man/XDrawArc.man
index c878c458e..af2527678 100644
--- a/lib/libX11/man/XDrawArc.man
+++ b/lib/libX11/man/XDrawArc.man
@@ -142,6 +142,16 @@
.el .sp 10p
..
.ny0
+.de EX
+.sp
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+.sp
+..
'\" e
.TH XDrawArc __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
@@ -240,13 +250,12 @@ than in degrees scaled by 64) in the range % [ 0 , ~2 pi ]% and where atan
returns a value in the range % [ - pi over 2 , ~pi over 2 ] %
and adjust is:
.LP
-.Ds
-.TA 1i 2i
-.ta 1i 2i
+.TS
+l l.
%0% for normal-angle in the range % [ 0 , ~pi over 2 ]%
%pi% for normal-angle in the range % [ pi over 2 , ~{3 pi} over 2 ]%
%2 pi% for normal-angle in the range % [ {3 pi} over 2 , ~2 pi ]%
-.De
+.TE
.LP
For any given arc,
.ZN XDrawArc
@@ -295,15 +304,13 @@ The
.ZN XArc
structure contains:
.LP
-.Ds 0
-.TA .5i 3i
-.ta .5i 3i
+.EX
typedef struct {
short x, y;
unsigned short width, height;
- short angle1, angle2; /\(** Degrees * 64 */
+ short angle1, angle2; /\&* Degrees * 64 */
} XArc;
-.De
+.EE
.LP
All x and y members are signed integers.
The width and height members are 16-bit unsigned integers.
diff --git a/lib/libX11/man/XDrawText.man b/lib/libX11/man/XDrawText.man
index 706d69e2c..ae2e44e71 100644
--- a/lib/libX11/man/XDrawText.man
+++ b/lib/libX11/man/XDrawText.man
@@ -228,10 +228,10 @@ structures contain:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- char *chars; /\(** pointer to string */
- int nchars; /\(** number of characters */
- int delta; /\(** delta between strings */
- Font font; /\(** Font to print it in, None don't change */
+ char *chars; /\&* pointer to string */
+ int nchars; /\&* number of characters */
+ int delta; /\&* delta between strings */
+ Font font; /\&* Font to print it in, None don't change */
} XTextItem;
.De
.LP
@@ -239,10 +239,10 @@ typedef struct {
.TA .5i 3i
.ta .5i 3i
typedef struct {
- XChar2b *chars; /\(** pointer to two-byte characters */
- int nchars; /\(** number of characters */
- int delta; /\(** delta between strings */
- Font font; /\(** font to print it in, None don't change */
+ XChar2b *chars; /\&* pointer to two-byte characters */
+ int nchars; /\&* number of characters */
+ int delta; /\&* delta between strings */
+ Font font; /\&* font to print it in, None don't change */
} XTextItem16;
.De
.LP
diff --git a/lib/libX11/man/XErrorEvent.man b/lib/libX11/man/XErrorEvent.man
index e1f4eae7f..c74b46b25 100644
--- a/lib/libX11/man/XErrorEvent.man
+++ b/lib/libX11/man/XErrorEvent.man
@@ -154,12 +154,12 @@ structure contains:
.ta .5i 2.5i
typedef struct {
int type;
- Display *display; /\(** Display the event was read from */
- unsigned long serial; /\(** serial number of failed request */
- unsigned char error_code; /\(** error code of failed request */
- unsigned char request_code; /\(** Major op-code of failed request */
- unsigned char minor_code; /\(** Minor op-code of failed request */
- XID resourceid; /\(** resource id */
+ Display *display; /\&* Display the event was read from */
+ unsigned long serial; /\&* serial number of failed request */
+ unsigned char error_code; /\&* error code of failed request */
+ unsigned char request_code; /\&* Major op-code of failed request */
+ unsigned char minor_code; /\&* Minor op-code of failed request */
+ XID resourceid; /\&* resource id */
} XErrorEvent;
.De
.LP
diff --git a/lib/libX11/man/XExposeEvent.man b/lib/libX11/man/XExposeEvent.man
index 82efac21b..84cf71291 100644
--- a/lib/libX11/man/XExposeEvent.man
+++ b/lib/libX11/man/XExposeEvent.man
@@ -153,14 +153,14 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** Expose */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* Expose */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
int x, y;
int width, height;
- int count; /\(** if nonzero, at least this many more */
+ int count; /\&* if nonzero, at least this many more */
} XExposeEvent;
.De
.LP
diff --git a/lib/libX11/man/XFocusChangeEvent.man b/lib/libX11/man/XFocusChangeEvent.man
index c96d3ccd4..61f38a7d5 100644
--- a/lib/libX11/man/XFocusChangeEvent.man
+++ b/lib/libX11/man/XFocusChangeEvent.man
@@ -155,14 +155,14 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** FocusIn or FocusOut */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
- Window window; /\(** window of event */
- int mode; /\(** NotifyNormal, NotifyGrab, NotifyUngrab */
+ int type; /\&* FocusIn or FocusOut */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
+ Window window; /\&* window of event */
+ int mode; /\&* NotifyNormal, NotifyGrab, NotifyUngrab */
int detail;
- /\(**
+ /\&*
* NotifyAncestor, NotifyVirtual, NotifyInferior,
* NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
* NotifyPointerRoot, NotifyDetailNone
diff --git a/lib/libX11/man/XFontSetExtents.man b/lib/libX11/man/XFontSetExtents.man
index 6d415baaf..d70428fb1 100644
--- a/lib/libX11/man/XFontSetExtents.man
+++ b/lib/libX11/man/XFontSetExtents.man
@@ -153,8 +153,8 @@ structure contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- XRectangle max_ink_extent; /\(** over all drawable characters */
- XRectangle max_logical_extent; /\(** over all drawable characters */
+ XRectangle max_ink_extent; /\&* over all drawable characters */
+ XRectangle max_logical_extent; /\&* over all drawable characters */
} XFontSetExtents;
.De
.LP
diff --git a/lib/libX11/man/XGetVisualInfo.man b/lib/libX11/man/XGetVisualInfo.man
index 86f6856e4..e4f793793 100644
--- a/lib/libX11/man/XGetVisualInfo.man
+++ b/lib/libX11/man/XGetVisualInfo.man
@@ -209,7 +209,7 @@ The
structure contains:
.LP
.LP
-/\(** Visual information mask bits */
+/\&* Visual information mask bits */
.TS
lw(.5i) lw(2.5i) lw(.8i).
T{
@@ -294,13 +294,13 @@ T}
.Ds 0
.TA .5i 3i
.ta .5i 3i
-/\(** Values */
+/\&* Values */
typedef struct {
Visual *visual;
VisualID visualid;
int screen;
- unsigned int depth;
+ int depth;
int class;
unsigned long red_mask;
unsigned long green_mask;
diff --git a/lib/libX11/man/XGetWindowAttributes.man b/lib/libX11/man/XGetWindowAttributes.man
index d0521adab..2aa86e41e 100644
--- a/lib/libX11/man/XGetWindowAttributes.man
+++ b/lib/libX11/man/XGetWindowAttributes.man
@@ -193,7 +193,8 @@ The
.ZN XGetWindowAttributes
function returns the current attributes for the specified window to an
.ZN XWindowAttributes
-structure.
+structure. It returns a nonzero status on success; otherwise, it returns a
+zero status.
.LP
.ZN XGetWindowAttributes
can generate
@@ -210,6 +211,8 @@ border width, and depth.
These are described in the argument list.
It is legal to pass to this function a window whose class is
.ZN InputOnly .
+It returns a nonzero status on success; otherwise, it returns a
+zero status.
.SH STRUCTURES
The
.ZN XWindowAttributes
@@ -219,27 +222,27 @@ structure contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int x, y; /\(** location of window */
- int width, height; /\(** width and height of window */
- int border_width; /\(** border width of window */
- int depth; /\(** depth of window */
- Visual *visual; /\(** the associated visual structure */
- Window root; /\(** root of screen containing window */
- int class; /\(** InputOutput, InputOnly*/
- int bit_gravity; /\(** one of the bit gravity values */
- int win_gravity; /\(** one of the window gravity values */
- int backing_store; /\(** NotUseful, WhenMapped, Always */
- unsigned long backing_planes; /\(** planes to be preserved if possible */
- unsigned long backing_pixel; /\(** value to be used when restoring planes */
- Bool save_under; /\(** boolean, should bits under be saved? */
- Colormap colormap; /\(** color map to be associated with window */
- Bool map_installed; /\(** boolean, is color map currently installed*/
- int map_state; /\(** IsUnmapped, IsUnviewable, IsViewable */
- long all_event_masks; /\(** set of events all people have interest in*/
- long your_event_mask; /\(** my event mask */
- long do_not_propagate_mask; /\(** set of events that should not propagate */
- Bool override_redirect; /\(** boolean value for override-redirect */
- Screen *screen; /\(** back pointer to correct screen */
+ int x, y; /\&* location of window */
+ int width, height; /\&* width and height of window */
+ int border_width; /\&* border width of window */
+ int depth; /\&* depth of window */
+ Visual *visual; /\&* the associated visual structure */
+ Window root; /\&* root of screen containing window */
+ int class; /\&* InputOutput, InputOnly*/
+ int bit_gravity; /\&* one of the bit gravity values */
+ int win_gravity; /\&* one of the window gravity values */
+ int backing_store; /\&* NotUseful, WhenMapped, Always */
+ unsigned long backing_planes; /\&* planes to be preserved if possible */
+ unsigned long backing_pixel; /\&* value to be used when restoring planes */
+ Bool save_under; /\&* boolean, should bits under be saved? */
+ Colormap colormap; /\&* color map to be associated with window */
+ Bool map_installed; /\&* boolean, is color map currently installed*/
+ int map_state; /\&* IsUnmapped, IsUnviewable, IsViewable */
+ long all_event_masks; /\&* set of events all people have interest in*/
+ long your_event_mask; /\&* my event mask */
+ long do_not_propagate_mask; /\&* set of events that should not propagate */
+ Bool override_redirect; /\&* boolean value for override-redirect */
+ Screen *screen; /\&* back pointer to correct screen */
} XWindowAttributes;
.De
.LP
diff --git a/lib/libX11/man/XGraphicsExposeEvent.man b/lib/libX11/man/XGraphicsExposeEvent.man
index 6e20083f4..a5637c84c 100644
--- a/lib/libX11/man/XGraphicsExposeEvent.man
+++ b/lib/libX11/man/XGraphicsExposeEvent.man
@@ -155,16 +155,16 @@ events contain:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** GraphicsExpose */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* GraphicsExpose */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Drawable drawable;
int x, y;
int width, height;
- int count; /\(** if nonzero, at least this many more */
- int major_code; /\(** core is CopyArea or CopyPlane */
- int minor_code; /\(** not defined in the core */
+ int count; /\&* if nonzero, at least this many more */
+ int major_code; /\&* core is CopyArea or CopyPlane */
+ int minor_code; /\&* not defined in the core */
} XGraphicsExposeEvent;
.De
.LP
@@ -172,13 +172,13 @@ typedef struct {
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** NoExpose */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* NoExpose */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Drawable drawable;
- int major_code; /\(** core is CopyArea or CopyPlane */
- int minor_code; /\(** not defined in the core */
+ int major_code; /\&* core is CopyArea or CopyPlane */
+ int minor_code; /\&* not defined in the core */
} XNoExposeEvent;
.De
.LP
diff --git a/lib/libX11/man/XGravityEvent.man b/lib/libX11/man/XGravityEvent.man
index 9d07e6f85..c49719e1f 100644
--- a/lib/libX11/man/XGravityEvent.man
+++ b/lib/libX11/man/XGravityEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** GravityNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* GravityNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window event;
Window window;
int x, y;
diff --git a/lib/libX11/man/XIfEvent.man b/lib/libX11/man/XIfEvent.man
index 61d28e511..17c483b45 100644
--- a/lib/libX11/man/XIfEvent.man
+++ b/lib/libX11/man/XIfEvent.man
@@ -221,7 +221,6 @@ has first called
.ZN XLockDisplay .
.LP
The predicate procedure and its associated arguments are:
-.sM
.HP
Bool (\^*\fIpredicate\fP\^)\^(\^Display *\fIdisplay\fP, XEvent *\fIevent\fP, XPointer \fIarg\fP\^)
.IP \fIdisplay\fP 1i
@@ -238,7 +237,6 @@ or
.ZN XPeekIfEvent
function.
.LP
-.eM
The predicate procedure is called once for each
event in the queue until it finds a match.
After finding a match, the predicate procedure must return
diff --git a/lib/libX11/man/XKeymapEvent.man b/lib/libX11/man/XKeymapEvent.man
index c687c9641..356865d7e 100644
--- a/lib/libX11/man/XKeymapEvent.man
+++ b/lib/libX11/man/XKeymapEvent.man
@@ -152,12 +152,12 @@ events contains:
.Ds 0
.TA .5i 3i
.ta .5i 3i
-/\(** generated on EnterWindow and FocusIn when KeymapState selected */
+/\&* generated on EnterWindow and FocusIn when KeymapState selected */
typedef struct {
- int type; /\(** KeymapNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* KeymapNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
char key_vector[32];
} XKeymapEvent;
diff --git a/lib/libX11/man/XLoadFont.man b/lib/libX11/man/XLoadFont.man
index ab7e89060..a13ed844a 100644
--- a/lib/libX11/man/XLoadFont.man
+++ b/lib/libX11/man/XLoadFont.man
@@ -141,6 +141,16 @@
.el .sp 10p
..
.ny0
+.de EX
+.sp
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+.sp
+..
.TH XLoadFont __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XLoadFont, XQueryFont, XLoadQueryFont, XFreeFont, XGetFontProperty, XUnloadFont, XCharStruct, XFontProp, XChar2b, XFontStruct \- load or unload fonts and font metric structures
@@ -309,62 +319,54 @@ and
structures contain:
.LP
.IN "XCharStruct" "" "@DEF@"
-.Ds 0
-.TA .5i 3i
-.ta .5i 3i
+.EX
typedef struct {
- short lbearing; /\(** origin to left edge of raster */
- short rbearing; /\(** origin to right edge of raster */
- short width; /\(** advance to next char's origin */
- short ascent; /\(** baseline to top edge of raster */
- short descent; /\(** baseline to bottom edge of raster */
- unsigned short attributes; /\(** per char flags (not predefined) */
+ short lbearing; /\&* origin to left edge of raster */
+ short rbearing; /\&* origin to right edge of raster */
+ short width; /\&* advance to next char's origin */
+ short ascent; /\&* baseline to top edge of raster */
+ short descent; /\&* baseline to bottom edge of raster */
+ unsigned short attributes; /\&* per char flags (not predefined) */
} XCharStruct;
-.De
+.EE
.LP
.IN "XFontProp" "" "@DEF@"
-.Ds 0
-.TA .5i 1i 3i
-.ta .5i 1i 3i
+.EX
typedef struct {
Atom name;
unsigned long card32;
} XFontProp;
-.De
+.EE
.LP
.IN "XChar2b" "" "@DEF@"
-.Ds 0
-.TA .5i 3i
-.ta .5i 3i
-typedef struct { /\(** normal 16 bit characters are two bytes */
+.EX
+typedef struct { /\&* normal 16 bit characters are two bytes */
unsigned char byte1;
unsigned char byte2;
} XChar2b;
-.De
+.EE
.LP
.IN "XFontStruct" "" "@DEF@"
-.Ds 0
-.TA .5i 3i
-.ta .5i 3i
+.EX
typedef struct {
- XExtData *ext_data; /\(** hook for extension to hang data */
- Font fid; /\(** Font id for this font */
- unsigned direction; /\(** hint about the direction font is painted */
- unsigned min_char_or_byte2; /\(** first character */
- unsigned max_char_or_byte2; /\(** last character */
- unsigned min_byte1; /\(** first row that exists */
- unsigned max_byte1; /\(** last row that exists */
- Bool all_chars_exist; /\(** flag if all characters have nonzero size */
- unsigned default_char; /\(** char to print for undefined character */
- int n_properties; /\(** how many properties there are */
- XFontProp *properties; /\(** pointer to array of additional properties */
- XCharStruct min_bounds; /\(** minimum bounds over all existing char */
- XCharStruct max_bounds; /\(** maximum bounds over all existing char */
- XCharStruct *per_char; /\(** first_char to last_char information */
- int ascent; /\(** logical extent above baseline for spacing */
- int descent; /\(** logical decent below baseline for spacing */
+ XExtData *ext_data; /\&* hook for extension to hang data */
+ Font fid; /\&* Font id for this font */
+ unsigned direction; /\&* hint about the direction font is painted */
+ unsigned min_char_or_byte2; /\&* first character */
+ unsigned max_char_or_byte2; /\&* last character */
+ unsigned min_byte1; /\&* first row that exists */
+ unsigned max_byte1; /\&* last row that exists */
+ Bool all_chars_exist; /\&* flag if all characters have nonzero size */
+ unsigned default_char; /\&* char to print for undefined character */
+ int n_properties; /\&* how many properties there are */
+ XFontProp *properties; /\&* pointer to array of additional properties */
+ XCharStruct min_bounds; /\&* minimum bounds over all existing char */
+ XCharStruct max_bounds; /\&* maximum bounds over all existing char */
+ XCharStruct *per_char; /\&* first_char to last_char information */
+ int ascent; /\&* logical extent above baseline for spacing */
+ int descent; /\&* logical decent below baseline for spacing */
} XFontStruct;
-.De
+.EE
.LP
X supports single byte/character, two bytes/character matrix,
and 16-bit character text operations.
@@ -416,19 +418,16 @@ min_char_or_byte2 and max_char_or_byte2 are less than 256,
and the 2-byte character index values corresponding to the
per_char array element N (counting from 0) are:
.IP
-.nf
+.EX
byte1 = N/D + min_byte1
-.br
byte2 = N\\D + min_char_or_byte2
-.IP
-.fi
+.EE
where:
-.IP
-.nf
+.EX
D = max_char_or_byte2 \- min_char_or_byte2 + 1
/ = integer division
- \\ = integer modulus
-.fi
+ \e\e = integer modulus
+.EE
.IP \(bu 5
If the per_char pointer is NULL,
all glyphs between the first and last character indexes
diff --git a/lib/libX11/man/XMapEvent.man b/lib/libX11/man/XMapEvent.man
index 5bc8f8540..7f2747c63 100644
--- a/lib/libX11/man/XMapEvent.man
+++ b/lib/libX11/man/XMapEvent.man
@@ -153,13 +153,13 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** MapNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* MapNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window event;
Window window;
- Bool override_redirect; /\(** boolean, is override set... */
+ Bool override_redirect; /\&* boolean, is override set... */
} XMapEvent;
.De
.LP
@@ -208,15 +208,15 @@ events is:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** MappingNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
- Window window; /\(** unused */
- int request; /\(** one of MappingModifier, MappingKeyboard,
+ int type; /\&* MappingNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
+ Window window; /\&* unused */
+ int request; /\&* one of MappingModifier, MappingKeyboard,
MappingPointer */
- int first_keycode; /\(** first keycode */
- int count; /\(** defines range of change w. first_keycode*/
+ int first_keycode; /\&* first keycode */
+ int count; /\&* defines range of change w. first_keycode*/
} XMappingEvent;
.De
.LP
diff --git a/lib/libX11/man/XMapRequestEvent.man b/lib/libX11/man/XMapRequestEvent.man
index f76551de6..a8ece726c 100644
--- a/lib/libX11/man/XMapRequestEvent.man
+++ b/lib/libX11/man/XMapRequestEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** MapRequest */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* MapRequest */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window parent;
Window window;
} XMapRequestEvent;
diff --git a/lib/libX11/man/XOpenIM.man b/lib/libX11/man/XOpenIM.man
index 047008540..56171bbae 100644
--- a/lib/libX11/man/XOpenIM.man
+++ b/lib/libX11/man/XOpenIM.man
@@ -142,7 +142,7 @@
.ny0
.TH XOpenIM __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and otain input method information
+XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and obtain input method information
.SH SYNTAX
.HP
XIM XOpenIM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char
@@ -159,12 +159,12 @@ Display *XDisplayOfIM\^(\^XIM \fIim\fP\^);
char *XLocaleOfIM\^(\^XIM \fIim\fP\^);
.HP
Bool XRegisterIMInstantiateCallback\^(\^Display *\fIdisplay\fP\^, XrmDatabase
-\fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^, XIMProc
-\fIcallback\fP\^, XPointer *\fIclient_data\fP\^);
+\fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^, XIDProc
+\fIcallback\fP\^, XPointer \fIclient_data\fP\^);
.HP
Bool XUnregisterIMInstantiateCallback\^(\^Display *\fIdisplay\fP\^,
XrmDatabase \fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^,
-XIMProc \fIcallback\fP\^, XPointer *\fIclient_data\fP\^);
+XIDProc \fIcallback\fP\^, XPointer \fIclient_data\fP\^);
.LP
.SH ARGUMENTS
.IP \fIcallback\fP 1i
@@ -285,7 +285,7 @@ locale and modifiers.
.LP
The function returns
.ZN True
- if it succeeds; otherwise, it returns
+if it succeeds; otherwise, it returns
.ZN False .
.LP
The
diff --git a/lib/libX11/man/XPropertyEvent.man b/lib/libX11/man/XPropertyEvent.man
index ef34642da..30ac75a2d 100644
--- a/lib/libX11/man/XPropertyEvent.man
+++ b/lib/libX11/man/XPropertyEvent.man
@@ -153,14 +153,14 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** PropertyNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* PropertyNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
Atom atom;
Time time;
- int state; /\(** PropertyNewValue or PropertyDelete */
+ int state; /\&* PropertyNewValue or PropertyDelete */
} XPropertyEvent;
.De
.LP
diff --git a/lib/libX11/man/XQueryColor.man b/lib/libX11/man/XQueryColor.man
index eff8a6c66..e2e884b7e 100644
--- a/lib/libX11/man/XQueryColor.man
+++ b/lib/libX11/man/XQueryColor.man
@@ -1,3 +1,4 @@
+'\" t
.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
@@ -276,16 +277,13 @@ supported, but its continued use is not encouraged.
The syntax is an initial sharp sign character followed by
a numeric specification, in one of the following formats:
.LP
-.\" Start marker code here
-.Ds 0
-.TA 2i
-.ta 2i
+.TS
+l l.
\&#RGB (4 bits each)
\&#RRGGBB (8 bits each)
\&#RRRGGGBBB (12 bits each)
\&#RRRRGGGGBBBB (16 bits each)
-.De
-.\" End marker code here
+.TE
.LP
The R, G, and B represent single hexadecimal digits.
When fewer than 16 bits each are specified,
diff --git a/lib/libX11/man/XQueryExtension.man b/lib/libX11/man/XQueryExtension.man
index a81ec0cf3..bfc096498 100644
--- a/lib/libX11/man/XQueryExtension.man
+++ b/lib/libX11/man/XQueryExtension.man
@@ -14,7 +14,7 @@
.\" of the information in this document. It is provided \`\`as-is'' without
.\" express or implied warranty.
.\"
-.dS xL Programming with Xlib
+.ds xL Programming with Xlib
.TH XQueryExtension __libmansuffix__ __xorgversion__ "X FUNCTIONS"
.SH NAME
XQueryExtension, XListExtensions, XFreeExtensionList \- list available extensions
@@ -25,7 +25,6 @@ Bool XQueryExtension(\^\fIdisplay, \fIname\fP, \fImajor_opcode_return\fP, \fIfir
char **XListExtensions(\^\fIdisplay\fP, \fInextensions_return\fP\^)
.HP
XFreeExtensionList(\^\fIlist\fP\^)
-.FN
.SH ARGUMENTS
.IP \fIdisplay\fP 1i
Specifies the connection to the X server.
diff --git a/lib/libX11/man/XReparentEvent.man b/lib/libX11/man/XReparentEvent.man
index ff42e2834..228661c4d 100644
--- a/lib/libX11/man/XReparentEvent.man
+++ b/lib/libX11/man/XReparentEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** ReparentNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* ReparentNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window event;
Window window;
Window parent;
diff --git a/lib/libX11/man/XResizeRequestEvent.man b/lib/libX11/man/XResizeRequestEvent.man
index 71243b9ac..eb522f35b 100644
--- a/lib/libX11/man/XResizeRequestEvent.man
+++ b/lib/libX11/man/XResizeRequestEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** ResizeRequest */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* ResizeRequest */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
int width, height;
} XResizeRequestEvent;
diff --git a/lib/libX11/man/XSelectionClearEvent.man b/lib/libX11/man/XSelectionClearEvent.man
index 3fd7b1f96..d1860349a 100644
--- a/lib/libX11/man/XSelectionClearEvent.man
+++ b/lib/libX11/man/XSelectionClearEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** SelectionClear */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* SelectionClear */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
Atom selection;
Time time;
diff --git a/lib/libX11/man/XSelectionEvent.man b/lib/libX11/man/XSelectionEvent.man
index 45481f51c..e68eef706 100644
--- a/lib/libX11/man/XSelectionEvent.man
+++ b/lib/libX11/man/XSelectionEvent.man
@@ -153,14 +153,14 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** SelectionNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* SelectionNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window requestor;
Atom selection;
Atom target;
- Atom property; /\(** atom or None */
+ Atom property; /\&* atom or None */
Time time;
} XSelectionEvent;
.De
diff --git a/lib/libX11/man/XSelectionRequestEvent.man b/lib/libX11/man/XSelectionRequestEvent.man
index 9d2febee8..ae15700a2 100644
--- a/lib/libX11/man/XSelectionRequestEvent.man
+++ b/lib/libX11/man/XSelectionRequestEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** SelectionRequest */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* SelectionRequest */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window owner;
Window requestor;
Atom selection;
diff --git a/lib/libX11/man/XSetScreenSaver.man b/lib/libX11/man/XSetScreenSaver.man
index c0c1e3639..4a42bcfd1 100644
--- a/lib/libX11/man/XSetScreenSaver.man
+++ b/lib/libX11/man/XSetScreenSaver.man
@@ -213,6 +213,8 @@ If the timeout value is nonzero,
.ZN XSetScreenSaver
enables the screen saver.
An interval of 0 disables the random-pattern motion.
+Both values are limited to a 16-bit signed integer range by the wire protocol,
+despite the C prototype.
If no input from devices (keyboard, mouse, and so on) is generated
for the specified number of timeout seconds once the screen saver is enabled,
the screen saver is activated.
diff --git a/lib/libX11/man/XStringListToTextProperty.man b/lib/libX11/man/XStringListToTextProperty.man
index a92104832..abba41945 100644
--- a/lib/libX11/man/XStringListToTextProperty.man
+++ b/lib/libX11/man/XStringListToTextProperty.man
@@ -230,10 +230,10 @@ structure contains:
.TA .5i 2.5i
.ta .5i 2.5i
typedef struct {
- unsigned char *value; /\(** property data */
- Atom encoding; /\(** type of property */
- int format; /\(** 8, 16, or 32 */
- unsigned long nitems; /\(** number of items in value */
+ unsigned char *value; /\&* property data */
+ Atom encoding; /\&* type of property */
+ int format; /\&* 8, 16, or 32 */
+ unsigned long nitems; /\&* number of items in value */
} XTextProperty;
.De
.SH "SEE ALSO"
diff --git a/lib/libX11/man/XUnmapEvent.man b/lib/libX11/man/XUnmapEvent.man
index c560a2ac0..a0623f757 100644
--- a/lib/libX11/man/XUnmapEvent.man
+++ b/lib/libX11/man/XUnmapEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** UnmapNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* UnmapNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window event;
Window window;
Bool from_configure;
diff --git a/lib/libX11/man/XVisibilityEvent.man b/lib/libX11/man/XVisibilityEvent.man
index 0313aabf9..7b878cf5d 100644
--- a/lib/libX11/man/XVisibilityEvent.man
+++ b/lib/libX11/man/XVisibilityEvent.man
@@ -153,10 +153,10 @@ events contains:
.TA .5i 3i
.ta .5i 3i
typedef struct {
- int type; /\(** VisibilityNotify */
- unsigned long serial; /\(** # of last request processed by server */
- Bool send_event; /\(** true if this came from a SendEvent request */
- Display *display; /\(** Display the event was read from */
+ int type; /\&* VisibilityNotify */
+ unsigned long serial; /\&* # of last request processed by server */
+ Bool send_event; /\&* true if this came from a SendEvent request */
+ Display *display; /\&* Display the event was read from */
Window window;
int state;
} XVisibilityEvent;
diff --git a/lib/libX11/man/XcmsCIELabQueryMaxC.man b/lib/libX11/man/XcmsCIELabQueryMaxC.man
index ef0c3ee12..58484b42e 100644
--- a/lib/libX11/man/XcmsCIELabQueryMaxC.man
+++ b/lib/libX11/man/XcmsCIELabQueryMaxC.man
@@ -164,7 +164,7 @@ are ignored.
.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
.IP \fIchroma\fP 1i
Specifies the chroma at which to find \*(Ch.
-.ds Lc maximum chroma (MaxC and MaxLC), maximum lightnes (MaxL), \
+.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
or minimum lightness (MinL)
.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
or hue angle (MaxLC)
diff --git a/lib/libX11/man/XcmsCIELuvQueryMaxC.man b/lib/libX11/man/XcmsCIELuvQueryMaxC.man
index 01f9f497d..af469c5f3 100644
--- a/lib/libX11/man/XcmsCIELuvQueryMaxC.man
+++ b/lib/libX11/man/XcmsCIELuvQueryMaxC.man
@@ -164,7 +164,7 @@ are ignored.
.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
.IP \fIchroma\fP 1i
Specifies the chroma at which to find \*(Ch.
-.ds Lc maximum chroma (MaxC and MaxLC), maximum lightnes (MaxL), \
+.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
or minimum lightness (MinL)
.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
or hue angle (MaxLC)
diff --git a/lib/libX11/man/XcmsColor.man b/lib/libX11/man/XcmsColor.man
index 43635ceb7..c039cbf3a 100644
--- a/lib/libX11/man/XcmsColor.man
+++ b/lib/libX11/man/XcmsColor.man
@@ -140,18 +140,26 @@
.el .sp 10p
..
.ny0
+.de EX
+.sp
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+.sp
+..
.TH XcmsColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
-XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color struture
+XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color structure
.SH STRUCTURES
The structure for
.ZN XcmsColor
contains:
.LP
-.Ds 0
-.TA .5i 1i 2.5i
-.ta .5i 1i 2.5i
-typedef unsigned long XcmsColorFormat; /\(** Color Specification Format */
+.EX
+typedef unsigned long XcmsColorFormat; /\&* Color Specification Format */
typedef struct {
union {
@@ -167,101 +175,83 @@ typedef struct {
} spec;
unsigned long pixel;
XcmsColorFormat format;
-} XcmsColor; /\(** Xcms Color Structure */
-.De
+} XcmsColor; /\&* Xcms Color Structure */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef double XcmsFloat;
typedef struct {
- unsigned short red; /\(** 0x0000 to 0xffff */
- unsigned short green; /\(** 0x0000 to 0xffff */
- unsigned short blue; /\(** 0x0000 to 0xffff */
-} XcmsRGB; /\(** RGB Device */
-.De
+ unsigned short red; /\&* 0x0000 to 0xffff */
+ unsigned short green; /\&* 0x0000 to 0xffff */
+ unsigned short blue; /\&* 0x0000 to 0xffff */
+} XcmsRGB; /\&* RGB Device */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef struct {
- XcmsFloat red; /\(** 0.0 to 1.0 */
- XcmsFloat green; /\(** 0.0 to 1.0 */
- XcmsFloat blue; /\(** 0.0 to 1.0 */
-} XcmsRGBi; /\(** RGB Intensity */
-.De
+ XcmsFloat red; /\&* 0.0 to 1.0 */
+ XcmsFloat green; /\&* 0.0 to 1.0 */
+ XcmsFloat blue; /\&* 0.0 to 1.0 */
+} XcmsRGBi; /\&* RGB Intensity */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef struct {
XcmsFloat X;
- XcmsFloat Y; /\(** 0.0 to 1.0 */
+ XcmsFloat Y; /\&* 0.0 to 1.0 */
XcmsFloat Z;
-} XcmsCIEXYZ; /\(** CIE XYZ */
-.De
+} XcmsCIEXYZ; /\&* CIE XYZ */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef struct {
- XcmsFloat u_prime; /\(** 0.0 to ~0.6 */
- XcmsFloat v_prime; /\(** 0.0 to ~0.6 */
- XcmsFloat Y; /\(** 0.0 to 1.0 */
-} XcmsCIEuvY; /\(** CIE u'v'Y */
-.De
+ XcmsFloat u_prime; /\&* 0.0 to ~0.6 */
+ XcmsFloat v_prime; /\&* 0.0 to ~0.6 */
+ XcmsFloat Y; /\&* 0.0 to 1.0 */
+} XcmsCIEuvY; /\&* CIE u'v'Y */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef struct {
- XcmsFloat x; /\(** 0.0 to ~.75 */
- XcmsFloat y; /\(** 0.0 to ~.85 */
- XcmsFloat Y; /\(** 0.0 to 1.0 */
-} XcmsCIExyY; /\(** CIE xyY */
-.De
+ XcmsFloat x; /\&* 0.0 to ~.75 */
+ XcmsFloat y; /\&* 0.0 to ~.85 */
+ XcmsFloat Y; /\&* 0.0 to 1.0 */
+} XcmsCIExyY; /\&* CIE xyY */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef struct {
- XcmsFloat L_star; /\(** 0.0 to 100.0 */
+ XcmsFloat L_star; /\&* 0.0 to 100.0 */
XcmsFloat a_star;
XcmsFloat b_star;
-} XcmsCIELab; /\(** CIE L*a*b* */
-.De
+} XcmsCIELab; /\&* CIE L*a*b* */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef struct {
- XcmsFloat L_star; /\(** 0.0 to 100.0 */
+ XcmsFloat L_star; /\&* 0.0 to 100.0 */
XcmsFloat u_star;
XcmsFloat v_star;
-} XcmsCIELuv; /\(** CIE L*u*v* */
-.De
+} XcmsCIELuv; /\&* CIE L*u*v* */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef struct {
- XcmsFloat H; /\(** 0.0 to 360.0 */
- XcmsFloat V; /\(** 0.0 to 100.0 */
- XcmsFloat C; /\(** 0.0 to 100.0 */
-} XcmsTekHVC; /\(** TekHVC */
-.De
+ XcmsFloat H; /\&* 0.0 to 360.0 */
+ XcmsFloat V; /\&* 0.0 to 100.0 */
+ XcmsFloat C; /\&* 0.0 to 100.0 */
+} XcmsTekHVC; /\&* TekHVC */
+.EE
.LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
typedef struct {
XcmsFloat pad0;
XcmsFloat pad1;
XcmsFloat pad2;
XcmsFloat pad3;
-} XcmsPad; /\(** four doubles */
-.De
+} XcmsPad; /\&* four doubles */
+.EE
.SH DESCRIPTION
The
.ZN XcmsColor
@@ -271,5 +261,5 @@ each supporting color specification encoding for a particular color space.
XcmsAllocColor(3X11),
XcmsStoreColor(3X11),
XcmsConvertColors(3X11),
-.br
+.LP
\fI\*(xL\fP
diff --git a/lib/libX11/man/XmbDrawText.man b/lib/libX11/man/XmbDrawText.man
index 30fe5ea7a..b857f5a1f 100644
--- a/lib/libX11/man/XmbDrawText.man
+++ b/lib/libX11/man/XmbDrawText.man
@@ -228,10 +228,10 @@ structure contains:
.TA .5i 2.5i
.ta .5i 2.5i
typedef struct {
- char *chars; /\(** pointer to string */
- int nchars; /\(** number of bytes */
- int delta; /\(** pixel delta between strings */
- XFontSet font_set; /\(** fonts, None means don't change */
+ char *chars; /\&* pointer to string */
+ int nchars; /\&* number of bytes */
+ int delta; /\&* pixel delta between strings */
+ XFontSet font_set; /\&* fonts, None means don't change */
} XmbTextItem;
.De
The
@@ -241,10 +241,10 @@ structure contains:
.TA .5i 2.5i
.ta .5i 2.5i
typedef struct {
- wchar_t *chars; /\(** pointer to wide char string */
- int nchars; /\(** number of wide characters */
- int delta; /\(** pixel delta between strings */
- XFontSet font_set; /\(** fonts, None means don't change */
+ wchar_t *chars; /\&* pointer to wide char string */
+ int nchars; /\&* number of wide characters */
+ int delta; /\&* pixel delta between strings */
+ XFontSet font_set; /\&* fonts, None means don't change */
} XwcTextItem;
.De
.SH "SEE ALSO"
diff --git a/lib/libX11/man/XmbTextListToTextProperty.man b/lib/libX11/man/XmbTextListToTextProperty.man
index cad0cf37c..23501e9b1 100644
--- a/lib/libX11/man/XmbTextListToTextProperty.man
+++ b/lib/libX11/man/XmbTextListToTextProperty.man
@@ -408,10 +408,10 @@ structure contains:
.TA .5i 2.5i
.ta .5i 2.5i
typedef struct {
- unsigned char *value; /\(** property data */
- Atom encoding; /\(** type of property */
- int format; /\(** 8, 16, or 32 */
- unsigned long nitems; /\(** number of items in value */
+ unsigned char *value; /\&* property data */
+ Atom encoding; /\&* type of property */
+ int format; /\&* 8, 16, or 32 */
+ unsigned long nitems; /\&* number of items in value */
} XTextProperty;
.De
.LP
@@ -447,11 +447,11 @@ T}
.TA .5i 2.5i
.ta .5i 2.5i
typedef enum {
- XStringStyle, /\(** STRING */
- XCompoundTextStyle, /\(** COMPOUND_TEXT */
- XTextStyle, /\(** text in owner's encoding (current locale) */
- XStdICCTextStyle, /\(** STRING, else COMPOUND_TEXT */
- XUTF8StringStyle /\(** UTF8_STRING */
+ XStringStyle, /\&* STRING */
+ XCompoundTextStyle, /\&* COMPOUND_TEXT */
+ XTextStyle, /\&* text in owner's encoding (current locale) */
+ XStdICCTextStyle, /\&* STRING, else COMPOUND_TEXT */
+ XUTF8StringStyle /\&* UTF8_STRING */
} XICCEncodingStyle;
.De
.SH "SEE ALSO"
diff --git a/lib/libX11/man/XrmGetFileDatabase.man b/lib/libX11/man/XrmGetFileDatabase.man
index 959603a62..c46994a94 100644
--- a/lib/libX11/man/XrmGetFileDatabase.man
+++ b/lib/libX11/man/XrmGetFileDatabase.man
@@ -140,6 +140,16 @@
.el .sp 10p
..
.ny0
+.de EX
+.sp
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+.sp
+..
.TH XrmGetFileDatabase __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XrmGetFileDatabase, XrmPutFileDatabase, XrmGetStringDatabase, XrmLocaleOfDatabase, XrmGetDatabase, XrmSetDatabase, XrmDestroyDatabase \- retrieve and store resource databases
@@ -247,9 +257,7 @@ terminated by newline characters or the end of the file.
The syntax of an individual resource line is:
.LP
.\" Start marker code here
-.Ds 0
-.TA 1.5i 1.75i
-.ta 1.5i 1.75i
+.EX
ResourceLine = Comment | IncludeFile | ResourceSpec | <empty line>
Comment = "!" {<any character except null or newline>}
IncludeFile = "#" WhiteSpace "include" WhiteSpace FileName WhiteSpace
@@ -262,8 +270,7 @@ Component = "?" | ComponentName
ComponentName = NameChar {NameChar}
NameChar = "a"\-"z" | "A"\-"Z" | "0"\-"9" | "_" | "-"
Value = {<any character except null or unescaped newline>}
-.De
-.\" End marker code here
+.EE
.LP
Elements separated by vertical bar (|) are alternatives.
Curly braces ({\&.\&.\&.}) indicate zero or more repetitions
diff --git a/lib/libX11/man/XrmInitialize.man b/lib/libX11/man/XrmInitialize.man
index c282e6143..c481bef09 100644
--- a/lib/libX11/man/XrmInitialize.man
+++ b/lib/libX11/man/XrmInitialize.man
@@ -233,14 +233,14 @@ typedef struct {
.TA .5i 2.5i
.ta .5i 2.5i
typedef enum {
- XrmoptionNoArg, /\(** Value is specified in XrmOptionDescRec.value */
- XrmoptionIsArg, /\(** Value is the option string itself */
- XrmoptionStickyArg, /\(** Value is characters immediately following option */
- XrmoptionSepArg, /\(** Value is next argument in argv */
- XrmoptionResArg, /\(** Resource and value in next argument in argv */
- XrmoptionSkipArg, /\(** Ignore this option and the next argument in argv */
- XrmoptionSkipLine, /\(** Ignore this option and the rest of argv */
- XrmoptionSkipNArgs /\(** Ignore this option and the next
+ XrmoptionNoArg, /\&* Value is specified in XrmOptionDescRec.value */
+ XrmoptionIsArg, /\&* Value is the option string itself */
+ XrmoptionStickyArg, /\&* Value is characters immediately following option */
+ XrmoptionSepArg, /\&* Value is next argument in argv */
+ XrmoptionResArg, /\&* Resource and value in next argument in argv */
+ XrmoptionSkipArg, /\&* Ignore this option and the next argument in argv */
+ XrmoptionSkipLine, /\&* Ignore this option and the rest of argv */
+ XrmoptionSkipNArgs /\&* Ignore this option and the next
\ \ \ XrmOptionDescRec.value arguments in argv */
} XrmOptionKind;
.De
@@ -249,10 +249,10 @@ typedef enum {
.TA .5i 2.5i
.ta .5i 2.5i
typedef struct {
- char *option; /\(** Option specification string in argv */
- char *specifier; /\(** Binding and resource name (sans application name) */
- XrmOptionKind argKind; /\(** Which style of option it is */
- XPointer value; /\(** Value to provide if XrmoptionNoArg or
+ char *option; /\&* Option specification string in argv */
+ char *specifier; /\&* Binding and resource name (sans application name) */
+ XrmOptionKind argKind; /\&* Which style of option it is */
+ XPointer value; /\&* Value to provide if XrmoptionNoArg or
\ \ \ XrmoptionSkipNArgs */
} XrmOptionDescRec, *XrmOptionDescList;
.De
diff --git a/lib/libX11/man/XrmUniqueQuark.man b/lib/libX11/man/XrmUniqueQuark.man
index 26332be15..baaeac972 100644
--- a/lib/libX11/man/XrmUniqueQuark.man
+++ b/lib/libX11/man/XrmUniqueQuark.man
@@ -143,7 +143,7 @@
.TH XrmUniqueQuark __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
.SH NAME
XrmUniqueQuark, XrmStringToQuark, XrmPermStringToQuark, XrmQuarkToString, XrmStringToQuarkList, XrmStringToBindingQuarkList \- manipulate resource quarks
-.SH SYNTAX
+.SH SYNOPSIS
.HP
XrmQuark XrmUniqueQuark\^(void);
.LP
@@ -267,9 +267,9 @@ A binding list is a list of type
and indicates if components of name or class lists are bound tightly or loosely
(that is, if wildcarding of intermediate components is specified).
.LP
-.Ds 0
+.EX
typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList;
-.De
+.EE
.LP
.ZN XrmBindTightly
indicates that a period separates the components, and
@@ -290,17 +290,15 @@ If the string does not start with period or asterisk,
a period is assumed.
For example, ``*a.b*c'' becomes:
.LP
-.Ds 0
-.TA .75i 1.5i 2.25i
-.ta .75i 1.5i 2.25i
+.TS
+l l l.
quarks a b c
-.br
bindings loose tight loose
-.De
+.TE
.SH "SEE ALSO"
XrmGetResource(3X11),
XrmInitialize(3X11),
XrmMergeDatabases(3X11),
XrmPutResource(3X11)
-.br
+.LP
\fI\*(xL\fP
diff --git a/lib/libX11/man/xkb/Makefile.in b/lib/libX11/man/xkb/Makefile.in
index 1f5e73b18..5a99a1feb 100644
--- a/lib/libX11/man/xkb/Makefile.in
+++ b/lib/libX11/man/xkb/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -445,7 +454,6 @@ libman_PRE = \
@MANPAGES_TRUE@libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
-SED = sed
SUFFIXES = .pre .$(LIB_MAN_SUFFIX) .man
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man b/lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man
index dcb7533d4..6b35a7723 100644
--- a/lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man
+++ b/lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man
@@ -57,7 +57,7 @@ connection to server
keycode of first key to fetch
.TP
.I \- num
-# keys for which virtual mod maps are desired
+number of keys for which virtual mod maps are desired
.TP
.I \- xkb
Xkb description where results will be placed
diff --git a/lib/libX11/modules/Makefile.in b/lib/libX11/modules/Makefile.in
index a5c1d7086..4f595366e 100644
--- a/lib/libX11/modules/Makefile.in
+++ b/lib/libX11/modules/Makefile.in
@@ -87,6 +87,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -103,6 +104,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -110,6 +112,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -119,11 +122,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -138,6 +144,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -186,7 +193,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/im/Makefile.in b/lib/libX11/modules/im/Makefile.in
index 3fe6f5031..f1dfacac3 100644
--- a/lib/libX11/modules/im/Makefile.in
+++ b/lib/libX11/modules/im/Makefile.in
@@ -87,6 +87,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -103,6 +104,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -110,6 +112,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -119,11 +122,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -138,6 +144,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -186,7 +193,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/im/ximcp/Makefile.in b/lib/libX11/modules/im/ximcp/Makefile.in
index 5019639d8..9e7c48a82 100644
--- a/lib/libX11/modules/im/ximcp/Makefile.in
+++ b/lib/libX11/modules/im/ximcp/Makefile.in
@@ -122,6 +122,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -138,6 +139,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -145,6 +147,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -154,11 +157,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -173,6 +179,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -221,7 +228,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/im/ximcp/imDefIc.c b/lib/libX11/modules/im/ximcp/imDefIc.c
index cb30ac232..c04744bb3 100644
--- a/lib/libX11/modules/im/ximcp/imDefIc.c
+++ b/lib/libX11/modules/im/ximcp/imDefIc.c
@@ -949,6 +949,8 @@ _XimProtoSetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
+ MARK_FOCUSED(ic);
+
_XimRegisterFilter(ic);
return;
}
@@ -994,6 +996,8 @@ _XimProtoUnsetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
+ UNMARK_FOCUSED(ic);
+
_XimUnregisterFilter(ic);
return;
}
diff --git a/lib/libX11/modules/im/ximcp/imDefLkup.c b/lib/libX11/modules/im/ximcp/imDefLkup.c
index aa1aaaf06..66e4add49 100644
--- a/lib/libX11/modules/im/ximcp/imDefLkup.c
+++ b/lib/libX11/modules/im/ximcp/imDefLkup.c
@@ -216,8 +216,13 @@ _XimRespSyncReply(
Xic ic,
BITMASK16 mode)
{
- if (mode & XimSYNCHRONUS) /* SYNC Request */
- MARK_NEED_SYNC_REPLY(ic);
+ if (mode & XimSYNCHRONUS) /* SYNC Request */ {
+ if (IS_FOCUSED(ic))
+ MARK_NEED_SYNC_REPLY(ic);
+ else
+ _XimProcSyncReply(ic->core.im, ic);
+ }
+
return True;
}
@@ -466,7 +471,7 @@ _XimGetWindowEventmask(
Xim im = (Xim )ic->core.im;
XWindowAttributes atr;
- if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
+ if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr))
return 0;
return (EVENTMASK)atr.your_event_mask;
}
diff --git a/lib/libX11/modules/im/ximcp/imTrX.c b/lib/libX11/modules/im/ximcp/imTrX.c
index e2de05f28..5076839d2 100644
--- a/lib/libX11/modules/im/ximcp/imTrX.c
+++ b/lib/libX11/modules/im/ximcp/imTrX.c
@@ -156,6 +156,8 @@ _XimXConnect(Xim im)
event.xclient.data.l[0] = (CARD32)spec->lib_connect_wid;
event.xclient.data.l[1] = spec->major_code;
event.xclient.data.l[2] = spec->minor_code;
+ event.xclient.data.l[3] = 0;
+ event.xclient.data.l[4] = 0;
if(event.xclient.data.l[1] == 1 || event.xclient.data.l[1] == 2) {
XWindowAttributes atr;
diff --git a/lib/libX11/modules/lc/Makefile.in b/lib/libX11/modules/lc/Makefile.in
index db783881e..af6cb980e 100644
--- a/lib/libX11/modules/lc/Makefile.in
+++ b/lib/libX11/modules/lc/Makefile.in
@@ -87,6 +87,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -103,6 +104,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -110,6 +112,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -119,11 +122,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -138,6 +144,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -186,7 +193,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/lc/Utf8/Makefile.in b/lib/libX11/modules/lc/Utf8/Makefile.in
index d93dd484e..9310e946d 100644
--- a/lib/libX11/modules/lc/Utf8/Makefile.in
+++ b/lib/libX11/modules/lc/Utf8/Makefile.in
@@ -113,6 +113,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -129,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -136,6 +138,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -145,11 +148,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -164,6 +170,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -212,7 +219,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/lc/def/Makefile.in b/lib/libX11/modules/lc/def/Makefile.in
index 868e69b20..d2bfee26a 100644
--- a/lib/libX11/modules/lc/def/Makefile.in
+++ b/lib/libX11/modules/lc/def/Makefile.in
@@ -112,6 +112,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -128,6 +129,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -135,6 +137,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -144,11 +147,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -163,6 +169,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -211,7 +218,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/lc/gen/Makefile.in b/lib/libX11/modules/lc/gen/Makefile.in
index 02af30456..f68abdc7c 100644
--- a/lib/libX11/modules/lc/gen/Makefile.in
+++ b/lib/libX11/modules/lc/gen/Makefile.in
@@ -112,6 +112,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -128,6 +129,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -135,6 +137,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -144,11 +147,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -163,6 +169,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -211,7 +218,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/lc/xlocale/Makefile.in b/lib/libX11/modules/lc/xlocale/Makefile.in
index a97752cc5..b2a10fb16 100644
--- a/lib/libX11/modules/lc/xlocale/Makefile.in
+++ b/lib/libX11/modules/lc/xlocale/Makefile.in
@@ -112,6 +112,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -128,6 +129,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -135,6 +137,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -144,11 +147,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -163,6 +169,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -211,7 +218,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/om/Makefile.in b/lib/libX11/modules/om/Makefile.in
index b269b322b..280acc20a 100644
--- a/lib/libX11/modules/om/Makefile.in
+++ b/lib/libX11/modules/om/Makefile.in
@@ -87,6 +87,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -103,6 +104,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -110,6 +112,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -119,11 +122,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -138,6 +144,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -186,7 +193,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/modules/om/generic/Makefile.in b/lib/libX11/modules/om/generic/Makefile.in
index fd668819d..f7da19f46 100644
--- a/lib/libX11/modules/om/generic/Makefile.in
+++ b/lib/libX11/modules/om/generic/Makefile.in
@@ -115,6 +115,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -131,6 +132,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -138,6 +140,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -147,11 +150,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -166,6 +172,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -214,7 +221,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/nls/C/Makefile.in b/lib/libX11/nls/C/Makefile.in
index 9cf6a772f..17ed98be7 100644
--- a/lib/libX11/nls/C/Makefile.in
+++ b/lib/libX11/nls/C/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/C
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/Makefile.am b/lib/libX11/nls/Makefile.am
index d8e83bf0d..dcd7b9802 100644
--- a/lib/libX11/nls/Makefile.am
+++ b/lib/libX11/nls/Makefile.am
@@ -11,6 +11,7 @@ CLEANFILES= \
XLC_LOCALE
SUBDIRS= \
+ am_ET.UTF-8 \
armscii-8 \
C \
el_GR.UTF-8 \
diff --git a/lib/libX11/nls/Makefile.in b/lib/libX11/nls/Makefile.in
index c90939bcb..88970c655 100644
--- a/lib/libX11/nls/Makefile.in
+++ b/lib/libX11/nls/Makefile.in
@@ -102,6 +102,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -118,6 +119,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -125,6 +127,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -134,11 +137,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -153,6 +159,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -201,7 +208,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -252,6 +261,7 @@ CLEANFILES = \
XLC_LOCALE
SUBDIRS = \
+ am_ET.UTF-8 \
armscii-8 \
C \
el_GR.UTF-8 \
@@ -310,7 +320,6 @@ SUBDIRS = \
zh_TW.big5 \
zh_TW.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/am_ET.UTF-8/Compose.pre b/lib/libX11/nls/am_ET.UTF-8/Compose.pre
new file mode 100644
index 000000000..cb12e5cef
--- /dev/null
+++ b/lib/libX11/nls/am_ET.UTF-8/Compose.pre
@@ -0,0 +1,341 @@
+XCOMM
+XCOMM UTF-8 (Unicode) compose sequence
+XCOMM for Ethiopean layout.
+XCOMM Designed as a part of OLPC project
+XCOMM
+XCOMM 2007 Sergey Udaltsov <svu@gnome.org>
+XCOMM
+
+
+XCOMM
+XCOMM Group I
+XCOMM
+
+XCOMM Modifier: /u/
+<u> <U1200> : "ሁ" <U1201> # key h (base character ሀ)
+<u> <U1208> : "ሉ" <U1209> # key l (base character ለ)
+<u> <U1218> : "ሙ" <U1219> # key m (base character መ)
+<u> <U1228> : "ሩ" <U1229> # key r (base character ረ)
+<u> <U1230> : "ሱ" <U1231> # key s (base character ሰ)
+<u> <U1240> : "ቁ" <U1241> # key q (base character ቀ)
+<u> <U1260> : "ቡ" <U1261> # key b (base character በ)
+<u> <U1270> : "ቱ" <U1271> # key t (base character ተ)
+<u> <U1290> : "ኑ" <U1291> # key n (base character ነ)
+<u> <U12A0> : "ኡ" <U12A1> # key x (base character አ)
+<u> <U12A8> : "ኩ" <U12A9> # key k (base character ከ)
+<u> <U12C8> : "ዉ" <U12C9> # key w (base character ወ)
+<u> <U12D8> : "ዙ" <U12D9> # key z (base character ዘ)
+<u> <U12E8> : "ዩ" <U12E9> # key y (base character የ)
+<u> <U12F0> : "ዱ" <U12F1> # key d (base character ደ)
+<u> <U1300> : "ጁ" <U1301> # key j (base character ጀ)
+<u> <U1308> : "ጉ" <U1309> # key g (base character ገ)
+<u> <U1340> : "ፁ" <U1341> # key [ (base character ፀ)
+<u> <U1348> : "ፉ" <U1349> # key f (base character ፈ)
+<u> <U1350> : "ፑ" <U1351> # key p (base character ፐ)
+<u> <U1238> : "ሹ" <U1239> # key v (base character ሸ)
+<u> <U1328> : "ጩ" <U1329> # key ] (base character ጨ)
+
+XCOMM Modifier: /i/
+<i> <U1200> : "ሂ" <U1202> # key h (base character ሀ)
+<i> <U1208> : "ሊ" <U120A> # key l (base character ለ)
+<i> <U1218> : "ሚ" <U121A> # key m (base character መ)
+<i> <U1228> : "ሪ" <U122A> # key r (base character ረ)
+<i> <U1230> : "ሲ" <U1232> # key s (base character ሰ)
+<i> <U1240> : "ቂ" <U1242> # key q (base character ቀ)
+<i> <U1260> : "ቢ" <U1262> # key b (base character በ)
+<i> <U1270> : "ቲ" <U1272> # key t (base character ተ)
+<i> <U1290> : "ኒ" <U1292> # key n (base character ነ)
+<i> <U12A0> : "ኢ" <U12A2> # key x (base character አ)
+<i> <U12A8> : "ኪ" <U12AA> # key k (base character ከ)
+<i> <U12C8> : "ዊ" <U12CA> # key w (base character ወ)
+<i> <U12D8> : "ዚ" <U12DA> # key z (base character ዘ)
+<i> <U12E8> : "ዪ" <U12EA> # key y (base character የ)
+<i> <U12F0> : "ዲ" <U12F2> # key d (base character ደ)
+<i> <U1300> : "ጂ" <U1302> # key j (base character ጀ)
+<i> <U1308> : "ጊ" <U130A> # key g (base character ገ)
+<i> <U1340> : "ፂ" <U1342> # key [ (base character ፀ)
+<i> <U1348> : "ፊ" <U134A> # key f (base character ፈ)
+<i> <U1350> : "ፒ" <U1352> # key p (base character ፐ)
+<i> <U1238> : "ሺ" <U123A> # key v (base character ሸ)
+<i> <U1328> : "ጪ" <U132A> # key ] (base character ጨ)
+
+XCOMM Modifier: /a/
+<a> <U1200> : "ሃ" <U1203> # key h (base character ሀ)
+<a> <U1208> : "ላ" <U120B> # key l (base character ለ)
+<a> <U1218> : "ማ" <U121B> # key m (base character መ)
+<a> <U1228> : "ራ" <U122B> # key r (base character ረ)
+<a> <U1230> : "ሳ" <U1233> # key s (base character ሰ)
+<a> <U1240> : "ቃ" <U1243> # key q (base character ቀ)
+<a> <U1260> : "ባ" <U1263> # key b (base character በ)
+<a> <U1270> : "ታ" <U1273> # key t (base character ተ)
+<a> <U1290> : "ና" <U1293> # key n (base character ነ)
+<a> <U12A0> : "ኣ" <U12A3> # key x (base character አ)
+<a> <U12A8> : "ካ" <U12AB> # key k (base character ከ)
+<a> <U12C8> : "ዋ" <U12CB> # key w (base character ወ)
+<a> <U12D8> : "ዛ" <U12DB> # key z (base character ዘ)
+<a> <U12E8> : "ያ" <U12EB> # key y (base character የ)
+<a> <U12F0> : "ዳ" <U12F3> # key d (base character ደ)
+<a> <U1300> : "ጃ" <U1303> # key j (base character ጀ)
+<a> <U1308> : "ጋ" <U130B> # key g (base character ገ)
+<a> <U1340> : "ፃ" <U1343> # key [ (base character ፀ)
+<a> <U1348> : "ፋ" <U134B> # key f (base character ፈ)
+<a> <U1350> : "ፓ" <U1353> # key p (base character ፐ)
+<a> <U1238> : "ሻ" <U123B> # key v (base character ሸ)
+<a> <U1328> : "ጫ" <U132B> # key ] (base character ጨ)
+
+XCOMM Modifier: /e/
+<e> <U1200> : "ሄ" <U1204> # key h (base character ሀ)
+<e> <U1208> : "ሌ" <U120C> # key l (base character ለ)
+<e> <U1218> : "ሜ" <U121C> # key m (base character መ)
+<e> <U1228> : "ሬ" <U122C> # key r (base character ረ)
+<e> <U1230> : "ሴ" <U1234> # key s (base character ሰ)
+<e> <U1240> : "ቄ" <U1244> # key q (base character ቀ)
+<e> <U1260> : "ቤ" <U1264> # key b (base character በ)
+<e> <U1270> : "ቴ" <U1274> # key t (base character ተ)
+<e> <U1290> : "ኔ" <U1294> # key n (base character ነ)
+<e> <U12A0> : "ኤ" <U12A4> # key x (base character አ)
+<e> <U12A8> : "ኬ" <U12AC> # key k (base character ከ)
+<e> <U12C8> : "ዌ" <U12CC> # key w (base character ወ)
+<e> <U12D8> : "ዜ" <U12DC> # key z (base character ዘ)
+<e> <U12E8> : "ዬ" <U12EC> # key y (base character የ)
+<e> <U12F0> : "ዴ" <U12F4> # key d (base character ደ)
+<e> <U1300> : "ጄ" <U1304> # key j (base character ጀ)
+<e> <U1308> : "ጌ" <U130C> # key g (base character ገ)
+<e> <U1340> : "ፄ" <U1344> # key [ (base character ፀ)
+<e> <U1348> : "ፌ" <U134C> # key f (base character ፈ)
+<e> <U1350> : "ፔ" <U1354> # key p (base character ፐ)
+<e> <U1238> : "ሼ" <U123C> # key v (base character ሸ)
+<e> <U1328> : "ጬ" <U132C> # key ] (base character ጨ)
+
+XCOMM Modifier: /c/
+<c> <U1200> : "ህ" <U1205> # key h (base character ሀ)
+<c> <U1208> : "ል" <U120D> # key l (base character ለ)
+<c> <U1218> : "ም" <U121D> # key m (base character መ)
+<c> <U1228> : "ር" <U122D> # key r (base character ረ)
+<c> <U1230> : "ስ" <U1235> # key s (base character ሰ)
+<c> <U1240> : "ቅ" <U1245> # key q (base character ቀ)
+<c> <U1260> : "ብ" <U1265> # key b (base character በ)
+<c> <U1270> : "ት" <U1275> # key t (base character ተ)
+<c> <U1290> : "ን" <U1295> # key n (base character ነ)
+<c> <U12A0> : "እ" <U12A5> # key x (base character አ)
+<c> <U12A8> : "ክ" <U12AD> # key k (base character ከ)
+<c> <U12C8> : "ው" <U12CD> # key w (base character ወ)
+<c> <U12D8> : "ዝ" <U12DD> # key z (base character ዘ)
+<c> <U12E8> : "ይ" <U12ED> # key y (base character የ)
+<c> <U12F0> : "ድ" <U12F5> # key d (base character ደ)
+<c> <U1300> : "ጅ" <U1305> # key j (base character ጀ)
+<c> <U1308> : "ግ" <U130D> # key g (base character ገ)
+<c> <U1340> : "ፅ" <U1345> # key [ (base character ፀ)
+<c> <U1348> : "ፍ" <U134D> # key f (base character ፈ)
+<c> <U1350> : "ፕ" <U1355> # key p (base character ፐ)
+<c> <U1238> : "ሽ" <U123D> # key v (base character ሸ)
+<c> <U1328> : "ጭ" <U132D> # key ] (base character ጨ)
+
+XCOMM Modifier: /o/
+<o> <U1200> : "ሆ" <U1206> # key h (base character ሀ)
+<o> <U1208> : "ሎ" <U120E> # key l (base character ለ)
+<o> <U1218> : "ሞ" <U121E> # key m (base character መ)
+<o> <U1228> : "ሮ" <U122E> # key r (base character ረ)
+<o> <U1230> : "ሶ" <U1236> # key s (base character ሰ)
+<o> <U1240> : "ቆ" <U1246> # key q (base character ቀ)
+<o> <U1260> : "ቦ" <U1266> # key b (base character በ)
+<o> <U1270> : "ቶ" <U1276> # key t (base character ተ)
+<o> <U1290> : "ኖ" <U1296> # key n (base character ነ)
+<o> <U12A0> : "ኦ" <U12A6> # key x (base character አ)
+<o> <U12A8> : "ኮ" <U12AE> # key k (base character ከ)
+<o> <U12C8> : "ዎ" <U12CE> # key w (base character ወ)
+<o> <U12D8> : "ዞ" <U12DE> # key z (base character ዘ)
+<o> <U12E8> : "ዮ" <U12EE> # key y (base character የ)
+<o> <U12F0> : "ዶ" <U12F6> # key d (base character ደ)
+<o> <U1300> : "ጆ" <U1306> # key j (base character ጀ)
+<o> <U1308> : "ጎ" <U130E> # key g (base character ገ)
+<o> <U1340> : "ፆ" <U1346> # key [ (base character ፀ)
+<o> <U1348> : "ፎ" <U134E> # key f (base character ፈ)
+<o> <U1350> : "ፖ" <U1356> # key p (base character ፐ)
+<o> <U1238> : "ሾ" <U123E> # key v (base character ሸ)
+<o> <U1328> : "ጮ" <U132E> # key ] (base character ጨ)
+
+XCOMM Modifier: /A/
+<A> <U1208> : "ሏ" <U120F> # key l (base character ለ)
+<A> <U1218> : "ሟ" <U121F> # key m (base character መ)
+<A> <U1228> : "ሯ" <U122F> # key r (base character ረ)
+<A> <U1230> : "ሷ" <U1237> # key s (base character ሰ)
+<A> <U1240> : "ቋ" <U124B> # key q (base character ቀ)
+<A> <U1260> : "ቧ" <U1267> # key b (base character በ)
+<A> <U1270> : "ቷ" <U1277> # key t (base character ተ)
+<A> <U1290> : "ኗ" <U1297> # key n (base character ነ)
+<A> <U12A0> : "ኧ" <U12A7> # key x (base character አ)
+<A> <U12A8> : "ኳ" <U12B3> # key k (base character ከ)
+<A> <U12D8> : "ዟ" <U12DF> # key z (base character ዘ)
+<A> <U12F0> : "ዷ" <U12F7> # key d (base character ደ)
+<A> <U1300> : "ጇ" <U1307> # key j (base character ጀ)
+<A> <U1308> : "ጓ" <U1313> # key g (base character ገ)
+<A> <U1348> : "ፏ" <U134F> # key f (base character ፈ)
+<A> <U1350> : "ፗ" <U1357> # key p (base character ፐ)
+<A> <U1238> : "ሿ" <U123F> # key v (base character ሸ)
+<A> <U1328> : "ጯ" <U132F> # key ] (base character ጨ)
+
+XCOMM Modifier: /U/
+<U> <U1240> : "ቍ" <U124D> # key q (base character ቀ)
+<U> <U12A8> : "ኵ" <U12B5> # key k (base character ከ)
+<U> <U1308> : "ጕ" <U1315> # key g (base character ገ)
+
+XCOMM Modifier: /I/
+<I> <U1240> : "ቊ" <U124A> # key q (base character ቀ)
+<I> <U12A8> : "ኲ" <U12B2> # key k (base character ከ)
+<I> <U1308> : "ጒ" <U1312> # key g (base character ገ)
+
+XCOMM Modifier: /E/
+<E> <U1240> : "ቌ" <U124C> # key q (base character ቀ)
+<E> <U12A8> : "ኴ" <U12B4> # key k (base character ከ)
+<E> <U1308> : "ጔ" <U1314> # key g (base character ገ)
+
+XCOMM Modifier: /O/
+<O> <U1240> : "ቈ" <U1248> # key q (base character ቀ)
+<O> <U12A8> : "ኰ" <U12B0> # key k (base character ከ)
+<O> <U1308> : "ጐ" <U1310> # key g (base character ገ)
+
+XCOMM
+XCOMM Group II
+XCOMM
+XCOMM Modifier: /u/
+<u> <U1210> : "ሑ" <U1211> # key h (base character ሐ)
+<u> <U1220> : "ሡ" <U1221> # key s (base character ሠ)
+<u> <U1250> : "ቑ" <U1251> # key q (base character ቐ)
+<u> <U1278> : "ቹ" <U1279> # key c (base character ቸ)
+<u> <U1320> : "ጡ" <U1321> # key t (base character ጠ)
+<u> <U1298> : "ኙ" <U1299> # key n (base character ኘ)
+<u> <U12D0> : "ዑ" <U12D1> # key x (base character ዐ)
+<u> <U12B8> : "ኹ" <U12B9> # key k (base character ኸ)
+<u> <U12E0> : "ዡ" <U12E1> # key z (base character ዠ)
+<u> <U12F8> : "ዹ" <U12F9> # key d (base character ዸ)
+<u> <U1318> : "ጙ" <U1319> # key g (base character ጘ)
+<u> <U1338> : "ጹ" <U1339> # key [ (base character ጸ)
+<u> <U1330> : "ጱ" <U1331> # key p (base character ጰ)
+<u> <U1280> : "ኁ" <U1281> # key ] (base character ኀ)
+<u> <U1268> : "ቩ" <U1269> # key v (base character ቨ)
+
+XCOMM Modifier: /i/
+<i> <U1210> : "ሒ" <U1212> # key h (base character ሐ)
+<i> <U1220> : "ሢ" <U1222> # key s (base character ሠ)
+<i> <U1250> : "ቒ" <U1252> # key q (base character ቐ)
+<i> <U1278> : "ቺ" <U127A> # key c (base character ቸ)
+<i> <U1320> : "ጢ" <U1322> # key t (base character ጠ)
+<i> <U1298> : "ኚ" <U129A> # key n (base character ኘ)
+<i> <U12D0> : "ዒ" <U12D2> # key x (base character ዐ)
+<i> <U12B8> : "ኺ" <U12BA> # key k (base character ኸ)
+<i> <U12E0> : "ዢ" <U12E2> # key z (base character ዠ)
+<i> <U12F8> : "ዺ" <U12FA> # key d (base character ዸ)
+<i> <U1318> : "ጚ" <U131A> # key g (base character ጘ)
+<i> <U1338> : "ጺ" <U133A> # key [ (base character ጸ)
+<i> <U1330> : "ጲ" <U1332> # key p (base character ጰ)
+<i> <U1280> : "ኂ" <U1282> # key ] (base character ኀ)
+<i> <U1268> : "ቪ" <U126A> # key v (base character ቨ)
+
+XCOMM Modifier: /a/
+<a> <U1210> : "ሓ" <U1213> # key h (base character ሐ)
+<a> <U1220> : "ሣ" <U1223> # key s (base character ሠ)
+<a> <U1250> : "ቓ" <U1253> # key q (base character ቐ)
+<a> <U1278> : "ቻ" <U127B> # key c (base character ቸ)
+<a> <U1320> : "ጣ" <U1323> # key t (base character ጠ)
+<a> <U1298> : "ኛ" <U129B> # key n (base character ኘ)
+<a> <U12D0> : "ዓ" <U12D3> # key x (base character ዐ)
+<a> <U12B8> : "ኻ" <U12BB> # key k (base character ኸ)
+<a> <U12E0> : "ዣ" <U12E3> # key z (base character ዠ)
+<a> <U12F8> : "ዻ" <U12FB> # key d (base character ዸ)
+<a> <U1318> : "ጛ" <U131B> # key g (base character ጘ)
+<a> <U1338> : "ጻ" <U133B> # key [ (base character ጸ)
+<a> <U1330> : "ጳ" <U1333> # key p (base character ጰ)
+<a> <U1280> : "ኃ" <U1283> # key ] (base character ኀ)
+<a> <U1268> : "ቫ" <U126B> # key v (base character ቨ)
+
+XCOMM Modifier: /e/
+<e> <U1210> : "ሔ" <U1214> # key h (base character ሐ)
+<e> <U1220> : "ሤ" <U1224> # key s (base character ሠ)
+<e> <U1250> : "ቔ" <U1254> # key q (base character ቐ)
+<e> <U1278> : "ቼ" <U127C> # key c (base character ቸ)
+<e> <U1320> : "ጤ" <U1324> # key t (base character ጠ)
+<e> <U1298> : "ኜ" <U129C> # key n (base character ኘ)
+<e> <U12D0> : "ዔ" <U12D4> # key x (base character ዐ)
+<e> <U12B8> : "ኼ" <U12BC> # key k (base character ኸ)
+<e> <U12E0> : "ዤ" <U12E4> # key z (base character ዠ)
+<e> <U12F8> : "ዼ" <U12FC> # key d (base character ዸ)
+<e> <U1318> : "ጜ" <U131C> # key g (base character ጘ)
+<e> <U1338> : "ጼ" <U133C> # key [ (base character ጸ)
+<e> <U1330> : "ጴ" <U1334> # key p (base character ጰ)
+<e> <U1280> : "ኄ" <U1284> # key ] (base character ኀ)
+<e> <U1268> : "ቬ" <U126C> # key v (base character ቨ)
+
+XCOMM Modifier: /c/
+<c> <U1210> : "ሕ" <U1215> # key h (base character ሐ)
+<c> <U1220> : "ሥ" <U1225> # key s (base character ሠ)
+<c> <U1250> : "ቕ" <U1255> # key q (base character ቐ)
+<c> <U1278> : "ች" <U127D> # key c (base character ቸ)
+<c> <U1320> : "ጥ" <U1325> # key t (base character ጠ)
+<c> <U1298> : "ኝ" <U129D> # key n (base character ኘ)
+<c> <U12D0> : "ዕ" <U12D5> # key x (base character ዐ)
+<c> <U12B8> : "ኽ" <U12BD> # key k (base character ኸ)
+<c> <U12E0> : "ዥ" <U12E5> # key z (base character ዠ)
+<c> <U12F8> : "ዽ" <U12FD> # key d (base character ዸ)
+<c> <U1318> : "ጝ" <U131D> # key g (base character ጘ)
+<c> <U1338> : "ጽ" <U133D> # key [ (base character ጸ)
+<c> <U1330> : "ጵ" <U1335> # key p (base character ጰ)
+<c> <U1280> : "ኅ" <U1285> # key ] (base character ኀ)
+<c> <U1268> : "ቭ" <U126D> # key v (base character ቨ)
+
+XCOMM Modifier: /o/
+<o> <U1210> : "ሖ" <U1216> # key h (base character ሐ)
+<o> <U1220> : "ሦ" <U1226> # key s (base character ሠ)
+<o> <U1250> : "ቖ" <U1256> # key q (base character ቐ)
+<o> <U1278> : "ቾ" <U127E> # key c (base character ቸ)
+<o> <U1320> : "ጦ" <U1326> # key t (base character ጠ)
+<o> <U1298> : "ኞ" <U129E> # key n (base character ኘ)
+<o> <U12D0> : "ዖ" <U12D6> # key x (base character ዐ)
+<o> <U12B8> : "ኾ" <U12BE> # key k (base character ኸ)
+<o> <U12E0> : "ዦ" <U12E6> # key z (base character ዠ)
+<o> <U12F8> : "ዾ" <U12FE> # key d (base character ዸ)
+<o> <U1318> : "ጞ" <U131E> # key g (base character ጘ)
+<o> <U1338> : "ጾ" <U133E> # key [ (base character ጸ)
+<o> <U1330> : "ጶ" <U1336> # key p (base character ጰ)
+<o> <U1280> : "ኆ" <U1286> # key ] (base character ኀ)
+<o> <U1268> : "ቮ" <U126E> # key v (base character ቨ)
+
+XCOMM Modifier: /A/
+<A> <U1210> : "ሗ" <U1217> # key h (base character ሐ)
+<A> <U1220> : "ሧ" <U1227> # key s (base character ሠ)
+<A> <U1250> : "ቛ" <U125B> # key q (base character ቐ)
+<A> <U1278> : "ቿ" <U127F> # key c (base character ቸ)
+<A> <U1320> : "ጧ" <U1327> # key t (base character ጠ)
+<A> <U1298> : "ኟ" <U129F> # key n (base character ኘ)
+<A> <U12B8> : "ዃ" <U12C3> # key k (base character ኸ)
+<A> <U12E0> : "ዧ" <U12E7> # key z (base character ዠ)
+<A> <U12F8> : "ዿ" <U12FF> # key d (base character ዸ)
+<A> <U1338> : "ጿ" <U133F> # key [ (base character ጸ)
+<A> <U1330> : "ጷ" <U1337> # key p (base character ጰ)
+<A> <U1280> : "ኋ" <U128B> # key ] (base character ኀ)
+<A> <U1268> : "ቯ" <U126F> # key v (base character ቨ)
+
+XCOMM Modifier: /U/
+<U> <U1250> : "ቝ" <U125D> # key q (base character ቐ)
+<U> <U12B8> : "ዅ" <U12C5> # key k (base character ኸ)
+
+XCOMM Modifier: /I/
+<I> <U1250> : "ቚ" <U125A> # key q (base character ቐ)
+<I> <U12B8> : "ዂ" <U12C2> # key k (base character ኸ)
+
+XCOMM Modifier: /E/
+<E> <U1250> : "ቜ" <U125C> # key q (base character ቐ)
+<E> <U12B8> : "ዄ" <U12C4> # key k (base character ኸ)
+
+XCOMM Modifier: /O/
+<O> <U1250> : "ቘ" <U1258> # key q (base character ቐ)
+<O> <U12B8> : "ዀ" <U12C0> # key k (base character ኸ)
+
+XCOMM
+XCOMM Group III
+XCOMM
+<backslash> <quotedbl> : "፥" <U1365> # key "
+<backslash> <apostrophe> : "፦" <U1366> # key "
+<backslash> <minus> : "|" <U007C> # key -
+<backslash> <underscore> : "¥" <U00A5> # key _
+<backslash> <question> : "፧" <U1367> # key ?
diff --git a/lib/libX11/nls/am_ET.UTF-8/Makefile.am b/lib/libX11/nls/am_ET.UTF-8/Makefile.am
new file mode 100644
index 000000000..a2904fbdc
--- /dev/null
+++ b/lib/libX11/nls/am_ET.UTF-8/Makefile.am
@@ -0,0 +1,3 @@
+x11thislocaledir = $(X11_LOCALEDATADIR)/am_ET.UTF-8
+
+include $(top_srcdir)/nls/localerules.in
diff --git a/lib/libX11/nls/am_ET.UTF-8/Makefile.in b/lib/libX11/nls/am_ET.UTF-8/Makefile.in
new file mode 100644
index 000000000..58ba88d9f
--- /dev/null
+++ b/lib/libX11/nls/am_ET.UTF-8/Makefile.in
@@ -0,0 +1,480 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# -*- Makefile -*-
+# Rules for generating files using the C pre-processor
+# (Replaces CppFileTarget from Imake)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(dist_x11thislocale_DATA) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/cpprules.in \
+ $(top_srcdir)/nls/localerules.in
+subdir = nls/am_ET.UTF-8
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h \
+ $(top_builddir)/include/X11/XlibConf.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
+ "$(DESTDIR)$(x11thislocaledir)"
+dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
+x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
+BIGFONT_LIBS = @BIGFONT_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINTLIB = @LINTLIB@
+LINT_FALSE = @LINT_FALSE@
+LINT_FLAGS = @LINT_FLAGS@
+LINT_TRUE = @LINT_TRUE@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
+MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MANPAGES_FALSE = @MANPAGES_FALSE@
+MANPAGES_TRUE = @MANPAGES_TRUE@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OS2_FALSE = @OS2_FALSE@
+OS2_TRUE = @OS2_TRUE@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+THRSTUBS_FALSE = @THRSTUBS_FALSE@
+THRSTUBS_TRUE = @THRSTUBS_TRUE@
+UDC_FALSE = @UDC_FALSE@
+UDC_TRUE = @UDC_TRUE@
+VERSION = @VERSION@
+WCHAR32 = @WCHAR32@
+X11_CFLAGS = @X11_CFLAGS@
+X11_DATADIR = @X11_DATADIR@
+X11_EXTRA_DEPS = @X11_EXTRA_DEPS@
+X11_LIBDIR = @X11_LIBDIR@
+X11_LIBS = @X11_LIBS@
+X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
+X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
+XCB_FALSE = @XCB_FALSE@
+XCB_TRUE = @XCB_TRUE@
+XCMS_FALSE = @XCMS_FALSE@
+XCMS_TRUE = @XCMS_TRUE@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XERRORDB = @XERRORDB@
+XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
+XKBPROTO_LIBS = @XKBPROTO_LIBS@
+XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
+XKB_FALSE = @XKB_FALSE@
+XKB_TRUE = @XKB_TRUE@
+XKEYSYMDB = @XKEYSYMDB@
+XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
+XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
+XLOCALEDIR = @XLOCALEDIR@
+XLOCALELIBDIR = @XLOCALELIBDIR@
+XLOCALE_FALSE = @XLOCALE_FALSE@
+XLOCALE_TRUE = @XLOCALE_TRUE@
+XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XPROTO_CFLAGS = @XPROTO_CFLAGS@
+XPROTO_LIBS = @XPROTO_LIBS@
+XTHREADLIB = @XTHREADLIB@
+XTHREADS = @XTHREADS@
+XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
+XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
+XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+x11thislocaledir = $(X11_LOCALEDATADIR)/am_ET.UTF-8
+SUFFIXES = .pre
+WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
+CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
+
+# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
+# to cpp, because that trick does not work on all ANSI C preprocessors.
+# Delete line numbers from the cpp output (-P is not portable, I guess).
+# Allow XCOMM to be preceded by whitespace and provide a means of generating
+# output lines with trailing backslashes.
+# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
+CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
+ -e '/^\#line *[0-9][0-9]* *.*$$/d' \
+ -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
+ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
+ -e '/^[ ]*XHASH/s/XHASH/\#/' \
+ -e '/\@\@$$/s/\@\@$$/\\/'
+
+EXTRA_DIST = XLC_LOCALE.pre Compose.pre
+dist_x11thislocale_DATA = XI18N_OBJS
+x11thislocale_DATA = XLC_LOCALE Compose
+CLEANFILES = XLC_LOCALE Compose
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .pre
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/nls/localerules.in $(top_srcdir)/cpprules.in $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/am_ET.UTF-8/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign nls/am_ET.UTF-8/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(x11thislocaledir)" || $(mkdir_p) "$(DESTDIR)$(x11thislocaledir)"
+ @list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
+ $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+ done
+
+uninstall-dist_x11thislocaleDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
+ rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+ done
+install-x11thislocaleDATA: $(x11thislocale_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(x11thislocaledir)" || $(mkdir_p) "$(DESTDIR)$(x11thislocaledir)"
+ @list='$(x11thislocale_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
+ $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+ done
+
+uninstall-x11thislocaleDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(x11thislocale_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
+ rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+ done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ $(mkdir_p) $(distdir)/../.. $(distdir)/../../nls
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(x11thislocaledir)" "$(DESTDIR)$(x11thislocaledir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_x11thislocaleDATA \
+ install-x11thislocaleDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \
+ uninstall-x11thislocaleDATA
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dist_x11thislocaleDATA \
+ install-exec install-exec-am install-info install-info-am \
+ install-man install-strip install-x11thislocaleDATA \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-dist_x11thislocaleDATA uninstall-info-am \
+ uninstall-x11thislocaleDATA
+
+
+# Allow people to comment out lines by starting them with '##'
+.pre:
+ $(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/libX11/nls/am_ET.UTF-8/XI18N_OBJS b/lib/libX11/nls/am_ET.UTF-8/XI18N_OBJS
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/lib/libX11/nls/am_ET.UTF-8/XI18N_OBJS
diff --git a/lib/libX11/nls/am_ET.UTF-8/XLC_LOCALE.pre b/lib/libX11/nls/am_ET.UTF-8/XLC_LOCALE.pre
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/lib/libX11/nls/am_ET.UTF-8/XLC_LOCALE.pre
diff --git a/lib/libX11/nls/armscii-8/Makefile.in b/lib/libX11/nls/armscii-8/Makefile.in
index 9d4fb7cfd..e9c8c8c1c 100644
--- a/lib/libX11/nls/armscii-8/Makefile.in
+++ b/lib/libX11/nls/armscii-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/armscii-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/compose.dir.pre b/lib/libX11/nls/compose.dir.pre
index d9886c7b5..c9a35dcf5 100644
--- a/lib/libX11/nls/compose.dir.pre
+++ b/lib/libX11/nls/compose.dir.pre
@@ -32,8 +32,14 @@ iso8859-1/Compose: br_FR.ISO8859-1
iso8859-14/Compose: br_FR.ISO8859-14
iso8859-15/Compose: br_FR.ISO8859-15
iso8859-2/Compose: bs_BA.ISO8859-2
+iso8859-1/Compose: ca_AD.ISO8859-1
+iso8859-15/Compose: ca_AD.ISO8859-15
iso8859-1/Compose: ca_ES.ISO8859-1
iso8859-15/Compose: ca_ES.ISO8859-15
+iso8859-1/Compose: ca_FR.ISO8859-1
+iso8859-15/Compose: ca_FR.ISO8859-15
+iso8859-1/Compose: ca_IT.ISO8859-1
+iso8859-15/Compose: ca_IT.ISO8859-15
iso8859-2/Compose: cs_CZ.ISO8859-2
iso8859-1/Compose: cy_GB.ISO8859-1
iso8859-14/Compose: cy_GB.ISO8859-14
@@ -258,7 +264,10 @@ en_US.UTF-8/Compose: be_BY.UTF-8
en_US.UTF-8/Compose: bg_BG.UTF-8
en_US.UTF-8/Compose: bn_IN.UTF-8
en_US.UTF-8/Compose: br_FR.UTF-8
+en_US.UTF-8/Compose: ca_AD.UTF-8
en_US.UTF-8/Compose: ca_ES.UTF-8
+en_US.UTF-8/Compose: ca_FR.UTF-8
+en_US.UTF-8/Compose: ca_IT.UTF-8
en_US.UTF-8/Compose: cs_CZ.UTF-8
en_US.UTF-8/Compose: cy_GB.UTF-8
en_US.UTF-8/Compose: cz_CZ.UTF-8
diff --git a/lib/libX11/nls/el_GR.UTF-8/Compose.pre b/lib/libX11/nls/el_GR.UTF-8/Compose.pre
index e8daf224f..53ff43314 100644
--- a/lib/libX11/nls/el_GR.UTF-8/Compose.pre
+++ b/lib/libX11/nls/el_GR.UTF-8/Compose.pre
@@ -167,7 +167,9 @@ XCOMM Special Character
<Multi_key> <exclam> <P> : "¶" paragraph
<Multi_key> <period> <asciicircum> : "·" periodcentered
<Multi_key> <asciicircum> <period> : "·" periodcentered
-<Multi_key> <period> <period> : "·" periodcentered
+<Multi_key> <period> <minus> : "·" periodcentered
+<Multi_key> <period> <equal> : "•" enfilledcircbullet
+<Multi_key> <period> <period> : "…" ellipsis
<Multi_key> <1> <4> : "¼" onequarter
<Multi_key> <1> <2> : "½" onehalf
<Multi_key> <3> <4> : "¾" threequarters
@@ -410,350 +412,696 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <greater> <Greek_alpha> : "ἀ" U1f00
<dead_horn> <Greek_alpha> : "ἀ" U1f00
+<U0313> <Greek_alpha> : "ἀ" U1f00
+<dead_psili> <Greek_alpha> : "ἀ" U1f00
<Multi_key> <less> <Greek_alpha> : "ἁ" U1f01
<dead_ogonek> <Greek_alpha> : "ἁ" U1f01
+<U0314> <Greek_alpha> : "ἁ" U1f01
+<dead_dasia> <Greek_alpha> : "ἁ" U1f01
<Multi_key> <greater> <grave> <Greek_alpha> : "ἂ" U1f02
<Multi_key> <grave> <greater> <Greek_alpha> : "ἂ" U1f02
<dead_horn> <dead_grave> <Greek_alpha> : "ἂ" U1f02
+<U0313> <dead_grave> <Greek_alpha> : "ἂ" U1f02
+<dead_psili> <dead_grave> <Greek_alpha> : "ἂ" U1f02
<dead_grave> <dead_horn> <Greek_alpha> : "ἂ" U1f02
+<dead_grave> <U0313> <Greek_alpha> : "ἂ" U1f02
+<dead_grave> <dead_psili> <Greek_alpha> : "ἂ" U1f02
<Multi_key> <less> <grave> <Greek_alpha> : "ἃ" U1f03
<Multi_key> <grave> <less> <Greek_alpha> : "ἃ" U1f03
<dead_ogonek> <dead_grave> <Greek_alpha> : "ἃ" U1f03
+<U0314> <dead_grave> <Greek_alpha> : "ἃ" U1f03
+<dead_dasia> <dead_grave> <Greek_alpha> : "ἃ" U1f03
<dead_grave> <dead_ogonek> <Greek_alpha> : "ἃ" U1f03
+<dead_grave> <U0314> <Greek_alpha> : "ἃ" U1f03
+<dead_grave> <dead_dasia> <Greek_alpha> : "ἃ" U1f03
<Multi_key> <greater> <apostrophe> <Greek_alpha> : "ἄ" U1f04
<Multi_key> <apostrophe> <greater> <Greek_alpha> : "ἄ" U1f04
<dead_horn> <dead_acute> <Greek_alpha> : "ἄ" U1f04
+<U0313> <dead_acute> <Greek_alpha> : "ἄ" U1f04
+<dead_psili> <dead_acute> <Greek_alpha> : "ἄ" U1f04
<dead_acute> <dead_horn> <Greek_alpha> : "ἄ" U1f04
+<dead_acute> <U0313> <Greek_alpha> : "ἄ" U1f04
+<dead_acute> <dead_psili> <Greek_alpha> : "ἄ" U1f04
<Multi_key> <less> <apostrophe> <Greek_alpha> : "ἅ" U1f05
<Multi_key> <apostrophe> <less> <Greek_alpha> : "ἅ" U1f05
<dead_ogonek> <dead_acute> <Greek_alpha> : "ἅ" U1f05
+<U0314> <dead_acute> <Greek_alpha> : "ἅ" U1f05
+<dead_dasia> <dead_acute> <Greek_alpha> : "ἅ" U1f05
<dead_acute> <dead_ogonek> <Greek_alpha> : "ἅ" U1f05
+<dead_acute> <U0314> <Greek_alpha> : "ἅ" U1f05
+<dead_acute> <dead_dasia> <Greek_alpha> : "ἅ" U1f05
<Multi_key> <greater> <asciitilde> <Greek_alpha> : "ἆ" U1f06
<Multi_key> <asciitilde> <greater> <Greek_alpha> : "ἆ" U1f06
<dead_horn> <dead_tilde> <Greek_alpha> : "ἆ" U1f06
+<U0313> <dead_tilde> <Greek_alpha> : "ἆ" U1f06
+<dead_psili> <dead_tilde> <Greek_alpha> : "ἆ" U1f06
<dead_tilde> <dead_horn> <Greek_alpha> : "ἆ" U1f06
+<dead_tilde> <U0313> <Greek_alpha> : "ἆ" U1f06
+<dead_tilde> <dead_psili> <Greek_alpha> : "ἆ" U1f06
<Multi_key> <less> <asciitilde> <Greek_alpha> : "ἇ" U1f07
<Multi_key> <asciitilde> <less> <Greek_alpha> : "ἇ" U1f07
<dead_ogonek> <dead_tilde> <Greek_alpha> : "ἇ" U1f07
+<U0314> <dead_tilde> <Greek_alpha> : "ἇ" U1f07
+<dead_dasia> <dead_tilde> <Greek_alpha> : "ἇ" U1f07
<dead_tilde> <dead_ogonek> <Greek_alpha> : "ἇ" U1f07
+<dead_tilde> <U0314> <Greek_alpha> : "ἇ" U1f07
+<dead_tilde> <dead_dasia> <Greek_alpha> : "ἇ" U1f07
<Multi_key> <greater> <Greek_ALPHA> : "Ἀ" U1f08
<dead_horn> <Greek_ALPHA> : "Ἀ" U1f08
+<U0313> <Greek_ALPHA> : "Ἀ" U1f08
+<dead_psili> <Greek_ALPHA> : "Ἀ" U1f08
<Multi_key> <less> <Greek_ALPHA> : "Ἁ" U1f09
<dead_ogonek> <Greek_ALPHA> : "Ἁ" U1f09
+<U0314> <Greek_ALPHA> : "Ἁ" U1f09
+<dead_dasia> <Greek_ALPHA> : "Ἁ" U1f09
<Multi_key> <greater> <grave> <Greek_ALPHA> : "Ἂ" U1f0a
<Multi_key> <grave> <greater> <Greek_ALPHA> : "Ἂ" U1f0a
<dead_horn> <dead_grave> <Greek_ALPHA> : "Ἂ" U1f0a
+<U0313> <dead_grave> <Greek_ALPHA> : "Ἂ" U1f0a
+<dead_psili> <dead_grave> <Greek_ALPHA> : "Ἂ" U1f0a
<dead_grave> <dead_horn> <Greek_ALPHA> : "Ἂ" U1f0a
+<dead_grave> <U0313> <Greek_ALPHA> : "Ἂ" U1f0a
+<dead_grave> <dead_psili> <Greek_ALPHA> : "Ἂ" U1f0a
<Multi_key> <less> <grave> <Greek_ALPHA> : "Ἃ" U1f0b
<Multi_key> <grave> <less> <Greek_ALPHA> : "Ἃ" U1f0b
<dead_ogonek> <dead_grave> <Greek_ALPHA> : "Ἃ" U1f0b
+<U0314> <dead_grave> <Greek_ALPHA> : "Ἃ" U1f0b
+<dead_dasia> <dead_grave> <Greek_ALPHA> : "Ἃ" U1f0b
<dead_grave> <dead_ogonek> <Greek_ALPHA> : "Ἃ" U1f0b
+<dead_grave> <U0314> <Greek_ALPHA> : "Ἃ" U1f0b
+<dead_grave> <dead_dasia> <Greek_ALPHA> : "Ἃ" U1f0b
<Multi_key> <greater> <apostrophe> <Greek_ALPHA> : "Ἄ" U1f0c
<Multi_key> <apostrophe> <greater> <Greek_ALPHA> : "Ἄ" U1f0c
<dead_horn> <dead_acute> <Greek_ALPHA> : "Ἄ" U1f0c
+<U0313> <dead_acute> <Greek_ALPHA> : "Ἄ" U1f0c
+<dead_psili> <dead_acute> <Greek_ALPHA> : "Ἄ" U1f0c
<dead_acute> <dead_horn> <Greek_ALPHA> : "Ἄ" U1f0c
+<dead_acute> <U0313> <Greek_ALPHA> : "Ἄ" U1f0c
+<dead_acute> <dead_psili> <Greek_ALPHA> : "Ἄ" U1f0c
<Multi_key> <less> <apostrophe> <Greek_ALPHA> : "Ἅ" U1f0d
<Multi_key> <apostrophe> <less> <Greek_ALPHA> : "Ἅ" U1f0d
<dead_ogonek> <dead_acute> <Greek_ALPHA> : "Ἅ" U1f0d
+<U0314> <dead_acute> <Greek_ALPHA> : "Ἅ" U1f0d
+<dead_dasia> <dead_acute> <Greek_ALPHA> : "Ἅ" U1f0d
<dead_acute> <dead_ogonek> <Greek_ALPHA> : "Ἅ" U1f0d
+<dead_acute> <U0314> <Greek_ALPHA> : "Ἅ" U1f0d
+<dead_acute> <dead_dasia> <Greek_ALPHA> : "Ἅ" U1f0d
<Multi_key> <greater> <asciitilde> <Greek_ALPHA> : "Ἆ" U1f0e
<Multi_key> <asciitilde> <greater> <Greek_ALPHA> : "Ἆ" U1f0e
<dead_horn> <dead_tilde> <Greek_ALPHA> : "Ἆ" U1f0e
+<U0313> <dead_tilde> <Greek_ALPHA> : "Ἆ" U1f0e
+<dead_psili> <dead_tilde> <Greek_ALPHA> : "Ἆ" U1f0e
<dead_tilde> <dead_horn> <Greek_ALPHA> : "Ἆ" U1f0e
+<dead_tilde> <U0313> <Greek_ALPHA> : "Ἆ" U1f0e
+<dead_tilde> <dead_psili> <Greek_ALPHA> : "Ἆ" U1f0e
<Multi_key> <less> <asciitilde> <Greek_ALPHA> : "Ἇ" U1f0f
<Multi_key> <asciitilde> <less> <Greek_ALPHA> : "Ἇ" U1f0f
<dead_ogonek> <dead_tilde> <Greek_ALPHA> : "Ἇ" U1f0f
+<U0314> <dead_tilde> <Greek_ALPHA> : "Ἇ" U1f0f
+<dead_dasia> <dead_tilde> <Greek_ALPHA> : "Ἇ" U1f0f
<dead_tilde> <dead_ogonek> <Greek_ALPHA> : "Ἇ" U1f0f
+<dead_tilde> <U0314> <Greek_ALPHA> : "Ἇ" U1f0f
+<dead_tilde> <dead_dasia> <Greek_ALPHA> : "Ἇ" U1f0f
<Multi_key> <greater> <Greek_epsilon> : "ἐ" U1f10
<dead_horn> <Greek_epsilon> : "ἐ" U1f10
+<U0313> <Greek_epsilon> : "ἐ" U1f10
+<dead_psili> <Greek_epsilon> : "ἐ" U1f10
<Multi_key> <less> <Greek_epsilon> : "ἑ" U1f11
<dead_ogonek> <Greek_epsilon> : "ἑ" U1f11
+<U0314> <Greek_epsilon> : "ἑ" U1f11
+<dead_dasia> <Greek_epsilon> : "ἑ" U1f11
<Multi_key> <greater> <grave> <Greek_epsilon> : "ἒ" U1f12
<Multi_key> <grave> <greater> <Greek_epsilon> : "ἒ" U1f12
<dead_horn> <dead_grave> <Greek_epsilon> : "ἒ" U1f12
+<U0313> <dead_grave> <Greek_epsilon> : "ἒ" U1f12
+<dead_psili> <dead_grave> <Greek_epsilon> : "ἒ" U1f12
<dead_grave> <dead_horn> <Greek_epsilon> : "ἒ" U1f12
+<dead_grave> <U0313> <Greek_epsilon> : "ἒ" U1f12
+<dead_grave> <dead_psili> <Greek_epsilon> : "ἒ" U1f12
<Multi_key> <less> <grave> <Greek_epsilon> : "ἓ" U1f13
<Multi_key> <grave> <less> <Greek_epsilon> : "ἓ" U1f13
<dead_ogonek> <dead_grave> <Greek_epsilon> : "ἓ" U1f13
+<U0314> <dead_grave> <Greek_epsilon> : "ἓ" U1f13
+<dead_dasia> <dead_grave> <Greek_epsilon> : "ἓ" U1f13
<dead_grave> <dead_ogonek> <Greek_epsilon> : "ἓ" U1f13
+<dead_grave> <U0314> <Greek_epsilon> : "ἓ" U1f13
+<dead_grave> <dead_dasia> <Greek_epsilon> : "ἓ" U1f13
<Multi_key> <greater> <apostrophe> <Greek_epsilon> : "ἔ" U1f14
<Multi_key> <apostrophe> <greater> <Greek_epsilon> : "ἔ" U1f14
<dead_horn> <dead_acute> <Greek_epsilon> : "ἔ" U1f14
+<U0313> <dead_acute> <Greek_epsilon> : "ἔ" U1f14
+<dead_psili> <dead_acute> <Greek_epsilon> : "ἔ" U1f14
<dead_acute> <dead_horn> <Greek_epsilon> : "ἔ" U1f14
+<dead_acute> <U0313> <Greek_epsilon> : "ἔ" U1f14
+<dead_acute> <dead_psili> <Greek_epsilon> : "ἔ" U1f14
<Multi_key> <less> <apostrophe> <Greek_epsilon> : "ἕ" U1f15
<Multi_key> <apostrophe> <less> <Greek_epsilon> : "ἕ" U1f15
<dead_ogonek> <dead_acute> <Greek_epsilon> : "ἕ" U1f15
+<U0314> <dead_acute> <Greek_epsilon> : "ἕ" U1f15
+<dead_dasia> <dead_acute> <Greek_epsilon> : "ἕ" U1f15
<dead_acute> <dead_ogonek> <Greek_epsilon> : "ἕ" U1f15
+<dead_acute> <U0314> <Greek_epsilon> : "ἕ" U1f15
+<dead_acute> <dead_dasia> <Greek_epsilon> : "ἕ" U1f15
<Multi_key> <greater> <Greek_EPSILON> : "Ἐ" U1f18
<dead_horn> <Greek_EPSILON> : "Ἐ" U1f18
+<U0313> <Greek_EPSILON> : "Ἐ" U1f18
+<dead_psili> <Greek_EPSILON> : "Ἐ" U1f18
<Multi_key> <less> <Greek_EPSILON> : "Ἑ" U1f19
<dead_ogonek> <Greek_EPSILON> : "Ἑ" U1f19
+<U0314> <Greek_EPSILON> : "Ἑ" U1f19
+<dead_dasia> <Greek_EPSILON> : "Ἑ" U1f19
<Multi_key> <greater> <grave> <Greek_EPSILON> : "Ἒ" U1f1a
<Multi_key> <grave> <greater> <Greek_EPSILON> : "Ἒ" U1f1a
<dead_horn> <dead_grave> <Greek_EPSILON> : "Ἒ" U1f1a
+<U0313> <dead_grave> <Greek_EPSILON> : "Ἒ" U1f1a
+<dead_psili> <dead_grave> <Greek_EPSILON> : "Ἒ" U1f1a
<dead_grave> <dead_horn> <Greek_EPSILON> : "Ἒ" U1f1a
+<dead_grave> <U0313> <Greek_EPSILON> : "Ἒ" U1f1a
+<dead_grave> <dead_psili> <Greek_EPSILON> : "Ἒ" U1f1a
<Multi_key> <less> <grave> <Greek_EPSILON> : "Ἓ" U1f1b
<Multi_key> <grave> <less> <Greek_EPSILON> : "Ἓ" U1f1b
<dead_ogonek> <dead_grave> <Greek_EPSILON> : "Ἓ" U1f1b
+<U0314> <dead_grave> <Greek_EPSILON> : "Ἓ" U1f1b
+<dead_dasia> <dead_grave> <Greek_EPSILON> : "Ἓ" U1f1b
<dead_grave> <dead_ogonek> <Greek_EPSILON> : "Ἓ" U1f1b
+<dead_grave> <U0314> <Greek_EPSILON> : "Ἓ" U1f1b
+<dead_grave> <dead_dasia> <Greek_EPSILON> : "Ἓ" U1f1b
<Multi_key> <greater> <apostrophe> <Greek_EPSILON> : "Ἔ" U1f1c
<Multi_key> <apostrophe> <greater> <Greek_EPSILON> : "Ἔ" U1f1c
<dead_horn> <dead_acute> <Greek_EPSILON> : "Ἔ" U1f1c
+<U0313> <dead_acute> <Greek_EPSILON> : "Ἔ" U1f1c
+<dead_psili> <dead_acute> <Greek_EPSILON> : "Ἔ" U1f1c
<dead_acute> <dead_horn> <Greek_EPSILON> : "Ἔ" U1f1c
+<dead_acute> <U0313> <Greek_EPSILON> : "Ἔ" U1f1c
+<dead_acute> <dead_psili> <Greek_EPSILON> : "Ἔ" U1f1c
<Multi_key> <less> <apostrophe> <Greek_EPSILON> : "Ἕ" U1f1d
<Multi_key> <apostrophe> <less> <Greek_EPSILON> : "Ἕ" U1f1d
<dead_ogonek> <dead_acute> <Greek_EPSILON> : "Ἕ" U1f1d
+<U0314> <dead_acute> <Greek_EPSILON> : "Ἕ" U1f1d
+<dead_dasia> <dead_acute> <Greek_EPSILON> : "Ἕ" U1f1d
<dead_acute> <dead_ogonek> <Greek_EPSILON> : "Ἕ" U1f1d
+<dead_acute> <U0314> <Greek_EPSILON> : "Ἕ" U1f1d
+<dead_acute> <dead_dasia> <Greek_EPSILON> : "Ἕ" U1f1d
<Multi_key> <greater> <Greek_eta> : "ἠ" U1f20
<dead_horn> <Greek_eta> : "ἠ" U1f20
+<U0313> <Greek_eta> : "ἠ" U1f20
+<dead_psili> <Greek_eta> : "ἠ" U1f20
<Multi_key> <less> <Greek_eta> : "ἡ" U1f21
<dead_ogonek> <Greek_eta> : "ἡ" U1f21
+<U0314> <Greek_eta> : "ἡ" U1f21
+<dead_dasia> <Greek_eta> : "ἡ" U1f21
<Multi_key> <greater> <grave> <Greek_eta> : "ἢ" U1f22
<Multi_key> <grave> <greater> <Greek_eta> : "ἢ" U1f22
<dead_horn> <dead_grave> <Greek_eta> : "ἢ" U1f22
+<U0313> <dead_grave> <Greek_eta> : "ἢ" U1f22
+<dead_psili> <dead_grave> <Greek_eta> : "ἢ" U1f22
<dead_grave> <dead_horn> <Greek_eta> : "ἢ" U1f22
+<dead_grave> <U0313> <Greek_eta> : "ἢ" U1f22
+<dead_grave> <dead_psili> <Greek_eta> : "ἢ" U1f22
<Multi_key> <less> <grave> <Greek_eta> : "ἣ" U1f23
<Multi_key> <grave> <less> <Greek_eta> : "ἣ" U1f23
<dead_ogonek> <dead_grave> <Greek_eta> : "ἣ" U1f23
+<U0314> <dead_grave> <Greek_eta> : "ἣ" U1f23
+<dead_dasia> <dead_grave> <Greek_eta> : "ἣ" U1f23
<dead_grave> <dead_ogonek> <Greek_eta> : "ἣ" U1f23
+<dead_grave> <U0314> <Greek_eta> : "ἣ" U1f23
+<dead_grave> <dead_dasia> <Greek_eta> : "ἣ" U1f23
<Multi_key> <greater> <apostrophe> <Greek_eta> : "ἤ" U1f24
<Multi_key> <apostrophe> <greater> <Greek_eta> : "ἤ" U1f24
<dead_horn> <dead_acute> <Greek_eta> : "ἤ" U1f24
+<U0313> <dead_acute> <Greek_eta> : "ἤ" U1f24
+<dead_psili> <dead_acute> <Greek_eta> : "ἤ" U1f24
<dead_acute> <dead_horn> <Greek_eta> : "ἤ" U1f24
+<dead_acute> <U0313> <Greek_eta> : "ἤ" U1f24
+<dead_acute> <dead_psili> <Greek_eta> : "ἤ" U1f24
<Multi_key> <less> <apostrophe> <Greek_eta> : "ἥ" U1f25
<Multi_key> <apostrophe> <less> <Greek_eta> : "ἥ" U1f25
<dead_ogonek> <dead_acute> <Greek_eta> : "ἥ" U1f25
+<U0314> <dead_acute> <Greek_eta> : "ἥ" U1f25
+<dead_dasia> <dead_acute> <Greek_eta> : "ἥ" U1f25
<dead_acute> <dead_ogonek> <Greek_eta> : "ἥ" U1f25
+<dead_acute> <U0314> <Greek_eta> : "ἥ" U1f25
+<dead_acute> <dead_dasia> <Greek_eta> : "ἥ" U1f25
<Multi_key> <greater> <asciitilde> <Greek_eta> : "ἦ" U1f26
<Multi_key> <asciitilde> <greater> <Greek_eta> : "ἦ" U1f26
<dead_horn> <dead_tilde> <Greek_eta> : "ἦ" U1f26
+<U0313> <dead_tilde> <Greek_eta> : "ἦ" U1f26
+<dead_psili> <dead_tilde> <Greek_eta> : "ἦ" U1f26
<dead_tilde> <dead_horn> <Greek_eta> : "ἦ" U1f26
+<dead_tilde> <U0313> <Greek_eta> : "ἦ" U1f26
+<dead_tilde> <dead_psili> <Greek_eta> : "ἦ" U1f26
<Multi_key> <less> <asciitilde> <Greek_eta> : "ἧ" U1f27
<Multi_key> <asciitilde> <less> <Greek_eta> : "ἧ" U1f27
<dead_ogonek> <dead_tilde> <Greek_eta> : "ἧ" U1f27
+<U0314> <dead_tilde> <Greek_eta> : "ἧ" U1f27
+<dead_dasia> <dead_tilde> <Greek_eta> : "ἧ" U1f27
<dead_tilde> <dead_ogonek> <Greek_eta> : "ἧ" U1f27
+<dead_tilde> <U0314> <Greek_eta> : "ἧ" U1f27
+<dead_tilde> <dead_dasia> <Greek_eta> : "ἧ" U1f27
<Multi_key> <greater> <Greek_ETA> : "Ἠ" U1f28
<dead_horn> <Greek_ETA> : "Ἠ" U1f28
+<U0313> <Greek_ETA> : "Ἠ" U1f28
+<dead_psili> <Greek_ETA> : "Ἠ" U1f28
<Multi_key> <less> <Greek_ETA> : "Ἡ" U1f29
<dead_ogonek> <Greek_ETA> : "Ἡ" U1f29
+<U0314> <Greek_ETA> : "Ἡ" U1f29
+<dead_dasia> <Greek_ETA> : "Ἡ" U1f29
<Multi_key> <greater> <grave> <Greek_ETA> : "Ἢ" U1f2a
<Multi_key> <grave> <greater> <Greek_ETA> : "Ἢ" U1f2a
<dead_horn> <dead_grave> <Greek_ETA> : "Ἢ" U1f2a
+<U0313> <dead_grave> <Greek_ETA> : "Ἢ" U1f2a
+<dead_psili> <dead_grave> <Greek_ETA> : "Ἢ" U1f2a
<dead_grave> <dead_horn> <Greek_ETA> : "Ἢ" U1f2a
+<dead_grave> <U0313> <Greek_ETA> : "Ἢ" U1f2a
+<dead_grave> <dead_psili> <Greek_ETA> : "Ἢ" U1f2a
<Multi_key> <less> <grave> <Greek_ETA> : "Ἣ" U1f2b
<Multi_key> <grave> <less> <Greek_ETA> : "Ἣ" U1f2b
<dead_ogonek> <dead_grave> <Greek_ETA> : "Ἣ" U1f2b
+<U0314> <dead_grave> <Greek_ETA> : "Ἣ" U1f2b
+<dead_dasia> <dead_grave> <Greek_ETA> : "Ἣ" U1f2b
<dead_grave> <dead_ogonek> <Greek_ETA> : "Ἣ" U1f2b
+<dead_grave> <U0314> <Greek_ETA> : "Ἣ" U1f2b
+<dead_grave> <dead_dasia> <Greek_ETA> : "Ἣ" U1f2b
<Multi_key> <greater> <apostrophe> <Greek_ETA> : "Ἤ" U1f2c
<Multi_key> <apostrophe> <greater> <Greek_ETA> : "Ἤ" U1f2c
<dead_horn> <dead_acute> <Greek_ETA> : "Ἤ" U1f2c
+<U0313> <dead_acute> <Greek_ETA> : "Ἤ" U1f2c
+<dead_psili> <dead_acute> <Greek_ETA> : "Ἤ" U1f2c
<dead_acute> <dead_horn> <Greek_ETA> : "Ἤ" U1f2c
+<dead_acute> <U0313> <Greek_ETA> : "Ἤ" U1f2c
+<dead_acute> <dead_psili> <Greek_ETA> : "Ἤ" U1f2c
<Multi_key> <less> <apostrophe> <Greek_ETA> : "Ἥ" U1f2d
<Multi_key> <apostrophe> <less> <Greek_ETA> : "Ἥ" U1f2d
<dead_ogonek> <dead_acute> <Greek_ETA> : "Ἥ" U1f2d
+<U0314> <dead_acute> <Greek_ETA> : "Ἥ" U1f2d
+<dead_dasia> <dead_acute> <Greek_ETA> : "Ἥ" U1f2d
<dead_acute> <dead_ogonek> <Greek_ETA> : "Ἥ" U1f2d
+<dead_acute> <U0314> <Greek_ETA> : "Ἥ" U1f2d
+<dead_acute> <dead_dasia> <Greek_ETA> : "Ἥ" U1f2d
<Multi_key> <greater> <asciitilde> <Greek_ETA> : "Ἦ" U1f2e
<Multi_key> <asciitilde> <greater> <Greek_ETA> : "Ἦ" U1f2e
<dead_horn> <dead_tilde> <Greek_ETA> : "Ἦ" U1f2e
+<U0313> <dead_tilde> <Greek_ETA> : "Ἦ" U1f2e
+<dead_psili> <dead_tilde> <Greek_ETA> : "Ἦ" U1f2e
<dead_tilde> <dead_horn> <Greek_ETA> : "Ἦ" U1f2e
+<dead_tilde> <U0313> <Greek_ETA> : "Ἦ" U1f2e
+<dead_tilde> <dead_psili> <Greek_ETA> : "Ἦ" U1f2e
<Multi_key> <less> <asciitilde> <Greek_ETA> : "Ἧ" U1f2f
<Multi_key> <asciitilde> <less> <Greek_ETA> : "Ἧ" U1f2f
<dead_ogonek> <dead_tilde> <Greek_ETA> : "Ἧ" U1f2f
+<U0314> <dead_tilde> <Greek_ETA> : "Ἧ" U1f2f
+<dead_dasia> <dead_tilde> <Greek_ETA> : "Ἧ" U1f2f
<dead_tilde> <dead_ogonek> <Greek_ETA> : "Ἧ" U1f2f
+<dead_tilde> <U0314> <Greek_ETA> : "Ἧ" U1f2f
+<dead_tilde> <dead_dasia> <Greek_ETA> : "Ἧ" U1f2f
<Multi_key> <greater> <Greek_iota> : "ἰ" U1f30
<dead_horn> <Greek_iota> : "ἰ" U1f30
+<U0313> <Greek_iota> : "ἰ" U1f30
+<dead_psili> <Greek_iota> : "ἰ" U1f30
<Multi_key> <less> <Greek_iota> : "ἱ" U1f31
<dead_ogonek> <Greek_iota> : "ἱ" U1f31
+<U0314> <Greek_iota> : "ἱ" U1f31
+<dead_dasia> <Greek_iota> : "ἱ" U1f31
<Multi_key> <greater> <grave> <Greek_iota> : "ἲ" U1f32
<Multi_key> <grave> <greater> <Greek_iota> : "ἲ" U1f32
<dead_horn> <dead_grave> <Greek_iota> : "ἲ" U1f32
+<U0313> <dead_grave> <Greek_iota> : "ἲ" U1f32
+<dead_psili> <dead_grave> <Greek_iota> : "ἲ" U1f32
<dead_grave> <dead_horn> <Greek_iota> : "ἲ" U1f32
+<dead_grave> <U0313> <Greek_iota> : "ἲ" U1f32
+<dead_grave> <dead_psili> <Greek_iota> : "ἲ" U1f32
<Multi_key> <less> <grave> <Greek_iota> : "ἳ" U1f33
<Multi_key> <grave> <less> <Greek_iota> : "ἳ" U1f33
<dead_ogonek> <dead_grave> <Greek_iota> : "ἳ" U1f33
+<U0314> <dead_grave> <Greek_iota> : "ἳ" U1f33
+<dead_dasia> <dead_grave> <Greek_iota> : "ἳ" U1f33
<dead_grave> <dead_ogonek> <Greek_iota> : "ἳ" U1f33
+<dead_grave> <U0314> <Greek_iota> : "ἳ" U1f33
+<dead_grave> <dead_dasia> <Greek_iota> : "ἳ" U1f33
<Multi_key> <greater> <apostrophe> <Greek_iota> : "ἴ" U1f34
<Multi_key> <apostrophe> <greater> <Greek_iota> : "ἴ" U1f34
<dead_horn> <dead_acute> <Greek_iota> : "ἴ" U1f34
+<U0313> <dead_acute> <Greek_iota> : "ἴ" U1f34
+<dead_psili> <dead_acute> <Greek_iota> : "ἴ" U1f34
<dead_acute> <dead_horn> <Greek_iota> : "ἴ" U1f34
+<dead_acute> <U0313> <Greek_iota> : "ἴ" U1f34
+<dead_acute> <dead_psili> <Greek_iota> : "ἴ" U1f34
<Multi_key> <less> <apostrophe> <Greek_iota> : "ἵ" U1f35
<Multi_key> <apostrophe> <less> <Greek_iota> : "ἵ" U1f35
<dead_ogonek> <dead_acute> <Greek_iota> : "ἵ" U1f35
+<U0314> <dead_acute> <Greek_iota> : "ἵ" U1f35
+<dead_dasia> <dead_acute> <Greek_iota> : "ἵ" U1f35
<dead_acute> <dead_ogonek> <Greek_iota> : "ἵ" U1f35
+<dead_acute> <U0314> <Greek_iota> : "ἵ" U1f35
+<dead_acute> <dead_dasia> <Greek_iota> : "ἵ" U1f35
<Multi_key> <greater> <asciitilde> <Greek_iota> : "ἶ" U1f36
<Multi_key> <asciitilde> <greater> <Greek_iota> : "ἶ" U1f36
<dead_horn> <dead_tilde> <Greek_iota> : "ἶ" U1f36
+<U0313> <dead_tilde> <Greek_iota> : "ἶ" U1f36
+<dead_psili> <dead_tilde> <Greek_iota> : "ἶ" U1f36
<dead_tilde> <dead_horn> <Greek_iota> : "ἶ" U1f36
+<dead_tilde> <U0313> <Greek_iota> : "ἶ" U1f36
+<dead_tilde> <dead_psili> <Greek_iota> : "ἶ" U1f36
<Multi_key> <less> <asciitilde> <Greek_iota> : "ἷ" U1f37
<Multi_key> <asciitilde> <less> <Greek_iota> : "ἷ" U1f37
<dead_ogonek> <dead_tilde> <Greek_iota> : "ἷ" U1f37
+<U0314> <dead_tilde> <Greek_iota> : "ἷ" U1f37
+<dead_dasia> <dead_tilde> <Greek_iota> : "ἷ" U1f37
<dead_tilde> <dead_ogonek> <Greek_iota> : "ἷ" U1f37
+<dead_tilde> <U0314> <Greek_iota> : "ἷ" U1f37
+<dead_tilde> <dead_dasia> <Greek_iota> : "ἷ" U1f37
<Multi_key> <greater> <Greek_IOTA> : "Ἰ" U1f38
<dead_horn> <Greek_IOTA> : "Ἰ" U1f38
+<U0313> <Greek_IOTA> : "Ἰ" U1f38
+<dead_psili> <Greek_IOTA> : "Ἰ" U1f38
<Multi_key> <less> <Greek_IOTA> : "Ἱ" U1f39
<dead_ogonek> <Greek_IOTA> : "Ἱ" U1f39
+<U0314> <Greek_IOTA> : "Ἱ" U1f39
+<dead_dasia> <Greek_IOTA> : "Ἱ" U1f39
<Multi_key> <greater> <grave> <Greek_IOTA> : "Ἲ" U1f3a
<Multi_key> <grave> <greater> <Greek_IOTA> : "Ἲ" U1f3a
<dead_horn> <dead_grave> <Greek_IOTA> : "Ἲ" U1f3a
+<U0313> <dead_grave> <Greek_IOTA> : "Ἲ" U1f3a
+<dead_psili> <dead_grave> <Greek_IOTA> : "Ἲ" U1f3a
<dead_grave> <dead_horn> <Greek_IOTA> : "Ἲ" U1f3a
+<dead_grave> <U0313> <Greek_IOTA> : "Ἲ" U1f3a
+<dead_grave> <dead_psili> <Greek_IOTA> : "Ἲ" U1f3a
<Multi_key> <less> <grave> <Greek_IOTA> : "Ἳ" U1f3b
<Multi_key> <grave> <less> <Greek_IOTA> : "Ἳ" U1f3b
<dead_ogonek> <dead_grave> <Greek_IOTA> : "Ἳ" U1f3b
+<U0314> <dead_grave> <Greek_IOTA> : "Ἳ" U1f3b
+<dead_dasia> <dead_grave> <Greek_IOTA> : "Ἳ" U1f3b
<dead_grave> <dead_ogonek> <Greek_IOTA> : "Ἳ" U1f3b
+<dead_grave> <U0314> <Greek_IOTA> : "Ἳ" U1f3b
+<dead_grave> <dead_dasia> <Greek_IOTA> : "Ἳ" U1f3b
<Multi_key> <greater> <apostrophe> <Greek_IOTA> : "Ἴ" U1f3c
<Multi_key> <apostrophe> <greater> <Greek_IOTA> : "Ἴ" U1f3c
<dead_horn> <dead_acute> <Greek_IOTA> : "Ἴ" U1f3c
+<U0313> <dead_acute> <Greek_IOTA> : "Ἴ" U1f3c
+<dead_psili> <dead_acute> <Greek_IOTA> : "Ἴ" U1f3c
<dead_acute> <dead_horn> <Greek_IOTA> : "Ἴ" U1f3c
+<dead_acute> <U0313> <Greek_IOTA> : "Ἴ" U1f3c
+<dead_acute> <dead_psili> <Greek_IOTA> : "Ἴ" U1f3c
<Multi_key> <less> <apostrophe> <Greek_IOTA> : "Ἵ" U1f3d
<Multi_key> <apostrophe> <less> <Greek_IOTA> : "Ἵ" U1f3d
<dead_ogonek> <dead_acute> <Greek_IOTA> : "Ἵ" U1f3d
+<U0314> <dead_acute> <Greek_IOTA> : "Ἵ" U1f3d
+<dead_dasia> <dead_acute> <Greek_IOTA> : "Ἵ" U1f3d
<dead_acute> <dead_ogonek> <Greek_IOTA> : "Ἵ" U1f3d
+<dead_acute> <U0314> <Greek_IOTA> : "Ἵ" U1f3d
+<dead_acute> <dead_dasia> <Greek_IOTA> : "Ἵ" U1f3d
<Multi_key> <greater> <asciitilde> <Greek_IOTA> : "Ἶ" U1f3e
<Multi_key> <asciitilde> <greater> <Greek_IOTA> : "Ἶ" U1f3e
<dead_horn> <dead_tilde> <Greek_IOTA> : "Ἶ" U1f3e
+<U0313> <dead_tilde> <Greek_IOTA> : "Ἶ" U1f3e
+<dead_psili> <dead_tilde> <Greek_IOTA> : "Ἶ" U1f3e
<dead_tilde> <dead_horn> <Greek_IOTA> : "Ἶ" U1f3e
+<dead_tilde> <U0313> <Greek_IOTA> : "Ἶ" U1f3e
+<dead_tilde> <dead_psili> <Greek_IOTA> : "Ἶ" U1f3e
<Multi_key> <less> <asciitilde> <Greek_IOTA> : "Ἷ" U1f3f
<Multi_key> <asciitilde> <less> <Greek_IOTA> : "Ἷ" U1f3f
<dead_ogonek> <dead_tilde> <Greek_IOTA> : "Ἷ" U1f3f
+<U0314> <dead_tilde> <Greek_IOTA> : "Ἷ" U1f3f
+<dead_dasia> <dead_tilde> <Greek_IOTA> : "Ἷ" U1f3f
<dead_tilde> <dead_ogonek> <Greek_IOTA> : "Ἷ" U1f3f
+<dead_tilde> <U0314> <Greek_IOTA> : "Ἷ" U1f3f
+<dead_tilde> <dead_dasia> <Greek_IOTA> : "Ἷ" U1f3f
<Multi_key> <greater> <Greek_omicron> : "ὀ" U1f40
<dead_horn> <Greek_omicron> : "ὀ" U1f40
+<U0313> <Greek_omicron> : "ὀ" U1f40
+<dead_psili> <Greek_omicron> : "ὀ" U1f40
<Multi_key> <less> <Greek_omicron> : "ὁ" U1f41
<dead_ogonek> <Greek_omicron> : "ὁ" U1f41
+<U0314> <Greek_omicron> : "ὁ" U1f41
+<dead_dasia> <Greek_omicron> : "ὁ" U1f41
<Multi_key> <greater> <grave> <Greek_omicron> : "ὂ" U1f42
<Multi_key> <grave> <greater> <Greek_omicron> : "ὂ" U1f42
<dead_horn> <dead_grave> <Greek_omicron> : "ὂ" U1f42
+<U0313> <dead_grave> <Greek_omicron> : "ὂ" U1f42
+<dead_psili> <dead_grave> <Greek_omicron> : "ὂ" U1f42
<dead_grave> <dead_horn> <Greek_omicron> : "ὂ" U1f42
+<dead_grave> <U0313> <Greek_omicron> : "ὂ" U1f42
+<dead_grave> <dead_psili> <Greek_omicron> : "ὂ" U1f42
<Multi_key> <less> <grave> <Greek_omicron> : "ὃ" U1f43
<Multi_key> <grave> <less> <Greek_omicron> : "ὃ" U1f43
<dead_ogonek> <dead_grave> <Greek_omicron> : "ὃ" U1f43
+<U0314> <dead_grave> <Greek_omicron> : "ὃ" U1f43
+<dead_dasia> <dead_grave> <Greek_omicron> : "ὃ" U1f43
<dead_grave> <dead_ogonek> <Greek_omicron> : "ὃ" U1f43
+<dead_grave> <U0314> <Greek_omicron> : "ὃ" U1f43
+<dead_grave> <dead_dasia> <Greek_omicron> : "ὃ" U1f43
<Multi_key> <greater> <apostrophe> <Greek_omicron> : "ὄ" U1f44
<Multi_key> <apostrophe> <greater> <Greek_omicron> : "ὄ" U1f44
<dead_horn> <dead_acute> <Greek_omicron> : "ὄ" U1f44
+<U0313> <dead_acute> <Greek_omicron> : "ὄ" U1f44
+<dead_psili> <dead_acute> <Greek_omicron> : "ὄ" U1f44
<dead_acute> <dead_horn> <Greek_omicron> : "ὄ" U1f44
+<dead_acute> <U0313> <Greek_omicron> : "ὄ" U1f44
+<dead_acute> <dead_psili> <Greek_omicron> : "ὄ" U1f44
<Multi_key> <less> <apostrophe> <Greek_omicron> : "ὅ" U1f45
<Multi_key> <apostrophe> <less> <Greek_omicron> : "ὅ" U1f45
<dead_ogonek> <dead_acute> <Greek_omicron> : "ὅ" U1f45
+<U0314> <dead_acute> <Greek_omicron> : "ὅ" U1f45
+<dead_dasia> <dead_acute> <Greek_omicron> : "ὅ" U1f45
<dead_acute> <dead_ogonek> <Greek_omicron> : "ὅ" U1f45
+<dead_acute> <U0314> <Greek_omicron> : "ὅ" U1f45
+<dead_acute> <dead_dasia> <Greek_omicron> : "ὅ" U1f45
<Multi_key> <greater> <Greek_OMICRON> : "Ὀ" U1f48
<dead_horn> <Greek_OMICRON> : "Ὀ" U1f48
+<U0313> <Greek_OMICRON> : "Ὀ" U1f48
+<dead_psili> <Greek_OMICRON> : "Ὀ" U1f48
<Multi_key> <less> <Greek_OMICRON> : "Ὁ" U1f49
<dead_ogonek> <Greek_OMICRON> : "Ὁ" U1f49
+<U0314> <Greek_OMICRON> : "Ὁ" U1f49
+<dead_dasia> <Greek_OMICRON> : "Ὁ" U1f49
<Multi_key> <greater> <grave> <Greek_OMICRON> : "Ὂ" U1f4a
<Multi_key> <grave> <greater> <Greek_OMICRON> : "Ὂ" U1f4a
<dead_horn> <dead_grave> <Greek_OMICRON> : "Ὂ" U1f4a
+<U0313> <dead_grave> <Greek_OMICRON> : "Ὂ" U1f4a
+<dead_psili> <dead_grave> <Greek_OMICRON> : "Ὂ" U1f4a
<dead_grave> <dead_horn> <Greek_OMICRON> : "Ὂ" U1f4a
+<dead_grave> <U0313> <Greek_OMICRON> : "Ὂ" U1f4a
+<dead_grave> <dead_psili> <Greek_OMICRON> : "Ὂ" U1f4a
<Multi_key> <less> <grave> <Greek_OMICRON> : "Ὃ" U1f4b
<Multi_key> <grave> <less> <Greek_OMICRON> : "Ὃ" U1f4b
<dead_ogonek> <dead_grave> <Greek_OMICRON> : "Ὃ" U1f4b
+<U0314> <dead_grave> <Greek_OMICRON> : "Ὃ" U1f4b
+<dead_dasia> <dead_grave> <Greek_OMICRON> : "Ὃ" U1f4b
<dead_grave> <dead_ogonek> <Greek_OMICRON> : "Ὃ" U1f4b
+<dead_grave> <U0314> <Greek_OMICRON> : "Ὃ" U1f4b
+<dead_grave> <dead_dasia> <Greek_OMICRON> : "Ὃ" U1f4b
<Multi_key> <greater> <apostrophe> <Greek_OMICRON> : "Ὄ" U1f4c
<Multi_key> <apostrophe> <greater> <Greek_OMICRON> : "Ὄ" U1f4c
<dead_horn> <dead_acute> <Greek_OMICRON> : "Ὄ" U1f4c
+<U0313> <dead_acute> <Greek_OMICRON> : "Ὄ" U1f4c
+<dead_psili> <dead_acute> <Greek_OMICRON> : "Ὄ" U1f4c
<dead_acute> <dead_horn> <Greek_OMICRON> : "Ὄ" U1f4c
+<dead_acute> <U0313> <Greek_OMICRON> : "Ὄ" U1f4c
+<dead_acute> <dead_psili> <Greek_OMICRON> : "Ὄ" U1f4c
<Multi_key> <less> <apostrophe> <Greek_OMICRON> : "Ὅ" U1f4d
<Multi_key> <apostrophe> <less> <Greek_OMICRON> : "Ὅ" U1f4d
<dead_ogonek> <dead_acute> <Greek_OMICRON> : "Ὅ" U1f4d
+<U0314> <dead_acute> <Greek_OMICRON> : "Ὅ" U1f4d
+<dead_dasia> <dead_acute> <Greek_OMICRON> : "Ὅ" U1f4d
<dead_acute> <dead_ogonek> <Greek_OMICRON> : "Ὅ" U1f4d
+<dead_acute> <U0314> <Greek_OMICRON> : "Ὅ" U1f4d
+<dead_acute> <dead_dasia> <Greek_OMICRON> : "Ὅ" U1f4d
<Multi_key> <greater> <Greek_upsilon> : "ὐ" U1f50
<dead_horn> <Greek_upsilon> : "ὐ" U1f50
+<U0313> <Greek_upsilon> : "ὐ" U1f50
+<dead_psili> <Greek_upsilon> : "ὐ" U1f50
<Multi_key> <less> <Greek_upsilon> : "ὑ" U1f51
<dead_ogonek> <Greek_upsilon> : "ὑ" U1f51
+<U0314> <Greek_upsilon> : "ὑ" U1f51
+<dead_dasia> <Greek_upsilon> : "ὑ" U1f51
<Multi_key> <greater> <grave> <Greek_upsilon> : "ὒ" U1f52
<Multi_key> <grave> <greater> <Greek_upsilon> : "ὒ" U1f52
<dead_horn> <dead_grave> <Greek_upsilon> : "ὒ" U1f52
+<U0313> <dead_grave> <Greek_upsilon> : "ὒ" U1f52
+<dead_psili> <dead_grave> <Greek_upsilon> : "ὒ" U1f52
<dead_grave> <dead_horn> <Greek_upsilon> : "ὒ" U1f52
+<dead_grave> <U0313> <Greek_upsilon> : "ὒ" U1f52
+<dead_grave> <dead_psili> <Greek_upsilon> : "ὒ" U1f52
<Multi_key> <less> <grave> <Greek_upsilon> : "ὓ" U1f53
<Multi_key> <grave> <less> <Greek_upsilon> : "ὓ" U1f53
<dead_ogonek> <dead_grave> <Greek_upsilon> : "ὓ" U1f53
+<U0314> <dead_grave> <Greek_upsilon> : "ὓ" U1f53
+<dead_dasia> <dead_grave> <Greek_upsilon> : "ὓ" U1f53
<dead_grave> <dead_ogonek> <Greek_upsilon> : "ὓ" U1f53
+<dead_grave> <U0314> <Greek_upsilon> : "ὓ" U1f53
+<dead_grave> <dead_dasia> <Greek_upsilon> : "ὓ" U1f53
<Multi_key> <greater> <apostrophe> <Greek_upsilon> : "ὔ" U1f54
<Multi_key> <apostrophe> <greater> <Greek_upsilon> : "ὔ" U1f54
<dead_horn> <dead_acute> <Greek_upsilon> : "ὔ" U1f54
+<U0313> <dead_acute> <Greek_upsilon> : "ὔ" U1f54
+<dead_psili> <dead_acute> <Greek_upsilon> : "ὔ" U1f54
<dead_acute> <dead_horn> <Greek_upsilon> : "ὔ" U1f54
+<dead_acute> <U0313> <Greek_upsilon> : "ὔ" U1f54
+<dead_acute> <dead_psili> <Greek_upsilon> : "ὔ" U1f54
<Multi_key> <less> <apostrophe> <Greek_upsilon> : "ὕ" U1f55
<Multi_key> <apostrophe> <less> <Greek_upsilon> : "ὕ" U1f55
<dead_ogonek> <dead_acute> <Greek_upsilon> : "ὕ" U1f55
+<U0314> <dead_acute> <Greek_upsilon> : "ὕ" U1f55
+<dead_dasia> <dead_acute> <Greek_upsilon> : "ὕ" U1f55
<dead_acute> <dead_ogonek> <Greek_upsilon> : "ὕ" U1f55
+<dead_acute> <U0314> <Greek_upsilon> : "ὕ" U1f55
+<dead_acute> <dead_dasia> <Greek_upsilon> : "ὕ" U1f55
<Multi_key> <greater> <asciitilde> <Greek_upsilon> : "ὖ" U1f56
<Multi_key> <asciitilde> <greater> <Greek_upsilon> : "ὖ" U1f56
<dead_horn> <dead_tilde> <Greek_upsilon> : "ὖ" U1f56
+<U0313> <dead_tilde> <Greek_upsilon> : "ὖ" U1f56
+<dead_psili> <dead_tilde> <Greek_upsilon> : "ὖ" U1f56
<dead_tilde> <dead_horn> <Greek_upsilon> : "ὖ" U1f56
+<dead_tilde> <U0313> <Greek_upsilon> : "ὖ" U1f56
+<dead_tilde> <dead_psili> <Greek_upsilon> : "ὖ" U1f56
<Multi_key> <less> <asciitilde> <Greek_upsilon> : "ὗ" U1f57
<Multi_key> <asciitilde> <less> <Greek_upsilon> : "ὗ" U1f57
<dead_ogonek> <dead_tilde> <Greek_upsilon> : "ὗ" U1f57
+<U0314> <dead_tilde> <Greek_upsilon> : "ὗ" U1f57
+<dead_dasia> <dead_tilde> <Greek_upsilon> : "ὗ" U1f57
<dead_tilde> <dead_ogonek> <Greek_upsilon> : "ὗ" U1f57
+<dead_tilde> <U0314> <Greek_upsilon> : "ὗ" U1f57
+<dead_tilde> <dead_dasia> <Greek_upsilon> : "ὗ" U1f57
<Multi_key> <less> <Greek_UPSILON> : "Ὑ" U1f59
<dead_ogonek> <Greek_UPSILON> : "Ὑ" U1f59
+<U0314> <Greek_UPSILON> : "Ὑ" U1f59
+<dead_dasia> <Greek_UPSILON> : "Ὑ" U1f59
<Multi_key> <less> <grave> <Greek_UPSILON> : "Ὓ" U1f5b
<Multi_key> <grave> <less> <Greek_UPSILON> : "Ὓ" U1f5b
<dead_ogonek> <dead_grave> <Greek_UPSILON> : "Ὓ" U1f5b
+<U0314> <dead_grave> <Greek_UPSILON> : "Ὓ" U1f5b
+<dead_dasia> <dead_grave> <Greek_UPSILON> : "Ὓ" U1f5b
<dead_grave> <dead_ogonek> <Greek_UPSILON> : "Ὓ" U1f5b
+<dead_grave> <U0314> <Greek_UPSILON> : "Ὓ" U1f5b
+<dead_grave> <dead_dasia> <Greek_UPSILON> : "Ὓ" U1f5b
<Multi_key> <less> <apostrophe> <Greek_UPSILON> : "Ὕ" U1f5d
<Multi_key> <apostrophe> <less> <Greek_UPSILON> : "Ὕ" U1f5d
<dead_ogonek> <dead_acute> <Greek_UPSILON> : "Ὕ" U1f5d
+<U0314> <dead_acute> <Greek_UPSILON> : "Ὕ" U1f5d
+<dead_dasia> <dead_acute> <Greek_UPSILON> : "Ὕ" U1f5d
<dead_acute> <dead_ogonek> <Greek_UPSILON> : "Ὕ" U1f5d
+<dead_acute> <U0314> <Greek_UPSILON> : "Ὕ" U1f5d
+<dead_acute> <dead_dasia> <Greek_UPSILON> : "Ὕ" U1f5d
<Multi_key> <less> <asciitilde> <Greek_UPSILON> : "Ὗ" U1f5f
<Multi_key> <asciitilde> <less> <Greek_UPSILON> : "Ὗ" U1f5f
<dead_ogonek> <dead_tilde> <Greek_UPSILON> : "Ὗ" U1f5f
+<U0314> <dead_tilde> <Greek_UPSILON> : "Ὗ" U1f5f
+<dead_dasia> <dead_tilde> <Greek_UPSILON> : "Ὗ" U1f5f
<dead_tilde> <dead_ogonek> <Greek_UPSILON> : "Ὗ" U1f5f
+<dead_tilde> <U0314> <Greek_UPSILON> : "Ὗ" U1f5f
+<dead_tilde> <dead_dasia> <Greek_UPSILON> : "Ὗ" U1f5f
<Multi_key> <greater> <Greek_omega> : "ὠ" U1f60
<dead_horn> <Greek_omega> : "ὠ" U1f60
+<U0313> <Greek_omega> : "ὠ" U1f60
+<dead_psili> <Greek_omega> : "ὠ" U1f60
<Multi_key> <less> <Greek_omega> : "ὡ" U1f61
<dead_ogonek> <Greek_omega> : "ὡ" U1f61
+<U0314> <Greek_omega> : "ὡ" U1f61
+<dead_dasia> <Greek_omega> : "ὡ" U1f61
<Multi_key> <greater> <grave> <Greek_omega> : "ὢ" U1f62
<Multi_key> <grave> <greater> <Greek_omega> : "ὢ" U1f62
<dead_horn> <dead_grave> <Greek_omega> : "ὢ" U1f62
+<U0313> <dead_grave> <Greek_omega> : "ὢ" U1f62
+<dead_psili> <dead_grave> <Greek_omega> : "ὢ" U1f62
<dead_grave> <dead_horn> <Greek_omega> : "ὢ" U1f62
+<dead_grave> <U0313> <Greek_omega> : "ὢ" U1f62
+<dead_grave> <dead_psili> <Greek_omega> : "ὢ" U1f62
<Multi_key> <less> <grave> <Greek_omega> : "ὣ" U1f63
<Multi_key> <grave> <less> <Greek_omega> : "ὣ" U1f63
<dead_ogonek> <dead_grave> <Greek_omega> : "ὣ" U1f63
+<U0314> <dead_grave> <Greek_omega> : "ὣ" U1f63
+<dead_dasia> <dead_grave> <Greek_omega> : "ὣ" U1f63
<dead_grave> <dead_ogonek> <Greek_omega> : "ὣ" U1f63
+<dead_grave> <U0314> <Greek_omega> : "ὣ" U1f63
+<dead_grave> <dead_dasia> <Greek_omega> : "ὣ" U1f63
<Multi_key> <greater> <apostrophe> <Greek_omega> : "ὤ" U1f64
<Multi_key> <apostrophe> <greater> <Greek_omega> : "ὤ" U1f64
<dead_horn> <dead_acute> <Greek_omega> : "ὤ" U1f64
+<U0313> <dead_acute> <Greek_omega> : "ὤ" U1f64
+<dead_psili> <dead_acute> <Greek_omega> : "ὤ" U1f64
<dead_acute> <dead_horn> <Greek_omega> : "ὤ" U1f64
+<dead_acute> <U0313> <Greek_omega> : "ὤ" U1f64
+<dead_acute> <dead_psili> <Greek_omega> : "ὤ" U1f64
<Multi_key> <less> <apostrophe> <Greek_omega> : "ὥ" U1f65
<Multi_key> <apostrophe> <less> <Greek_omega> : "ὥ" U1f65
<dead_ogonek> <dead_acute> <Greek_omega> : "ὥ" U1f65
+<U0314> <dead_acute> <Greek_omega> : "ὥ" U1f65
+<dead_dasia> <dead_acute> <Greek_omega> : "ὥ" U1f65
<dead_acute> <dead_ogonek> <Greek_omega> : "ὥ" U1f65
+<dead_acute> <U0314> <Greek_omega> : "ὥ" U1f65
+<dead_acute> <dead_dasia> <Greek_omega> : "ὥ" U1f65
<Multi_key> <greater> <asciitilde> <Greek_omega> : "ὦ" U1f66
<Multi_key> <asciitilde> <greater> <Greek_omega> : "ὦ" U1f66
<dead_horn> <dead_tilde> <Greek_omega> : "ὦ" U1f66
+<U0313> <dead_tilde> <Greek_omega> : "ὦ" U1f66
+<dead_psili> <dead_tilde> <Greek_omega> : "ὦ" U1f66
<dead_tilde> <dead_horn> <Greek_omega> : "ὦ" U1f66
+<dead_tilde> <U0313> <Greek_omega> : "ὦ" U1f66
+<dead_tilde> <dead_psili> <Greek_omega> : "ὦ" U1f66
<Multi_key> <less> <asciitilde> <Greek_omega> : "ὧ" U1f67
<Multi_key> <asciitilde> <less> <Greek_omega> : "ὧ" U1f67
<dead_ogonek> <dead_tilde> <Greek_omega> : "ὧ" U1f67
+<U0314> <dead_tilde> <Greek_omega> : "ὧ" U1f67
+<dead_dasia> <dead_tilde> <Greek_omega> : "ὧ" U1f67
<dead_tilde> <dead_ogonek> <Greek_omega> : "ὧ" U1f67
+<dead_tilde> <U0314> <Greek_omega> : "ὧ" U1f67
+<dead_tilde> <dead_dasia> <Greek_omega> : "ὧ" U1f67
<Multi_key> <greater> <Greek_OMEGA> : "Ὠ" U1f68
<dead_horn> <Greek_OMEGA> : "Ὠ" U1f68
+<U0313> <Greek_OMEGA> : "Ὠ" U1f68
+<dead_psili> <Greek_OMEGA> : "Ὠ" U1f68
<Multi_key> <less> <Greek_OMEGA> : "Ὡ" U1f69
<dead_ogonek> <Greek_OMEGA> : "Ὡ" U1f69
+<U0314> <Greek_OMEGA> : "Ὡ" U1f69
+<dead_dasia> <Greek_OMEGA> : "Ὡ" U1f69
<Multi_key> <greater> <grave> <Greek_OMEGA> : "Ὢ" U1f6a
<Multi_key> <grave> <greater> <Greek_OMEGA> : "Ὢ" U1f6a
<dead_horn> <dead_grave> <Greek_OMEGA> : "Ὢ" U1f6a
+<U0313> <dead_grave> <Greek_OMEGA> : "Ὢ" U1f6a
+<dead_psili> <dead_grave> <Greek_OMEGA> : "Ὢ" U1f6a
<dead_grave> <dead_horn> <Greek_OMEGA> : "Ὢ" U1f6a
+<dead_grave> <U0313> <Greek_OMEGA> : "Ὢ" U1f6a
+<dead_grave> <dead_psili> <Greek_OMEGA> : "Ὢ" U1f6a
<Multi_key> <less> <grave> <Greek_OMEGA> : "Ὣ" U1f6b
<Multi_key> <grave> <less> <Greek_OMEGA> : "Ὣ" U1f6b
<dead_ogonek> <dead_grave> <Greek_OMEGA> : "Ὣ" U1f6b
+<U0314> <dead_grave> <Greek_OMEGA> : "Ὣ" U1f6b
+<dead_dasia> <dead_grave> <Greek_OMEGA> : "Ὣ" U1f6b
<dead_grave> <dead_ogonek> <Greek_OMEGA> : "Ὣ" U1f6b
+<dead_grave> <U0314> <Greek_OMEGA> : "Ὣ" U1f6b
+<dead_grave> <dead_dasia> <Greek_OMEGA> : "Ὣ" U1f6b
<Multi_key> <greater> <apostrophe> <Greek_OMEGA> : "Ὤ" U1f6c
<Multi_key> <apostrophe> <greater> <Greek_OMEGA> : "Ὤ" U1f6c
<dead_horn> <dead_acute> <Greek_OMEGA> : "Ὤ" U1f6c
+<U0313> <dead_acute> <Greek_OMEGA> : "Ὤ" U1f6c
+<dead_psili> <dead_acute> <Greek_OMEGA> : "Ὤ" U1f6c
<dead_acute> <dead_horn> <Greek_OMEGA> : "Ὤ" U1f6c
+<dead_acute> <U0313> <Greek_OMEGA> : "Ὤ" U1f6c
+<dead_acute> <dead_psili> <Greek_OMEGA> : "Ὤ" U1f6c
<Multi_key> <less> <apostrophe> <Greek_OMEGA> : "Ὥ" U1f6d
<Multi_key> <apostrophe> <less> <Greek_OMEGA> : "Ὥ" U1f6d
<dead_ogonek> <dead_acute> <Greek_OMEGA> : "Ὥ" U1f6d
+<U0314> <dead_acute> <Greek_OMEGA> : "Ὥ" U1f6d
+<dead_dasia> <dead_acute> <Greek_OMEGA> : "Ὥ" U1f6d
<dead_acute> <dead_ogonek> <Greek_OMEGA> : "Ὥ" U1f6d
+<dead_acute> <U0314> <Greek_OMEGA> : "Ὥ" U1f6d
+<dead_acute> <dead_dasia> <Greek_OMEGA> : "Ὥ" U1f6d
<Multi_key> <greater> <asciitilde> <Greek_OMEGA> : "Ὦ" U1f6e
<Multi_key> <asciitilde> <greater> <Greek_OMEGA> : "Ὦ" U1f6e
<dead_horn> <dead_tilde> <Greek_OMEGA> : "Ὦ" U1f6e
+<U0313> <dead_tilde> <Greek_OMEGA> : "Ὦ" U1f6e
+<dead_psili> <dead_tilde> <Greek_OMEGA> : "Ὦ" U1f6e
<dead_tilde> <dead_horn> <Greek_OMEGA> : "Ὦ" U1f6e
+<dead_tilde> <U0313> <Greek_OMEGA> : "Ὦ" U1f6e
+<dead_tilde> <dead_psili> <Greek_OMEGA> : "Ὦ" U1f6e
<Multi_key> <less> <asciitilde> <Greek_OMEGA> : "Ὧ" U1f6f
<Multi_key> <asciitilde> <less> <Greek_OMEGA> : "Ὧ" U1f6f
<dead_ogonek> <dead_tilde> <Greek_OMEGA> : "Ὧ" U1f6f
+<U0314> <dead_tilde> <Greek_OMEGA> : "Ὧ" U1f6f
+<dead_dasia> <dead_tilde> <Greek_OMEGA> : "Ὧ" U1f6f
<dead_tilde> <dead_ogonek> <Greek_OMEGA> : "Ὧ" U1f6f
+<dead_tilde> <U0314> <Greek_OMEGA> : "Ὧ" U1f6f
+<dead_tilde> <dead_dasia> <Greek_OMEGA> : "Ὧ" U1f6f
<Multi_key> <grave> <Greek_alpha> : "ὰ" U1f70
<dead_grave> <Greek_alpha> : "ὰ" U1f70
<Multi_key> <grave> <Greek_epsilon> : "ὲ" U1f72
@@ -771,11 +1119,19 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <bar> <greater> <Greek_alpha> : "ᾀ" U1f80
<Multi_key> <greater> <bar> <Greek_alpha> : "ᾀ" U1f80
<dead_iota> <dead_horn> <Greek_alpha> : "ᾀ" U1f80
+<dead_iota> <U0313> <Greek_alpha> : "ᾀ" U1f80
+<dead_iota> <dead_psili> <Greek_alpha> : "ᾀ" U1f80
<dead_horn> <dead_iota> <Greek_alpha> : "ᾀ" U1f80
+<U0313> <dead_iota> <Greek_alpha> : "ᾀ" U1f80
+<dead_psili> <dead_iota> <Greek_alpha> : "ᾀ" U1f80
<Multi_key> <bar> <less> <Greek_alpha> : "ᾁ" U1f81
<Multi_key> <less> <bar> <Greek_alpha> : "ᾁ" U1f81
<dead_iota> <dead_ogonek> <Greek_alpha> : "ᾁ" U1f81
+<dead_iota> <U0314> <Greek_alpha> : "ᾁ" U1f81
+<dead_iota> <dead_dasia> <Greek_alpha> : "ᾁ" U1f81
<dead_ogonek> <dead_iota> <Greek_alpha> : "ᾁ" U1f81
+<U0314> <dead_iota> <Greek_alpha> : "ᾁ" U1f81
+<dead_dasia> <dead_iota> <Greek_alpha> : "ᾁ" U1f81
<Multi_key> <bar> <greater> <grave> <Greek_alpha> : "ᾂ" U1f82
<Multi_key> <bar> <grave> <greater> <Greek_alpha> : "ᾂ" U1f82
<Multi_key> <greater> <bar> <grave> <Greek_alpha> : "ᾂ" U1f82
@@ -783,11 +1139,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <greater> <Greek_alpha> : "ᾂ" U1f82
<Multi_key> <grave> <greater> <bar> <Greek_alpha> : "ᾂ" U1f82
<dead_iota> <dead_horn> <dead_grave> <Greek_alpha> : "ᾂ" U1f82
+<dead_iota> <U0313> <dead_grave> <Greek_alpha> : "ᾂ" U1f82
+<dead_iota> <dead_psili> <dead_grave> <Greek_alpha> : "ᾂ" U1f82
<dead_iota> <dead_grave> <dead_horn> <Greek_alpha> : "ᾂ" U1f82
+<dead_iota> <dead_grave> <U0313> <Greek_alpha> : "ᾂ" U1f82
+<dead_iota> <dead_grave> <dead_psili> <Greek_alpha> : "ᾂ" U1f82
<dead_horn> <dead_iota> <dead_grave> <Greek_alpha> : "ᾂ" U1f82
+<U0313> <dead_iota> <dead_grave> <Greek_alpha> : "ᾂ" U1f82
+<dead_psili> <dead_iota> <dead_grave> <Greek_alpha> : "ᾂ" U1f82
<dead_horn> <dead_grave> <dead_iota> <Greek_alpha> : "ᾂ" U1f82
+<U0313> <dead_grave> <dead_iota> <Greek_alpha> : "ᾂ" U1f82
+<dead_psili> <dead_grave> <dead_iota> <Greek_alpha> : "ᾂ" U1f82
<dead_grave> <dead_iota> <dead_horn> <Greek_alpha> : "ᾂ" U1f82
+<dead_grave> <dead_iota> <U0313> <Greek_alpha> : "ᾂ" U1f82
+<dead_grave> <dead_iota> <dead_psili> <Greek_alpha> : "ᾂ" U1f82
<dead_grave> <dead_horn> <dead_iota> <Greek_alpha> : "ᾂ" U1f82
+<dead_grave> <U0313> <dead_iota> <Greek_alpha> : "ᾂ" U1f82
+<dead_grave> <dead_psili> <dead_iota> <Greek_alpha> : "ᾂ" U1f82
<Multi_key> <bar> <less> <grave> <Greek_alpha> : "ᾃ" U1f83
<Multi_key> <bar> <grave> <less> <Greek_alpha> : "ᾃ" U1f83
<Multi_key> <less> <bar> <grave> <Greek_alpha> : "ᾃ" U1f83
@@ -795,11 +1163,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <less> <Greek_alpha> : "ᾃ" U1f83
<Multi_key> <grave> <less> <bar> <Greek_alpha> : "ᾃ" U1f83
<dead_iota> <dead_ogonek> <dead_grave> <Greek_alpha> : "ᾃ" U1f83
+<dead_iota> <U0314> <dead_grave> <Greek_alpha> : "ᾃ" U1f83
+<dead_iota> <dead_dasia> <dead_grave> <Greek_alpha> : "ᾃ" U1f83
<dead_iota> <dead_grave> <dead_ogonek> <Greek_alpha> : "ᾃ" U1f83
+<dead_iota> <dead_grave> <U0314> <Greek_alpha> : "ᾃ" U1f83
+<dead_iota> <dead_grave> <dead_dasia> <Greek_alpha> : "ᾃ" U1f83
<dead_ogonek> <dead_iota> <dead_grave> <Greek_alpha> : "ᾃ" U1f83
+<U0314> <dead_iota> <dead_grave> <Greek_alpha> : "ᾃ" U1f83
+<dead_dasia> <dead_iota> <dead_grave> <Greek_alpha> : "ᾃ" U1f83
<dead_ogonek> <dead_grave> <dead_iota> <Greek_alpha> : "ᾃ" U1f83
+<U0314> <dead_grave> <dead_iota> <Greek_alpha> : "ᾃ" U1f83
+<dead_dasia> <dead_grave> <dead_iota> <Greek_alpha> : "ᾃ" U1f83
<dead_grave> <dead_iota> <dead_ogonek> <Greek_alpha> : "ᾃ" U1f83
+<dead_grave> <dead_iota> <U0314> <Greek_alpha> : "ᾃ" U1f83
+<dead_grave> <dead_iota> <dead_dasia> <Greek_alpha> : "ᾃ" U1f83
<dead_grave> <dead_ogonek> <dead_iota> <Greek_alpha> : "ᾃ" U1f83
+<dead_grave> <U0314> <dead_iota> <Greek_alpha> : "ᾃ" U1f83
+<dead_grave> <dead_dasia> <dead_iota> <Greek_alpha> : "ᾃ" U1f83
<Multi_key> <bar> <greater> <apostrophe> <Greek_alpha> : "ᾄ" U1f84
<Multi_key> <bar> <apostrophe> <greater> <Greek_alpha> : "ᾄ" U1f84
<Multi_key> <greater> <bar> <apostrophe> <Greek_alpha> : "ᾄ" U1f84
@@ -807,11 +1187,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <greater> <Greek_alpha> : "ᾄ" U1f84
<Multi_key> <apostrophe> <greater> <bar> <Greek_alpha> : "ᾄ" U1f84
<dead_iota> <dead_horn> <dead_acute> <Greek_alpha> : "ᾄ" U1f84
+<dead_iota> <U0313> <dead_acute> <Greek_alpha> : "ᾄ" U1f84
+<dead_iota> <dead_psili> <dead_acute> <Greek_alpha> : "ᾄ" U1f84
<dead_iota> <dead_acute> <dead_horn> <Greek_alpha> : "ᾄ" U1f84
+<dead_iota> <dead_acute> <U0313> <Greek_alpha> : "ᾄ" U1f84
+<dead_iota> <dead_acute> <dead_psili> <Greek_alpha> : "ᾄ" U1f84
<dead_horn> <dead_iota> <dead_acute> <Greek_alpha> : "ᾄ" U1f84
+<U0313> <dead_iota> <dead_acute> <Greek_alpha> : "ᾄ" U1f84
+<dead_psili> <dead_iota> <dead_acute> <Greek_alpha> : "ᾄ" U1f84
<dead_horn> <dead_acute> <dead_iota> <Greek_alpha> : "ᾄ" U1f84
+<U0313> <dead_acute> <dead_iota> <Greek_alpha> : "ᾄ" U1f84
+<dead_psili> <dead_acute> <dead_iota> <Greek_alpha> : "ᾄ" U1f84
<dead_acute> <dead_iota> <dead_horn> <Greek_alpha> : "ᾄ" U1f84
+<dead_acute> <dead_iota> <U0313> <Greek_alpha> : "ᾄ" U1f84
+<dead_acute> <dead_iota> <dead_psili> <Greek_alpha> : "ᾄ" U1f84
<dead_acute> <dead_horn> <dead_iota> <Greek_alpha> : "ᾄ" U1f84
+<dead_acute> <U0313> <dead_iota> <Greek_alpha> : "ᾄ" U1f84
+<dead_acute> <dead_psili> <dead_iota> <Greek_alpha> : "ᾄ" U1f84
<Multi_key> <bar> <less> <apostrophe> <Greek_alpha> : "ᾅ" U1f85
<Multi_key> <bar> <apostrophe> <less> <Greek_alpha> : "ᾅ" U1f85
<Multi_key> <less> <bar> <apostrophe> <Greek_alpha> : "ᾅ" U1f85
@@ -819,11 +1211,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <less> <Greek_alpha> : "ᾅ" U1f85
<Multi_key> <apostrophe> <less> <bar> <Greek_alpha> : "ᾅ" U1f85
<dead_iota> <dead_ogonek> <dead_acute> <Greek_alpha> : "ᾅ" U1f85
+<dead_iota> <U0314> <dead_acute> <Greek_alpha> : "ᾅ" U1f85
+<dead_iota> <dead_dasia> <dead_acute> <Greek_alpha> : "ᾅ" U1f85
<dead_iota> <dead_acute> <dead_ogonek> <Greek_alpha> : "ᾅ" U1f85
+<dead_iota> <dead_acute> <U0314> <Greek_alpha> : "ᾅ" U1f85
+<dead_iota> <dead_acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1f85
<dead_ogonek> <dead_iota> <dead_acute> <Greek_alpha> : "ᾅ" U1f85
+<U0314> <dead_iota> <dead_acute> <Greek_alpha> : "ᾅ" U1f85
+<dead_dasia> <dead_iota> <dead_acute> <Greek_alpha> : "ᾅ" U1f85
<dead_ogonek> <dead_acute> <dead_iota> <Greek_alpha> : "ᾅ" U1f85
+<U0314> <dead_acute> <dead_iota> <Greek_alpha> : "ᾅ" U1f85
+<dead_dasia> <dead_acute> <dead_iota> <Greek_alpha> : "ᾅ" U1f85
<dead_acute> <dead_iota> <dead_ogonek> <Greek_alpha> : "ᾅ" U1f85
+<dead_acute> <dead_iota> <U0314> <Greek_alpha> : "ᾅ" U1f85
+<dead_acute> <dead_iota> <dead_dasia> <Greek_alpha> : "ᾅ" U1f85
<dead_acute> <dead_ogonek> <dead_iota> <Greek_alpha> : "ᾅ" U1f85
+<dead_acute> <U0314> <dead_iota> <Greek_alpha> : "ᾅ" U1f85
+<dead_acute> <dead_dasia> <dead_iota> <Greek_alpha> : "ᾅ" U1f85
<Multi_key> <bar> <greater> <asciitilde> <Greek_alpha> : "ᾆ" U1f86
<Multi_key> <bar> <asciitilde> <greater> <Greek_alpha> : "ᾆ" U1f86
<Multi_key> <greater> <bar> <asciitilde> <Greek_alpha> : "ᾆ" U1f86
@@ -831,11 +1235,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <greater> <Greek_alpha> : "ᾆ" U1f86
<Multi_key> <asciitilde> <greater> <bar> <Greek_alpha> : "ᾆ" U1f86
<dead_iota> <dead_horn> <dead_tilde> <Greek_alpha> : "ᾆ" U1f86
+<dead_iota> <U0313> <dead_tilde> <Greek_alpha> : "ᾆ" U1f86
+<dead_iota> <dead_psili> <dead_tilde> <Greek_alpha> : "ᾆ" U1f86
<dead_iota> <dead_tilde> <dead_horn> <Greek_alpha> : "ᾆ" U1f86
+<dead_iota> <dead_tilde> <U0313> <Greek_alpha> : "ᾆ" U1f86
+<dead_iota> <dead_tilde> <dead_psili> <Greek_alpha> : "ᾆ" U1f86
<dead_horn> <dead_iota> <dead_tilde> <Greek_alpha> : "ᾆ" U1f86
+<U0313> <dead_iota> <dead_tilde> <Greek_alpha> : "ᾆ" U1f86
+<dead_psili> <dead_iota> <dead_tilde> <Greek_alpha> : "ᾆ" U1f86
<dead_horn> <dead_tilde> <dead_iota> <Greek_alpha> : "ᾆ" U1f86
+<U0313> <dead_tilde> <dead_iota> <Greek_alpha> : "ᾆ" U1f86
+<dead_psili> <dead_tilde> <dead_iota> <Greek_alpha> : "ᾆ" U1f86
<dead_tilde> <dead_iota> <dead_horn> <Greek_alpha> : "ᾆ" U1f86
+<dead_tilde> <dead_iota> <U0313> <Greek_alpha> : "ᾆ" U1f86
+<dead_tilde> <dead_iota> <dead_psili> <Greek_alpha> : "ᾆ" U1f86
<dead_tilde> <dead_horn> <dead_iota> <Greek_alpha> : "ᾆ" U1f86
+<dead_tilde> <U0313> <dead_iota> <Greek_alpha> : "ᾆ" U1f86
+<dead_tilde> <dead_psili> <dead_iota> <Greek_alpha> : "ᾆ" U1f86
<Multi_key> <bar> <less> <asciitilde> <Greek_alpha> : "ᾇ" U1f87
<Multi_key> <bar> <asciitilde> <less> <Greek_alpha> : "ᾇ" U1f87
<Multi_key> <less> <bar> <asciitilde> <Greek_alpha> : "ᾇ" U1f87
@@ -843,19 +1259,39 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <less> <Greek_alpha> : "ᾇ" U1f87
<Multi_key> <asciitilde> <less> <bar> <Greek_alpha> : "ᾇ" U1f87
<dead_iota> <dead_ogonek> <dead_tilde> <Greek_alpha> : "ᾇ" U1f87
+<dead_iota> <U0314> <dead_tilde> <Greek_alpha> : "ᾇ" U1f87
+<dead_iota> <dead_dasia> <dead_tilde> <Greek_alpha> : "ᾇ" U1f87
<dead_iota> <dead_tilde> <dead_ogonek> <Greek_alpha> : "ᾇ" U1f87
+<dead_iota> <dead_tilde> <U0314> <Greek_alpha> : "ᾇ" U1f87
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_alpha> : "ᾇ" U1f87
<dead_ogonek> <dead_iota> <dead_tilde> <Greek_alpha> : "ᾇ" U1f87
+<U0314> <dead_iota> <dead_tilde> <Greek_alpha> : "ᾇ" U1f87
+<dead_dasia> <dead_iota> <dead_tilde> <Greek_alpha> : "ᾇ" U1f87
<dead_ogonek> <dead_tilde> <dead_iota> <Greek_alpha> : "ᾇ" U1f87
+<U0314> <dead_tilde> <dead_iota> <Greek_alpha> : "ᾇ" U1f87
+<dead_dasia> <dead_tilde> <dead_iota> <Greek_alpha> : "ᾇ" U1f87
<dead_tilde> <dead_iota> <dead_ogonek> <Greek_alpha> : "ᾇ" U1f87
+<dead_tilde> <dead_iota> <U0314> <Greek_alpha> : "ᾇ" U1f87
+<dead_tilde> <dead_iota> <dead_dasia> <Greek_alpha> : "ᾇ" U1f87
<dead_tilde> <dead_ogonek> <dead_iota> <Greek_alpha> : "ᾇ" U1f87
+<dead_tilde> <U0314> <dead_iota> <Greek_alpha> : "ᾇ" U1f87
+<dead_tilde> <dead_dasia> <dead_iota> <Greek_alpha> : "ᾇ" U1f87
<Multi_key> <bar> <greater> <Greek_ALPHA> : "ᾈ" U1f88
<Multi_key> <greater> <bar> <Greek_ALPHA> : "ᾈ" U1f88
<dead_iota> <dead_horn> <Greek_ALPHA> : "ᾈ" U1f88
+<dead_iota> <U0313> <Greek_ALPHA> : "ᾈ" U1f88
+<dead_iota> <dead_psili> <Greek_ALPHA> : "ᾈ" U1f88
<dead_horn> <dead_iota> <Greek_ALPHA> : "ᾈ" U1f88
+<U0313> <dead_iota> <Greek_ALPHA> : "ᾈ" U1f88
+<dead_psili> <dead_iota> <Greek_ALPHA> : "ᾈ" U1f88
<Multi_key> <bar> <less> <Greek_ALPHA> : "ᾉ" U1f89
<Multi_key> <less> <bar> <Greek_ALPHA> : "ᾉ" U1f89
<dead_iota> <dead_ogonek> <Greek_ALPHA> : "ᾉ" U1f89
+<dead_iota> <U0314> <Greek_ALPHA> : "ᾉ" U1f89
+<dead_iota> <dead_dasia> <Greek_ALPHA> : "ᾉ" U1f89
<dead_ogonek> <dead_iota> <Greek_ALPHA> : "ᾉ" U1f89
+<U0314> <dead_iota> <Greek_ALPHA> : "ᾉ" U1f89
+<dead_dasia> <dead_iota> <Greek_ALPHA> : "ᾉ" U1f89
<Multi_key> <bar> <greater> <grave> <Greek_ALPHA> : "ᾊ" U1f8a
<Multi_key> <bar> <grave> <greater> <Greek_ALPHA> : "ᾊ" U1f8a
<Multi_key> <greater> <bar> <grave> <Greek_ALPHA> : "ᾊ" U1f8a
@@ -863,11 +1299,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <greater> <Greek_ALPHA> : "ᾊ" U1f8a
<Multi_key> <grave> <greater> <bar> <Greek_ALPHA> : "ᾊ" U1f8a
<dead_iota> <dead_horn> <dead_grave> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_iota> <U0313> <dead_grave> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_iota> <dead_psili> <dead_grave> <Greek_ALPHA> : "ᾊ" U1f8a
<dead_iota> <dead_grave> <dead_horn> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_iota> <dead_grave> <U0313> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_iota> <dead_grave> <dead_psili> <Greek_ALPHA> : "ᾊ" U1f8a
<dead_horn> <dead_iota> <dead_grave> <Greek_ALPHA> : "ᾊ" U1f8a
+<U0313> <dead_iota> <dead_grave> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_psili> <dead_iota> <dead_grave> <Greek_ALPHA> : "ᾊ" U1f8a
<dead_horn> <dead_grave> <dead_iota> <Greek_ALPHA> : "ᾊ" U1f8a
+<U0313> <dead_grave> <dead_iota> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_psili> <dead_grave> <dead_iota> <Greek_ALPHA> : "ᾊ" U1f8a
<dead_grave> <dead_iota> <dead_horn> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_grave> <dead_iota> <U0313> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_grave> <dead_iota> <dead_psili> <Greek_ALPHA> : "ᾊ" U1f8a
<dead_grave> <dead_horn> <dead_iota> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_grave> <U0313> <dead_iota> <Greek_ALPHA> : "ᾊ" U1f8a
+<dead_grave> <dead_psili> <dead_iota> <Greek_ALPHA> : "ᾊ" U1f8a
<Multi_key> <bar> <less> <grave> <Greek_ALPHA> : "ᾋ" U1f8b
<Multi_key> <bar> <grave> <less> <Greek_ALPHA> : "ᾋ" U1f8b
<Multi_key> <less> <bar> <grave> <Greek_ALPHA> : "ᾋ" U1f8b
@@ -875,11 +1323,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <less> <Greek_ALPHA> : "ᾋ" U1f8b
<Multi_key> <grave> <less> <bar> <Greek_ALPHA> : "ᾋ" U1f8b
<dead_iota> <dead_ogonek> <dead_grave> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_iota> <U0314> <dead_grave> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_iota> <dead_dasia> <dead_grave> <Greek_ALPHA> : "ᾋ" U1f8b
<dead_iota> <dead_grave> <dead_ogonek> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_iota> <dead_grave> <U0314> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_iota> <dead_grave> <dead_dasia> <Greek_ALPHA> : "ᾋ" U1f8b
<dead_ogonek> <dead_iota> <dead_grave> <Greek_ALPHA> : "ᾋ" U1f8b
+<U0314> <dead_iota> <dead_grave> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_dasia> <dead_iota> <dead_grave> <Greek_ALPHA> : "ᾋ" U1f8b
<dead_ogonek> <dead_grave> <dead_iota> <Greek_ALPHA> : "ᾋ" U1f8b
+<U0314> <dead_grave> <dead_iota> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_dasia> <dead_grave> <dead_iota> <Greek_ALPHA> : "ᾋ" U1f8b
<dead_grave> <dead_iota> <dead_ogonek> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_grave> <dead_iota> <U0314> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_grave> <dead_iota> <dead_dasia> <Greek_ALPHA> : "ᾋ" U1f8b
<dead_grave> <dead_ogonek> <dead_iota> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_grave> <U0314> <dead_iota> <Greek_ALPHA> : "ᾋ" U1f8b
+<dead_grave> <dead_dasia> <dead_iota> <Greek_ALPHA> : "ᾋ" U1f8b
<Multi_key> <bar> <greater> <apostrophe> <Greek_ALPHA> : "ᾌ" U1f8c
<Multi_key> <bar> <apostrophe> <greater> <Greek_ALPHA> : "ᾌ" U1f8c
<Multi_key> <greater> <bar> <apostrophe> <Greek_ALPHA> : "ᾌ" U1f8c
@@ -887,11 +1347,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <greater> <Greek_ALPHA> : "ᾌ" U1f8c
<Multi_key> <apostrophe> <greater> <bar> <Greek_ALPHA> : "ᾌ" U1f8c
<dead_iota> <dead_horn> <dead_acute> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_iota> <U0313> <dead_acute> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_iota> <dead_psili> <dead_acute> <Greek_ALPHA> : "ᾌ" U1f8c
<dead_iota> <dead_acute> <dead_horn> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_iota> <dead_acute> <U0313> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_iota> <dead_acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1f8c
<dead_horn> <dead_iota> <dead_acute> <Greek_ALPHA> : "ᾌ" U1f8c
+<U0313> <dead_iota> <dead_acute> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_psili> <dead_iota> <dead_acute> <Greek_ALPHA> : "ᾌ" U1f8c
<dead_horn> <dead_acute> <dead_iota> <Greek_ALPHA> : "ᾌ" U1f8c
+<U0313> <dead_acute> <dead_iota> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_psili> <dead_acute> <dead_iota> <Greek_ALPHA> : "ᾌ" U1f8c
<dead_acute> <dead_iota> <dead_horn> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_acute> <dead_iota> <U0313> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_acute> <dead_iota> <dead_psili> <Greek_ALPHA> : "ᾌ" U1f8c
<dead_acute> <dead_horn> <dead_iota> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_acute> <U0313> <dead_iota> <Greek_ALPHA> : "ᾌ" U1f8c
+<dead_acute> <dead_psili> <dead_iota> <Greek_ALPHA> : "ᾌ" U1f8c
<Multi_key> <bar> <less> <apostrophe> <Greek_ALPHA> : "ᾍ" U1f8d
<Multi_key> <bar> <apostrophe> <less> <Greek_ALPHA> : "ᾍ" U1f8d
<Multi_key> <less> <bar> <apostrophe> <Greek_ALPHA> : "ᾍ" U1f8d
@@ -899,11 +1371,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <less> <Greek_ALPHA> : "ᾍ" U1f8d
<Multi_key> <apostrophe> <less> <bar> <Greek_ALPHA> : "ᾍ" U1f8d
<dead_iota> <dead_ogonek> <dead_acute> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_iota> <U0314> <dead_acute> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_iota> <dead_dasia> <dead_acute> <Greek_ALPHA> : "ᾍ" U1f8d
<dead_iota> <dead_acute> <dead_ogonek> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_iota> <dead_acute> <U0314> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_iota> <dead_acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1f8d
<dead_ogonek> <dead_iota> <dead_acute> <Greek_ALPHA> : "ᾍ" U1f8d
+<U0314> <dead_iota> <dead_acute> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_dasia> <dead_iota> <dead_acute> <Greek_ALPHA> : "ᾍ" U1f8d
<dead_ogonek> <dead_acute> <dead_iota> <Greek_ALPHA> : "ᾍ" U1f8d
+<U0314> <dead_acute> <dead_iota> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_dasia> <dead_acute> <dead_iota> <Greek_ALPHA> : "ᾍ" U1f8d
<dead_acute> <dead_iota> <dead_ogonek> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_acute> <dead_iota> <U0314> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_acute> <dead_iota> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1f8d
<dead_acute> <dead_ogonek> <dead_iota> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_acute> <U0314> <dead_iota> <Greek_ALPHA> : "ᾍ" U1f8d
+<dead_acute> <dead_dasia> <dead_iota> <Greek_ALPHA> : "ᾍ" U1f8d
<Multi_key> <bar> <greater> <asciitilde> <Greek_ALPHA> : "ᾎ" U1f8e
<Multi_key> <bar> <asciitilde> <greater> <Greek_ALPHA> : "ᾎ" U1f8e
<Multi_key> <greater> <bar> <asciitilde> <Greek_ALPHA> : "ᾎ" U1f8e
@@ -911,11 +1395,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <greater> <Greek_ALPHA> : "ᾎ" U1f8e
<Multi_key> <asciitilde> <greater> <bar> <Greek_ALPHA> : "ᾎ" U1f8e
<dead_iota> <dead_horn> <dead_tilde> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_iota> <U0313> <dead_tilde> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_iota> <dead_psili> <dead_tilde> <Greek_ALPHA> : "ᾎ" U1f8e
<dead_iota> <dead_tilde> <dead_horn> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_iota> <dead_tilde> <U0313> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_iota> <dead_tilde> <dead_psili> <Greek_ALPHA> : "ᾎ" U1f8e
<dead_horn> <dead_iota> <dead_tilde> <Greek_ALPHA> : "ᾎ" U1f8e
+<U0313> <dead_iota> <dead_tilde> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_psili> <dead_iota> <dead_tilde> <Greek_ALPHA> : "ᾎ" U1f8e
<dead_horn> <dead_tilde> <dead_iota> <Greek_ALPHA> : "ᾎ" U1f8e
+<U0313> <dead_tilde> <dead_iota> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_psili> <dead_tilde> <dead_iota> <Greek_ALPHA> : "ᾎ" U1f8e
<dead_tilde> <dead_iota> <dead_horn> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_tilde> <dead_iota> <U0313> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_tilde> <dead_iota> <dead_psili> <Greek_ALPHA> : "ᾎ" U1f8e
<dead_tilde> <dead_horn> <dead_iota> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_tilde> <U0313> <dead_iota> <Greek_ALPHA> : "ᾎ" U1f8e
+<dead_tilde> <dead_psili> <dead_iota> <Greek_ALPHA> : "ᾎ" U1f8e
<Multi_key> <bar> <less> <asciitilde> <Greek_ALPHA> : "ᾏ" U1f8f
<Multi_key> <bar> <asciitilde> <less> <Greek_ALPHA> : "ᾏ" U1f8f
<Multi_key> <less> <bar> <asciitilde> <Greek_ALPHA> : "ᾏ" U1f8f
@@ -923,19 +1419,39 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <less> <Greek_ALPHA> : "ᾏ" U1f8f
<Multi_key> <asciitilde> <less> <bar> <Greek_ALPHA> : "ᾏ" U1f8f
<dead_iota> <dead_ogonek> <dead_tilde> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_iota> <U0314> <dead_tilde> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_iota> <dead_dasia> <dead_tilde> <Greek_ALPHA> : "ᾏ" U1f8f
<dead_iota> <dead_tilde> <dead_ogonek> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_iota> <dead_tilde> <U0314> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_ALPHA> : "ᾏ" U1f8f
<dead_ogonek> <dead_iota> <dead_tilde> <Greek_ALPHA> : "ᾏ" U1f8f
+<U0314> <dead_iota> <dead_tilde> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_dasia> <dead_iota> <dead_tilde> <Greek_ALPHA> : "ᾏ" U1f8f
<dead_ogonek> <dead_tilde> <dead_iota> <Greek_ALPHA> : "ᾏ" U1f8f
+<U0314> <dead_tilde> <dead_iota> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_dasia> <dead_tilde> <dead_iota> <Greek_ALPHA> : "ᾏ" U1f8f
<dead_tilde> <dead_iota> <dead_ogonek> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_tilde> <dead_iota> <U0314> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_tilde> <dead_iota> <dead_dasia> <Greek_ALPHA> : "ᾏ" U1f8f
<dead_tilde> <dead_ogonek> <dead_iota> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_tilde> <U0314> <dead_iota> <Greek_ALPHA> : "ᾏ" U1f8f
+<dead_tilde> <dead_dasia> <dead_iota> <Greek_ALPHA> : "ᾏ" U1f8f
<Multi_key> <bar> <greater> <Greek_eta> : "ᾐ" U1f90
<Multi_key> <greater> <bar> <Greek_eta> : "ᾐ" U1f90
<dead_iota> <dead_horn> <Greek_eta> : "ᾐ" U1f90
+<dead_iota> <U0313> <Greek_eta> : "ᾐ" U1f90
+<dead_iota> <dead_psili> <Greek_eta> : "ᾐ" U1f90
<dead_horn> <dead_iota> <Greek_eta> : "ᾐ" U1f90
+<U0313> <dead_iota> <Greek_eta> : "ᾐ" U1f90
+<dead_psili> <dead_iota> <Greek_eta> : "ᾐ" U1f90
<Multi_key> <bar> <less> <Greek_eta> : "ᾑ" U1f91
<Multi_key> <less> <bar> <Greek_eta> : "ᾑ" U1f91
<dead_iota> <dead_ogonek> <Greek_eta> : "ᾑ" U1f91
+<dead_iota> <U0314> <Greek_eta> : "ᾑ" U1f91
+<dead_iota> <dead_dasia> <Greek_eta> : "ᾑ" U1f91
<dead_ogonek> <dead_iota> <Greek_eta> : "ᾑ" U1f91
+<U0314> <dead_iota> <Greek_eta> : "ᾑ" U1f91
+<dead_dasia> <dead_iota> <Greek_eta> : "ᾑ" U1f91
<Multi_key> <bar> <greater> <grave> <Greek_eta> : "ᾒ" U1f92
<Multi_key> <bar> <grave> <greater> <Greek_eta> : "ᾒ" U1f92
<Multi_key> <greater> <bar> <grave> <Greek_eta> : "ᾒ" U1f92
@@ -943,11 +1459,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <greater> <Greek_eta> : "ᾒ" U1f92
<Multi_key> <grave> <greater> <bar> <Greek_eta> : "ᾒ" U1f92
<dead_iota> <dead_horn> <dead_grave> <Greek_eta> : "ᾒ" U1f92
+<dead_iota> <U0313> <dead_grave> <Greek_eta> : "ᾒ" U1f92
+<dead_iota> <dead_psili> <dead_grave> <Greek_eta> : "ᾒ" U1f92
<dead_iota> <dead_grave> <dead_horn> <Greek_eta> : "ᾒ" U1f92
+<dead_iota> <dead_grave> <U0313> <Greek_eta> : "ᾒ" U1f92
+<dead_iota> <dead_grave> <dead_psili> <Greek_eta> : "ᾒ" U1f92
<dead_horn> <dead_iota> <dead_grave> <Greek_eta> : "ᾒ" U1f92
+<U0313> <dead_iota> <dead_grave> <Greek_eta> : "ᾒ" U1f92
+<dead_psili> <dead_iota> <dead_grave> <Greek_eta> : "ᾒ" U1f92
<dead_horn> <dead_grave> <dead_iota> <Greek_eta> : "ᾒ" U1f92
+<U0313> <dead_grave> <dead_iota> <Greek_eta> : "ᾒ" U1f92
+<dead_psili> <dead_grave> <dead_iota> <Greek_eta> : "ᾒ" U1f92
<dead_grave> <dead_iota> <dead_horn> <Greek_eta> : "ᾒ" U1f92
+<dead_grave> <dead_iota> <U0313> <Greek_eta> : "ᾒ" U1f92
+<dead_grave> <dead_iota> <dead_psili> <Greek_eta> : "ᾒ" U1f92
<dead_grave> <dead_horn> <dead_iota> <Greek_eta> : "ᾒ" U1f92
+<dead_grave> <U0313> <dead_iota> <Greek_eta> : "ᾒ" U1f92
+<dead_grave> <dead_psili> <dead_iota> <Greek_eta> : "ᾒ" U1f92
<Multi_key> <bar> <less> <grave> <Greek_eta> : "ᾓ" U1f93
<Multi_key> <bar> <grave> <less> <Greek_eta> : "ᾓ" U1f93
<Multi_key> <less> <bar> <grave> <Greek_eta> : "ᾓ" U1f93
@@ -955,11 +1483,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <less> <Greek_eta> : "ᾓ" U1f93
<Multi_key> <grave> <less> <bar> <Greek_eta> : "ᾓ" U1f93
<dead_iota> <dead_ogonek> <dead_grave> <Greek_eta> : "ᾓ" U1f93
+<dead_iota> <U0314> <dead_grave> <Greek_eta> : "ᾓ" U1f93
+<dead_iota> <dead_dasia> <dead_grave> <Greek_eta> : "ᾓ" U1f93
<dead_iota> <dead_grave> <dead_ogonek> <Greek_eta> : "ᾓ" U1f93
+<dead_iota> <dead_grave> <U0314> <Greek_eta> : "ᾓ" U1f93
+<dead_iota> <dead_grave> <dead_dasia> <Greek_eta> : "ᾓ" U1f93
<dead_ogonek> <dead_iota> <dead_grave> <Greek_eta> : "ᾓ" U1f93
+<U0314> <dead_iota> <dead_grave> <Greek_eta> : "ᾓ" U1f93
+<dead_dasia> <dead_iota> <dead_grave> <Greek_eta> : "ᾓ" U1f93
<dead_ogonek> <dead_grave> <dead_iota> <Greek_eta> : "ᾓ" U1f93
+<U0314> <dead_grave> <dead_iota> <Greek_eta> : "ᾓ" U1f93
+<dead_dasia> <dead_grave> <dead_iota> <Greek_eta> : "ᾓ" U1f93
<dead_grave> <dead_iota> <dead_ogonek> <Greek_eta> : "ᾓ" U1f93
+<dead_grave> <dead_iota> <U0314> <Greek_eta> : "ᾓ" U1f93
+<dead_grave> <dead_iota> <dead_dasia> <Greek_eta> : "ᾓ" U1f93
<dead_grave> <dead_ogonek> <dead_iota> <Greek_eta> : "ᾓ" U1f93
+<dead_grave> <U0314> <dead_iota> <Greek_eta> : "ᾓ" U1f93
+<dead_grave> <dead_dasia> <dead_iota> <Greek_eta> : "ᾓ" U1f93
<Multi_key> <bar> <greater> <apostrophe> <Greek_eta> : "ᾔ" U1f94
<Multi_key> <bar> <apostrophe> <greater> <Greek_eta> : "ᾔ" U1f94
<Multi_key> <greater> <bar> <apostrophe> <Greek_eta> : "ᾔ" U1f94
@@ -967,11 +1507,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <greater> <Greek_eta> : "ᾔ" U1f94
<Multi_key> <apostrophe> <greater> <bar> <Greek_eta> : "ᾔ" U1f94
<dead_iota> <dead_horn> <dead_acute> <Greek_eta> : "ᾔ" U1f94
+<dead_iota> <U0313> <dead_acute> <Greek_eta> : "ᾔ" U1f94
+<dead_iota> <dead_psili> <dead_acute> <Greek_eta> : "ᾔ" U1f94
<dead_iota> <dead_acute> <dead_horn> <Greek_eta> : "ᾔ" U1f94
+<dead_iota> <dead_acute> <U0313> <Greek_eta> : "ᾔ" U1f94
+<dead_iota> <dead_acute> <dead_psili> <Greek_eta> : "ᾔ" U1f94
<dead_horn> <dead_iota> <dead_acute> <Greek_eta> : "ᾔ" U1f94
+<U0313> <dead_iota> <dead_acute> <Greek_eta> : "ᾔ" U1f94
+<dead_psili> <dead_iota> <dead_acute> <Greek_eta> : "ᾔ" U1f94
<dead_horn> <dead_acute> <dead_iota> <Greek_eta> : "ᾔ" U1f94
+<U0313> <dead_acute> <dead_iota> <Greek_eta> : "ᾔ" U1f94
+<dead_psili> <dead_acute> <dead_iota> <Greek_eta> : "ᾔ" U1f94
<dead_acute> <dead_iota> <dead_horn> <Greek_eta> : "ᾔ" U1f94
+<dead_acute> <dead_iota> <U0313> <Greek_eta> : "ᾔ" U1f94
+<dead_acute> <dead_iota> <dead_psili> <Greek_eta> : "ᾔ" U1f94
<dead_acute> <dead_horn> <dead_iota> <Greek_eta> : "ᾔ" U1f94
+<dead_acute> <U0313> <dead_iota> <Greek_eta> : "ᾔ" U1f94
+<dead_acute> <dead_psili> <dead_iota> <Greek_eta> : "ᾔ" U1f94
<Multi_key> <bar> <less> <apostrophe> <Greek_eta> : "ᾕ" U1f95
<Multi_key> <bar> <apostrophe> <less> <Greek_eta> : "ᾕ" U1f95
<Multi_key> <less> <bar> <apostrophe> <Greek_eta> : "ᾕ" U1f95
@@ -979,11 +1531,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <less> <Greek_eta> : "ᾕ" U1f95
<Multi_key> <apostrophe> <less> <bar> <Greek_eta> : "ᾕ" U1f95
<dead_iota> <dead_ogonek> <dead_acute> <Greek_eta> : "ᾕ" U1f95
+<dead_iota> <U0314> <dead_acute> <Greek_eta> : "ᾕ" U1f95
+<dead_iota> <dead_dasia> <dead_acute> <Greek_eta> : "ᾕ" U1f95
<dead_iota> <dead_acute> <dead_ogonek> <Greek_eta> : "ᾕ" U1f95
+<dead_iota> <dead_acute> <U0314> <Greek_eta> : "ᾕ" U1f95
+<dead_iota> <dead_acute> <dead_dasia> <Greek_eta> : "ᾕ" U1f95
<dead_ogonek> <dead_iota> <dead_acute> <Greek_eta> : "ᾕ" U1f95
+<U0314> <dead_iota> <dead_acute> <Greek_eta> : "ᾕ" U1f95
+<dead_dasia> <dead_iota> <dead_acute> <Greek_eta> : "ᾕ" U1f95
<dead_ogonek> <dead_acute> <dead_iota> <Greek_eta> : "ᾕ" U1f95
+<U0314> <dead_acute> <dead_iota> <Greek_eta> : "ᾕ" U1f95
+<dead_dasia> <dead_acute> <dead_iota> <Greek_eta> : "ᾕ" U1f95
<dead_acute> <dead_iota> <dead_ogonek> <Greek_eta> : "ᾕ" U1f95
+<dead_acute> <dead_iota> <U0314> <Greek_eta> : "ᾕ" U1f95
+<dead_acute> <dead_iota> <dead_dasia> <Greek_eta> : "ᾕ" U1f95
<dead_acute> <dead_ogonek> <dead_iota> <Greek_eta> : "ᾕ" U1f95
+<dead_acute> <U0314> <dead_iota> <Greek_eta> : "ᾕ" U1f95
+<dead_acute> <dead_dasia> <dead_iota> <Greek_eta> : "ᾕ" U1f95
<Multi_key> <bar> <greater> <asciitilde> <Greek_eta> : "ᾖ" U1f96
<Multi_key> <bar> <asciitilde> <greater> <Greek_eta> : "ᾖ" U1f96
<Multi_key> <greater> <bar> <asciitilde> <Greek_eta> : "ᾖ" U1f96
@@ -991,11 +1555,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <greater> <Greek_eta> : "ᾖ" U1f96
<Multi_key> <asciitilde> <greater> <bar> <Greek_eta> : "ᾖ" U1f96
<dead_iota> <dead_horn> <dead_tilde> <Greek_eta> : "ᾖ" U1f96
+<dead_iota> <U0313> <dead_tilde> <Greek_eta> : "ᾖ" U1f96
+<dead_iota> <dead_psili> <dead_tilde> <Greek_eta> : "ᾖ" U1f96
<dead_iota> <dead_tilde> <dead_horn> <Greek_eta> : "ᾖ" U1f96
+<dead_iota> <dead_tilde> <U0313> <Greek_eta> : "ᾖ" U1f96
+<dead_iota> <dead_tilde> <dead_psili> <Greek_eta> : "ᾖ" U1f96
<dead_horn> <dead_iota> <dead_tilde> <Greek_eta> : "ᾖ" U1f96
+<U0313> <dead_iota> <dead_tilde> <Greek_eta> : "ᾖ" U1f96
+<dead_psili> <dead_iota> <dead_tilde> <Greek_eta> : "ᾖ" U1f96
<dead_horn> <dead_tilde> <dead_iota> <Greek_eta> : "ᾖ" U1f96
+<U0313> <dead_tilde> <dead_iota> <Greek_eta> : "ᾖ" U1f96
+<dead_psili> <dead_tilde> <dead_iota> <Greek_eta> : "ᾖ" U1f96
<dead_tilde> <dead_iota> <dead_horn> <Greek_eta> : "ᾖ" U1f96
+<dead_tilde> <dead_iota> <U0313> <Greek_eta> : "ᾖ" U1f96
+<dead_tilde> <dead_iota> <dead_psili> <Greek_eta> : "ᾖ" U1f96
<dead_tilde> <dead_horn> <dead_iota> <Greek_eta> : "ᾖ" U1f96
+<dead_tilde> <U0313> <dead_iota> <Greek_eta> : "ᾖ" U1f96
+<dead_tilde> <dead_psili> <dead_iota> <Greek_eta> : "ᾖ" U1f96
<Multi_key> <bar> <less> <asciitilde> <Greek_eta> : "ᾗ" U1f97
<Multi_key> <bar> <asciitilde> <less> <Greek_eta> : "ᾗ" U1f97
<Multi_key> <less> <bar> <asciitilde> <Greek_eta> : "ᾗ" U1f97
@@ -1003,19 +1579,39 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <less> <Greek_eta> : "ᾗ" U1f97
<Multi_key> <asciitilde> <less> <bar> <Greek_eta> : "ᾗ" U1f97
<dead_iota> <dead_ogonek> <dead_tilde> <Greek_eta> : "ᾗ" U1f97
+<dead_iota> <U0314> <dead_tilde> <Greek_eta> : "ᾗ" U1f97
+<dead_iota> <dead_dasia> <dead_tilde> <Greek_eta> : "ᾗ" U1f97
<dead_iota> <dead_tilde> <dead_ogonek> <Greek_eta> : "ᾗ" U1f97
+<dead_iota> <dead_tilde> <U0314> <Greek_eta> : "ᾗ" U1f97
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_eta> : "ᾗ" U1f97
<dead_ogonek> <dead_iota> <dead_tilde> <Greek_eta> : "ᾗ" U1f97
+<U0314> <dead_iota> <dead_tilde> <Greek_eta> : "ᾗ" U1f97
+<dead_dasia> <dead_iota> <dead_tilde> <Greek_eta> : "ᾗ" U1f97
<dead_ogonek> <dead_tilde> <dead_iota> <Greek_eta> : "ᾗ" U1f97
+<U0314> <dead_tilde> <dead_iota> <Greek_eta> : "ᾗ" U1f97
+<dead_dasia> <dead_tilde> <dead_iota> <Greek_eta> : "ᾗ" U1f97
<dead_tilde> <dead_iota> <dead_ogonek> <Greek_eta> : "ᾗ" U1f97
+<dead_tilde> <dead_iota> <U0314> <Greek_eta> : "ᾗ" U1f97
+<dead_tilde> <dead_iota> <dead_dasia> <Greek_eta> : "ᾗ" U1f97
<dead_tilde> <dead_ogonek> <dead_iota> <Greek_eta> : "ᾗ" U1f97
+<dead_tilde> <U0314> <dead_iota> <Greek_eta> : "ᾗ" U1f97
+<dead_tilde> <dead_dasia> <dead_iota> <Greek_eta> : "ᾗ" U1f97
<Multi_key> <bar> <greater> <Greek_ETA> : "ᾘ" U1f98
<Multi_key> <greater> <bar> <Greek_ETA> : "ᾘ" U1f98
<dead_iota> <dead_horn> <Greek_ETA> : "ᾘ" U1f98
+<dead_iota> <U0313> <Greek_ETA> : "ᾘ" U1f98
+<dead_iota> <dead_psili> <Greek_ETA> : "ᾘ" U1f98
<dead_horn> <dead_iota> <Greek_ETA> : "ᾘ" U1f98
+<U0313> <dead_iota> <Greek_ETA> : "ᾘ" U1f98
+<dead_psili> <dead_iota> <Greek_ETA> : "ᾘ" U1f98
<Multi_key> <bar> <less> <Greek_ETA> : "ᾙ" U1f99
<Multi_key> <less> <bar> <Greek_ETA> : "ᾙ" U1f99
<dead_iota> <dead_ogonek> <Greek_ETA> : "ᾙ" U1f99
+<dead_iota> <U0314> <Greek_ETA> : "ᾙ" U1f99
+<dead_iota> <dead_dasia> <Greek_ETA> : "ᾙ" U1f99
<dead_ogonek> <dead_iota> <Greek_ETA> : "ᾙ" U1f99
+<U0314> <dead_iota> <Greek_ETA> : "ᾙ" U1f99
+<dead_dasia> <dead_iota> <Greek_ETA> : "ᾙ" U1f99
<Multi_key> <bar> <greater> <grave> <Greek_ETA> : "ᾚ" U1f9a
<Multi_key> <bar> <grave> <greater> <Greek_ETA> : "ᾚ" U1f9a
<Multi_key> <greater> <bar> <grave> <Greek_ETA> : "ᾚ" U1f9a
@@ -1023,11 +1619,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <greater> <Greek_ETA> : "ᾚ" U1f9a
<Multi_key> <grave> <greater> <bar> <Greek_ETA> : "ᾚ" U1f9a
<dead_iota> <dead_horn> <dead_grave> <Greek_ETA> : "ᾚ" U1f9a
+<dead_iota> <U0313> <dead_grave> <Greek_ETA> : "ᾚ" U1f9a
+<dead_iota> <dead_psili> <dead_grave> <Greek_ETA> : "ᾚ" U1f9a
<dead_iota> <dead_grave> <dead_horn> <Greek_ETA> : "ᾚ" U1f9a
+<dead_iota> <dead_grave> <U0313> <Greek_ETA> : "ᾚ" U1f9a
+<dead_iota> <dead_grave> <dead_psili> <Greek_ETA> : "ᾚ" U1f9a
<dead_horn> <dead_iota> <dead_grave> <Greek_ETA> : "ᾚ" U1f9a
+<U0313> <dead_iota> <dead_grave> <Greek_ETA> : "ᾚ" U1f9a
+<dead_psili> <dead_iota> <dead_grave> <Greek_ETA> : "ᾚ" U1f9a
<dead_horn> <dead_grave> <dead_iota> <Greek_ETA> : "ᾚ" U1f9a
+<U0313> <dead_grave> <dead_iota> <Greek_ETA> : "ᾚ" U1f9a
+<dead_psili> <dead_grave> <dead_iota> <Greek_ETA> : "ᾚ" U1f9a
<dead_grave> <dead_iota> <dead_horn> <Greek_ETA> : "ᾚ" U1f9a
+<dead_grave> <dead_iota> <U0313> <Greek_ETA> : "ᾚ" U1f9a
+<dead_grave> <dead_iota> <dead_psili> <Greek_ETA> : "ᾚ" U1f9a
<dead_grave> <dead_horn> <dead_iota> <Greek_ETA> : "ᾚ" U1f9a
+<dead_grave> <U0313> <dead_iota> <Greek_ETA> : "ᾚ" U1f9a
+<dead_grave> <dead_psili> <dead_iota> <Greek_ETA> : "ᾚ" U1f9a
<Multi_key> <bar> <less> <grave> <Greek_ETA> : "ᾛ" U1f9b
<Multi_key> <bar> <grave> <less> <Greek_ETA> : "ᾛ" U1f9b
<Multi_key> <less> <bar> <grave> <Greek_ETA> : "ᾛ" U1f9b
@@ -1035,11 +1643,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <less> <Greek_ETA> : "ᾛ" U1f9b
<Multi_key> <grave> <less> <bar> <Greek_ETA> : "ᾛ" U1f9b
<dead_iota> <dead_ogonek> <dead_grave> <Greek_ETA> : "ᾛ" U1f9b
+<dead_iota> <U0314> <dead_grave> <Greek_ETA> : "ᾛ" U1f9b
+<dead_iota> <dead_dasia> <dead_grave> <Greek_ETA> : "ᾛ" U1f9b
<dead_iota> <dead_grave> <dead_ogonek> <Greek_ETA> : "ᾛ" U1f9b
+<dead_iota> <dead_grave> <U0314> <Greek_ETA> : "ᾛ" U1f9b
+<dead_iota> <dead_grave> <dead_dasia> <Greek_ETA> : "ᾛ" U1f9b
<dead_ogonek> <dead_iota> <dead_grave> <Greek_ETA> : "ᾛ" U1f9b
+<U0314> <dead_iota> <dead_grave> <Greek_ETA> : "ᾛ" U1f9b
+<dead_dasia> <dead_iota> <dead_grave> <Greek_ETA> : "ᾛ" U1f9b
<dead_ogonek> <dead_grave> <dead_iota> <Greek_ETA> : "ᾛ" U1f9b
+<U0314> <dead_grave> <dead_iota> <Greek_ETA> : "ᾛ" U1f9b
+<dead_dasia> <dead_grave> <dead_iota> <Greek_ETA> : "ᾛ" U1f9b
<dead_grave> <dead_iota> <dead_ogonek> <Greek_ETA> : "ᾛ" U1f9b
+<dead_grave> <dead_iota> <U0314> <Greek_ETA> : "ᾛ" U1f9b
+<dead_grave> <dead_iota> <dead_dasia> <Greek_ETA> : "ᾛ" U1f9b
<dead_grave> <dead_ogonek> <dead_iota> <Greek_ETA> : "ᾛ" U1f9b
+<dead_grave> <U0314> <dead_iota> <Greek_ETA> : "ᾛ" U1f9b
+<dead_grave> <dead_dasia> <dead_iota> <Greek_ETA> : "ᾛ" U1f9b
<Multi_key> <bar> <greater> <apostrophe> <Greek_ETA> : "ᾜ" U1f9c
<Multi_key> <bar> <apostrophe> <greater> <Greek_ETA> : "ᾜ" U1f9c
<Multi_key> <greater> <bar> <apostrophe> <Greek_ETA> : "ᾜ" U1f9c
@@ -1047,11 +1667,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <greater> <Greek_ETA> : "ᾜ" U1f9c
<Multi_key> <apostrophe> <greater> <bar> <Greek_ETA> : "ᾜ" U1f9c
<dead_iota> <dead_horn> <dead_acute> <Greek_ETA> : "ᾜ" U1f9c
+<dead_iota> <U0313> <dead_acute> <Greek_ETA> : "ᾜ" U1f9c
+<dead_iota> <dead_psili> <dead_acute> <Greek_ETA> : "ᾜ" U1f9c
<dead_iota> <dead_acute> <dead_horn> <Greek_ETA> : "ᾜ" U1f9c
+<dead_iota> <dead_acute> <U0313> <Greek_ETA> : "ᾜ" U1f9c
+<dead_iota> <dead_acute> <dead_psili> <Greek_ETA> : "ᾜ" U1f9c
<dead_horn> <dead_iota> <dead_acute> <Greek_ETA> : "ᾜ" U1f9c
+<U0313> <dead_iota> <dead_acute> <Greek_ETA> : "ᾜ" U1f9c
+<dead_psili> <dead_iota> <dead_acute> <Greek_ETA> : "ᾜ" U1f9c
<dead_horn> <dead_acute> <dead_iota> <Greek_ETA> : "ᾜ" U1f9c
+<U0313> <dead_acute> <dead_iota> <Greek_ETA> : "ᾜ" U1f9c
+<dead_psili> <dead_acute> <dead_iota> <Greek_ETA> : "ᾜ" U1f9c
<dead_acute> <dead_iota> <dead_horn> <Greek_ETA> : "ᾜ" U1f9c
+<dead_acute> <dead_iota> <U0313> <Greek_ETA> : "ᾜ" U1f9c
+<dead_acute> <dead_iota> <dead_psili> <Greek_ETA> : "ᾜ" U1f9c
<dead_acute> <dead_horn> <dead_iota> <Greek_ETA> : "ᾜ" U1f9c
+<dead_acute> <U0313> <dead_iota> <Greek_ETA> : "ᾜ" U1f9c
+<dead_acute> <dead_psili> <dead_iota> <Greek_ETA> : "ᾜ" U1f9c
<Multi_key> <bar> <less> <apostrophe> <Greek_ETA> : "ᾝ" U1f9d
<Multi_key> <bar> <apostrophe> <less> <Greek_ETA> : "ᾝ" U1f9d
<Multi_key> <less> <bar> <apostrophe> <Greek_ETA> : "ᾝ" U1f9d
@@ -1059,11 +1691,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <less> <Greek_ETA> : "ᾝ" U1f9d
<Multi_key> <apostrophe> <less> <bar> <Greek_ETA> : "ᾝ" U1f9d
<dead_iota> <dead_ogonek> <dead_acute> <Greek_ETA> : "ᾝ" U1f9d
+<dead_iota> <U0314> <dead_acute> <Greek_ETA> : "ᾝ" U1f9d
+<dead_iota> <dead_dasia> <dead_acute> <Greek_ETA> : "ᾝ" U1f9d
<dead_iota> <dead_acute> <dead_ogonek> <Greek_ETA> : "ᾝ" U1f9d
+<dead_iota> <dead_acute> <U0314> <Greek_ETA> : "ᾝ" U1f9d
+<dead_iota> <dead_acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1f9d
<dead_ogonek> <dead_iota> <dead_acute> <Greek_ETA> : "ᾝ" U1f9d
+<U0314> <dead_iota> <dead_acute> <Greek_ETA> : "ᾝ" U1f9d
+<dead_dasia> <dead_iota> <dead_acute> <Greek_ETA> : "ᾝ" U1f9d
<dead_ogonek> <dead_acute> <dead_iota> <Greek_ETA> : "ᾝ" U1f9d
+<U0314> <dead_acute> <dead_iota> <Greek_ETA> : "ᾝ" U1f9d
+<dead_dasia> <dead_acute> <dead_iota> <Greek_ETA> : "ᾝ" U1f9d
<dead_acute> <dead_iota> <dead_ogonek> <Greek_ETA> : "ᾝ" U1f9d
+<dead_acute> <dead_iota> <U0314> <Greek_ETA> : "ᾝ" U1f9d
+<dead_acute> <dead_iota> <dead_dasia> <Greek_ETA> : "ᾝ" U1f9d
<dead_acute> <dead_ogonek> <dead_iota> <Greek_ETA> : "ᾝ" U1f9d
+<dead_acute> <U0314> <dead_iota> <Greek_ETA> : "ᾝ" U1f9d
+<dead_acute> <dead_dasia> <dead_iota> <Greek_ETA> : "ᾝ" U1f9d
<Multi_key> <bar> <greater> <asciitilde> <Greek_ETA> : "ᾞ" U1f9e
<Multi_key> <bar> <asciitilde> <greater> <Greek_ETA> : "ᾞ" U1f9e
<Multi_key> <greater> <bar> <asciitilde> <Greek_ETA> : "ᾞ" U1f9e
@@ -1071,11 +1715,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <greater> <Greek_ETA> : "ᾞ" U1f9e
<Multi_key> <asciitilde> <greater> <bar> <Greek_ETA> : "ᾞ" U1f9e
<dead_iota> <dead_horn> <dead_tilde> <Greek_ETA> : "ᾞ" U1f9e
+<dead_iota> <U0313> <dead_tilde> <Greek_ETA> : "ᾞ" U1f9e
+<dead_iota> <dead_psili> <dead_tilde> <Greek_ETA> : "ᾞ" U1f9e
<dead_iota> <dead_tilde> <dead_horn> <Greek_ETA> : "ᾞ" U1f9e
+<dead_iota> <dead_tilde> <U0313> <Greek_ETA> : "ᾞ" U1f9e
+<dead_iota> <dead_tilde> <dead_psili> <Greek_ETA> : "ᾞ" U1f9e
<dead_horn> <dead_iota> <dead_tilde> <Greek_ETA> : "ᾞ" U1f9e
+<U0313> <dead_iota> <dead_tilde> <Greek_ETA> : "ᾞ" U1f9e
+<dead_psili> <dead_iota> <dead_tilde> <Greek_ETA> : "ᾞ" U1f9e
<dead_horn> <dead_tilde> <dead_iota> <Greek_ETA> : "ᾞ" U1f9e
+<U0313> <dead_tilde> <dead_iota> <Greek_ETA> : "ᾞ" U1f9e
+<dead_psili> <dead_tilde> <dead_iota> <Greek_ETA> : "ᾞ" U1f9e
<dead_tilde> <dead_iota> <dead_horn> <Greek_ETA> : "ᾞ" U1f9e
+<dead_tilde> <dead_iota> <U0313> <Greek_ETA> : "ᾞ" U1f9e
+<dead_tilde> <dead_iota> <dead_psili> <Greek_ETA> : "ᾞ" U1f9e
<dead_tilde> <dead_horn> <dead_iota> <Greek_ETA> : "ᾞ" U1f9e
+<dead_tilde> <U0313> <dead_iota> <Greek_ETA> : "ᾞ" U1f9e
+<dead_tilde> <dead_psili> <dead_iota> <Greek_ETA> : "ᾞ" U1f9e
<Multi_key> <bar> <less> <asciitilde> <Greek_ETA> : "ᾟ" U1f9f
<Multi_key> <bar> <asciitilde> <less> <Greek_ETA> : "ᾟ" U1f9f
<Multi_key> <less> <bar> <asciitilde> <Greek_ETA> : "ᾟ" U1f9f
@@ -1083,19 +1739,39 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <less> <Greek_ETA> : "ᾟ" U1f9f
<Multi_key> <asciitilde> <less> <bar> <Greek_ETA> : "ᾟ" U1f9f
<dead_iota> <dead_ogonek> <dead_tilde> <Greek_ETA> : "ᾟ" U1f9f
+<dead_iota> <U0314> <dead_tilde> <Greek_ETA> : "ᾟ" U1f9f
+<dead_iota> <dead_dasia> <dead_tilde> <Greek_ETA> : "ᾟ" U1f9f
<dead_iota> <dead_tilde> <dead_ogonek> <Greek_ETA> : "ᾟ" U1f9f
+<dead_iota> <dead_tilde> <U0314> <Greek_ETA> : "ᾟ" U1f9f
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_ETA> : "ᾟ" U1f9f
<dead_ogonek> <dead_iota> <dead_tilde> <Greek_ETA> : "ᾟ" U1f9f
+<U0314> <dead_iota> <dead_tilde> <Greek_ETA> : "ᾟ" U1f9f
+<dead_dasia> <dead_iota> <dead_tilde> <Greek_ETA> : "ᾟ" U1f9f
<dead_ogonek> <dead_tilde> <dead_iota> <Greek_ETA> : "ᾟ" U1f9f
+<U0314> <dead_tilde> <dead_iota> <Greek_ETA> : "ᾟ" U1f9f
+<dead_dasia> <dead_tilde> <dead_iota> <Greek_ETA> : "ᾟ" U1f9f
<dead_tilde> <dead_iota> <dead_ogonek> <Greek_ETA> : "ᾟ" U1f9f
+<dead_tilde> <dead_iota> <U0314> <Greek_ETA> : "ᾟ" U1f9f
+<dead_tilde> <dead_iota> <dead_dasia> <Greek_ETA> : "ᾟ" U1f9f
<dead_tilde> <dead_ogonek> <dead_iota> <Greek_ETA> : "ᾟ" U1f9f
+<dead_tilde> <U0314> <dead_iota> <Greek_ETA> : "ᾟ" U1f9f
+<dead_tilde> <dead_dasia> <dead_iota> <Greek_ETA> : "ᾟ" U1f9f
<Multi_key> <bar> <greater> <Greek_omega> : "ᾠ" U1fa0
<Multi_key> <greater> <bar> <Greek_omega> : "ᾠ" U1fa0
<dead_iota> <dead_horn> <Greek_omega> : "ᾠ" U1fa0
+<dead_iota> <U0313> <Greek_omega> : "ᾠ" U1fa0
+<dead_iota> <dead_psili> <Greek_omega> : "ᾠ" U1fa0
<dead_horn> <dead_iota> <Greek_omega> : "ᾠ" U1fa0
+<U0313> <dead_iota> <Greek_omega> : "ᾠ" U1fa0
+<dead_psili> <dead_iota> <Greek_omega> : "ᾠ" U1fa0
<Multi_key> <bar> <less> <Greek_omega> : "ᾡ" U1fa1
<Multi_key> <less> <bar> <Greek_omega> : "ᾡ" U1fa1
<dead_iota> <dead_ogonek> <Greek_omega> : "ᾡ" U1fa1
+<dead_iota> <U0314> <Greek_omega> : "ᾡ" U1fa1
+<dead_iota> <dead_dasia> <Greek_omega> : "ᾡ" U1fa1
<dead_ogonek> <dead_iota> <Greek_omega> : "ᾡ" U1fa1
+<U0314> <dead_iota> <Greek_omega> : "ᾡ" U1fa1
+<dead_dasia> <dead_iota> <Greek_omega> : "ᾡ" U1fa1
<Multi_key> <bar> <greater> <grave> <Greek_omega> : "ᾢ" U1fa2
<Multi_key> <bar> <grave> <greater> <Greek_omega> : "ᾢ" U1fa2
<Multi_key> <greater> <bar> <grave> <Greek_omega> : "ᾢ" U1fa2
@@ -1103,11 +1779,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <greater> <Greek_omega> : "ᾢ" U1fa2
<Multi_key> <grave> <greater> <bar> <Greek_omega> : "ᾢ" U1fa2
<dead_iota> <dead_horn> <dead_grave> <Greek_omega> : "ᾢ" U1fa2
+<dead_iota> <U0313> <dead_grave> <Greek_omega> : "ᾢ" U1fa2
+<dead_iota> <dead_psili> <dead_grave> <Greek_omega> : "ᾢ" U1fa2
<dead_iota> <dead_grave> <dead_horn> <Greek_omega> : "ᾢ" U1fa2
+<dead_iota> <dead_grave> <U0313> <Greek_omega> : "ᾢ" U1fa2
+<dead_iota> <dead_grave> <dead_psili> <Greek_omega> : "ᾢ" U1fa2
<dead_horn> <dead_iota> <dead_grave> <Greek_omega> : "ᾢ" U1fa2
+<U0313> <dead_iota> <dead_grave> <Greek_omega> : "ᾢ" U1fa2
+<dead_psili> <dead_iota> <dead_grave> <Greek_omega> : "ᾢ" U1fa2
<dead_horn> <dead_grave> <dead_iota> <Greek_omega> : "ᾢ" U1fa2
+<U0313> <dead_grave> <dead_iota> <Greek_omega> : "ᾢ" U1fa2
+<dead_psili> <dead_grave> <dead_iota> <Greek_omega> : "ᾢ" U1fa2
<dead_grave> <dead_iota> <dead_horn> <Greek_omega> : "ᾢ" U1fa2
+<dead_grave> <dead_iota> <U0313> <Greek_omega> : "ᾢ" U1fa2
+<dead_grave> <dead_iota> <dead_psili> <Greek_omega> : "ᾢ" U1fa2
<dead_grave> <dead_horn> <dead_iota> <Greek_omega> : "ᾢ" U1fa2
+<dead_grave> <U0313> <dead_iota> <Greek_omega> : "ᾢ" U1fa2
+<dead_grave> <dead_psili> <dead_iota> <Greek_omega> : "ᾢ" U1fa2
<Multi_key> <bar> <less> <grave> <Greek_omega> : "ᾣ" U1fa3
<Multi_key> <bar> <grave> <less> <Greek_omega> : "ᾣ" U1fa3
<Multi_key> <less> <bar> <grave> <Greek_omega> : "ᾣ" U1fa3
@@ -1115,11 +1803,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <less> <Greek_omega> : "ᾣ" U1fa3
<Multi_key> <grave> <less> <bar> <Greek_omega> : "ᾣ" U1fa3
<dead_iota> <dead_ogonek> <dead_grave> <Greek_omega> : "ᾣ" U1fa3
+<dead_iota> <U0314> <dead_grave> <Greek_omega> : "ᾣ" U1fa3
+<dead_iota> <dead_dasia> <dead_grave> <Greek_omega> : "ᾣ" U1fa3
<dead_iota> <dead_grave> <dead_ogonek> <Greek_omega> : "ᾣ" U1fa3
+<dead_iota> <dead_grave> <U0314> <Greek_omega> : "ᾣ" U1fa3
+<dead_iota> <dead_grave> <dead_dasia> <Greek_omega> : "ᾣ" U1fa3
<dead_ogonek> <dead_iota> <dead_grave> <Greek_omega> : "ᾣ" U1fa3
+<U0314> <dead_iota> <dead_grave> <Greek_omega> : "ᾣ" U1fa3
+<dead_dasia> <dead_iota> <dead_grave> <Greek_omega> : "ᾣ" U1fa3
<dead_ogonek> <dead_grave> <dead_iota> <Greek_omega> : "ᾣ" U1fa3
+<U0314> <dead_grave> <dead_iota> <Greek_omega> : "ᾣ" U1fa3
+<dead_dasia> <dead_grave> <dead_iota> <Greek_omega> : "ᾣ" U1fa3
<dead_grave> <dead_iota> <dead_ogonek> <Greek_omega> : "ᾣ" U1fa3
+<dead_grave> <dead_iota> <U0314> <Greek_omega> : "ᾣ" U1fa3
+<dead_grave> <dead_iota> <dead_dasia> <Greek_omega> : "ᾣ" U1fa3
<dead_grave> <dead_ogonek> <dead_iota> <Greek_omega> : "ᾣ" U1fa3
+<dead_grave> <U0314> <dead_iota> <Greek_omega> : "ᾣ" U1fa3
+<dead_grave> <dead_dasia> <dead_iota> <Greek_omega> : "ᾣ" U1fa3
<Multi_key> <bar> <greater> <apostrophe> <Greek_omega> : "ᾤ" U1fa4
<Multi_key> <bar> <apostrophe> <greater> <Greek_omega> : "ᾤ" U1fa4
<Multi_key> <greater> <bar> <apostrophe> <Greek_omega> : "ᾤ" U1fa4
@@ -1127,11 +1827,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <greater> <Greek_omega> : "ᾤ" U1fa4
<Multi_key> <apostrophe> <greater> <bar> <Greek_omega> : "ᾤ" U1fa4
<dead_iota> <dead_horn> <dead_acute> <Greek_omega> : "ᾤ" U1fa4
+<dead_iota> <U0313> <dead_acute> <Greek_omega> : "ᾤ" U1fa4
+<dead_iota> <dead_psili> <dead_acute> <Greek_omega> : "ᾤ" U1fa4
<dead_iota> <dead_acute> <dead_horn> <Greek_omega> : "ᾤ" U1fa4
+<dead_iota> <dead_acute> <U0313> <Greek_omega> : "ᾤ" U1fa4
+<dead_iota> <dead_acute> <dead_psili> <Greek_omega> : "ᾤ" U1fa4
<dead_horn> <dead_iota> <dead_acute> <Greek_omega> : "ᾤ" U1fa4
+<U0313> <dead_iota> <dead_acute> <Greek_omega> : "ᾤ" U1fa4
+<dead_psili> <dead_iota> <dead_acute> <Greek_omega> : "ᾤ" U1fa4
<dead_horn> <dead_acute> <dead_iota> <Greek_omega> : "ᾤ" U1fa4
+<U0313> <dead_acute> <dead_iota> <Greek_omega> : "ᾤ" U1fa4
+<dead_psili> <dead_acute> <dead_iota> <Greek_omega> : "ᾤ" U1fa4
<dead_acute> <dead_iota> <dead_horn> <Greek_omega> : "ᾤ" U1fa4
+<dead_acute> <dead_iota> <U0313> <Greek_omega> : "ᾤ" U1fa4
+<dead_acute> <dead_iota> <dead_psili> <Greek_omega> : "ᾤ" U1fa4
<dead_acute> <dead_horn> <dead_iota> <Greek_omega> : "ᾤ" U1fa4
+<dead_acute> <U0313> <dead_iota> <Greek_omega> : "ᾤ" U1fa4
+<dead_acute> <dead_psili> <dead_iota> <Greek_omega> : "ᾤ" U1fa4
<Multi_key> <bar> <less> <apostrophe> <Greek_omega> : "ᾥ" U1fa5
<Multi_key> <bar> <apostrophe> <less> <Greek_omega> : "ᾥ" U1fa5
<Multi_key> <less> <bar> <apostrophe> <Greek_omega> : "ᾥ" U1fa5
@@ -1139,11 +1851,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <less> <Greek_omega> : "ᾥ" U1fa5
<Multi_key> <apostrophe> <less> <bar> <Greek_omega> : "ᾥ" U1fa5
<dead_iota> <dead_ogonek> <dead_acute> <Greek_omega> : "ᾥ" U1fa5
+<dead_iota> <U0314> <dead_acute> <Greek_omega> : "ᾥ" U1fa5
+<dead_iota> <dead_dasia> <dead_acute> <Greek_omega> : "ᾥ" U1fa5
<dead_iota> <dead_acute> <dead_ogonek> <Greek_omega> : "ᾥ" U1fa5
+<dead_iota> <dead_acute> <U0314> <Greek_omega> : "ᾥ" U1fa5
+<dead_iota> <dead_acute> <dead_dasia> <Greek_omega> : "ᾥ" U1fa5
<dead_ogonek> <dead_iota> <dead_acute> <Greek_omega> : "ᾥ" U1fa5
+<U0314> <dead_iota> <dead_acute> <Greek_omega> : "ᾥ" U1fa5
+<dead_dasia> <dead_iota> <dead_acute> <Greek_omega> : "ᾥ" U1fa5
<dead_ogonek> <dead_acute> <dead_iota> <Greek_omega> : "ᾥ" U1fa5
+<U0314> <dead_acute> <dead_iota> <Greek_omega> : "ᾥ" U1fa5
+<dead_dasia> <dead_acute> <dead_iota> <Greek_omega> : "ᾥ" U1fa5
<dead_acute> <dead_iota> <dead_ogonek> <Greek_omega> : "ᾥ" U1fa5
+<dead_acute> <dead_iota> <U0314> <Greek_omega> : "ᾥ" U1fa5
+<dead_acute> <dead_iota> <dead_dasia> <Greek_omega> : "ᾥ" U1fa5
<dead_acute> <dead_ogonek> <dead_iota> <Greek_omega> : "ᾥ" U1fa5
+<dead_acute> <U0314> <dead_iota> <Greek_omega> : "ᾥ" U1fa5
+<dead_acute> <dead_dasia> <dead_iota> <Greek_omega> : "ᾥ" U1fa5
<Multi_key> <bar> <greater> <asciitilde> <Greek_omega> : "ᾦ" U1fa6
<Multi_key> <bar> <asciitilde> <greater> <Greek_omega> : "ᾦ" U1fa6
<Multi_key> <greater> <bar> <asciitilde> <Greek_omega> : "ᾦ" U1fa6
@@ -1151,11 +1875,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <greater> <Greek_omega> : "ᾦ" U1fa6
<Multi_key> <asciitilde> <greater> <bar> <Greek_omega> : "ᾦ" U1fa6
<dead_iota> <dead_horn> <dead_tilde> <Greek_omega> : "ᾦ" U1fa6
+<dead_iota> <U0313> <dead_tilde> <Greek_omega> : "ᾦ" U1fa6
+<dead_iota> <dead_psili> <dead_tilde> <Greek_omega> : "ᾦ" U1fa6
<dead_iota> <dead_tilde> <dead_horn> <Greek_omega> : "ᾦ" U1fa6
+<dead_iota> <dead_tilde> <U0313> <Greek_omega> : "ᾦ" U1fa6
+<dead_iota> <dead_tilde> <dead_psili> <Greek_omega> : "ᾦ" U1fa6
<dead_horn> <dead_iota> <dead_tilde> <Greek_omega> : "ᾦ" U1fa6
+<U0313> <dead_iota> <dead_tilde> <Greek_omega> : "ᾦ" U1fa6
+<dead_psili> <dead_iota> <dead_tilde> <Greek_omega> : "ᾦ" U1fa6
<dead_horn> <dead_tilde> <dead_iota> <Greek_omega> : "ᾦ" U1fa6
+<U0313> <dead_tilde> <dead_iota> <Greek_omega> : "ᾦ" U1fa6
+<dead_psili> <dead_tilde> <dead_iota> <Greek_omega> : "ᾦ" U1fa6
<dead_tilde> <dead_iota> <dead_horn> <Greek_omega> : "ᾦ" U1fa6
+<dead_tilde> <dead_iota> <U0313> <Greek_omega> : "ᾦ" U1fa6
+<dead_tilde> <dead_iota> <dead_psili> <Greek_omega> : "ᾦ" U1fa6
<dead_tilde> <dead_horn> <dead_iota> <Greek_omega> : "ᾦ" U1fa6
+<dead_tilde> <U0313> <dead_iota> <Greek_omega> : "ᾦ" U1fa6
+<dead_tilde> <dead_psili> <dead_iota> <Greek_omega> : "ᾦ" U1fa6
<Multi_key> <bar> <less> <asciitilde> <Greek_omega> : "ᾧ" U1fa7
<Multi_key> <bar> <asciitilde> <less> <Greek_omega> : "ᾧ" U1fa7
<Multi_key> <less> <bar> <asciitilde> <Greek_omega> : "ᾧ" U1fa7
@@ -1163,19 +1899,39 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <less> <Greek_omega> : "ᾧ" U1fa7
<Multi_key> <asciitilde> <less> <bar> <Greek_omega> : "ᾧ" U1fa7
<dead_iota> <dead_ogonek> <dead_tilde> <Greek_omega> : "ᾧ" U1fa7
+<dead_iota> <U0314> <dead_tilde> <Greek_omega> : "ᾧ" U1fa7
+<dead_iota> <dead_dasia> <dead_tilde> <Greek_omega> : "ᾧ" U1fa7
<dead_iota> <dead_tilde> <dead_ogonek> <Greek_omega> : "ᾧ" U1fa7
+<dead_iota> <dead_tilde> <U0314> <Greek_omega> : "ᾧ" U1fa7
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_omega> : "ᾧ" U1fa7
<dead_ogonek> <dead_iota> <dead_tilde> <Greek_omega> : "ᾧ" U1fa7
+<U0314> <dead_iota> <dead_tilde> <Greek_omega> : "ᾧ" U1fa7
+<dead_dasia> <dead_iota> <dead_tilde> <Greek_omega> : "ᾧ" U1fa7
<dead_ogonek> <dead_tilde> <dead_iota> <Greek_omega> : "ᾧ" U1fa7
+<U0314> <dead_tilde> <dead_iota> <Greek_omega> : "ᾧ" U1fa7
+<dead_dasia> <dead_tilde> <dead_iota> <Greek_omega> : "ᾧ" U1fa7
<dead_tilde> <dead_iota> <dead_ogonek> <Greek_omega> : "ᾧ" U1fa7
+<dead_tilde> <dead_iota> <U0314> <Greek_omega> : "ᾧ" U1fa7
+<dead_tilde> <dead_iota> <dead_dasia> <Greek_omega> : "ᾧ" U1fa7
<dead_tilde> <dead_ogonek> <dead_iota> <Greek_omega> : "ᾧ" U1fa7
+<dead_tilde> <U0314> <dead_iota> <Greek_omega> : "ᾧ" U1fa7
+<dead_tilde> <dead_dasia> <dead_iota> <Greek_omega> : "ᾧ" U1fa7
<Multi_key> <bar> <greater> <Greek_OMEGA> : "ᾨ" U1fa8
<Multi_key> <greater> <bar> <Greek_OMEGA> : "ᾨ" U1fa8
<dead_iota> <dead_horn> <Greek_OMEGA> : "ᾨ" U1fa8
+<dead_iota> <U0313> <Greek_OMEGA> : "ᾨ" U1fa8
+<dead_iota> <dead_psili> <Greek_OMEGA> : "ᾨ" U1fa8
<dead_horn> <dead_iota> <Greek_OMEGA> : "ᾨ" U1fa8
+<U0313> <dead_iota> <Greek_OMEGA> : "ᾨ" U1fa8
+<dead_psili> <dead_iota> <Greek_OMEGA> : "ᾨ" U1fa8
<Multi_key> <bar> <less> <Greek_OMEGA> : "ᾩ" U1fa9
<Multi_key> <less> <bar> <Greek_OMEGA> : "ᾩ" U1fa9
<dead_iota> <dead_ogonek> <Greek_OMEGA> : "ᾩ" U1fa9
+<dead_iota> <U0314> <Greek_OMEGA> : "ᾩ" U1fa9
+<dead_iota> <dead_dasia> <Greek_OMEGA> : "ᾩ" U1fa9
<dead_ogonek> <dead_iota> <Greek_OMEGA> : "ᾩ" U1fa9
+<U0314> <dead_iota> <Greek_OMEGA> : "ᾩ" U1fa9
+<dead_dasia> <dead_iota> <Greek_OMEGA> : "ᾩ" U1fa9
<Multi_key> <bar> <greater> <grave> <Greek_OMEGA> : "ᾪ" U1faa
<Multi_key> <bar> <grave> <greater> <Greek_OMEGA> : "ᾪ" U1faa
<Multi_key> <greater> <bar> <grave> <Greek_OMEGA> : "ᾪ" U1faa
@@ -1183,11 +1939,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <greater> <Greek_OMEGA> : "ᾪ" U1faa
<Multi_key> <grave> <greater> <bar> <Greek_OMEGA> : "ᾪ" U1faa
<dead_iota> <dead_horn> <dead_grave> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_iota> <U0313> <dead_grave> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_iota> <dead_psili> <dead_grave> <Greek_OMEGA> : "ᾪ" U1faa
<dead_iota> <dead_grave> <dead_horn> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_iota> <dead_grave> <U0313> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_iota> <dead_grave> <dead_psili> <Greek_OMEGA> : "ᾪ" U1faa
<dead_horn> <dead_iota> <dead_grave> <Greek_OMEGA> : "ᾪ" U1faa
+<U0313> <dead_iota> <dead_grave> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_psili> <dead_iota> <dead_grave> <Greek_OMEGA> : "ᾪ" U1faa
<dead_horn> <dead_grave> <dead_iota> <Greek_OMEGA> : "ᾪ" U1faa
+<U0313> <dead_grave> <dead_iota> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_psili> <dead_grave> <dead_iota> <Greek_OMEGA> : "ᾪ" U1faa
<dead_grave> <dead_iota> <dead_horn> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_grave> <dead_iota> <U0313> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_grave> <dead_iota> <dead_psili> <Greek_OMEGA> : "ᾪ" U1faa
<dead_grave> <dead_horn> <dead_iota> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_grave> <U0313> <dead_iota> <Greek_OMEGA> : "ᾪ" U1faa
+<dead_grave> <dead_psili> <dead_iota> <Greek_OMEGA> : "ᾪ" U1faa
<Multi_key> <bar> <less> <grave> <Greek_OMEGA> : "ᾫ" U1fab
<Multi_key> <bar> <grave> <less> <Greek_OMEGA> : "ᾫ" U1fab
<Multi_key> <less> <bar> <grave> <Greek_OMEGA> : "ᾫ" U1fab
@@ -1195,11 +1963,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <grave> <bar> <less> <Greek_OMEGA> : "ᾫ" U1fab
<Multi_key> <grave> <less> <bar> <Greek_OMEGA> : "ᾫ" U1fab
<dead_iota> <dead_ogonek> <dead_grave> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_iota> <U0314> <dead_grave> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_iota> <dead_dasia> <dead_grave> <Greek_OMEGA> : "ᾫ" U1fab
<dead_iota> <dead_grave> <dead_ogonek> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_iota> <dead_grave> <U0314> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_iota> <dead_grave> <dead_dasia> <Greek_OMEGA> : "ᾫ" U1fab
<dead_ogonek> <dead_iota> <dead_grave> <Greek_OMEGA> : "ᾫ" U1fab
+<U0314> <dead_iota> <dead_grave> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_dasia> <dead_iota> <dead_grave> <Greek_OMEGA> : "ᾫ" U1fab
<dead_ogonek> <dead_grave> <dead_iota> <Greek_OMEGA> : "ᾫ" U1fab
+<U0314> <dead_grave> <dead_iota> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_dasia> <dead_grave> <dead_iota> <Greek_OMEGA> : "ᾫ" U1fab
<dead_grave> <dead_iota> <dead_ogonek> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_grave> <dead_iota> <U0314> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_grave> <dead_iota> <dead_dasia> <Greek_OMEGA> : "ᾫ" U1fab
<dead_grave> <dead_ogonek> <dead_iota> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_grave> <U0314> <dead_iota> <Greek_OMEGA> : "ᾫ" U1fab
+<dead_grave> <dead_dasia> <dead_iota> <Greek_OMEGA> : "ᾫ" U1fab
<Multi_key> <bar> <greater> <apostrophe> <Greek_OMEGA> : "ᾬ" U1fac
<Multi_key> <bar> <apostrophe> <greater> <Greek_OMEGA> : "ᾬ" U1fac
<Multi_key> <greater> <bar> <apostrophe> <Greek_OMEGA> : "ᾬ" U1fac
@@ -1207,11 +1987,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <greater> <Greek_OMEGA> : "ᾬ" U1fac
<Multi_key> <apostrophe> <greater> <bar> <Greek_OMEGA> : "ᾬ" U1fac
<dead_iota> <dead_horn> <dead_acute> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_iota> <U0313> <dead_acute> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_iota> <dead_psili> <dead_acute> <Greek_OMEGA> : "ᾬ" U1fac
<dead_iota> <dead_acute> <dead_horn> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_iota> <dead_acute> <U0313> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_iota> <dead_acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1fac
<dead_horn> <dead_iota> <dead_acute> <Greek_OMEGA> : "ᾬ" U1fac
+<U0313> <dead_iota> <dead_acute> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_psili> <dead_iota> <dead_acute> <Greek_OMEGA> : "ᾬ" U1fac
<dead_horn> <dead_acute> <dead_iota> <Greek_OMEGA> : "ᾬ" U1fac
+<U0313> <dead_acute> <dead_iota> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_psili> <dead_acute> <dead_iota> <Greek_OMEGA> : "ᾬ" U1fac
<dead_acute> <dead_iota> <dead_horn> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_acute> <dead_iota> <U0313> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_acute> <dead_iota> <dead_psili> <Greek_OMEGA> : "ᾬ" U1fac
<dead_acute> <dead_horn> <dead_iota> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_acute> <U0313> <dead_iota> <Greek_OMEGA> : "ᾬ" U1fac
+<dead_acute> <dead_psili> <dead_iota> <Greek_OMEGA> : "ᾬ" U1fac
<Multi_key> <bar> <less> <apostrophe> <Greek_OMEGA> : "ᾭ" U1fad
<Multi_key> <bar> <apostrophe> <less> <Greek_OMEGA> : "ᾭ" U1fad
<Multi_key> <less> <bar> <apostrophe> <Greek_OMEGA> : "ᾭ" U1fad
@@ -1219,11 +2011,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <apostrophe> <bar> <less> <Greek_OMEGA> : "ᾭ" U1fad
<Multi_key> <apostrophe> <less> <bar> <Greek_OMEGA> : "ᾭ" U1fad
<dead_iota> <dead_ogonek> <dead_acute> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_iota> <U0314> <dead_acute> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_iota> <dead_dasia> <dead_acute> <Greek_OMEGA> : "ᾭ" U1fad
<dead_iota> <dead_acute> <dead_ogonek> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_iota> <dead_acute> <U0314> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_iota> <dead_acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1fad
<dead_ogonek> <dead_iota> <dead_acute> <Greek_OMEGA> : "ᾭ" U1fad
+<U0314> <dead_iota> <dead_acute> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_dasia> <dead_iota> <dead_acute> <Greek_OMEGA> : "ᾭ" U1fad
<dead_ogonek> <dead_acute> <dead_iota> <Greek_OMEGA> : "ᾭ" U1fad
+<U0314> <dead_acute> <dead_iota> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_dasia> <dead_acute> <dead_iota> <Greek_OMEGA> : "ᾭ" U1fad
<dead_acute> <dead_iota> <dead_ogonek> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_acute> <dead_iota> <U0314> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_acute> <dead_iota> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1fad
<dead_acute> <dead_ogonek> <dead_iota> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_acute> <U0314> <dead_iota> <Greek_OMEGA> : "ᾭ" U1fad
+<dead_acute> <dead_dasia> <dead_iota> <Greek_OMEGA> : "ᾭ" U1fad
<Multi_key> <bar> <greater> <asciitilde> <Greek_OMEGA> : "ᾮ" U1fae
<Multi_key> <bar> <asciitilde> <greater> <Greek_OMEGA> : "ᾮ" U1fae
<Multi_key> <greater> <bar> <asciitilde> <Greek_OMEGA> : "ᾮ" U1fae
@@ -1231,11 +2035,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <greater> <Greek_OMEGA> : "ᾮ" U1fae
<Multi_key> <asciitilde> <greater> <bar> <Greek_OMEGA> : "ᾮ" U1fae
<dead_iota> <dead_horn> <dead_tilde> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_iota> <U0313> <dead_tilde> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_iota> <dead_psili> <dead_tilde> <Greek_OMEGA> : "ᾮ" U1fae
<dead_iota> <dead_tilde> <dead_horn> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_iota> <dead_tilde> <U0313> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_iota> <dead_tilde> <dead_psili> <Greek_OMEGA> : "ᾮ" U1fae
<dead_horn> <dead_iota> <dead_tilde> <Greek_OMEGA> : "ᾮ" U1fae
+<U0313> <dead_iota> <dead_tilde> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_psili> <dead_iota> <dead_tilde> <Greek_OMEGA> : "ᾮ" U1fae
<dead_horn> <dead_tilde> <dead_iota> <Greek_OMEGA> : "ᾮ" U1fae
+<U0313> <dead_tilde> <dead_iota> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_psili> <dead_tilde> <dead_iota> <Greek_OMEGA> : "ᾮ" U1fae
<dead_tilde> <dead_iota> <dead_horn> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_tilde> <dead_iota> <U0313> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_tilde> <dead_iota> <dead_psili> <Greek_OMEGA> : "ᾮ" U1fae
<dead_tilde> <dead_horn> <dead_iota> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_tilde> <U0313> <dead_iota> <Greek_OMEGA> : "ᾮ" U1fae
+<dead_tilde> <dead_psili> <dead_iota> <Greek_OMEGA> : "ᾮ" U1fae
<Multi_key> <bar> <less> <asciitilde> <Greek_OMEGA> : "ᾯ" U1faf
<Multi_key> <bar> <asciitilde> <less> <Greek_OMEGA> : "ᾯ" U1faf
<Multi_key> <less> <bar> <asciitilde> <Greek_OMEGA> : "ᾯ" U1faf
@@ -1243,11 +2059,23 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<Multi_key> <asciitilde> <bar> <less> <Greek_OMEGA> : "ᾯ" U1faf
<Multi_key> <asciitilde> <less> <bar> <Greek_OMEGA> : "ᾯ" U1faf
<dead_iota> <dead_ogonek> <dead_tilde> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_iota> <U0314> <dead_tilde> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_iota> <dead_dasia> <dead_tilde> <Greek_OMEGA> : "ᾯ" U1faf
<dead_iota> <dead_tilde> <dead_ogonek> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_iota> <dead_tilde> <U0314> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_OMEGA> : "ᾯ" U1faf
<dead_ogonek> <dead_iota> <dead_tilde> <Greek_OMEGA> : "ᾯ" U1faf
+<U0314> <dead_iota> <dead_tilde> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_dasia> <dead_iota> <dead_tilde> <Greek_OMEGA> : "ᾯ" U1faf
<dead_ogonek> <dead_tilde> <dead_iota> <Greek_OMEGA> : "ᾯ" U1faf
+<U0314> <dead_tilde> <dead_iota> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_dasia> <dead_tilde> <dead_iota> <Greek_OMEGA> : "ᾯ" U1faf
<dead_tilde> <dead_iota> <dead_ogonek> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_tilde> <dead_iota> <U0314> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_tilde> <dead_iota> <dead_dasia> <Greek_OMEGA> : "ᾯ" U1faf
<dead_tilde> <dead_ogonek> <dead_iota> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_tilde> <U0314> <dead_iota> <Greek_OMEGA> : "ᾯ" U1faf
+<dead_tilde> <dead_dasia> <dead_iota> <Greek_OMEGA> : "ᾯ" U1faf
<dead_breve> <Greek_alpha> : "ᾰ" U1fb0
<dead_macron> <Greek_alpha> : "ᾱ" U1fb1
<dead_breve> <Greek_ALPHA> : "Ᾰ" U1fb8
@@ -1350,35 +2178,75 @@ XCOMM http://hal.csd.auth.gr/~vvas/i18n/xkb/polytonic-compose.pl
<dead_iota> <Greek_OMEGA> : "ῼ" U1ffc
<Multi_key> <greater> <Greek_rho> : "ῤ" U1fe4
<dead_horn> <Greek_rho> : "ῤ" U1fe4
+<U0313> <Greek_rho> : "ῤ" U1fe4
+<dead_psili> <Greek_rho> : "ῤ" U1fe4
<Multi_key> <less> <Greek_rho> : "ῥ" U1fe5
<dead_ogonek> <Greek_rho> : "ῥ" U1fe5
+<U0314> <Greek_rho> : "ῥ" U1fe5
+<dead_dasia> <Greek_rho> : "ῥ" U1fe5
<Multi_key> <less> <Greek_RHO> : "Ῥ" U1fec
<dead_ogonek> <Greek_RHO> : "Ῥ" U1fec
+<U0314> <Greek_RHO> : "Ῥ" U1fec
+<dead_dasia> <Greek_RHO> : "Ῥ" U1fec
<dead_horn> <dead_grave> <space> : "῍" U1fcd
+<U0313> <dead_grave> <space> : "῍" U1fcd
+<dead_psili> <dead_grave> <space> : "῍" U1fcd
<dead_grave> <dead_horn> <space> : "῍" U1fcd
+<dead_grave> <U0313> <space> : "῍" U1fcd
+<dead_grave> <dead_psili> <space> : "῍" U1fcd
<dead_horn> <dead_acute> <space> : "῎" U1fce
+<U0313> <dead_acute> <space> : "῎" U1fce
+<dead_psili> <dead_acute> <space> : "῎" U1fce
<dead_acute> <dead_horn> <space> : "῎" U1fce
+<dead_acute> <U0313> <space> : "῎" U1fce
+<dead_acute> <dead_psili> <space> : "῎" U1fce
<dead_horn> <dead_tilde> <space> : "῏" U1fcf
+<U0313> <dead_tilde> <space> : "῏" U1fcf
+<dead_psili> <dead_tilde> <space> : "῏" U1fcf
<dead_tilde> <dead_horn> <space> : "῏" U1fcf
+<dead_tilde> <U0313> <space> : "῏" U1fcf
+<dead_tilde> <dead_psili> <space> : "῏" U1fcf
<dead_ogonek> <dead_grave> <space> : "῝" U1fdd
+<U0314> <dead_grave> <space> : "῝" U1fdd
+<dead_dasia> <dead_grave> <space> : "῝" U1fdd
<dead_grave> <dead_ogonek> <space> : "῝" U1fdd
+<dead_grave> <U0314> <space> : "῝" U1fdd
+<dead_grave> <dead_dasia> <space> : "῝" U1fdd
<dead_ogonek> <dead_acute> <space> : "῞" U1fde
+<U0314> <dead_acute> <space> : "῞" U1fde
+<dead_dasia> <dead_acute> <space> : "῞" U1fde
<dead_acute> <dead_ogonek> <space> : "῞" U1fde
+<dead_acute> <U0314> <space> : "῞" U1fde
+<dead_acute> <dead_dasia> <space> : "῞" U1fde
<dead_ogonek> <dead_tilde> <space> : "῟" U1fdf
+<U0314> <dead_tilde> <space> : "῟" U1fdf
+<dead_dasia> <dead_tilde> <space> : "῟" U1fdf
<dead_tilde> <dead_ogonek> <space> : "῟" U1fdf
+<dead_tilde> <U0314> <space> : "῟" U1fdf
+<dead_tilde> <dead_dasia> <space> : "῟" U1fdf
<dead_diaeresis> <dead_grave> <space> : "῭" U1fed
<dead_grave> <dead_diaeresis> <space> : "῭" U1fed
<dead_diaeresis> <dead_tilde> <space> : "῁" U1fc1
<dead_tilde> <dead_diaeresis> <space> : "῁" U1fc1
<dead_horn> <space> : "᾿" U1fbf
+<U0313> <space> : "᾿" U1fbf
+<dead_psili> <space> : "᾿" U1fbf
<dead_horn> <dead_horn> : "᾿" U1fbf
+<U0313> <dead_horn> : "᾿" U1fbf
+<dead_psili> <dead_horn> : "᾿" U1fbf
<dead_ogonek> <space> : "῾" U1ffe
+<U0314> <space> : "῾" U1ffe
+<dead_dasia> <space> : "῾" U1ffe
<dead_ogonek> <dead_ogonek> : "῾" U1ffe
+<U0314> <dead_ogonek> : "῾" U1ffe
+<dead_dasia> <dead_ogonek> : "῾" U1ffe
<dead_grave> <space> : "`" U1fef
<dead_grave> <dead_grave> : "`" U1fef
<dead_tilde> <space> : "῀" U1fc0
<dead_tilde> <dead_tilde> : "῀" U1fc0
<dead_horn> <underscore> : "᾽" U1fbd
+<U0313> <underscore> : "᾽" U1fbd
+<dead_psili> <underscore> : "᾽" U1fbd
<dead_iota> <underscore> : "ι" U1fbe
<dead_iota> <space> : "ͺ" U037a
<dead_iota> <dead_iota> : "ͺ" U037a
diff --git a/lib/libX11/nls/el_GR.UTF-8/Makefile.in b/lib/libX11/nls/el_GR.UTF-8/Makefile.in
index ad8cf076c..804febf59 100644
--- a/lib/libX11/nls/el_GR.UTF-8/Makefile.in
+++ b/lib/libX11/nls/el_GR.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/el_GR.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/en_US.UTF-8/Compose.pre b/lib/libX11/nls/en_US.UTF-8/Compose.pre
index e6eaa61a4..02561d4dc 100644
--- a/lib/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/lib/libX11/nls/en_US.UTF-8/Compose.pre
@@ -92,7 +92,9 @@ 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> : "·" U00B7 # MIDDLE DOT
+<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
<Multi_key> <exclam> <exclam> : "¡" exclamdown # INVERTED EXCLAMATION MARK
<Multi_key> <p> <exclam> : "¶" paragraph # PILCROW SIGN
@@ -155,13 +157,29 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN
<Multi_key> <equal> <c> : "€" EuroSign # EURO SIGN
<Multi_key> <E> <equal> : "€" EuroSign # EURO SIGN
<Multi_key> <equal> <E> : "€" EuroSign # EURO SIGN
+<Multi_key> <e> <equal> : "€" EuroSign # EURO SIGN
+<Multi_key> <equal> <e> : "€" EuroSign # EURO SIGN
+<Multi_key> <Cyrillic_ES> <equal> : "€" EuroSign # EURO SIGN
+<Multi_key> <equal> <Cyrillic_ES> : "€" EuroSign # EURO SIGN
+<Multi_key> <Cyrillic_IE> <equal> : "€" EuroSign # EURO SIGN
+<Multi_key> <equal> <Cyrillic_IE> : "€" EuroSign # EURO SIGN
+XCOMM "₭" U20ad KIP SIGN
+XCOMM "₮" U20ae TUGRIK SIGN
+XCOMM "₯" U20af DRACHMA SIGN
+XCOMM "₰" U20b0 GERMAN PENNY SIGN
+XCOMM "₱" U20b1 PESO SIGN
+XCOMM "₲" U20b2 GUARANI SIGN
+XCOMM "₳" U20b3 AUSTRAL SIGN
+XCOMM "₴" U20b4 HRYVNIA SIGN
+XCOMM "₵" U20b5 CEDI SIGN
-<Multi_key> <bar> <c> : "¢" U00A2 # CENT SIGN
-<Multi_key> <c> <bar> : "¢" U00A2 # CENT SIGN
-<Multi_key> <c> <slash> : "¢" U00A2 # CENT SIGN
-<Multi_key> <slash> <c> : "¢" U00A2 # CENT SIGN
-<Multi_key> <L> <minus> : "£" U00a3 # POUND SIGN
-<Multi_key> <minus> <L> : "£" U00a3 # POUND SIGN
+
+<Multi_key> <bar> <c> : "¢" cent # CENT SIGN
+<Multi_key> <c> <bar> : "¢" cent # CENT SIGN
+<Multi_key> <c> <slash> : "¢" cent # CENT SIGN
+<Multi_key> <slash> <c> : "¢" cent # CENT SIGN
+<Multi_key> <L> <minus> : "£" sterling # POUND SIGN
+<Multi_key> <minus> <L> : "£" sterling # POUND SIGN
<Multi_key> <Y> <equal> : "¥" yen # YEN SIGN
<Multi_key> <equal> <Y> : "¥" yen # YEN SIGN
@@ -181,12 +199,18 @@ XCOMM Musical alterations
XCOMM Other symbols
<Multi_key> <s> <o> : "§" section # SECTION SIGN
<Multi_key> <o> <s> : "§" section # SECTION SIGN
+<Multi_key> <Cyrillic_pe> <Cyrillic_a> : "§" section # SECTION SIGN
<Multi_key> <o> <x> : "¤" currency # CURRENCY SIGN
<Multi_key> <x> <o> : "¤" currency # CURRENCY SIGN
<Multi_key> <P> <P> : "¶" paragraph # PILCROW SIGN
+<Multi_key> <N> <o> : "№" numerosign # NUMERO SIGN
+<Multi_key> <N> <O> : "№" numerosign # NUMERO SIGN
+<Multi_key> <Cyrillic_EN> <Cyrillic_o> : "№" numerosign # NUMERO SIGN
+<Multi_key> <Cyrillic_EN> <Cyrillic_O> : "№" numerosign # NUMERO SIGN
+
XCOMM Part 2
XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically
@@ -198,422 +222,425 @@ XCOMM
XCOMM group 1: cluster jamos made of three basic jamos
## The follwing block gets overridden by later shorter compositions
-##<Multi_key> <U10001107> <U10001109> <U10001100> : "ᄢ" U1122 # HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
-##<Multi_key> <U10001107> <U10001109> <U10001103> : "ᄣ" U1123 # HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
-##<Multi_key> <U10001107> <U10001109> <U10001107> : "ᄤ" U1124 # HANGUL CHOSEONG PIEUP-SIOS-PIEUP
-##<Multi_key> <U10001107> <U10001109> <U10001109> : "ᄥ" U1125 # HANGUL CHOSEONG PIEUP-SSANGSIOS
-##<Multi_key> <U10001107> <U10001109> <U1000110C> : "ᄦ" U1126 # HANGUL CHOSEONG PIEUP-SIOS-CIEUC
-##<Multi_key> <U10001107> <U10001107> <U1000110B> : "ᄬ" U112c # HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
-##<Multi_key> <U10001109> <U10001107> <U10001100> : "ᄳ" U1133 # HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
-##<Multi_key> <U10001109> <U10001109> <U10001109> : "ᄴ" U1134 # HANGUL CHOSEONG SIOS-SSANGSIOS
-##<Multi_key> <U10001169> <U10001161> <U10001175> : "ᅫ" U116b # HANGUL JUNGSEONG WAE
-##<Multi_key> <U1000116E> <U10001165> <U10001175> : "ᅰ" U1170 # HANGUL JUNGSEONG WE
-##<Multi_key> <U1000116E> <U10001165> <U10001173> : "ᆋ" U118b # HANGUL JUNGSEONG U-EO-EU
-##<Multi_key> <U100011A8> <U100011BA> <U100011A8> : "ᇄ" U11c4 # HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
-##<Multi_key> <U100011AF> <U100011A8> <U100011BA> : "ᇌ" U11cc # HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
-##<Multi_key> <U100011AF> <U100011AE> <U100011C2> : "ᇏ" U11cf # HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH
-##<Multi_key> <U100011AF> <U100011B7> <U100011A8> : "ᇑ" U11d1 # HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
-##<Multi_key> <U100011AF> <U100011B7> <U100011BA> : "ᇒ" U11d2 # HANGUL JONGSEONG RIEUL-MIEUM-SIOS
-##<Multi_key> <U100011AF> <U100011B8> <U100011BA> : "ᇓ" U11d3 # HANGUL JONGSEONG RIEUL-PIEUP-SIOS
-##<Multi_key> <U100011AF> <U100011B8> <U100011C2> : "ᇔ" U11d4 # HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
-##<Multi_key> <U100011AF> <U100011B8> <U100011BC> : "ᇕ" U11d5 # HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
-##<Multi_key> <U100011AF> <U100011BA> <U100011BA> : "ᇖ" U11d6 # HANGUL JONGSEONG RIEUL-SSANGSIOS
-##<Multi_key> <U100011B7> <U100011BA> <U100011BA> : "ᇞ" U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
-##<Multi_key> <U100011BC> <U100011A8> <U100011A8> : "ᇭ" U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
-<Multi_key> <U10001100> <U10001100> : "ᄁ" U1101 # HANGUL CHOSEONG SSANGKIYEOK
-<Multi_key> <U10001103> <U10001103> : "ᄄ" U1104 # HANGUL CHOSEONG SSANGTIKEUT
-<Multi_key> <U10001107> <U10001107> : "ᄈ" U1108 # HANGUL CHOSEONG SSANGPIEUP
-<Multi_key> <U10001109> <U10001109> : "ᄊ" U110a # HANGUL CHOSEONG SSANGSIOS
-<Multi_key> <U1000110C> <U1000110C> : "ᄍ" U110d # HANGUL CHOSEONG SSANGCIEUC
-<Multi_key> <U10001102> <U10001100> : "ᄓ" U1113 # HANGUL CHOSEONG NIEUN-KIYEOK
-<Multi_key> <U10001102> <U10001102> : "ᄔ" U1114 # HANGUL CHOSEONG SSANGNIEUN
-<Multi_key> <U10001102> <U10001103> : "ᄕ" U1115 # HANGUL CHOSEONG NIEUN-TIKEUT
-<Multi_key> <U10001102> <U10001107> : "ᄖ" U1116 # HANGUL CHOSEONG NIEUN-PIEUP
-<Multi_key> <U10001103> <U10001100> : "ᄗ" U1117 # HANGUL CHOSEONG TIKEUT-KIYEOK
-<Multi_key> <U10001105> <U10001102> : "ᄘ" U1118 # HANGUL CHOSEONG RIEUL-NIEUN
-<Multi_key> <U10001105> <U10001105> : "ᄙ" U1119 # HANGUL CHOSEONG SSANGRIEUL
-<Multi_key> <U10001105> <U10001112> : "ᄚ" U111a # HANGUL CHOSEONG RIEUL-HIEUH
-<Multi_key> <U10001105> <U1000110B> : "ᄛ" U111b # HANGUL CHOSEONG KAPYEOUNRIEUL
-<Multi_key> <U10001106> <U10001107> : "ᄜ" U111c # HANGUL CHOSEONG MIEUM-PIEUP
-<Multi_key> <U10001106> <U1000110B> : "ᄝ" U111d # HANGUL CHOSEONG KAPYEOUNMIEUM
-<Multi_key> <U10001107> <U10001100> : "ᄞ" U111e # HANGUL CHOSEONG PIEUP-KIYEOK
-<Multi_key> <U10001107> <U10001102> : "ᄟ" U111f # HANGUL CHOSEONG PIEUP-NIEUN
-<Multi_key> <U10001107> <U10001103> : "ᄠ" U1120 # HANGUL CHOSEONG PIEUP-TIKEUT
-<Multi_key> <U10001107> <U10001109> : "ᄡ" U1121 # HANGUL CHOSEONG PIEUP-SIOS
-<Multi_key> <U10001107> <U1000110C> : "ᄧ" U1127 # HANGUL CHOSEONG PIEUP-CIEUC
-<Multi_key> <U10001107> <U1000110E> : "ᄨ" U1128 # HANGUL CHOSEONG PIEUP-CHIEUCH
-<Multi_key> <U10001107> <U10001110> : "ᄩ" U1129 # HANGUL CHOSEONG PIEUP-THIEUTH
-<Multi_key> <U10001107> <U10001111> : "ᄪ" U112a # HANGUL CHOSEONG PIEUP-PHIEUPH
-<Multi_key> <U10001107> <U1000110B> : "ᄫ" U112b # HANGUL CHOSEONG KAPYEOUNPIEUP
-<Multi_key> <U10001109> <U10001100> : "ᄭ" U112d # HANGUL CHOSEONG SIOS-KIYEOK
-<Multi_key> <U10001109> <U10001102> : "ᄮ" U112e # HANGUL CHOSEONG SIOS-NIEUN
-<Multi_key> <U10001109> <U10001103> : "ᄯ" U112f # HANGUL CHOSEONG SIOS-TIKEUT
-<Multi_key> <U10001109> <U10001105> : "ᄰ" U1130 # HANGUL CHOSEONG SIOS-RIEUL
-<Multi_key> <U10001109> <U10001106> : "ᄱ" U1131 # HANGUL CHOSEONG SIOS-MIEUM
-<Multi_key> <U10001109> <U10001107> : "ᄲ" U1132 # HANGUL CHOSEONG SIOS-PIEUP
-<Multi_key> <U10001109> <U1000110B> : "ᄵ" U1135 # HANGUL CHOSEONG SIOS-IEUNG
-<Multi_key> <U10001109> <U1000110C> : "ᄶ" U1136 # HANGUL CHOSEONG SIOS-CIEUC
-<Multi_key> <U10001109> <U1000110E> : "ᄷ" U1137 # HANGUL CHOSEONG SIOS-CHIEUCH
-<Multi_key> <U10001109> <U1000110F> : "ᄸ" U1138 # HANGUL CHOSEONG SIOS-KHIEUKH
-<Multi_key> <U10001109> <U10001110> : "ᄹ" U1139 # HANGUL CHOSEONG SIOS-THIEUTH
-<Multi_key> <U10001109> <U10001111> : "ᄺ" U113a # HANGUL CHOSEONG SIOS-PHIEUPH
-<Multi_key> <U10001109> <U10001112> : "ᄻ" U113b # HANGUL CHOSEONG SIOS-HIEUH
-<Multi_key> <U1000113C> <U1000113C> : "ᄽ" U113d # HANGUL CHOSEONG CHITUEUMSSANGSIOS
-<Multi_key> <U1000113E> <U1000113E> : "ᄿ" U113f # HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS
-<Multi_key> <U1000110B> <U10001100> : "ᅁ" U1141 # HANGUL CHOSEONG IEUNG-KIYEOK
-<Multi_key> <U1000110B> <U10001103> : "ᅂ" U1142 # HANGUL CHOSEONG IEUNG-TIKEUT
-<Multi_key> <U1000110B> <U10001106> : "ᅃ" U1143 # HANGUL CHOSEONG IEUNG-MIEUM
-<Multi_key> <U1000110B> <U10001107> : "ᅄ" U1144 # HANGUL CHOSEONG IEUNG-PIEUP
-<Multi_key> <U1000110B> <U10001109> : "ᅅ" U1145 # HANGUL CHOSEONG IEUNG-SIOS
-<Multi_key> <U1000110B> <U10001140> : "ᅆ" U1146 # HANGUL CHOSEONG IEUNG-PANSIOS
-<Multi_key> <U1000110B> <U1000110B> : "ᅇ" U1147 # HANGUL CHOSEONG SSANGIEUNG
-<Multi_key> <U1000110B> <U1000110C> : "ᅈ" U1148 # HANGUL CHOSEONG IEUNG-CIEUC
-<Multi_key> <U1000110B> <U1000110E> : "ᅉ" U1149 # HANGUL CHOSEONG IEUNG-CHIEUCH
-<Multi_key> <U1000110B> <U10001110> : "ᅊ" U114a # HANGUL CHOSEONG IEUNG-THIEUTH
-<Multi_key> <U1000110B> <U10001111> : "ᅋ" U114b # HANGUL CHOSEONG IEUNG-PHIEUPH
-<Multi_key> <U1000110C> <U1000110B> : "ᅍ" U114d # HANGUL CHOSEONG CIEUC-IEUNG
-<Multi_key> <U1000114E> <U1000114E> : "ᅏ" U114f # HANGUL CHOSEONG CHITUEUMSSANGCIEUC
-<Multi_key> <U10001150> <U10001150> : "ᅑ" U1151 # HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC
-<Multi_key> <U1000110E> <U1000110F> : "ᅒ" U1152 # HANGUL CHOSEONG CHIEUCH-KHIEUKH
-<Multi_key> <U1000110E> <U10001112> : "ᅓ" U1153 # HANGUL CHOSEONG CHIEUCH-HIEUH
-<Multi_key> <U10001111> <U10001107> : "ᅖ" U1156 # HANGUL CHOSEONG PHIEUPH-PIEUP
-<Multi_key> <U10001111> <U1000110B> : "ᅗ" U1157 # HANGUL CHOSEONG KAPYEOUNPHIEUPH
-<Multi_key> <U10001112> <U10001112> : "ᅘ" U1158 # HANGUL CHOSEONG SSANGHIEUH
-<Multi_key> <U10001161> <U10001175> : "ᅢ" U1162 # HANGUL JUNGSEONG AE
-<Multi_key> <U10001163> <U10001175> : "ᅤ" U1164 # HANGUL JUNGSEONG YAE
-<Multi_key> <U10001165> <U10001175> : "ᅦ" U1166 # HANGUL JUNGSEONG E
-<Multi_key> <U10001167> <U10001175> : "ᅨ" U1168 # HANGUL JUNGSEONG YE
-<Multi_key> <U10001169> <U10001161> : "ᅪ" U116a # HANGUL JUNGSEONG WA
-<Multi_key> <U10001169> <U10001175> : "ᅬ" U116c # HANGUL JUNGSEONG OE
-<Multi_key> <U1000116E> <U10001165> : "ᅯ" U116f # HANGUL JUNGSEONG WEO
-<Multi_key> <U1000116E> <U10001175> : "ᅱ" U1171 # HANGUL JUNGSEONG WI
-<Multi_key> <U10001173> <U10001175> : "ᅴ" U1174 # HANGUL JUNGSEONG YI
-<Multi_key> <U10001161> <U10001169> : "ᅶ" U1176 # HANGUL JUNGSEONG A-O
-<Multi_key> <U10001161> <U1000116E> : "ᅷ" U1177 # HANGUL JUNGSEONG A-U
-<Multi_key> <U10001163> <U10001169> : "ᅸ" U1178 # HANGUL JUNGSEONG YA-O
-<Multi_key> <U10001163> <U1000116D> : "ᅹ" U1179 # HANGUL JUNGSEONG YA-YO
-<Multi_key> <U10001165> <U10001169> : "ᅺ" U117a # HANGUL JUNGSEONG EO-O
-<Multi_key> <U10001165> <U1000116E> : "ᅻ" U117b # HANGUL JUNGSEONG EO-U
-<Multi_key> <U10001165> <U10001173> : "ᅼ" U117c # HANGUL JUNGSEONG EO-EU
-<Multi_key> <U10001167> <U10001169> : "ᅽ" U117d # HANGUL JUNGSEONG YEO-O
-<Multi_key> <U10001167> <U1000116E> : "ᅾ" U117e # HANGUL JUNGSEONG YEO-U
-<Multi_key> <U10001169> <U10001165> : "ᅿ" U117f # HANGUL JUNGSEONG O-EO
-<Multi_key> <U10001169> <U10001166> : "ᆀ" U1180 # HANGUL JUNGSEONG O-E
-<Multi_key> <U10001169> <U10001168> : "ᆁ" U1181 # HANGUL JUNGSEONG O-YE
-<Multi_key> <U10001169> <U10001169> : "ᆂ" U1182 # HANGUL JUNGSEONG O-O
-<Multi_key> <U10001169> <U1000116E> : "ᆃ" U1183 # HANGUL JUNGSEONG O-U
-<Multi_key> <U1000116D> <U10001163> : "ᆄ" U1184 # HANGUL JUNGSEONG YO-YA
-<Multi_key> <U1000116D> <U10001164> : "ᆅ" U1185 # HANGUL JUNGSEONG YO-YAE
-<Multi_key> <U1000116D> <U10001167> : "ᆆ" U1186 # HANGUL JUNGSEONG YO-YEO
-<Multi_key> <U1000116D> <U10001169> : "ᆇ" U1187 # HANGUL JUNGSEONG YO-O
-<Multi_key> <U1000116D> <U10001175> : "ᆈ" U1188 # HANGUL JUNGSEONG YO-I
-<Multi_key> <U1000116E> <U10001161> : "ᆉ" U1189 # HANGUL JUNGSEONG U-A
-<Multi_key> <U1000116E> <U10001162> : "ᆊ" U118a # HANGUL JUNGSEONG U-AE
-<Multi_key> <U1000116E> <U10001168> : "ᆌ" U118c # HANGUL JUNGSEONG U-YE
-<Multi_key> <U1000116E> <U1000116E> : "ᆍ" U118d # HANGUL JUNGSEONG U-U
-<Multi_key> <U10001172> <U10001161> : "ᆎ" U118e # HANGUL JUNGSEONG YU-A
-<Multi_key> <U10001172> <U10001165> : "ᆏ" U118f # HANGUL JUNGSEONG YU-EO
-<Multi_key> <U10001172> <U10001166> : "ᆐ" U1190 # HANGUL JUNGSEONG YU-E
-<Multi_key> <U10001172> <U10001167> : "ᆑ" U1191 # HANGUL JUNGSEONG YU-YEO
-<Multi_key> <U10001172> <U10001168> : "ᆒ" U1192 # HANGUL JUNGSEONG YU-YE
-<Multi_key> <U10001172> <U1000116E> : "ᆓ" U1193 # HANGUL JUNGSEONG YU-U
-<Multi_key> <U10001172> <U10001175> : "ᆔ" U1194 # HANGUL JUNGSEONG YU-I
-<Multi_key> <U10001173> <U1000116E> : "ᆕ" U1195 # HANGUL JUNGSEONG EU-U
-<Multi_key> <U10001173> <U10001173> : "ᆖ" U1196 # HANGUL JUNGSEONG EU-EU
-<Multi_key> <U10001174> <U1000116E> : "ᆗ" U1197 # HANGUL JUNGSEONG YI-U
-<Multi_key> <U10001175> <U10001161> : "ᆘ" U1198 # HANGUL JUNGSEONG I-A
-<Multi_key> <U10001175> <U10001163> : "ᆙ" U1199 # HANGUL JUNGSEONG I-YA
-<Multi_key> <U10001175> <U10001169> : "ᆚ" U119a # HANGUL JUNGSEONG I-O
-<Multi_key> <U10001175> <U1000116E> : "ᆛ" U119b # HANGUL JUNGSEONG I-U
-<Multi_key> <U10001175> <U10001173> : "ᆜ" U119c # HANGUL JUNGSEONG I-EU
-<Multi_key> <U10001175> <U1000119E> : "ᆝ" U119d # HANGUL JUNGSEONG I-ARAEA
-<Multi_key> <U1000119E> <U10001165> : "ᆟ" U119f # HANGUL JUNGSEONG ARAEA-EO
-<Multi_key> <U1000119E> <U1000116E> : "ᆠ" U11a0 # HANGUL JUNGSEONG ARAEA-U
-<Multi_key> <U1000119E> <U10001175> : "ᆡ" U11a1 # HANGUL JUNGSEONG ARAEA-I
-<Multi_key> <U1000119E> <U1000119E> : "ᆢ" U11a2 # HANGUL JUNGSEONG SSANGARAEA
-<Multi_key> <U100011A8> <U100011A8> : "ᆩ" U11a9 # HANGUL JONGSEONG SSANGKIYEOK
-<Multi_key> <U100011A8> <U100011BA> : "ᆪ" U11aa # HANGUL JONGSEONG KIYEOK-SIOS
-<Multi_key> <U100011AB> <U100011BD> : "ᆬ" U11ac # HANGUL JONGSEONG NIEUN-CIEUC
-<Multi_key> <U100011AB> <U100011C2> : "ᆭ" U11ad # HANGUL JONGSEONG NIEUN-HIEUH
-<Multi_key> <U100011AF> <U100011A8> : "ᆰ" U11b0 # HANGUL JONGSEONG RIEUL-KIYEOK
-<Multi_key> <U100011AF> <U100011B7> : "ᆱ" U11b1 # HANGUL JONGSEONG RIEUL-MIEUM
-<Multi_key> <U100011AF> <U100011B8> : "ᆲ" U11b2 # HANGUL JONGSEONG RIEUL-PIEUP
-<Multi_key> <U100011AF> <U100011BA> : "ᆳ" U11b3 # HANGUL JONGSEONG RIEUL-SIOS
-<Multi_key> <U100011AF> <U100011C0> : "ᆴ" U11b4 # HANGUL JONGSEONG RIEUL-THIEUTH
-<Multi_key> <U100011AF> <U100011C1> : "ᆵ" U11b5 # HANGUL JONGSEONG RIEUL-PHIEUPH
-<Multi_key> <U100011AF> <U100011C2> : "ᆶ" U11b6 # HANGUL JONGSEONG RIEUL-HIEUH
-<Multi_key> <U100011B8> <U100011BA> : "ᆹ" U11b9 # HANGUL JONGSEONG PIEUP-SIOS
-<Multi_key> <U100011BA> <U100011BA> : "ᆻ" U11bb # HANGUL JONGSEONG SSANGSIOS
-<Multi_key> <U100011A8> <U100011AF> : "ᇃ" U11c3 # HANGUL JONGSEONG KIYEOK-RIEUL
-<Multi_key> <U100011AB> <U100011A8> : "ᇅ" U11c5 # HANGUL JONGSEONG NIEUN-KIYEOK
-<Multi_key> <U100011AB> <U100011AE> : "ᇆ" U11c6 # HANGUL JONGSEONG NIEUN-TIKEUT
-<Multi_key> <U100011AB> <U100011BA> : "ᇇ" U11c7 # HANGUL JONGSEONG NIEUN-SIOS
-<Multi_key> <U100011AB> <U100011EB> : "ᇈ" U11c8 # HANGUL JONGSEONG NIEUN-PANSIOS
-<Multi_key> <U100011AB> <U100011C0> : "ᇉ" U11c9 # HANGUL JONGSEONG NIEUN-THIEUTH
-<Multi_key> <U100011AE> <U100011A8> : "ᇊ" U11ca # HANGUL JONGSEONG TIKEUT-KIYEOK
-<Multi_key> <U100011AE> <U100011AF> : "ᇋ" U11cb # HANGUL JONGSEONG TIKEUT-RIEUL
-<Multi_key> <U100011AF> <U100011AB> : "ᇍ" U11cd # HANGUL JONGSEONG RIEUL-NIEUN
-<Multi_key> <U100011AF> <U100011AE> : "ᇎ" U11ce # HANGUL JONGSEONG RIEUL-TIKEUT
-<Multi_key> <U100011AF> <U100011AF> : "ᇐ" U11d0 # HANGUL JONGSEONG SSANGRIEUL
-<Multi_key> <U100011AF> <U100011EB> : "ᇗ" U11d7 # HANGUL JONGSEONG RIEUL-PANSIOS
-<Multi_key> <U100011AF> <U100011BF> : "ᇘ" U11d8 # HANGUL JONGSEONG RIEUL-KHIEUKH
-<Multi_key> <U100011AF> <U100011F9> : "ᇙ" U11d9 # HANGUL JONGSEONG RIEUL-YEORINHIEUH
-<Multi_key> <U100011B7> <U100011A8> : "ᇚ" U11da # HANGUL JONGSEONG MIEUM-KIYEOK
-<Multi_key> <U100011B7> <U100011AF> : "ᇛ" U11db # HANGUL JONGSEONG MIEUM-RIEUL
-<Multi_key> <U100011B7> <U100011B8> : "ᇜ" U11dc # HANGUL JONGSEONG MIEUM-PIEUP
-<Multi_key> <U100011B7> <U100011BA> : "ᇝ" U11dd # HANGUL JONGSEONG MIEUM-SIOS
-<Multi_key> <U100011B7> <U100011EB> : "ᇟ" U11df # HANGUL JONGSEONG MIEUM-PANSIOS
-<Multi_key> <U100011B7> <U100011BE> : "ᇠ" U11e0 # HANGUL JONGSEONG MIEUM-CHIEUCH
-<Multi_key> <U100011B7> <U100011C2> : "ᇡ" U11e1 # HANGUL JONGSEONG MIEUM-HIEUH
-<Multi_key> <U100011B7> <U100011BC> : "ᇢ" U11e2 # HANGUL JONGSEONG KAPYEOUNMIEUM
-<Multi_key> <U100011B8> <U100011AF> : "ᇣ" U11e3 # HANGUL JONGSEONG PIEUP-RIEUL
-<Multi_key> <U100011B8> <U100011C1> : "ᇤ" U11e4 # HANGUL JONGSEONG PIEUP-PHIEUPH
-<Multi_key> <U100011B8> <U100011C2> : "ᇥ" U11e5 # HANGUL JONGSEONG PIEUP-HIEUH
-<Multi_key> <U100011B8> <U100011BC> : "ᇦ" U11e6 # HANGUL JONGSEONG KAPYEOUNPIEUP
-<Multi_key> <U100011BA> <U100011A8> : "ᇧ" U11e7 # HANGUL JONGSEONG SIOS-KIYEOK
-<Multi_key> <U100011BA> <U100011AE> : "ᇨ" U11e8 # HANGUL JONGSEONG SIOS-TIKEUT
-<Multi_key> <U100011BA> <U100011AF> : "ᇩ" U11e9 # HANGUL JONGSEONG SIOS-RIEUL
-<Multi_key> <U100011BA> <U100011B8> : "ᇪ" U11ea # HANGUL JONGSEONG SIOS-PIEUP
-<Multi_key> <U100011BC> <U100011A8> : "ᇬ" U11ec # HANGUL JONGSEONG IEUNG-KIYEOK
-<Multi_key> <U100011BC> <U100011BC> : "ᇮ" U11ee # HANGUL JONGSEONG SSANGIEUNG
-<Multi_key> <U100011BC> <U100011BF> : "ᇯ" U11ef # HANGUL JONGSEONG IEUNG-KHIEUKH
-<Multi_key> <U100011F0> <U100011BA> : "ᇱ" U11f1 # HANGUL JONGSEONG YESIEUNG-SIOS
-<Multi_key> <U100011F0> <U100011EB> : "ᇲ" U11f2 # HANGUL JONGSEONG YESIEUNG-PANSIOS
-<Multi_key> <U100011C1> <U100011B8> : "ᇳ" U11f3 # HANGUL JONGSEONG PHIEUPH-PIEUP
-<Multi_key> <U100011C1> <U100011BC> : "ᇴ" U11f4 # HANGUL JONGSEONG KAPYEOUNPHIEUPH
-<Multi_key> <U100011C2> <U100011AB> : "ᇵ" U11f5 # HANGUL JONGSEONG HIEUH-NIEUN
-<Multi_key> <U100011C2> <U100011AF> : "ᇶ" U11f6 # HANGUL JONGSEONG HIEUH-RIEUL
-<Multi_key> <U100011C2> <U100011B7> : "ᇷ" U11f7 # HANGUL JONGSEONG HIEUH-MIEUM
-<Multi_key> <U100011C2> <U100011B8> : "ᇸ" U11f8 # HANGUL JONGSEONG HIEUH-PIEUP
-<Multi_key> <U10001121> <U10001100> : "ᄢ" U1122 # HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
-<Multi_key> <U10001121> <U10001103> : "ᄣ" U1123 # HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
-<Multi_key> <U10001121> <U10001107> : "ᄤ" U1124 # HANGUL CHOSEONG PIEUP-SIOS-PIEUP
-<Multi_key> <U10001121> <U10001109> : "ᄥ" U1125 # HANGUL CHOSEONG PIEUP-SSANGSIOS
-<Multi_key> <U10001121> <U1000110C> : "ᄦ" U1126 # HANGUL CHOSEONG PIEUP-SIOS-CIEUC
-<Multi_key> <U10001108> <U1000110B> : "ᄬ" U112c # HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
-<Multi_key> <U10001132> <U10001100> : "ᄳ" U1133 # HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
-<Multi_key> <U1000110A> <U10001109> : "ᄴ" U1134 # HANGUL CHOSEONG SIOS-SSANGSIOS
-<Multi_key> <U1000116A> <U10001175> : "ᅫ" U116b # HANGUL JUNGSEONG WAE
-<Multi_key> <U1000116F> <U10001175> : "ᅰ" U1170 # HANGUL JUNGSEONG WE
-<Multi_key> <U1000116F> <U10001173> : "ᆋ" U118b # HANGUL JUNGSEONG U-EO-EU
-<Multi_key> <U100011AA> <U100011A8> : "ᇄ" U11c4 # HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
-<Multi_key> <U100011B0> <U100011BA> : "ᇌ" U11cc # HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
-<Multi_key> <U100011CE> <U100011C2> : "ᇏ" U11cf # HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH
-<Multi_key> <U100011B1> <U100011A8> : "ᇑ" U11d1 # HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
-<Multi_key> <U100011B1> <U100011BA> : "ᇒ" U11d2 # HANGUL JONGSEONG RIEUL-MIEUM-SIOS
-<Multi_key> <U100011B2> <U100011BA> : "ᇓ" U11d3 # HANGUL JONGSEONG RIEUL-PIEUP-SIOS
-<Multi_key> <U100011B2> <U100011C2> : "ᇔ" U11d4 # HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
-<Multi_key> <U100011B2> <U100011BC> : "ᇕ" U11d5 # HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
-<Multi_key> <U100011B3> <U100011BA> : "ᇖ" U11d6 # HANGUL JONGSEONG RIEUL-SSANGSIOS
-<Multi_key> <U100011DD> <U100011BA> : "ᇞ" U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
-<Multi_key> <U100011EC> <U100011A8> : "ᇭ" U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
-<Multi_key> <U10001107> <U1000112D> : "ᄢ" U1122 # HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
-<Multi_key> <U10001107> <U1000112F> : "ᄣ" U1123 # HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
-<Multi_key> <U10001107> <U10001132> : "ᄤ" U1124 # HANGUL CHOSEONG PIEUP-SIOS-PIEUP
-<Multi_key> <U10001107> <U1000110A> : "ᄥ" U1125 # HANGUL CHOSEONG PIEUP-SSANGSIOS
-<Multi_key> <U10001107> <U10001136> : "ᄦ" U1126 # HANGUL CHOSEONG PIEUP-SIOS-CIEUC
-<Multi_key> <U10001107> <U1000112B> : "ᄬ" U112c # HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
-<Multi_key> <U10001109> <U1000111E> : "ᄳ" U1133 # HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
-<Multi_key> <U10001109> <U1000110A> : "ᄴ" U1134 # HANGUL CHOSEONG SIOS-SSANGSIOS
-<Multi_key> <U10001169> <U10001162> : "ᅫ" U116b # HANGUL JUNGSEONG WAE
-<Multi_key> <U1000116E> <U10001166> : "ᅰ" U1170 # HANGUL JUNGSEONG WE
-<Multi_key> <U1000116E> <U1000117C> : "ᆋ" U118b # HANGUL JUNGSEONG U-EO-EU
-<Multi_key> <U100011A8> <U100011E7> : "ᇄ" U11c4 # HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
-<Multi_key> <U100011AF> <U100011AA> : "ᇌ" U11cc # HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
-<Multi_key> <U100011AF> <U100011DA> : "ᇑ" U11d1 # HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
-<Multi_key> <U100011AF> <U100011DD> : "ᇒ" U11d2 # HANGUL JONGSEONG RIEUL-MIEUM-SIOS
-<Multi_key> <U100011AF> <U100011B9> : "ᇓ" U11d3 # HANGUL JONGSEONG RIEUL-PIEUP-SIOS
-<Multi_key> <U100011AF> <U100011E5> : "ᇔ" U11d4 # HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
-<Multi_key> <U100011AF> <U100011E6> : "ᇕ" U11d5 # HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
-<Multi_key> <U100011AF> <U100011BB> : "ᇖ" U11d6 # HANGUL JONGSEONG RIEUL-SSANGSIOS
-<Multi_key> <U100011B7> <U100011BB> : "ᇞ" U11de # HANGUL JONGSEONG MIEUM-SSANGSIOS
-<Multi_key> <U100011BC> <U100011A9> : "ᇭ" U11ed # HANGUL JONGSEONG IEUNG-SSANGKIYEOK
+##<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
-<Multi_key> <comma> <minus> : "¬" U00AC # NOT SIGN
-<Multi_key> <minus> <comma> : "¬" U00AC # NOT SIGN
-<dead_circumflex> <Multi_key> <underscore> <a> : "ª" U00AA # FEMININE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underscore> <a> : "ª" U00AA # FEMININE ORDINAL INDICATOR
-<dead_circumflex> <Multi_key> <underbar> <a> : "ª" U00AA # FEMININE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underbar> <a> : "ª" U00AA # FEMININE ORDINAL INDICATOR
-<dead_circumflex> <2> : "²" U00B2 # SUPERSCRIPT TWO
-<Multi_key> <asciicircum> <2> : "²" U00B2 # SUPERSCRIPT TWO
-<dead_circumflex> <KP_Space> : "²" U00B2 # SUPERSCRIPT TWO
-<Multi_key> <asciicircum> <KP_Space> : "²" U00B2 # SUPERSCRIPT TWO
-<dead_circumflex> <KP_2> : "²" U00B2 # SUPERSCRIPT TWO
-<Multi_key> <asciicircum> <KP_2> : "²" U00B2 # SUPERSCRIPT TWO
-<dead_circumflex> <3> : "³" U00B3 # SUPERSCRIPT THREE
-<Multi_key> <asciicircum> <3> : "³" U00B3 # SUPERSCRIPT THREE
-<dead_circumflex> <KP_3> : "³" U00B3 # SUPERSCRIPT THREE
-<Multi_key> <asciicircum> <KP_3> : "³" U00B3 # SUPERSCRIPT THREE
-<Multi_key> <m> <u> : "µ" U00B5 # MICRO SIGN
-<dead_circumflex> <1> : "¹" U00B9 # SUPERSCRIPT ONE
-<Multi_key> <asciicircum> <1> : "¹" U00B9 # SUPERSCRIPT ONE
-<dead_circumflex> <KP_1> : "¹" U00B9 # SUPERSCRIPT ONE
-<Multi_key> <asciicircum> <KP_1> : "¹" U00B9 # SUPERSCRIPT ONE
-<dead_circumflex> <Multi_key> <underscore> <o> : "º" U00BA # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underscore> <o> : "º" U00BA # MASCULINE ORDINAL INDICATOR
-<dead_circumflex> <Multi_key> <underbar> <o> : "º" U00BA # MASCULINE ORDINAL INDICATOR
-<Multi_key> <asciicircum> <underbar> <o> : "º" U00BA # MASCULINE ORDINAL INDICATOR
-<Multi_key> <1> <4> : "¼" U00BC # VULGAR FRACTION ONE QUARTER
-<Multi_key> <1> <2> : "½" U00BD # VULGAR FRACTION ONE HALF
-<Multi_key> <3> <4> : "¾" U00BE # VULGAR FRACTION THREE QUARTERS
-<dead_grave> <A> : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE
-<Multi_key> <grave> <A> : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE
-<combining_grave> <A> : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE
-<dead_acute> <A> : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
-<Multi_key> <acute> <A> : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
-<Multi_key> <apostrophe> <A> : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
-<combining_acute> <A> : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
-<dead_circumflex> <A> : "Â" U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <A> : "Â" U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-<dead_tilde> <A> : "Ã" U00C3 # LATIN CAPITAL LETTER A WITH TILDE
-<Multi_key> <asciitilde> <A> : "Ã" U00C3 # LATIN CAPITAL LETTER A WITH TILDE
-<combining_tilde> <A> : "Ã" U00C3 # LATIN CAPITAL LETTER A WITH TILDE
-<dead_diaeresis> <A> : "Ä" U00C4 # LATIN CAPITAL LETTER A WITH DIAERESIS
-<Multi_key> <quotedbl> <A> : "Ä" U00C4 # LATIN CAPITAL LETTER A WITH DIAERESIS
-<dead_abovering> <A> : "Å" U00C5 # LATIN CAPITAL LETTER A WITH RING ABOVE
-<Multi_key> <o> <A> : "Å" U00C5 # LATIN CAPITAL LETTER A WITH RING ABOVE
-<dead_cedilla> <C> : "Ç" U00C7 # LATIN CAPITAL LETTER C WITH CEDILLA
-<Multi_key> <comma> <C> : "Ç" U00C7 # LATIN CAPITAL LETTER C WITH CEDILLA
-<dead_grave> <E> : "È" U00C8 # LATIN CAPITAL LETTER E WITH GRAVE
-<Multi_key> <grave> <E> : "È" U00C8 # LATIN CAPITAL LETTER E WITH GRAVE
-<combining_grave> <E> : "È" U00C8 # LATIN CAPITAL LETTER E WITH GRAVE
-<dead_acute> <E> : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
-<Multi_key> <acute> <E> : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
-<Multi_key> <apostrophe> <E> : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
-<combining_acute> <E> : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
-<dead_circumflex> <E> : "Ê" U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <E> : "Ê" U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-<dead_diaeresis> <E> : "Ë" U00CB # LATIN CAPITAL LETTER E WITH DIAERESIS
-<Multi_key> <quotedbl> <E> : "Ë" U00CB # LATIN CAPITAL LETTER E WITH DIAERESIS
-<dead_grave> <I> : "Ì" U00CC # LATIN CAPITAL LETTER I WITH GRAVE
-<Multi_key> <grave> <I> : "Ì" U00CC # LATIN CAPITAL LETTER I WITH GRAVE
-<combining_grave> <I> : "Ì" U00CC # LATIN CAPITAL LETTER I WITH GRAVE
-<dead_acute> <I> : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
-<Multi_key> <acute> <I> : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
-<Multi_key> <apostrophe> <I> : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
-<combining_acute> <I> : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
-<dead_circumflex> <I> : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <I> : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-<dead_diaeresis> <I> : "Ï" U00CF # LATIN CAPITAL LETTER I WITH DIAERESIS
-<Multi_key> <quotedbl> <I> : "Ï" U00CF # LATIN CAPITAL LETTER I WITH DIAERESIS
-<Multi_key> <D> <H> : "Ð" U00D0 # LATIN CAPITAL LETTER ETH
-<dead_tilde> <N> : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE
-<Multi_key> <asciitilde> <N> : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE
-<combining_tilde> <N> : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE
-<dead_grave> <O> : "Ò" U00D2 # LATIN CAPITAL LETTER O WITH GRAVE
-<Multi_key> <grave> <O> : "Ò" U00D2 # LATIN CAPITAL LETTER O WITH GRAVE
-<combining_grave> <O> : "Ò" U00D2 # LATIN CAPITAL LETTER O WITH GRAVE
-<dead_acute> <O> : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
-<Multi_key> <acute> <O> : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
-<Multi_key> <apostrophe> <O> : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
-<combining_acute> <O> : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
-<dead_circumflex> <O> : "Ô" U00D4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <O> : "Ô" U00D4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-<dead_tilde> <O> : "Õ" U00D5 # LATIN CAPITAL LETTER O WITH TILDE
-<Multi_key> <asciitilde> <O> : "Õ" U00D5 # LATIN CAPITAL LETTER O WITH TILDE
-<combining_tilde> <O> : "Õ" U00D5 # LATIN CAPITAL LETTER O WITH TILDE
-<dead_diaeresis> <O> : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS
-<Multi_key> <quotedbl> <O> : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS
-<Multi_key> <x> <x> : "×" U00D7 # MULTIPLICATION SIGN
-<Multi_key> <slash> <O> : "Ø" U00D8 # LATIN CAPITAL LETTER O WITH STROKE
-<Multi_key> <KP_Divide> <O> : "Ø" U00D8 # LATIN CAPITAL LETTER O WITH STROKE
-<dead_grave> <U> : "Ù" U00D9 # LATIN CAPITAL LETTER U WITH GRAVE
-<Multi_key> <grave> <U> : "Ù" U00D9 # LATIN CAPITAL LETTER U WITH GRAVE
-<combining_grave> <U> : "Ù" U00D9 # LATIN CAPITAL LETTER U WITH GRAVE
-<dead_acute> <U> : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
-<Multi_key> <acute> <U> : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
-<Multi_key> <apostrophe> <U> : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
-<combining_acute> <U> : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
-<dead_circumflex> <U> : "Û" U00DB # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <U> : "Û" U00DB # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-<dead_diaeresis> <U> : "Ü" U00DC # LATIN CAPITAL LETTER U WITH DIAERESIS
-<Multi_key> <quotedbl> <U> : "Ü" U00DC # LATIN CAPITAL LETTER U WITH DIAERESIS
-<dead_acute> <Y> : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
-<Multi_key> <acute> <Y> : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
-<Multi_key> <apostrophe> <Y> : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
-<combining_acute> <Y> : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
-<Multi_key> <T> <H> : "Þ" U00DE # LATIN CAPITAL LETTER THORN
-<dead_grave> <a> : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE
-<Multi_key> <grave> <a> : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE
-<combining_grave> <a> : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE
-<dead_acute> <a> : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
-<Multi_key> <acute> <a> : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
-<Multi_key> <apostrophe> <a> : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
-<combining_acute> <a> : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
-<dead_circumflex> <a> : "â" U00E2 # LATIN SMALL LETTER A WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <a> : "â" U00E2 # LATIN SMALL LETTER A WITH CIRCUMFLEX
-<dead_tilde> <a> : "ã" U00E3 # LATIN SMALL LETTER A WITH TILDE
-<Multi_key> <asciitilde> <a> : "ã" U00E3 # LATIN SMALL LETTER A WITH TILDE
-<combining_tilde> <a> : "ã" U00E3 # LATIN SMALL LETTER A WITH TILDE
-<dead_diaeresis> <a> : "ä" U00E4 # LATIN SMALL LETTER A WITH DIAERESIS
-<Multi_key> <quotedbl> <a> : "ä" U00E4 # LATIN SMALL LETTER A WITH DIAERESIS
-<dead_abovering> <a> : "å" U00E5 # LATIN SMALL LETTER A WITH RING ABOVE
-<Multi_key> <o> <a> : "å" U00E5 # LATIN SMALL LETTER A WITH RING ABOVE
-<dead_cedilla> <c> : "ç" U00E7 # LATIN SMALL LETTER C WITH CEDILLA
-<Multi_key> <comma> <c> : "ç" U00E7 # LATIN SMALL LETTER C WITH CEDILLA
-<dead_grave> <e> : "è" U00E8 # LATIN SMALL LETTER E WITH GRAVE
-<Multi_key> <grave> <e> : "è" U00E8 # LATIN SMALL LETTER E WITH GRAVE
-<combining_grave> <e> : "è" U00E8 # LATIN SMALL LETTER E WITH GRAVE
-<dead_acute> <e> : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
-<Multi_key> <acute> <e> : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
-<Multi_key> <apostrophe> <e> : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
-<combining_acute> <e> : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
-<dead_circumflex> <e> : "ê" U00EA # LATIN SMALL LETTER E WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <e> : "ê" U00EA # LATIN SMALL LETTER E WITH CIRCUMFLEX
-<dead_diaeresis> <e> : "ë" U00EB # LATIN SMALL LETTER E WITH DIAERESIS
-<Multi_key> <quotedbl> <e> : "ë" U00EB # LATIN SMALL LETTER E WITH DIAERESIS
-<dead_grave> <i> : "ì" U00EC # LATIN SMALL LETTER I WITH GRAVE
-<Multi_key> <grave> <i> : "ì" U00EC # LATIN SMALL LETTER I WITH GRAVE
-<combining_grave> <i> : "ì" U00EC # LATIN SMALL LETTER I WITH GRAVE
-<dead_acute> <i> : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
-<Multi_key> <acute> <i> : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
-<Multi_key> <apostrophe> <i> : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
-<combining_acute> <i> : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
-<dead_circumflex> <i> : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <i> : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX
-<dead_diaeresis> <i> : "ï" U00EF # LATIN SMALL LETTER I WITH DIAERESIS
-<Multi_key> <quotedbl> <i> : "ï" U00EF # LATIN SMALL LETTER I WITH DIAERESIS
-<Multi_key> <d> <h> : "ð" U00F0 # LATIN SMALL LETTER ETH
-<dead_tilde> <n> : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE
-<Multi_key> <asciitilde> <n> : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE
-<combining_tilde> <n> : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE
-<dead_grave> <o> : "ò" U00F2 # LATIN SMALL LETTER O WITH GRAVE
-<Multi_key> <grave> <o> : "ò" U00F2 # LATIN SMALL LETTER O WITH GRAVE
-<combining_grave> <o> : "ò" U00F2 # LATIN SMALL LETTER O WITH GRAVE
-<dead_acute> <o> : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
-<Multi_key> <acute> <o> : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
-<Multi_key> <apostrophe> <o> : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
-<combining_acute> <o> : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
-<dead_circumflex> <o> : "ô" U00F4 # LATIN SMALL LETTER O WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <o> : "ô" U00F4 # LATIN SMALL LETTER O WITH CIRCUMFLEX
-<dead_tilde> <o> : "õ" U00F5 # LATIN SMALL LETTER O WITH TILDE
-<Multi_key> <asciitilde> <o> : "õ" U00F5 # LATIN SMALL LETTER O WITH TILDE
-<combining_tilde> <o> : "õ" U00F5 # LATIN SMALL LETTER O WITH TILDE
-<dead_diaeresis> <o> : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS
-<Multi_key> <quotedbl> <o> : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS
-<Multi_key> <colon> <minus> : "÷" U00F7 # DIVISION SIGN
-<Multi_key> <minus> <colon> : "÷" U00F7 # DIVISION SIGN
-<Multi_key> <slash> <o> : "ø" U00F8 # LATIN SMALL LETTER O WITH STROKE
-<Multi_key> <KP_Divide> <o> : "ø" U00F8 # LATIN SMALL LETTER O WITH STROKE
-<dead_grave> <u> : "ù" U00F9 # LATIN SMALL LETTER U WITH GRAVE
-<Multi_key> <grave> <u> : "ù" U00F9 # LATIN SMALL LETTER U WITH GRAVE
-<combining_grave> <u> : "ù" U00F9 # LATIN SMALL LETTER U WITH GRAVE
-<dead_acute> <u> : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
-<Multi_key> <acute> <u> : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
-<Multi_key> <apostrophe> <u> : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
-<combining_acute> <u> : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
-<dead_circumflex> <u> : "û" U00FB # LATIN SMALL LETTER U WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <u> : "û" U00FB # LATIN SMALL LETTER U WITH CIRCUMFLEX
-<dead_diaeresis> <u> : "ü" U00FC # LATIN SMALL LETTER U WITH DIAERESIS
-<Multi_key> <quotedbl> <u> : "ü" U00FC # LATIN SMALL LETTER U WITH DIAERESIS
-<dead_acute> <y> : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
-<Multi_key> <acute> <y> : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
-<Multi_key> <apostrophe> <y> : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
-<combining_acute> <y> : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
-<Multi_key> <t> <h> : "þ" U00FE # LATIN SMALL LETTER THORN
-<dead_diaeresis> <y> : "ÿ" U00FF # LATIN SMALL LETTER Y WITH DIAERESIS
-<Multi_key> <quotedbl> <y> : "ÿ" U00FF # LATIN SMALL LETTER Y WITH DIAERESIS
+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
+<combining_grave> <A> : "À" Agrave # LATIN CAPITAL LETTER A WITH GRAVE
+<dead_acute> <A> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
+<Multi_key> <acute> <A> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
+<Multi_key> <apostrophe> <A> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
+<combining_acute> <A> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
+<dead_circumflex> <A> : "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <A> : "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<dead_tilde> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
+<Multi_key> <asciitilde> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
+<combining_tilde> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
+<dead_diaeresis> <A> : "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
+<Multi_key> <quotedbl> <A> : "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
+<dead_abovering> <A> : "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
+<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
+<dead_grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
+<Multi_key> <grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
+<combining_grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
+<dead_acute> <E> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
+<Multi_key> <acute> <E> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
+<Multi_key> <apostrophe> <E> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
+<combining_acute> <E> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
+<dead_circumflex> <E> : "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <E> : "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<dead_diaeresis> <E> : "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
+<Multi_key> <quotedbl> <E> : "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
+<dead_grave> <I> : "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
+<Multi_key> <grave> <I> : "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
+<combining_grave> <I> : "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
+<dead_acute> <I> : "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
+<Multi_key> <acute> <I> : "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
+<Multi_key> <apostrophe> <I> : "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
+<combining_acute> <I> : "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
+<dead_circumflex> <I> : "Î" Icircumflex # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <I> : "Î" Icircumflex # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<dead_diaeresis> <I> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
+<Multi_key> <quotedbl> <I> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
+<Multi_key> <D> <H> : "Ð" ETH # LATIN CAPITAL LETTER ETH
+<dead_tilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
+<Multi_key> <asciitilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
+<combining_tilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
+<dead_grave> <O> : "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
+<Multi_key> <grave> <O> : "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
+<combining_grave> <O> : "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
+<dead_acute> <O> : "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
+<Multi_key> <acute> <O> : "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
+<Multi_key> <apostrophe> <O> : "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
+<combining_acute> <O> : "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
+<dead_circumflex> <O> : "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <O> : "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<dead_tilde> <O> : "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
+<Multi_key> <asciitilde> <O> : "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
+<combining_tilde> <O> : "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
+<dead_diaeresis> <O> : "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
+<Multi_key> <quotedbl> <O> : "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
+<Multi_key> <x> <x> : "×" multiply # MULTIPLICATION SIGN
+<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
+<combining_grave> <U> : "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
+<dead_acute> <U> : "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
+<Multi_key> <acute> <U> : "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
+<Multi_key> <apostrophe> <U> : "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
+<combining_acute> <U> : "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
+<dead_circumflex> <U> : "Û" Ucircumflex # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <U> : "Û" Ucircumflex # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<dead_diaeresis> <U> : "Ü" Udiaeresis # LATIN CAPITAL LETTER U WITH DIAERESIS
+<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
+<combining_acute> <Y> : "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
+<Multi_key> <T> <H> : "Þ" THORN # LATIN CAPITAL LETTER THORN
+<dead_grave> <a> : "à" agrave # LATIN SMALL LETTER A WITH GRAVE
+<Multi_key> <grave> <a> : "à" agrave # LATIN SMALL LETTER A WITH GRAVE
+<combining_grave> <a> : "à" agrave # LATIN SMALL LETTER A WITH GRAVE
+<dead_acute> <a> : "á" aacute # LATIN SMALL LETTER A WITH ACUTE
+<Multi_key> <acute> <a> : "á" aacute # LATIN SMALL LETTER A WITH ACUTE
+<Multi_key> <apostrophe> <a> : "á" aacute # LATIN SMALL LETTER A WITH ACUTE
+<combining_acute> <a> : "á" aacute # LATIN SMALL LETTER A WITH ACUTE
+<dead_circumflex> <a> : "â" acircumflex # LATIN SMALL LETTER A WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <a> : "â" acircumflex # LATIN SMALL LETTER A WITH CIRCUMFLEX
+<dead_tilde> <a> : "ã" atilde # LATIN SMALL LETTER A WITH TILDE
+<Multi_key> <asciitilde> <a> : "ã" atilde # LATIN SMALL LETTER A WITH TILDE
+<combining_tilde> <a> : "ã" atilde # LATIN SMALL LETTER A WITH TILDE
+<dead_diaeresis> <a> : "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS
+<Multi_key> <quotedbl> <a> : "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS
+<dead_abovering> <a> : "å" aring # LATIN SMALL LETTER A WITH RING ABOVE
+<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
+<dead_grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
+<Multi_key> <grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
+<combining_grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
+<dead_acute> <e> : "é" eacute # LATIN SMALL LETTER E WITH ACUTE
+<Multi_key> <acute> <e> : "é" eacute # LATIN SMALL LETTER E WITH ACUTE
+<Multi_key> <apostrophe> <e> : "é" eacute # LATIN SMALL LETTER E WITH ACUTE
+<combining_acute> <e> : "é" eacute # LATIN SMALL LETTER E WITH ACUTE
+<dead_circumflex> <e> : "ê" ecircumflex # LATIN SMALL LETTER E WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <e> : "ê" ecircumflex # LATIN SMALL LETTER E WITH CIRCUMFLEX
+<dead_diaeresis> <e> : "ë" ediaeresis # LATIN SMALL LETTER E WITH DIAERESIS
+<Multi_key> <quotedbl> <e> : "ë" ediaeresis # LATIN SMALL LETTER E WITH DIAERESIS
+<dead_grave> <i> : "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
+<Multi_key> <grave> <i> : "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
+<combining_grave> <i> : "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
+<dead_acute> <i> : "í" iacute # LATIN SMALL LETTER I WITH ACUTE
+<Multi_key> <acute> <i> : "í" iacute # LATIN SMALL LETTER I WITH ACUTE
+<Multi_key> <apostrophe> <i> : "í" iacute # LATIN SMALL LETTER I WITH ACUTE
+<combining_acute> <i> : "í" iacute # LATIN SMALL LETTER I WITH ACUTE
+<dead_circumflex> <i> : "î" icircumflex # LATIN SMALL LETTER I WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <i> : "î" icircumflex # LATIN SMALL LETTER I WITH CIRCUMFLEX
+<dead_diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+<Multi_key> <quotedbl> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
+<Multi_key> <d> <h> : "ð" eth # LATIN SMALL LETTER ETH
+<dead_tilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
+<Multi_key> <asciitilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
+<combining_tilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
+<dead_grave> <o> : "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
+<Multi_key> <grave> <o> : "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
+<combining_grave> <o> : "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
+<dead_acute> <o> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
+<Multi_key> <acute> <o> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
+<Multi_key> <apostrophe> <o> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
+<combining_acute> <o> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
+<dead_circumflex> <o> : "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <o> : "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
+<dead_tilde> <o> : "õ" otilde # LATIN SMALL LETTER O WITH TILDE
+<Multi_key> <asciitilde> <o> : "õ" otilde # LATIN SMALL LETTER O WITH TILDE
+<combining_tilde> <o> : "õ" otilde # LATIN SMALL LETTER O WITH TILDE
+<dead_diaeresis> <o> : "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
+<Multi_key> <quotedbl> <o> : "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
+<Multi_key> <colon> <minus> : "÷" division # DIVISION SIGN
+<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
+<combining_grave> <u> : "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
+<dead_acute> <u> : "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
+<Multi_key> <acute> <u> : "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
+<Multi_key> <apostrophe> <u> : "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
+<combining_acute> <u> : "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
+<dead_circumflex> <u> : "û" ucircumflex # LATIN SMALL LETTER U WITH CIRCUMFLEX
+<Multi_key> <asciicircum> <u> : "û" ucircumflex # LATIN SMALL LETTER U WITH CIRCUMFLEX
+<dead_diaeresis> <u> : "ü" udiaeresis # LATIN SMALL LETTER U WITH DIAERESIS
+<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
+<combining_acute> <y> : "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
+<Multi_key> <t> <h> : "þ" thorn # LATIN SMALL LETTER THORN
+<dead_diaeresis> <y> : "ÿ" ydiaeresis # LATIN SMALL LETTER Y WITH DIAERESIS
+<Multi_key> <quotedbl> <y> : "ÿ" ydiaeresis # LATIN SMALL LETTER Y WITH DIAERESIS
<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
@@ -654,8 +681,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
@@ -704,8 +733,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
@@ -759,8 +790,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
@@ -841,8 +874,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
@@ -902,8 +937,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
@@ -914,8 +951,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
@@ -934,9 +973,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U1000000D> : "Ǖ" U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-<Multi_key> <macron> <U1000000D> : "Ǖ" U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-<Multi_key> <underscore> <U1000000D> : "Ǖ" U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+<dead_macron> <U00DC> : "Ǖ" U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+<Multi_key> <macron> <U00DC> : "Ǖ" U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+<Multi_key> <underscore> <U00DC> : "Ǖ" U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
<dead_macron> <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
@@ -952,16 +991,16 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U1000000D> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<Multi_key> <acute> <U1000000D> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<Multi_key> <apostrophe> <U1000000D> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+<dead_acute> <U00DC> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+<Multi_key> <acute> <U00DC> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+<Multi_key> <apostrophe> <U00DC> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<dead_acute> <dead_diaeresis> <U> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<dead_acute> <Multi_key> <quotedbl> <U> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<Multi_key> <acute> <dead_diaeresis> <U> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<Multi_key> <acute> <quotedbl> <U> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<Multi_key> <apostrophe> <dead_diaeresis> <U> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<Multi_key> <apostrophe> <quotedbl> <U> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<combining_acute> <U1000000D> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+<combining_acute> <U00DC> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<combining_acute> <dead_diaeresis> <U> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<combining_acute> <Multi_key> <quotedbl> <U> : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
<dead_acute> <udiaeresis> : "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
@@ -976,8 +1015,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <udiaeresis> : "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
<combining_acute> <dead_diaeresis> <u> : "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
<combining_acute> <Multi_key> <quotedbl> <u> : "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<dead_caron> <U1000000D> : "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-<Multi_key> <c> <U1000000D> : "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+<dead_caron> <U00DC> : "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+<Multi_key> <c> <U00DC> : "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
<dead_caron> <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
@@ -988,13 +1027,13 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U1000000D> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<Multi_key> <grave> <U1000000D> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+<dead_grave> <U00DC> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+<Multi_key> <grave> <U00DC> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
<dead_grave> <dead_diaeresis> <U> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
<dead_grave> <Multi_key> <quotedbl> <U> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
<Multi_key> <grave> <dead_diaeresis> <U> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
<Multi_key> <grave> <quotedbl> <U> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<combining_grave> <U1000000D> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+<combining_grave> <U00DC> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
<combining_grave> <dead_diaeresis> <U> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
<combining_grave> <Multi_key> <quotedbl> <U> : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
<dead_grave> <udiaeresis> : "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
@@ -1024,18 +1063,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10000226> : "Ǡ" U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-<Multi_key> <macron> <U10000226> : "Ǡ" U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-<Multi_key> <underscore> <U10000226> : "Ǡ" U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE 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> <U10000227> : "ǡ" U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
-<Multi_key> <macron> <U10000227> : "ǡ" U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
-<Multi_key> <underscore> <U10000227> : "ǡ" U01E1 # LATIN SMALL 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
@@ -1048,8 +1087,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
@@ -1064,28 +1105,28 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U100001EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <macron> <U100001EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <underscore> <U100001EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+<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> <U100001EB> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <macron> <U100001EB> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <underscore> <U100001EB> : "ǭ" U01ED # LATIN SMALL 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> <U100001B7> : "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
-<Multi_key> <c> <U100001B7> : "Ǯ" U01EE # LATIN CAPITAL LETTER EZH WITH CARON
-<dead_caron> <U10000292> : "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
-<Multi_key> <c> <U10000292> : "ǯ" U01EF # LATIN SMALL LETTER EZH WITH CARON
+<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
@@ -1135,6 +1176,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
@@ -1144,9 +1186,11 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <Ooblique> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <slash> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <KP_Divide> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+<dead_stroke> <dead_acute> <O> : "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
<dead_acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<Multi_key> <acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<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
@@ -1156,34 +1200,35 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <oslash> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <slash> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
<combining_acute> <Multi_key> <KP_Divide> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<U1000030F> <A> : "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
-<U1000030F> <a> : "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
-<U10000311> <A> : "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
-<U10000311> <a> : "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
-<U1000030F> <E> : "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
-<U1000030F> <e> : "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
-<U10000311> <E> : "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
-<U10000311> <e> : "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
-<U1000030F> <I> : "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
-<U1000030F> <i> : "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
-<U10000311> <I> : "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
-<U10000311> <i> : "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
-<U1000030F> <O> : "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
-<U1000030F> <o> : "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
-<U10000311> <O> : "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
-<U10000311> <o> : "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
-<U1000030F> <R> : "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
-<U1000030F> <r> : "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
-<U10000311> <R> : "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
-<U10000311> <r> : "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
-<U1000030F> <U> : "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
-<U1000030F> <u> : "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
-<U10000311> <U> : "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
-<U10000311> <u> : "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
-<U10000326> <S> : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<U10000326> <s> : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<U10000326> <T> : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
-<U10000326> <t> : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+<dead_stroke> <dead_acute> <o> : "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
+<U030F> <A> : "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<U030F> <a> : "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<U0311> <A> : "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+<U0311> <a> : "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+<U030F> <E> : "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<U030F> <e> : "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<U0311> <E> : "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+<U0311> <e> : "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+<U030F> <I> : "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<U030F> <i> : "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<U0311> <I> : "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+<U0311> <i> : "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+<U030F> <O> : "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<U030F> <o> : "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<U0311> <O> : "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+<U0311> <o> : "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+<U030F> <R> : "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<U030F> <r> : "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<U0311> <R> : "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+<U0311> <r> : "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+<U030F> <U> : "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<U030F> <u> : "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+<U0311> <U> : "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+<U0311> <u> : "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+<U0326> <S> : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<U0326> <s> : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<U0326> <T> : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<U0326> <t> : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW
<dead_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
@@ -1242,18 +1287,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U1000022E> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <macron> <U1000022E> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <underscore> <U1000022E> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
+<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> <U1000022F> : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <macron> <U1000022F> : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <underscore> <U1000022F> : "ȱ" U0231 # LATIN SMALL 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
@@ -1267,18 +1312,19 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10000294> : "ʡ" U02A1 # LATIN LETTER GLOTTAL STOP WITH STROKE
-<Multi_key> <KP_Divide> <U10000294> : "ʡ" U02A1 # LATIN LETTER GLOTTAL STOP 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> <U10000266> : "ʱ" U02B1 # MODIFIER LETTER SMALL H WITH HOOK
-<Multi_key> <asciicircum> <underscore> <U10000266> : "ʱ" U02B1 # MODIFIER LETTER SMALL H WITH HOOK
-<dead_circumflex> <Multi_key> <underbar> <U10000266> : "ʱ" U02B1 # MODIFIER LETTER SMALL H WITH HOOK
-<Multi_key> <asciicircum> <underbar> <U10000266> : "ʱ" U02B1 # MODIFIER LETTER SMALL H WITH HOOK
+<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
@@ -1287,18 +1333,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10000279> : "ʴ" U02B4 # MODIFIER LETTER SMALL TURNED R
-<Multi_key> <asciicircum> <underscore> <U10000279> : "ʴ" U02B4 # MODIFIER LETTER SMALL TURNED R
-<dead_circumflex> <Multi_key> <underbar> <U10000279> : "ʴ" U02B4 # MODIFIER LETTER SMALL TURNED R
-<Multi_key> <asciicircum> <underbar> <U10000279> : "ʴ" U02B4 # MODIFIER LETTER SMALL TURNED R
-<dead_circumflex> <Multi_key> <underscore> <U1000027B> : "ʵ" U02B5 # MODIFIER LETTER SMALL TURNED R WITH HOOK
-<Multi_key> <asciicircum> <underscore> <U1000027B> : "ʵ" U02B5 # MODIFIER LETTER SMALL TURNED R WITH HOOK
-<dead_circumflex> <Multi_key> <underbar> <U1000027B> : "ʵ" U02B5 # MODIFIER LETTER SMALL TURNED R WITH HOOK
-<Multi_key> <asciicircum> <underbar> <U1000027B> : "ʵ" U02B5 # MODIFIER LETTER SMALL TURNED R WITH HOOK
-<dead_circumflex> <Multi_key> <underscore> <U10000281> : "ʶ" U02B6 # MODIFIER LETTER SMALL CAPITAL INVERTED R
-<Multi_key> <asciicircum> <underscore> <U10000281> : "ʶ" U02B6 # MODIFIER LETTER SMALL CAPITAL INVERTED R
-<dead_circumflex> <Multi_key> <underbar> <U10000281> : "ʶ" U02B6 # MODIFIER LETTER SMALL CAPITAL INVERTED R
-<Multi_key> <asciicircum> <underbar> <U10000281> : "ʶ" U02B6 # MODIFIER LETTER SMALL CAPITAL INVERTED 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
@@ -1307,10 +1353,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10000263> : "ˠ" U02E0 # MODIFIER LETTER SMALL GAMMA
-<Multi_key> <asciicircum> <underscore> <U10000263> : "ˠ" U02E0 # MODIFIER LETTER SMALL GAMMA
-<dead_circumflex> <Multi_key> <underbar> <U10000263> : "ˠ" U02E0 # MODIFIER LETTER SMALL GAMMA
-<Multi_key> <asciicircum> <underbar> <U10000263> : "ˠ" U02E0 # MODIFIER LETTER SMALL GAMMA
+<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
@@ -1323,10 +1369,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10000295> : "ˤ" U02E4 # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
-<Multi_key> <asciicircum> <underscore> <U10000295> : "ˤ" U02E4 # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
-<dead_circumflex> <Multi_key> <underbar> <U10000295> : "ˤ" U02E4 # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
-<Multi_key> <asciicircum> <underbar> <U10000295> : "ˤ" U02E4 # MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
+<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
@@ -1425,7 +1471,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <acute> <Greek_omega> : "ώ" U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
<Multi_key> <apostrophe> <Greek_omega> : "ώ" U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
<combining_acute> <Greek_omega> : "ώ" U03CE # GREEK SMALL LETTER OMEGA WITH TONOS
-<Multi_key> <quotedbl> <U100003D2> : "ϔ" U03D4 # GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL
+<Multi_key> <quotedbl> <U03D2> : "ϔ" U03D4 # GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL
<dead_grave> <Cyrillic_IE> : "Ѐ" U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
<Multi_key> <grave> <Cyrillic_IE> : "Ѐ" U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
<combining_grave> <Cyrillic_IE> : "Ѐ" U0400 # CYRILLIC CAPITAL LETTER IE WITH GRAVE
@@ -1474,8 +1520,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_breve> <Cyrillic_u> : "ў" U045E # CYRILLIC SMALL LETTER SHORT U
<Multi_key> <U> <Cyrillic_u> : "ў" U045E # CYRILLIC SMALL LETTER SHORT U
<Multi_key> <b> <Cyrillic_u> : "ў" U045E # CYRILLIC SMALL LETTER SHORT U
-<U1000030F> <U10000474> : "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<U1000030F> <U10000475> : "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<U030F> <U0474> : "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<U030F> <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
@@ -1484,10 +1530,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U100004AE> : "Ұ" U04B0 # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
-<Multi_key> <KP_Divide> <U100004AE> : "Ұ" U04B0 # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
-<Multi_key> <slash> <U100004AF> : "ұ" U04B1 # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
-<Multi_key> <KP_Divide> <U100004AF> : "ұ" U04B1 # CYRILLIC SMALL LETTER STRAIGHT U 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
@@ -1510,10 +1556,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U100004D8> : "Ӛ" U04DA # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
-<Multi_key> <quotedbl> <U100004D8> : "Ӛ" U04DA # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
-<dead_diaeresis> <U100004D9> : "ӛ" U04DB # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
-<Multi_key> <quotedbl> <U100004D9> : "ӛ" U04DB # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
+<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
@@ -1536,10 +1582,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U100004E8> : "Ӫ" U04EA # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
-<Multi_key> <quotedbl> <U100004E8> : "Ӫ" U04EA # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
-<dead_diaeresis> <U100004E9> : "ӫ" U04EB # CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
-<Multi_key> <quotedbl> <U100004E9> : "ӫ" U04EB # CYRILLIC SMALL LETTER BARRED 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
@@ -1566,80 +1612,80 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10000653> <Arabic_alef> : "آ" U0622 # ARABIC LETTER ALEF WITH MADDA ABOVE
-<Multi_key> <U10000654> <Arabic_alef> : "أ" U0623 # ARABIC LETTER ALEF WITH HAMZA ABOVE
-<Multi_key> <U10000654> <Arabic_waw> : "ؤ" U0624 # ARABIC LETTER WAW WITH HAMZA ABOVE
-<Multi_key> <U10000655> <Arabic_alef> : "إ" U0625 # ARABIC LETTER ALEF WITH HAMZA BELOW
-<Multi_key> <U10000654> <Arabic_yeh> : "ئ" U0626 # ARABIC LETTER YEH WITH HAMZA ABOVE
-<Multi_key> <U10000654> <U100006D5> : "ۀ" U06C0 # ARABIC LETTER HEH WITH YEH ABOVE
-<Multi_key> <U10000654> <U100006C1> : "ۂ" U06C2 # ARABIC LETTER HEH GOAL WITH HAMZA ABOVE
-<Multi_key> <U10000654> <U100006D2> : "ۓ" U06D3 # ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
-<Multi_key> <U1000093C> <U10000928> : "ऩ" U0929 # DEVANAGARI LETTER NNNA
-<Multi_key> <U1000093C> <U10000930> : "ऱ" U0931 # DEVANAGARI LETTER RRA
-<Multi_key> <U1000093C> <U10000933> : "ऴ" U0934 # DEVANAGARI LETTER LLLA
-<Multi_key> <U1000093C> <U10000915> : "क़" U0958 # DEVANAGARI LETTER QA
-<Multi_key> <U1000093C> <U10000916> : "ख़" U0959 # DEVANAGARI LETTER KHHA
-<Multi_key> <U1000093C> <U10000917> : "ग़" U095A # DEVANAGARI LETTER GHHA
-<Multi_key> <U1000093C> <U1000091C> : "ज़" U095B # DEVANAGARI LETTER ZA
-<Multi_key> <U1000093C> <U10000921> : "ड़" U095C # DEVANAGARI LETTER DDDHA
-<Multi_key> <U1000093C> <U10000922> : "ढ़" U095D # DEVANAGARI LETTER RHA
-<Multi_key> <U1000093C> <U1000092B> : "फ़" U095E # DEVANAGARI LETTER FA
-<Multi_key> <U1000093C> <U1000092F> : "य़" U095F # DEVANAGARI LETTER YYA
-<Multi_key> <U100009C7> <U100009BE> : "ো" U09CB # BENGALI VOWEL SIGN O
-<Multi_key> <U100009C7> <U100009D7> : "ৌ" U09CC # BENGALI VOWEL SIGN AU
-<Multi_key> <U100009BC> <U100009A1> : "ড়" U09DC # BENGALI LETTER RRA
-<Multi_key> <U100009BC> <U100009A2> : "ঢ়" U09DD # BENGALI LETTER RHA
-<Multi_key> <U100009BC> <U100009AF> : "য়" U09DF # BENGALI LETTER YYA
-<Multi_key> <U10000A3C> <U10000A32> : "ਲ਼" U0A33 # GURMUKHI LETTER LLA
-<Multi_key> <U10000A3C> <U10000A38> : "ਸ਼" U0A36 # GURMUKHI LETTER SHA
-<Multi_key> <U10000A3C> <U10000A16> : "ਖ਼" U0A59 # GURMUKHI LETTER KHHA
-<Multi_key> <U10000A3C> <U10000A17> : "ਗ਼" U0A5A # GURMUKHI LETTER GHHA
-<Multi_key> <U10000A3C> <U10000A1C> : "ਜ਼" U0A5B # GURMUKHI LETTER ZA
-<Multi_key> <U10000A3C> <U10000A2B> : "ਫ਼" U0A5E # GURMUKHI LETTER FA
-<Multi_key> <U10000B47> <U10000B56> : "ୈ" U0B48 # ORIYA VOWEL SIGN AI
-<Multi_key> <U10000B47> <U10000B3E> : "ୋ" U0B4B # ORIYA VOWEL SIGN O
-<Multi_key> <U10000B47> <U10000B57> : "ୌ" U0B4C # ORIYA VOWEL SIGN AU
-<Multi_key> <U10000B3C> <U10000B21> : "ଡ଼" U0B5C # ORIYA LETTER RRA
-<Multi_key> <U10000B3C> <U10000B22> : "ଢ଼" U0B5D # ORIYA LETTER RHA
-<Multi_key> <U10000BD7> <U10000B92> : "ஔ" U0B94 # TAMIL LETTER AU
-<Multi_key> <U10000BC6> <U10000BBE> : "ொ" U0BCA # TAMIL VOWEL SIGN O
-<Multi_key> <U10000BC7> <U10000BBE> : "ோ" U0BCB # TAMIL VOWEL SIGN OO
-<Multi_key> <U10000BC6> <U10000BD7> : "ௌ" U0BCC # TAMIL VOWEL SIGN AU
-<Multi_key> <U10000C46> <U10000C56> : "ై" U0C48 # TELUGU VOWEL SIGN AI
-<Multi_key> <U10000CBF> <U10000CD5> : "ೀ" U0CC0 # KANNADA VOWEL SIGN II
-<Multi_key> <U10000CC6> <U10000CD5> : "ೇ" U0CC7 # KANNADA VOWEL SIGN EE
-<Multi_key> <U10000CC6> <U10000CD6> : "ೈ" U0CC8 # KANNADA VOWEL SIGN AI
-<Multi_key> <U10000CC6> <U10000CC2> : "ೊ" U0CCA # KANNADA VOWEL SIGN O
-<Multi_key> <U10000CCA> <U10000CD5> : "ೋ" U0CCB # KANNADA VOWEL SIGN OO
-##<Multi_key> <U10000CC6> <U10000CC2> <U10000CD5> : "ೋ" U0CCB # KANNADA VOWEL SIGN OO
-<Multi_key> <U10000D46> <U10000D3E> : "ൊ" U0D4A # MALAYALAM VOWEL SIGN O
-<Multi_key> <U10000D47> <U10000D3E> : "ോ" U0D4B # MALAYALAM VOWEL SIGN OO
-<Multi_key> <U10000D46> <U10000D57> : "ൌ" U0D4C # MALAYALAM VOWEL SIGN AU
-<Multi_key> <U10000DD9> <U10000DCA> : "ේ" U0DDA # SINHALA VOWEL SIGN DIGA KOMBUVA
-<Multi_key> <U10000DD9> <U10000DCF> : "ො" U0DDC # SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA
-<Multi_key> <U10000DDC> <U10000DCA> : "ෝ" U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA
-##<Multi_key> <U10000DD9> <U10000DCF> <U10000DCA> : "ෝ" U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA
-<Multi_key> <U10000DD9> <U10000DDF> : "ෞ" U0DDE # SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA
-<Multi_key> <U10000FB7> <U10000F42> : "གྷ" U0F43 # TIBETAN LETTER GHA
-<Multi_key> <U10000FB7> <U10000F4C> : "ཌྷ" U0F4D # TIBETAN LETTER DDHA
-<Multi_key> <U10000FB7> <U10000F51> : "དྷ" U0F52 # TIBETAN LETTER DHA
-<Multi_key> <U10000FB7> <U10000F56> : "བྷ" U0F57 # TIBETAN LETTER BHA
-<Multi_key> <U10000FB7> <U10000F5B> : "ཛྷ" U0F5C # TIBETAN LETTER DZHA
-<Multi_key> <U10000FB5> <U10000F40> : "ཀྵ" U0F69 # TIBETAN LETTER KSSA
-<Multi_key> <U10000F71> <U10000F72> : "ཱི" U0F73 # TIBETAN VOWEL SIGN II
-<Multi_key> <U10000F71> <U10000F74> : "ཱུ" U0F75 # TIBETAN VOWEL SIGN UU
-<Multi_key> <U10000FB2> <U10000F80> : "ྲྀ" U0F76 # TIBETAN VOWEL SIGN VOCALIC R
-<Multi_key> <U10000FB3> <U10000F80> : "ླྀ" U0F78 # TIBETAN VOWEL SIGN VOCALIC L
-<Multi_key> <U10000F71> <U10000F80> : "ཱྀ" U0F81 # TIBETAN VOWEL SIGN REVERSED II
-<Multi_key> <U10000F92> <U10000FB7> : "ྒྷ" U0F93 # TIBETAN SUBJOINED LETTER GHA
-<Multi_key> <U10000F9C> <U10000FB7> : "ྜྷ" U0F9D # TIBETAN SUBJOINED LETTER DDHA
-<Multi_key> <U10000FA1> <U10000FB7> : "ྡྷ" U0FA2 # TIBETAN SUBJOINED LETTER DHA
-<Multi_key> <U10000FA6> <U10000FB7> : "ྦྷ" U0FA7 # TIBETAN SUBJOINED LETTER BHA
-<Multi_key> <U10000FAB> <U10000FB7> : "ྫྷ" U0FAC # TIBETAN SUBJOINED LETTER DZHA
-<Multi_key> <U10000F90> <U10000FB5> : "ྐྵ" U0FB9 # TIBETAN SUBJOINED LETTER KSSA
-<Multi_key> <U1000102E> <U10001025> : "ဦ" U1026 # MYANMAR LETTER UU
-<U10000325> <A> : "Ḁ" U1E00 # LATIN CAPITAL LETTER A WITH RING BELOW
-<U10000325> <a> : "ḁ" U1E01 # LATIN SMALL LETTER A WITH RING BELOW
+<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
+<U0325> <A> : "Ḁ" U1E00 # LATIN CAPITAL LETTER A WITH RING BELOW
+<U0325> <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
@@ -1650,8 +1696,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_belowdot> <b> : "ḅ" U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
<Multi_key> <exclam> <b> : "ḅ" U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
<combining_belowdot> <b> : "ḅ" U1E05 # LATIN SMALL LETTER B WITH DOT BELOW
-<U10000331> <B> : "Ḇ" U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW
-<U10000331> <b> : "ḇ" U1E07 # LATIN SMALL LETTER B WITH LINE BELOW
+<U0331> <B> : "Ḇ" U1E06 # LATIN CAPITAL LETTER B WITH LINE BELOW
+<U0331> <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
@@ -1684,14 +1730,14 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_belowdot> <d> : "ḍ" U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
<Multi_key> <exclam> <d> : "ḍ" U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
<combining_belowdot> <d> : "ḍ" U1E0D # LATIN SMALL LETTER D WITH DOT BELOW
-<U10000331> <D> : "Ḏ" U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW
-<U10000331> <d> : "ḏ" U1E0F # LATIN SMALL LETTER D WITH LINE BELOW
+<U0331> <D> : "Ḏ" U1E0E # LATIN CAPITAL LETTER D WITH LINE BELOW
+<U0331> <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
<dead_cedilla> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
<Multi_key> <comma> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
-<U1000032D> <D> : "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-<U1000032D> <d> : "ḓ" U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
+<U032D> <D> : "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+<U032D> <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
@@ -1748,22 +1794,22 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <dead_macron> <e> : "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
<combining_acute> <Multi_key> <macron> <e> : "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
<combining_acute> <Multi_key> <underscore> <e> : "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<U1000032D> <E> : "Ḙ" U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-<U1000032D> <e> : "ḙ" U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
-<U10000330> <E> : "Ḛ" U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
-<U10000330> <e> : "ḛ" U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW
-<dead_breve> <U10000228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <U> <U10000228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <b> <U10000228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+<U032D> <E> : "Ḙ" U1E18 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+<U032D> <e> : "ḙ" U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
+<U0330> <E> : "Ḛ" U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
+<U0330> <e> : "ḛ" U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW
+<dead_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
<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> <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
-<dead_breve> <U10000229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <U> <U10000229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <b> <U10000229> : "ḝ" U1E1D # LATIN SMALL 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
<Multi_key> <U> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
@@ -1798,10 +1844,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <comma> <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
-<U1000032E> <H> : "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
-<U1000032E> <h> : "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
-<U10000330> <I> : "Ḭ" U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
-<U10000330> <i> : "ḭ" U1E2D # LATIN SMALL LETTER I WITH TILDE BELOW
+<U032E> <H> : "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
+<U032E> <h> : "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
+<U0330> <I> : "Ḭ" U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
+<U0330> <i> : "ḭ" U1E2D # LATIN SMALL LETTER I WITH TILDE BELOW
<dead_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
@@ -1840,17 +1886,17 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_belowdot> <k> : "ḳ" U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
<Multi_key> <exclam> <k> : "ḳ" U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
<combining_belowdot> <k> : "ḳ" U1E33 # LATIN SMALL LETTER K WITH DOT BELOW
-<U10000331> <K> : "Ḵ" U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
-<U10000331> <k> : "ḵ" U1E35 # LATIN SMALL LETTER K WITH LINE BELOW
+<U0331> <K> : "Ḵ" U1E34 # LATIN CAPITAL LETTER K WITH LINE BELOW
+<U0331> <k> : "ḵ" U1E35 # LATIN SMALL LETTER K WITH LINE BELOW
<dead_belowdot> <L> : "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
<Multi_key> <exclam> <L> : "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
<combining_belowdot> <L> : "Ḷ" U1E36 # LATIN CAPITAL LETTER L WITH DOT BELOW
<dead_belowdot> <l> : "ḷ" U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
<Multi_key> <exclam> <l> : "ḷ" U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
<combining_belowdot> <l> : "ḷ" U1E37 # LATIN SMALL LETTER L WITH DOT BELOW
-<dead_macron> <U10001E36> : "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <U10001E36> : "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <U10001E36> : "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
+<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
@@ -1860,9 +1906,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_macron> <combining_belowdot> <L> : "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
<Multi_key> <macron> <combining_belowdot> <L> : "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
<Multi_key> <underscore> <combining_belowdot> <L> : "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<dead_macron> <U10001E37> : "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <U10001E37> : "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <U10001E37> : "ḹ" U1E39 # LATIN SMALL 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
@@ -1872,10 +1918,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_macron> <combining_belowdot> <l> : "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
<Multi_key> <macron> <combining_belowdot> <l> : "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
<Multi_key> <underscore> <combining_belowdot> <l> : "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<U10000331> <L> : "Ḻ" U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW
-<U10000331> <l> : "ḻ" U1E3B # LATIN SMALL LETTER L WITH LINE BELOW
-<U1000032D> <L> : "Ḽ" U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-<U1000032D> <l> : "ḽ" U1E3D # LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
+<U0331> <L> : "Ḻ" U1E3A # LATIN CAPITAL LETTER L WITH LINE BELOW
+<U0331> <l> : "ḻ" U1E3B # LATIN SMALL LETTER L WITH LINE BELOW
+<U032D> <L> : "Ḽ" U1E3C # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+<U032D> <l> : "ḽ" U1E3D # LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
<dead_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
@@ -1904,10 +1950,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_belowdot> <n> : "ṇ" U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
<Multi_key> <exclam> <n> : "ṇ" U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
<combining_belowdot> <n> : "ṇ" U1E47 # LATIN SMALL LETTER N WITH DOT BELOW
-<U10000331> <N> : "Ṉ" U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW
-<U10000331> <n> : "ṉ" U1E49 # LATIN SMALL LETTER N WITH LINE BELOW
-<U1000032D> <N> : "Ṋ" U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-<U1000032D> <n> : "ṋ" U1E4B # LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
+<U0331> <N> : "Ṉ" U1E48 # LATIN CAPITAL LETTER N WITH LINE BELOW
+<U0331> <n> : "ṉ" U1E49 # LATIN SMALL LETTER N WITH LINE BELOW
+<U032D> <N> : "Ṋ" U1E4A # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+<U032D> <n> : "ṋ" U1E4B # LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
<dead_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
@@ -2034,9 +2080,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_belowdot> <r> : "ṛ" U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
<Multi_key> <exclam> <r> : "ṛ" U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
<combining_belowdot> <r> : "ṛ" U1E5B # LATIN SMALL LETTER R WITH DOT BELOW
-<dead_macron> <U10001E5A> : "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <U10001E5A> : "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <U10001E5A> : "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
+<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
@@ -2046,9 +2092,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_macron> <combining_belowdot> <R> : "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
<Multi_key> <macron> <combining_belowdot> <R> : "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
<Multi_key> <underscore> <combining_belowdot> <R> : "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<dead_macron> <U10001E5B> : "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <macron> <U10001E5B> : "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<Multi_key> <underscore> <U10001E5B> : "ṝ" U1E5D # LATIN SMALL 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
@@ -2058,8 +2104,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_macron> <combining_belowdot> <r> : "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
<Multi_key> <macron> <combining_belowdot> <r> : "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
<Multi_key> <underscore> <combining_belowdot> <r> : "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<U10000331> <R> : "Ṟ" U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW
-<U10000331> <r> : "ṟ" U1E5F # LATIN SMALL LETTER R WITH LINE BELOW
+<U0331> <R> : "Ṟ" U1E5E # LATIN CAPITAL LETTER R WITH LINE BELOW
+<U0331> <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
@@ -2100,16 +2146,16 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10001E62> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<Multi_key> <period> <U10001E62> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW 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> <combining_belowdot> <S> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
<Multi_key> <period> <combining_belowdot> <S> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_abovedot> <U10001E63> : "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-<Multi_key> <period> <U10001E63> : "ṩ" U1E69 # LATIN SMALL 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
@@ -2126,16 +2172,16 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_belowdot> <t> : "ṭ" U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
<Multi_key> <exclam> <t> : "ṭ" U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
<combining_belowdot> <t> : "ṭ" U1E6D # LATIN SMALL LETTER T WITH DOT BELOW
-<U10000331> <T> : "Ṯ" U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW
-<U10000331> <t> : "ṯ" U1E6F # LATIN SMALL LETTER T WITH LINE BELOW
-<U1000032D> <T> : "Ṱ" U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-<U1000032D> <t> : "ṱ" U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
-<U10000324> <U> : "Ṳ" U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-<U10000324> <u> : "ṳ" U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW
-<U10000330> <U> : "Ṵ" U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW
-<U10000330> <u> : "ṵ" U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
-<U1000032D> <U> : "Ṷ" U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-<U1000032D> <u> : "ṷ" U1E77 # LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
+<U0331> <T> : "Ṯ" U1E6E # LATIN CAPITAL LETTER T WITH LINE BELOW
+<U0331> <t> : "ṯ" U1E6F # LATIN SMALL LETTER T WITH LINE BELOW
+<U032D> <T> : "Ṱ" U1E70 # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+<U032D> <t> : "ṱ" U1E71 # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
+<U0324> <U> : "Ṳ" U1E72 # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+<U0324> <u> : "ṳ" U1E73 # LATIN SMALL LETTER U WITH DIAERESIS BELOW
+<U0330> <U> : "Ṵ" U1E74 # LATIN CAPITAL LETTER U WITH TILDE BELOW
+<U0330> <u> : "ṵ" U1E75 # LATIN SMALL LETTER U WITH TILDE BELOW
+<U032D> <U> : "Ṷ" U1E76 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+<U032D> <u> : "ṷ" U1E77 # LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
<dead_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
@@ -2246,17 +2292,17 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_belowdot> <z> : "ẓ" U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
<Multi_key> <exclam> <z> : "ẓ" U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
<combining_belowdot> <z> : "ẓ" U1E93 # LATIN SMALL LETTER Z WITH DOT BELOW
-<U10000331> <Z> : "Ẕ" U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW
-<U10000331> <z> : "ẕ" U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW
-<U10000331> <h> : "ẖ" U1E96 # LATIN SMALL LETTER H WITH LINE BELOW
+<U0331> <Z> : "Ẕ" U1E94 # LATIN CAPITAL LETTER Z WITH LINE BELOW
+<U0331> <z> : "ẕ" U1E95 # LATIN SMALL LETTER Z WITH LINE BELOW
+<U0331> <h> : "ẖ" U1E96 # LATIN SMALL LETTER H WITH LINE BELOW
<dead_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> <U1000017F> : "ẛ" U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE
-<Multi_key> <period> <U1000017F> : "ẛ" U1E9B # LATIN SMALL LETTER LONG S WITH DOT 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
<combining_belowdot> <A> : "Ạ" U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW
@@ -2347,8 +2393,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_tilde> <acircumflex> : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
<combining_tilde> <dead_circumflex> <a> : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
<combining_tilde> <Multi_key> <asciicircum> <a> : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <U10001EA0> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U10001EA0> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+<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
@@ -2356,8 +2402,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_circumflex> <combining_belowdot> <A> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<Multi_key> <asciicircum> <combining_belowdot> <A> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<dead_belowdot> <Acircumflex> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <U10001EA1> : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U10001EA1> : "ậ" U1EAD # LATIN SMALL 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
@@ -2459,9 +2505,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_tilde> <dead_breve> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<combining_tilde> <Multi_key> <U> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<combining_tilde> <Multi_key> <b> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<dead_breve> <U10001EA0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <U10001EA0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <U10001EA0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+<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
@@ -2472,9 +2518,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <U> <combining_belowdot> <A> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
<Multi_key> <b> <combining_belowdot> <A> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
<dead_belowdot> <Abreve> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<dead_breve> <U10001EA1> : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <U10001EA1> : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <U10001EA1> : "ặ" U1EB7 # LATIN SMALL 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
@@ -2581,8 +2627,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_tilde> <ecircumflex> : "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
<combining_tilde> <dead_circumflex> <e> : "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
<combining_tilde> <Multi_key> <asciicircum> <e> : "ễ" U1EC5 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <U10001EB8> : "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U10001EB8> : "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+<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
@@ -2590,8 +2636,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_circumflex> <combining_belowdot> <E> : "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
<Multi_key> <asciicircum> <combining_belowdot> <E> : "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
<dead_belowdot> <Ecircumflex> : "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <U10001EB9> : "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U10001EB9> : "ệ" U1EC7 # LATIN SMALL 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
@@ -2701,8 +2747,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_tilde> <ocircumflex> : "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
<combining_tilde> <dead_circumflex> <o> : "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
<combining_tilde> <Multi_key> <asciicircum> <o> : "ỗ" U1ED7 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <U10001ECC> : "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U10001ECC> : "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+<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
@@ -2710,8 +2756,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_circumflex> <combining_belowdot> <O> : "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
<Multi_key> <asciicircum> <combining_belowdot> <O> : "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
<dead_belowdot> <Ocircumflex> : "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <U10001ECD> : "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U10001ECD> : "ộ" U1ED9 # LATIN SMALL 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
@@ -2720,7 +2766,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <asciicircum> <combining_belowdot> <o> : "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
<dead_belowdot> <ocircumflex> : "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
<dead_acute> <Ohorn> : "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<dead_acute> <U100001A0> : "Ớ" 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
@@ -2733,7 +2779,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <dead_horn> <O> : "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
<combining_acute> <Multi_key> <plus> <O> : "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
<dead_acute> <ohorn> : "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<dead_acute> <U100001A1> : "ớ" 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
@@ -2746,7 +2792,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <dead_horn> <o> : "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
<combining_acute> <Multi_key> <plus> <o> : "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
<dead_grave> <Ohorn> : "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<dead_grave> <U100001A0> : "Ờ" 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
@@ -2756,7 +2802,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_grave> <dead_horn> <O> : "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
<combining_grave> <Multi_key> <plus> <O> : "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
<dead_grave> <ohorn> : "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<dead_grave> <U100001A1> : "ờ" 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
@@ -2766,7 +2812,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_grave> <dead_horn> <o> : "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
<combining_grave> <Multi_key> <plus> <o> : "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
<dead_hook> <Ohorn> : "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<dead_hook> <U100001A0> : "Ở" 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
@@ -2776,7 +2822,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_hook> <dead_horn> <O> : "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
<combining_hook> <Multi_key> <plus> <O> : "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
<dead_hook> <ohorn> : "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<dead_hook> <U100001A1> : "ở" 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
@@ -2786,7 +2832,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_hook> <dead_horn> <o> : "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
<combining_hook> <Multi_key> <plus> <o> : "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
<dead_tilde> <Ohorn> : "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<dead_tilde> <U100001A0> : "Ỡ" 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
@@ -2796,7 +2842,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_tilde> <dead_horn> <O> : "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
<combining_tilde> <Multi_key> <plus> <O> : "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
<dead_tilde> <ohorn> : "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
-<dead_tilde> <U100001A1> : "ỡ" 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
@@ -2806,7 +2852,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_tilde> <dead_horn> <o> : "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
<combining_tilde> <Multi_key> <plus> <o> : "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
<dead_belowdot> <Ohorn> : "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-<dead_belowdot> <U100001A0> : "Ợ" 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
@@ -2816,7 +2862,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_belowdot> <dead_horn> <O> : "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
<combining_belowdot> <Multi_key> <plus> <O> : "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
<dead_belowdot> <ohorn> : "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-<dead_belowdot> <U100001A1> : "ợ" 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
@@ -2838,7 +2884,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <question> <u> : "ủ" U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
<combining_hook> <u> : "ủ" U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
<dead_acute> <Uhorn> : "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<dead_acute> <U100001AF> : "Ứ" 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
@@ -2851,7 +2897,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <dead_horn> <U> : "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
<combining_acute> <Multi_key> <plus> <U> : "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
<dead_acute> <uhorn> : "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<dead_acute> <U100001B0> : "ứ" 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
@@ -2864,7 +2910,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <dead_horn> <u> : "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
<combining_acute> <Multi_key> <plus> <u> : "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
<dead_grave> <Uhorn> : "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<dead_grave> <U100001AF> : "Ừ" 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
@@ -2874,7 +2920,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_grave> <dead_horn> <U> : "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
<combining_grave> <Multi_key> <plus> <U> : "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
<dead_grave> <uhorn> : "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<dead_grave> <U100001B0> : "ừ" 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
@@ -2884,7 +2930,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_grave> <dead_horn> <u> : "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
<combining_grave> <Multi_key> <plus> <u> : "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
<dead_hook> <Uhorn> : "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<dead_hook> <U100001AF> : "Ử" 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
@@ -2894,7 +2940,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_hook> <dead_horn> <U> : "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
<combining_hook> <Multi_key> <plus> <U> : "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
<dead_hook> <uhorn> : "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<dead_hook> <U100001B0> : "ử" 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
@@ -2904,7 +2950,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_hook> <dead_horn> <u> : "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
<combining_hook> <Multi_key> <plus> <u> : "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
<dead_tilde> <Uhorn> : "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<dead_tilde> <U100001AF> : "Ữ" 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
@@ -2914,7 +2960,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_tilde> <dead_horn> <U> : "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
<combining_tilde> <Multi_key> <plus> <U> : "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
<dead_tilde> <uhorn> : "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
-<dead_tilde> <U100001B0> : "ữ" 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
@@ -2924,7 +2970,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_tilde> <dead_horn> <u> : "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
<combining_tilde> <Multi_key> <plus> <u> : "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
<dead_belowdot> <Uhorn> : "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-<dead_belowdot> <U100001AF> : "Ự" 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
@@ -2934,7 +2980,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_belowdot> <dead_horn> <U> : "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
<combining_belowdot> <Multi_key> <plus> <U> : "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
<dead_belowdot> <uhorn> : "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<dead_belowdot> <U100001B0> : "ự" 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
@@ -2967,797 +3013,1070 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_tilde> <y> : "ỹ" U1EF9 # LATIN SMALL LETTER Y WITH TILDE
<Multi_key> <asciitilde> <y> : "ỹ" U1EF9 # LATIN SMALL LETTER Y WITH TILDE
<combining_tilde> <y> : "ỹ" U1EF9 # LATIN SMALL LETTER Y WITH TILDE
-<U10000313> <Greek_alpha> : "ἀ" U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
+<U0313> <Greek_alpha> : "ἀ" U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
+<dead_psili> <Greek_alpha> : "ἀ" U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
<Multi_key> <parenright> <Greek_alpha> : "ἀ" U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI
-<U10000314> <Greek_alpha> : "ἁ" U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
+<U0314> <Greek_alpha> : "ἁ" U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
+<dead_dasia> <Greek_alpha> : "ἁ" U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
<Multi_key> <parenleft> <Greek_alpha> : "ἁ" U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA
-<dead_grave> <U10001F00> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F00> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<dead_grave> <U1F00> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F00> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <U10001F00> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<combining_grave> <U1F00> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_alpha> : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-<dead_grave> <U10001F01> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F01> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<dead_grave> <U1F01> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F01> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <U10001F01> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<combining_grave> <U1F01> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_alpha> : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-<dead_acute> <U10001F00> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F00> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F00> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<dead_acute> <U1F00> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F00> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F00> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <U10001F00> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<combining_acute> <U1F00> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_alpha> : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-<dead_acute> <U10001F01> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F01> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F01> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<dead_acute> <U1F01> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F01> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F01> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <U10001F01> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<combining_acute> <U1F01> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_alpha> : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-<U10000342> <U10001F00> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F00> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F00> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<U0342> <U1F00> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F00> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F00> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_alpha> : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F01> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F01> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F01> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<U0342> <U1F01> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F01> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F01> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_alpha> : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U10000313> <Greek_ALPHA> : "Ἀ" U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
+<U0313> <Greek_ALPHA> : "Ἀ" U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
+<dead_psili> <Greek_ALPHA> : "Ἀ" U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
<Multi_key> <parenright> <Greek_ALPHA> : "Ἀ" U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI
-<U10000314> <Greek_ALPHA> : "Ἁ" U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
+<U0314> <Greek_ALPHA> : "Ἁ" U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
+<dead_dasia> <Greek_ALPHA> : "Ἁ" U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
<Multi_key> <parenleft> <Greek_ALPHA> : "Ἁ" U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA
-<dead_grave> <U10001F08> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F08> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<dead_grave> <U1F08> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F08> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <U10001F08> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<combining_grave> <U1F08> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_ALPHA> : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-<dead_grave> <U10001F09> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F09> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<dead_grave> <U1F09> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F09> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <U10001F09> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<combining_grave> <U1F09> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_ALPHA> : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-<dead_acute> <U10001F08> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F08> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F08> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<dead_acute> <U1F08> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F08> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F08> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <U10001F08> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<combining_acute> <U1F08> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_ALPHA> : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-<dead_acute> <U10001F09> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F09> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F09> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<dead_acute> <U1F09> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F09> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F09> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <U10001F09> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<combining_acute> <U1F09> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_ALPHA> : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-<U10000342> <U10001F08> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F08> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F08> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<U0342> <U1F08> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F08> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F08> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_ALPHA> : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F09> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F09> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F09> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<U0342> <U1F09> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F09> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F09> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_ALPHA> : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-<U10000313> <Greek_epsilon> : "ἐ" U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
+<U0313> <Greek_epsilon> : "ἐ" U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
+<dead_psili> <Greek_epsilon> : "ἐ" U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
<Multi_key> <parenright> <Greek_epsilon> : "ἐ" U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI
-<U10000314> <Greek_epsilon> : "ἑ" U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
+<U0314> <Greek_epsilon> : "ἑ" U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
+<dead_dasia> <Greek_epsilon> : "ἑ" U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
<Multi_key> <parenleft> <Greek_epsilon> : "ἑ" U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA
-<dead_grave> <U10001F10> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F10> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<dead_grave> <U1F10> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F10> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <U10001F10> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<combining_grave> <U1F10> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_epsilon> : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-<dead_grave> <U10001F11> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F11> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<dead_grave> <U1F11> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F11> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <U10001F11> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<combining_grave> <U1F11> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_epsilon> : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-<dead_acute> <U10001F10> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F10> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F10> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<dead_acute> <U1F10> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F10> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F10> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <U10001F10> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<combining_acute> <U1F10> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_epsilon> : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-<dead_acute> <U10001F11> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F11> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F11> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<dead_acute> <U1F11> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F11> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F11> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U10001F11> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<combining_acute> <U1F11> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_epsilon> : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-<U10000313> <Greek_EPSILON> : "Ἐ" U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
+<U0313> <Greek_EPSILON> : "Ἐ" U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
+<dead_psili> <Greek_EPSILON> : "Ἐ" U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
<Multi_key> <parenright> <Greek_EPSILON> : "Ἐ" U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI
-<U10000314> <Greek_EPSILON> : "Ἑ" U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
+<U0314> <Greek_EPSILON> : "Ἑ" U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
+<dead_dasia> <Greek_EPSILON> : "Ἑ" U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
<Multi_key> <parenleft> <Greek_EPSILON> : "Ἑ" U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA
-<dead_grave> <U10001F18> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F18> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<dead_grave> <U1F18> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F18> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <U10001F18> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<combining_grave> <U1F18> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_EPSILON> : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-<dead_grave> <U10001F19> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F19> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<dead_grave> <U1F19> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F19> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <U10001F19> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<combining_grave> <U1F19> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_EPSILON> : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-<dead_acute> <U10001F18> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F18> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F18> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<dead_acute> <U1F18> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F18> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F18> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <U10001F18> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<combining_acute> <U1F18> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_EPSILON> : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-<dead_acute> <U10001F19> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F19> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F19> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<dead_acute> <U1F19> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F19> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F19> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U10001F19> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<combining_acute> <U1F19> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_EPSILON> : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-<U10000313> <Greek_eta> : "ἠ" U1F20 # GREEK SMALL LETTER ETA WITH PSILI
+<U0313> <Greek_eta> : "ἠ" U1F20 # GREEK SMALL LETTER ETA WITH PSILI
+<dead_psili> <Greek_eta> : "ἠ" U1F20 # GREEK SMALL LETTER ETA WITH PSILI
<Multi_key> <parenright> <Greek_eta> : "ἠ" U1F20 # GREEK SMALL LETTER ETA WITH PSILI
-<U10000314> <Greek_eta> : "ἡ" U1F21 # GREEK SMALL LETTER ETA WITH DASIA
+<U0314> <Greek_eta> : "ἡ" U1F21 # GREEK SMALL LETTER ETA WITH DASIA
+<dead_dasia> <Greek_eta> : "ἡ" U1F21 # GREEK SMALL LETTER ETA WITH DASIA
<Multi_key> <parenleft> <Greek_eta> : "ἡ" U1F21 # GREEK SMALL LETTER ETA WITH DASIA
-<dead_grave> <U10001F20> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F20> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<dead_grave> <U1F20> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F20> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <U10001F20> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<combining_grave> <U1F20> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_eta> : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-<dead_grave> <U10001F21> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F21> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<dead_grave> <U1F21> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F21> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <U10001F21> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<combining_grave> <U1F21> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_eta> : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-<dead_acute> <U10001F20> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F20> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F20> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<dead_acute> <U1F20> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F20> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F20> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <U10001F20> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<combining_acute> <U1F20> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_eta> : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-<dead_acute> <U10001F21> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F21> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F21> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<dead_acute> <U1F21> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F21> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F21> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <U10001F21> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<combining_acute> <U1F21> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_eta> : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-<U10000342> <U10001F20> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F20> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F20> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<U0342> <U1F20> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F20> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F20> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_eta> : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F21> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F21> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F21> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<U0342> <U1F21> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F21> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F21> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_eta> : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-<U10000313> <Greek_ETA> : "Ἠ" U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
+<U0313> <Greek_ETA> : "Ἠ" U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
+<dead_psili> <Greek_ETA> : "Ἠ" U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
<Multi_key> <parenright> <Greek_ETA> : "Ἠ" U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI
-<U10000314> <Greek_ETA> : "Ἡ" U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
+<U0314> <Greek_ETA> : "Ἡ" U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
+<dead_dasia> <Greek_ETA> : "Ἡ" U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
<Multi_key> <parenleft> <Greek_ETA> : "Ἡ" U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA
-<dead_grave> <U10001F28> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F28> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<dead_grave> <U1F28> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F28> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <U10001F28> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<combining_grave> <U1F28> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_ETA> : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-<dead_grave> <U10001F29> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F29> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<dead_grave> <U1F29> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F29> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <U10001F29> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<combining_grave> <U1F29> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_ETA> : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-<dead_acute> <U10001F28> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F28> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F28> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<dead_acute> <U1F28> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F28> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F28> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <U10001F28> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<combining_acute> <U1F28> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_ETA> : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-<dead_acute> <U10001F29> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F29> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F29> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<dead_acute> <U1F29> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F29> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F29> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <U10001F29> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<combining_acute> <U1F29> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_ETA> : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-<U10000342> <U10001F28> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F28> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F28> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<U0342> <U1F28> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F28> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F28> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_ETA> : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F29> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F29> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F29> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<U0342> <U1F29> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F29> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F29> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_ETA> : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-<U10000313> <Greek_iota> : "ἰ" U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
+<U0313> <Greek_iota> : "ἰ" U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
+<dead_psili> <Greek_iota> : "ἰ" U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
<Multi_key> <parenright> <Greek_iota> : "ἰ" U1F30 # GREEK SMALL LETTER IOTA WITH PSILI
-<U10000314> <Greek_iota> : "ἱ" U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
+<U0314> <Greek_iota> : "ἱ" U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
+<dead_dasia> <Greek_iota> : "ἱ" U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
<Multi_key> <parenleft> <Greek_iota> : "ἱ" U1F31 # GREEK SMALL LETTER IOTA WITH DASIA
-<dead_grave> <U10001F30> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F30> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<dead_grave> <U1F30> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F30> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <U10001F30> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<combining_grave> <U1F30> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_iota> : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-<dead_grave> <U10001F31> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F31> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<dead_grave> <U1F31> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F31> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <U10001F31> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<combining_grave> <U1F31> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_iota> : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-<dead_acute> <U10001F30> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F30> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F30> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<dead_acute> <U1F30> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F30> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F30> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <U10001F30> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<combining_acute> <U1F30> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_iota> : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-<dead_acute> <U10001F31> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F31> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F31> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<dead_acute> <U1F31> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F31> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F31> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <U10001F31> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<combining_acute> <U1F31> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_iota> : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-<U10000342> <U10001F30> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F30> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F30> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<U0342> <U1F30> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F30> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F30> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_iota> : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F31> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F31> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F31> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<U0342> <U1F31> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F31> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F31> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_iota> : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U10000313> <Greek_IOTA> : "Ἰ" U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
+<U0313> <Greek_IOTA> : "Ἰ" U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
+<dead_psili> <Greek_IOTA> : "Ἰ" U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
<Multi_key> <parenright> <Greek_IOTA> : "Ἰ" U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI
-<U10000314> <Greek_IOTA> : "Ἱ" U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
+<U0314> <Greek_IOTA> : "Ἱ" U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
+<dead_dasia> <Greek_IOTA> : "Ἱ" U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
<Multi_key> <parenleft> <Greek_IOTA> : "Ἱ" U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA
-<dead_grave> <U10001F38> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F38> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<dead_grave> <U1F38> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F38> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <U10001F38> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<combining_grave> <U1F38> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_IOTA> : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-<dead_grave> <U10001F39> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F39> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<dead_grave> <U1F39> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F39> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <U10001F39> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<combining_grave> <U1F39> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_IOTA> : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-<dead_acute> <U10001F38> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F38> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F38> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<dead_acute> <U1F38> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F38> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F38> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <U10001F38> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<combining_acute> <U1F38> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_IOTA> : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-<dead_acute> <U10001F39> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F39> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F39> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<dead_acute> <U1F39> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F39> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F39> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <U10001F39> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<combining_acute> <U1F39> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_IOTA> : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-<U10000342> <U10001F38> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F38> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F38> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<U0342> <U1F38> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F38> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F38> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_IOTA> : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F39> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F39> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F39> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<U0342> <U1F39> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F39> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F39> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_IOTA> : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-<U10000313> <Greek_omicron> : "ὀ" U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
+<U0313> <Greek_omicron> : "ὀ" U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
+<dead_psili> <Greek_omicron> : "ὀ" U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
<Multi_key> <parenright> <Greek_omicron> : "ὀ" U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI
-<U10000314> <Greek_omicron> : "ὁ" U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
+<U0314> <Greek_omicron> : "ὁ" U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
+<dead_dasia> <Greek_omicron> : "ὁ" U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
<Multi_key> <parenleft> <Greek_omicron> : "ὁ" U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA
-<dead_grave> <U10001F40> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F40> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<dead_grave> <U1F40> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F40> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <U10001F40> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<combining_grave> <U1F40> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_omicron> : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-<dead_grave> <U10001F41> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F41> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<dead_grave> <U1F41> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F41> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <U10001F41> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<combining_grave> <U1F41> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_omicron> : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-<dead_acute> <U10001F40> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F40> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F40> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<dead_acute> <U1F40> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F40> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F40> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <U10001F40> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<combining_acute> <U1F40> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_omicron> : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-<dead_acute> <U10001F41> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F41> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F41> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<dead_acute> <U1F41> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F41> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F41> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U10001F41> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<combining_acute> <U1F41> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_omicron> : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-<U10000313> <Greek_OMICRON> : "Ὀ" U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
+<U0313> <Greek_OMICRON> : "Ὀ" U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
+<dead_psili> <Greek_OMICRON> : "Ὀ" U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
<Multi_key> <parenright> <Greek_OMICRON> : "Ὀ" U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI
-<U10000314> <Greek_OMICRON> : "Ὁ" U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
+<U0314> <Greek_OMICRON> : "Ὁ" U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
+<dead_dasia> <Greek_OMICRON> : "Ὁ" U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
<Multi_key> <parenleft> <Greek_OMICRON> : "Ὁ" U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA
-<dead_grave> <U10001F48> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F48> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<dead_grave> <U1F48> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F48> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <U10001F48> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<combining_grave> <U1F48> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_OMICRON> : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-<dead_grave> <U10001F49> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F49> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<dead_grave> <U1F49> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F49> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <U10001F49> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<combining_grave> <U1F49> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_OMICRON> : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-<dead_acute> <U10001F48> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F48> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F48> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<dead_acute> <U1F48> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F48> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F48> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <U10001F48> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<combining_acute> <U1F48> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_OMICRON> : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-<dead_acute> <U10001F49> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F49> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F49> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<dead_acute> <U1F49> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F49> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F49> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U10001F49> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<combining_acute> <U1F49> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_OMICRON> : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-<U10000313> <Greek_upsilon> : "ὐ" U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
+<U0313> <Greek_upsilon> : "ὐ" U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
+<dead_psili> <Greek_upsilon> : "ὐ" U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
<Multi_key> <parenright> <Greek_upsilon> : "ὐ" U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI
-<U10000314> <Greek_upsilon> : "ὑ" U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
+<U0314> <Greek_upsilon> : "ὑ" U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
+<dead_dasia> <Greek_upsilon> : "ὑ" U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
<Multi_key> <parenleft> <Greek_upsilon> : "ὑ" U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA
-<dead_grave> <U10001F50> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F50> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<dead_grave> <U1F50> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F50> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<combining_grave> <U10001F50> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<combining_grave> <U1F50> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_upsilon> : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-<dead_grave> <U10001F51> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F51> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<dead_grave> <U1F51> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F51> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <U10001F51> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<combining_grave> <U1F51> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_upsilon> : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-<dead_acute> <U10001F50> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F50> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F50> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<dead_acute> <U1F50> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F50> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F50> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<combining_acute> <U10001F50> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<combining_acute> <U1F50> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_upsilon> : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-<dead_acute> <U10001F51> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F51> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F51> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<dead_acute> <U1F51> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F51> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F51> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <U10001F51> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<combining_acute> <U1F51> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_upsilon> : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-<U10000342> <U10001F50> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F50> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F50> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<U0342> <U1F50> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F50> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F50> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_upsilon> : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F51> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F51> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F51> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<U0342> <U1F51> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F51> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F51> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_upsilon> : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U10000314> <Greek_UPSILON> : "Ὑ" U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
+<U0314> <Greek_UPSILON> : "Ὑ" U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
+<dead_dasia> <Greek_UPSILON> : "Ὑ" U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
<Multi_key> <parenleft> <Greek_UPSILON> : "Ὑ" U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA
-<dead_grave> <U10001F59> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F59> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<dead_grave> <U1F59> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F59> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <U10001F59> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<combining_grave> <U1F59> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_UPSILON> : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-<dead_acute> <U10001F59> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F59> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F59> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<dead_acute> <U1F59> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F59> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F59> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <U10001F59> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<combining_acute> <U1F59> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_UPSILON> : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-<U10000342> <U10001F59> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F59> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F59> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<U0342> <U1F59> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F59> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F59> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_UPSILON> : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-<U10000313> <Greek_omega> : "ὠ" U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
+<U0313> <Greek_omega> : "ὠ" U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
+<dead_psili> <Greek_omega> : "ὠ" U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
<Multi_key> <parenright> <Greek_omega> : "ὠ" U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI
-<U10000314> <Greek_omega> : "ὡ" U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
+<U0314> <Greek_omega> : "ὡ" U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
+<dead_dasia> <Greek_omega> : "ὡ" U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
<Multi_key> <parenleft> <Greek_omega> : "ὡ" U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA
-<dead_grave> <U10001F60> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F60> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<dead_grave> <U1F60> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F60> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <U10001F60> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<combining_grave> <U1F60> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_omega> : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-<dead_grave> <U10001F61> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F61> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<dead_grave> <U1F61> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F61> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <U10001F61> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<combining_grave> <U1F61> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_omega> : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-<dead_acute> <U10001F60> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F60> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F60> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<dead_acute> <U1F60> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F60> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F60> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <U10001F60> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<combining_acute> <U1F60> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_omega> : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-<dead_acute> <U10001F61> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F61> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F61> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<dead_acute> <U1F61> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F61> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F61> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <U10001F61> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<combining_acute> <U1F61> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_omega> : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-<U10000342> <U10001F60> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F60> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F60> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<U0342> <U1F60> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F60> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F60> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_omega> : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F61> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F61> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F61> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<U0342> <U1F61> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F61> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F61> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_omega> : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U10000313> <Greek_OMEGA> : "Ὠ" U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
+<U0313> <Greek_OMEGA> : "Ὠ" U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
+<dead_psili> <Greek_OMEGA> : "Ὠ" U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
<Multi_key> <parenright> <Greek_OMEGA> : "Ὠ" U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI
-<U10000314> <Greek_OMEGA> : "Ὡ" U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
+<U0314> <Greek_OMEGA> : "Ὡ" U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
+<dead_dasia> <Greek_OMEGA> : "Ὡ" U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
<Multi_key> <parenleft> <Greek_OMEGA> : "Ὡ" U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA
-<dead_grave> <U10001F68> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10001F68> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<dead_grave> <U10000313> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<dead_grave> <U1F68> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<Multi_key> <grave> <U1F68> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<dead_grave> <U0313> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<dead_grave> <dead_psili> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
<dead_grave> <Multi_key> <parenright> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<Multi_key> <grave> <U10000313> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<Multi_key> <grave> <U0313> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<Multi_key> <grave> <dead_psili> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
<Multi_key> <grave> <parenright> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <U10001F68> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<combining_grave> <U10000313> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<combining_grave> <U1F68> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<combining_grave> <U0313> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+<combining_grave> <dead_psili> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
<combining_grave> <Multi_key> <parenright> <Greek_OMEGA> : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-<dead_grave> <U10001F69> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10001F69> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<dead_grave> <U10000314> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<dead_grave> <U1F69> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<Multi_key> <grave> <U1F69> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<dead_grave> <U0314> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<dead_grave> <dead_dasia> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
<dead_grave> <Multi_key> <parenleft> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<Multi_key> <grave> <U10000314> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<Multi_key> <grave> <U0314> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<Multi_key> <grave> <dead_dasia> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
<Multi_key> <grave> <parenleft> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <U10001F69> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<combining_grave> <U10000314> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<combining_grave> <U1F69> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<combining_grave> <U0314> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+<combining_grave> <dead_dasia> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
<combining_grave> <Multi_key> <parenleft> <Greek_OMEGA> : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-<dead_acute> <U10001F68> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10001F68> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10001F68> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<dead_acute> <U10000313> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<dead_acute> <U1F68> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <acute> <U1F68> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U1F68> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<dead_acute> <U0313> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<dead_acute> <dead_psili> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
<dead_acute> <Multi_key> <parenright> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <acute> <U10000313> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <acute> <U0313> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <acute> <dead_psili> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
<Multi_key> <acute> <parenright> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<Multi_key> <apostrophe> <U10000313> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <U0313> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<Multi_key> <apostrophe> <dead_psili> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
<Multi_key> <apostrophe> <parenright> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <U10001F68> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<combining_acute> <U10000313> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<combining_acute> <U1F68> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<combining_acute> <U0313> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+<combining_acute> <dead_psili> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
<combining_acute> <Multi_key> <parenright> <Greek_OMEGA> : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-<dead_acute> <U10001F69> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10001F69> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10001F69> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<dead_acute> <U10000314> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<dead_acute> <U1F69> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <acute> <U1F69> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U1F69> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<dead_acute> <U0314> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<dead_acute> <dead_dasia> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
<dead_acute> <Multi_key> <parenleft> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <acute> <U10000314> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <acute> <U0314> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <acute> <dead_dasia> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
<Multi_key> <acute> <parenleft> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<Multi_key> <apostrophe> <U10000314> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <U0314> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<Multi_key> <apostrophe> <dead_dasia> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
<Multi_key> <apostrophe> <parenleft> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <U10001F69> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<combining_acute> <U10000314> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<combining_acute> <U1F69> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<combining_acute> <U0314> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+<combining_acute> <dead_dasia> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
<combining_acute> <Multi_key> <parenleft> <Greek_OMEGA> : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-<U10000342> <U10001F68> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10001F68> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F68> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U10000342> <U10000313> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U10000342> <Multi_key> <parenright> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<dead_tilde> <U10000313> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<U0342> <U1F68> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U1F68> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F68> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<U0342> <U0313> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<U0342> <dead_psili> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<U0342> <Multi_key> <parenright> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<dead_tilde> <U0313> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<dead_tilde> <dead_psili> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
<dead_tilde> <Multi_key> <parenright> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000313> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <U0313> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_psili> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
<Multi_key> <asciitilde> <parenright> <Greek_OMEGA> : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-<U10000342> <U10001F69> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10001F69> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10001F69> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U10000342> <U10000314> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<U10000342> <Multi_key> <parenleft> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<dead_tilde> <U10000314> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<U0342> <U1F69> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U1F69> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U1F69> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<U0342> <U0314> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<U0342> <dead_dasia> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<U0342> <Multi_key> <parenleft> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<dead_tilde> <U0314> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<dead_tilde> <dead_dasia> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
<dead_tilde> <Multi_key> <parenleft> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-<Multi_key> <asciitilde> <U10000314> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <U0314> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+<Multi_key> <asciitilde> <dead_dasia> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
<Multi_key> <asciitilde> <parenleft> <Greek_OMEGA> : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
<dead_grave> <Greek_alpha> : "ὰ" U1F70 # GREEK SMALL LETTER ALPHA WITH VARIA
<Multi_key> <grave> <Greek_alpha> : "ὰ" U1F70 # GREEK SMALL LETTER ALPHA WITH VARIA
@@ -3780,869 +4099,1133 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_grave> <Greek_omega> : "ὼ" U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA
<Multi_key> <grave> <Greek_omega> : "ὼ" U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA
<combining_grave> <Greek_omega> : "ὼ" U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA
-<dead_iota> <U10001F00> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F00> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U10000313> <Greek_alpha> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <U1F00> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F00> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <U0313> <Greek_alpha> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <dead_psili> <Greek_alpha> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <parenright> <Greek_alpha> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000313> <Greek_alpha> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0313> <Greek_alpha> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_psili> <Greek_alpha> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <parenright> <Greek_alpha> : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U10001F01> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F01> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U10000314> <Greek_alpha> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <U1F01> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F01> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <U0314> <Greek_alpha> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <dead_dasia> <Greek_alpha> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <parenleft> <Greek_alpha> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000314> <Greek_alpha> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0314> <Greek_alpha> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_dasia> <Greek_alpha> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <parenleft> <Greek_alpha> : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F02> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F02> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F00> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F00> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F00> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F00> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10000313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA 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> <U0313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <dead_psili> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenright> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenright> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F00> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F00> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10000313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U1F00> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F00> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U0313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <dead_psili> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenright> <Greek_alpha> : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F03> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F03> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10000314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <U1F03> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F03> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <U1F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U1F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U1F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U1F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <U0314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <dead_dasia> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenleft> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10000314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U1F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F01> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U0314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <dead_dasia> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenleft> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F04> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F04> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10000313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA 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> <U0313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <dead_acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10000313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U1F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F00> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U0313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F05> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F05> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10000314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA 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> <U0314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <dead_acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10000314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U1F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F01> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U0314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F06> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F06> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10001F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10000313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenright> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1F06> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F06> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U1F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F00> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U0313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <dead_psili> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenright> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U0313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_psili> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenright> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0313> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_alpha> : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10001F07> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F07> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10001F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10000314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenleft> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1F07> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F07> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U1F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F01> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U0314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <dead_dasia> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U0314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenleft> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0314> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_alpha> : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10001F08> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F08> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U10000313> <Greek_ALPHA> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <U1F08> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F08> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <U0313> <Greek_ALPHA> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <dead_psili> <Greek_ALPHA> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <parenright> <Greek_ALPHA> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000313> <Greek_ALPHA> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0313> <Greek_ALPHA> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_psili> <Greek_ALPHA> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <parenright> <Greek_ALPHA> : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U10001F09> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F09> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U10000314> <Greek_ALPHA> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <U1F09> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F09> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <U0314> <Greek_ALPHA> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <dead_dasia> <Greek_ALPHA> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000314> <Greek_ALPHA> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0314> <Greek_ALPHA> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_dasia> <Greek_ALPHA> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <parenleft> <Greek_ALPHA> : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F0A> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F0A> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F08> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F08> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F08> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F08> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10000313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA 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> <U0313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <dead_psili> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenright> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenright> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F08> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F08> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10000313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U1F08> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F08> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U0313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <dead_psili> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenright> <Greek_ALPHA> : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F0B> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F0B> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10000314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <U1F0B> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F0B> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <U1F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U1F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U1F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U1F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <U0314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <dead_dasia> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenleft> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10000314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U1F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F09> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U0314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <dead_dasia> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenleft> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F0C> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F0C> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10000313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA 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> <U0313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <dead_acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10000313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U1F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F08> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U0313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F0D> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F0D> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10000314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA 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> <U0314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <dead_acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10000314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U1F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F09> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U0314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F0E> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F0E> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10001F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10000313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenright> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U1F0E> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F0E> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U1F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F08> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U0313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <dead_psili> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenright> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U0313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_psili> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenright> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0313> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_ALPHA> : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10001F0F> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F0F> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10001F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10000314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U1F0F> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F0F> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U1F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F09> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U0314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <dead_dasia> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U0314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenleft> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0314> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_ALPHA> : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10001F20> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F20> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U10000313> <Greek_eta> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <U1F20> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F20> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <U0313> <Greek_eta> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <dead_psili> <Greek_eta> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <parenright> <Greek_eta> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000313> <Greek_eta> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0313> <Greek_eta> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_psili> <Greek_eta> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <parenright> <Greek_eta> : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U10001F21> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F21> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U10000314> <Greek_eta> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <U1F21> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F21> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <U0314> <Greek_eta> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <dead_dasia> <Greek_eta> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <parenleft> <Greek_eta> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000314> <Greek_eta> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0314> <Greek_eta> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_dasia> <Greek_eta> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <parenleft> <Greek_eta> : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F22> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F22> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F20> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F20> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F20> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F20> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10000313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA 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> <U0313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <dead_psili> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenright> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenright> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F20> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F20> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10000313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U1F20> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F20> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U0313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <dead_psili> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenright> <Greek_eta> : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F23> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F23> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10000314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <U1F23> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F23> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <U1F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U1F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U1F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U1F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <U0314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <dead_dasia> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenleft> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10000314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U1F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F21> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U0314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <dead_dasia> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenleft> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F24> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F24> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10000313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA 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> <U0313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <dead_acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10000313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U1F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F20> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U0313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F25> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F25> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10000314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA 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> <U0314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <dead_acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10000314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U1F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F21> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U0314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F26> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F26> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10001F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10000313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenright> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1F26> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F26> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U1F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F20> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U0313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <dead_psili> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenright> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U0313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_psili> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenright> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0313> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_eta> : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10001F27> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F27> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10001F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10000314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenleft> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1F27> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F27> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U1F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F21> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U0314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <dead_dasia> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U0314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenleft> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0314> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_eta> : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10001F28> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F28> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U10000313> <Greek_ETA> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <U1F28> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F28> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <U0313> <Greek_ETA> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <dead_psili> <Greek_ETA> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <parenright> <Greek_ETA> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000313> <Greek_ETA> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0313> <Greek_ETA> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_psili> <Greek_ETA> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <parenright> <Greek_ETA> : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U10001F29> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F29> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U10000314> <Greek_ETA> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <U1F29> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F29> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <U0314> <Greek_ETA> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <dead_dasia> <Greek_ETA> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <parenleft> <Greek_ETA> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000314> <Greek_ETA> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0314> <Greek_ETA> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_dasia> <Greek_ETA> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <parenleft> <Greek_ETA> : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F2A> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F2A> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F28> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F28> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F28> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F28> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10000313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA 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> <U0313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <dead_psili> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenright> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenright> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F28> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F28> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10000313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U1F28> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F28> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U0313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <dead_psili> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenright> <Greek_ETA> : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F2B> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F2B> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10000314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <U1F2B> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F2B> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <U1F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U1F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U1F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U1F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <U0314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <dead_dasia> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenleft> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10000314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U1F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F29> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U0314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <dead_dasia> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenleft> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F2C> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F2C> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10000313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA 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> <U0313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <dead_acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10000313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U1F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F28> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U0313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F2D> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F2D> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10000314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA 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> <U0314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <dead_acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10000314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U1F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F29> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U0314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F2E> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F2E> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10001F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10000313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenright> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U1F2E> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F2E> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U1F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F28> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U0313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <dead_psili> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenright> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U0313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_psili> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenright> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0313> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_ETA> : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10001F2F> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F2F> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10001F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10000314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenleft> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U1F2F> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F2F> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U1F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F29> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U0314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <dead_dasia> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U0314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenleft> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0314> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_ETA> : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10001F60> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F60> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U10000313> <Greek_omega> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <U1F60> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F60> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <U0313> <Greek_omega> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+<dead_iota> <dead_psili> <Greek_omega> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <parenright> <Greek_omega> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000313> <Greek_omega> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0313> <Greek_omega> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_psili> <Greek_omega> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <parenright> <Greek_omega> : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-<dead_iota> <U10001F61> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F61> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U10000314> <Greek_omega> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <U1F61> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F61> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <U0314> <Greek_omega> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+<dead_iota> <dead_dasia> <Greek_omega> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <parenleft> <Greek_omega> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000314> <Greek_omega> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0314> <Greek_omega> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_dasia> <Greek_omega> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <parenleft> <Greek_omega> : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F62> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F62> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F60> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F60> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F60> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F60> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10000313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA 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> <U0313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <dead_psili> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenright> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenright> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F60> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F60> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10000313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U1F60> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F60> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U0313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <dead_psili> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenright> <Greek_omega> : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F63> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F63> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <dead_grave> <U10000314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <U1F63> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F63> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <U1F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U1F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U1F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U1F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <U0314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <dead_grave> <dead_dasia> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenleft> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <combining_grave> <U10000314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U1F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F61> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <U0314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<dead_iota> <combining_grave> <dead_dasia> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenleft> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F64> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F64> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10000313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA 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> <U0313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <dead_acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10000313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U1F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F60> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U0313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F65> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F65> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <dead_acute> <U10000314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA 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> <U0314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <dead_acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <combining_acute> <U10000314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U1F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F61> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <U0314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<dead_iota> <combining_acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <U10001F66> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F66> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10001F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10000313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenright> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1F66> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F66> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U1F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F60> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U0313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <dead_psili> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenright> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U0313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_psili> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenright> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0313> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_omega> : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10001F67> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F67> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10001F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <U10000314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenleft> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1F67> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F67> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U1F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F61> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <U0314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <dead_dasia> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <U0314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenleft> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0314> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_omega> : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10001F68> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F68> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U10000313> <Greek_OMEGA> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <U1F68> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F68> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <U0313> <Greek_OMEGA> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+<dead_iota> <dead_psili> <Greek_OMEGA> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <parenright> <Greek_OMEGA> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000313> <Greek_OMEGA> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0313> <Greek_OMEGA> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_psili> <Greek_OMEGA> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <parenright> <Greek_OMEGA> : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-<dead_iota> <U10001F69> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F69> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U10000314> <Greek_OMEGA> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <U1F69> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F69> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <U0314> <Greek_OMEGA> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+<dead_iota> <dead_dasia> <Greek_OMEGA> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000314> <Greek_OMEGA> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0314> <Greek_OMEGA> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_dasia> <Greek_OMEGA> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <parenleft> <Greek_OMEGA> : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F6A> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F6A> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F68> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F68> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F68> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F68> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10000313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA 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> <U0313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <dead_psili> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenright> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_psili> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenright> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_psili> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenright> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_psili> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenright> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F68> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F68> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10000313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U1F68> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F68> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U0313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <dead_psili> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenright> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0313> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_psili> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenright> <Greek_OMEGA> : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F6B> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F6B> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10001F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10001F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10001F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10001F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <dead_grave> <U10000314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <U1F6B> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F6B> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <U1F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U1F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U1F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U1F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <U0314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <dead_grave> <dead_dasia> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_grave> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <grave> <U10000314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <U0314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <grave> <dead_dasia> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <grave> <parenleft> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_grave> <U10000314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <U0314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_grave> <dead_dasia> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_grave> <parenleft> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <grave> <U10000314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <U0314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <grave> <dead_dasia> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10001F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10001F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <combining_grave> <U10000314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U1F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U1F69> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <U0314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<dead_iota> <combining_grave> <dead_dasia> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <combining_grave> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_grave> <U10000314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <U0314> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_grave> <dead_dasia> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_grave> <parenleft> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F6C> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F6C> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10000313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA 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> <U0313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <dead_acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10000313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U1F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F68> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U0313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0313> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F6D> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F6D> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10001F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10001F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10001F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10001F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10001F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10001F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <dead_acute> <U10000314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA 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> <U0314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <dead_acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <U10000314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <U0314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <acute> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <apostrophe> <U10000314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <U0314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_acute> <U10000314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <U0314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <acute> <U10000314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <U0314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <apostrophe> <U10000314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <U0314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <apostrophe> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <apostrophe> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10001F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10001F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <combining_acute> <U10000314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U1F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U1F69> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <U0314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<dead_iota> <combining_acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <combining_acute> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <combining_acute> <U10000314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <U0314> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <combining_acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <U10001F6E> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F6E> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10001F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10000313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenright> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U1F6E> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F6E> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U1F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F68> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U0313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <dead_psili> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenright> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U0313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_psili> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenright> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_psili> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenright> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenright> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_psili> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenright> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_psili> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenright> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0313> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_psili> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenright> <Greek_OMEGA> : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10001F6F> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F6F> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10001F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10001F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10001F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10001F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10001F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10001F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <U10000314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <U10000342> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <dead_tilde> <U10000314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U1F6F> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U1F6F> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U1F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U1F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U1F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U1F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U1F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U1F69> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <U0314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <dead_dasia> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <U0342> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <U0314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <dead_tilde> <dead_dasia> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <dead_tilde> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <asciitilde> <U10000314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <U0314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<dead_iota> <Multi_key> <asciitilde> <dead_dasia> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <parenleft> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <U10000314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <parenleft> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <dead_tilde> <U10000314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <U0314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <dead_dasia> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <parenleft> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <U0314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <dead_tilde> <dead_dasia> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <parenleft> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-<Multi_key> <Greek_iota> <asciitilde> <U10000314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <U0314> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+<Multi_key> <Greek_iota> <asciitilde> <dead_dasia> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <parenleft> <Greek_OMEGA> : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
<dead_breve> <Greek_alpha> : "ᾰ" U1FB0 # GREEK SMALL LETTER ALPHA WITH VRACHY
<Multi_key> <U> <Greek_alpha> : "ᾰ" U1FB0 # GREEK SMALL LETTER ALPHA WITH VRACHY
@@ -4650,8 +5233,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10001F70> : "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F70> : "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
+<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
@@ -4670,15 +5253,15 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <Greek_iota> <apostrophe> <Greek_alpha> : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Greek_alpha> : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <Greek_alpha> : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-<U10000342> <Greek_alpha> : "ᾶ" U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+<U0342> <Greek_alpha> : "ᾶ" U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
<dead_tilde> <Greek_alpha> : "ᾶ" U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
<Multi_key> <asciitilde> <Greek_alpha> : "ᾶ" U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
-<dead_iota> <U10001FB6> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001FB6> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Greek_alpha> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1FB6> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1FB6> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Greek_alpha> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Greek_alpha> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <Greek_alpha> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <Greek_alpha> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <Greek_alpha> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <Greek_alpha> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <Greek_alpha> : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_breve> <Greek_ALPHA> : "Ᾰ" U1FB8 # GREEK CAPITAL LETTER ALPHA WITH VRACHY
@@ -4692,11 +5275,11 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_grave> <Greek_ALPHA> : "Ὰ" U1FBA # GREEK CAPITAL LETTER ALPHA WITH VARIA
<dead_iota> <Greek_ALPHA> : "ᾼ" U1FBC # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
<Multi_key> <Greek_iota> <Greek_ALPHA> : "ᾼ" U1FBC # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-<Multi_key> <diaeresis> <U10000342> : "῁" U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
+<Multi_key> <diaeresis> <U0342> : "῁" U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
<Multi_key> <diaeresis> <dead_tilde> : "῁" U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
<Multi_key> <diaeresis> <asciitilde> : "῁" U1FC1 # GREEK DIALYTIKA AND PERISPOMENI
-<dead_iota> <U10001F74> : "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F74> : "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
+<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
@@ -4715,15 +5298,15 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <Greek_iota> <apostrophe> <Greek_eta> : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Greek_eta> : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <Greek_eta> : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-<U10000342> <Greek_eta> : "ῆ" U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
+<U0342> <Greek_eta> : "ῆ" U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
<dead_tilde> <Greek_eta> : "ῆ" U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
<Multi_key> <asciitilde> <Greek_eta> : "ῆ" U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI
-<dead_iota> <U10001FC6> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001FC6> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Greek_eta> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1FC6> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1FC6> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Greek_eta> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Greek_eta> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <Greek_eta> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <Greek_eta> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <Greek_eta> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <Greek_eta> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <Greek_eta> : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_grave> <Greek_EPSILON> : "Ὲ" U1FC8 # GREEK CAPITAL LETTER EPSILON WITH VARIA
@@ -4734,16 +5317,16 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_grave> <Greek_ETA> : "Ὴ" U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA
<dead_iota> <Greek_ETA> : "ῌ" U1FCC # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
<Multi_key> <Greek_iota> <Greek_ETA> : "ῌ" U1FCC # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-<Multi_key> <U10001FBF> <dead_grave> : "῍" U1FCD # GREEK PSILI AND VARIA
-<Multi_key> <U10001FBF> <grave> : "῍" U1FCD # GREEK PSILI AND VARIA
-<Multi_key> <U10001FBF> <combining_grave> : "῍" U1FCD # GREEK PSILI AND VARIA
-<Multi_key> <U10001FBF> <dead_acute> : "῎" U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U10001FBF> <acute> : "῎" U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U10001FBF> <apostrophe> : "῎" U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U10001FBF> <combining_acute> : "῎" U1FCE # GREEK PSILI AND OXIA
-<Multi_key> <U10001FBF> <U10000342> : "῏" U1FCF # GREEK PSILI AND PERISPOMENI
-<Multi_key> <U10001FBF> <dead_tilde> : "῏" U1FCF # GREEK PSILI AND PERISPOMENI
-<Multi_key> <U10001FBF> <asciitilde> : "῏" U1FCF # GREEK PSILI AND PERISPOMENI
+<Multi_key> <U1FBF> <dead_grave> : "῍" U1FCD # GREEK PSILI AND VARIA
+<Multi_key> <U1FBF> <grave> : "῍" U1FCD # GREEK PSILI AND VARIA
+<Multi_key> <U1FBF> <combining_grave> : "῍" U1FCD # GREEK PSILI AND VARIA
+<Multi_key> <U1FBF> <dead_acute> : "῎" U1FCE # GREEK PSILI AND OXIA
+<Multi_key> <U1FBF> <acute> : "῎" U1FCE # GREEK PSILI AND OXIA
+<Multi_key> <U1FBF> <apostrophe> : "῎" U1FCE # GREEK PSILI AND OXIA
+<Multi_key> <U1FBF> <combining_acute> : "῎" U1FCE # GREEK PSILI AND OXIA
+<Multi_key> <U1FBF> <U0342> : "῏" U1FCF # GREEK PSILI AND PERISPOMENI
+<Multi_key> <U1FBF> <dead_tilde> : "῏" U1FCF # GREEK PSILI AND PERISPOMENI
+<Multi_key> <U1FBF> <asciitilde> : "῏" U1FCF # GREEK PSILI AND PERISPOMENI
<dead_breve> <Greek_iota> : "ῐ" U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
<Multi_key> <U> <Greek_iota> : "ῐ" U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
<Multi_key> <b> <Greek_iota> : "ῐ" U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY
@@ -4759,14 +5342,14 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_grave> <Greek_iotadieresis> : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
<combining_grave> <dead_diaeresis> <Greek_iota> : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
<combining_grave> <Multi_key> <quotedbl> <Greek_iota> : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-<U10000342> <Greek_iota> : "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
+<U0342> <Greek_iota> : "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
<dead_tilde> <Greek_iota> : "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
<Multi_key> <asciitilde> <Greek_iota> : "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI
-<U10000342> <Greek_iotadieresis> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+<U0342> <Greek_iotadieresis> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
<dead_tilde> <Greek_iotadieresis> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
<Multi_key> <asciitilde> <Greek_iotadieresis> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-<U10000342> <dead_diaeresis> <Greek_iota> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-<U10000342> <Multi_key> <quotedbl> <Greek_iota> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+<U0342> <dead_diaeresis> <Greek_iota> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+<U0342> <Multi_key> <quotedbl> <Greek_iota> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
<dead_tilde> <dead_diaeresis> <Greek_iota> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
<dead_tilde> <Multi_key> <quotedbl> <Greek_iota> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
<Multi_key> <asciitilde> <dead_diaeresis> <Greek_iota> : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
@@ -4780,16 +5363,16 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_grave> <Greek_IOTA> : "Ὶ" U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA
<Multi_key> <grave> <Greek_IOTA> : "Ὶ" U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA
<combining_grave> <Greek_IOTA> : "Ὶ" U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA
-<Multi_key> <U10001FFE> <dead_grave> : "῝" U1FDD # GREEK DASIA AND VARIA
-<Multi_key> <U10001FFE> <grave> : "῝" U1FDD # GREEK DASIA AND VARIA
-<Multi_key> <U10001FFE> <combining_grave> : "῝" U1FDD # GREEK DASIA AND VARIA
-<Multi_key> <U10001FFE> <dead_acute> : "῞" U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U10001FFE> <acute> : "῞" U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U10001FFE> <apostrophe> : "῞" U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U10001FFE> <combining_acute> : "῞" U1FDE # GREEK DASIA AND OXIA
-<Multi_key> <U10001FFE> <U10000342> : "῟" U1FDF # GREEK DASIA AND PERISPOMENI
-<Multi_key> <U10001FFE> <dead_tilde> : "῟" U1FDF # GREEK DASIA AND PERISPOMENI
-<Multi_key> <U10001FFE> <asciitilde> : "῟" U1FDF # GREEK DASIA AND PERISPOMENI
+<Multi_key> <U1FFE> <dead_grave> : "῝" U1FDD # GREEK DASIA AND VARIA
+<Multi_key> <U1FFE> <grave> : "῝" U1FDD # GREEK DASIA AND VARIA
+<Multi_key> <U1FFE> <combining_grave> : "῝" U1FDD # GREEK DASIA AND VARIA
+<Multi_key> <U1FFE> <dead_acute> : "῞" U1FDE # GREEK DASIA AND OXIA
+<Multi_key> <U1FFE> <acute> : "῞" U1FDE # GREEK DASIA AND OXIA
+<Multi_key> <U1FFE> <apostrophe> : "῞" U1FDE # GREEK DASIA AND OXIA
+<Multi_key> <U1FFE> <combining_acute> : "῞" U1FDE # GREEK DASIA AND OXIA
+<Multi_key> <U1FFE> <U0342> : "῟" U1FDF # GREEK DASIA AND PERISPOMENI
+<Multi_key> <U1FFE> <dead_tilde> : "῟" U1FDF # GREEK DASIA AND PERISPOMENI
+<Multi_key> <U1FFE> <asciitilde> : "῟" U1FDF # GREEK DASIA AND PERISPOMENI
<dead_breve> <Greek_upsilon> : "ῠ" U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
<Multi_key> <U> <Greek_upsilon> : "ῠ" U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
<Multi_key> <b> <Greek_upsilon> : "ῠ" U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY
@@ -4805,18 +5388,20 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_grave> <Greek_upsilondieresis> : "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
<combining_grave> <dead_diaeresis> <Greek_upsilon> : "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
<combining_grave> <Multi_key> <quotedbl> <Greek_upsilon> : "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-<U10000313> <Greek_rho> : "ῤ" U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
+<U0313> <Greek_rho> : "ῤ" U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
+<dead_psili> <Greek_rho> : "ῤ" U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
<Multi_key> <parenright> <Greek_rho> : "ῤ" U1FE4 # GREEK SMALL LETTER RHO WITH PSILI
-<U10000314> <Greek_rho> : "ῥ" U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
+<U0314> <Greek_rho> : "ῥ" U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
+<dead_dasia> <Greek_rho> : "ῥ" U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
<Multi_key> <parenleft> <Greek_rho> : "ῥ" U1FE5 # GREEK SMALL LETTER RHO WITH DASIA
-<U10000342> <Greek_upsilon> : "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
+<U0342> <Greek_upsilon> : "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
<dead_tilde> <Greek_upsilon> : "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
<Multi_key> <asciitilde> <Greek_upsilon> : "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-<U10000342> <Greek_upsilondieresis> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+<U0342> <Greek_upsilondieresis> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
<dead_tilde> <Greek_upsilondieresis> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
<Multi_key> <asciitilde> <Greek_upsilondieresis> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-<U10000342> <dead_diaeresis> <Greek_upsilon> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-<U10000342> <Multi_key> <quotedbl> <Greek_upsilon> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+<U0342> <dead_diaeresis> <Greek_upsilon> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+<U0342> <Multi_key> <quotedbl> <Greek_upsilon> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
<dead_tilde> <dead_diaeresis> <Greek_upsilon> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
<dead_tilde> <Multi_key> <quotedbl> <Greek_upsilon> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
<Multi_key> <asciitilde> <dead_diaeresis> <Greek_upsilon> : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
@@ -4830,13 +5415,14 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_grave> <Greek_UPSILON> : "Ὺ" U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
<Multi_key> <grave> <Greek_UPSILON> : "Ὺ" U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
<combining_grave> <Greek_UPSILON> : "Ὺ" U1FEA # GREEK CAPITAL LETTER UPSILON WITH VARIA
-<U10000314> <Greek_RHO> : "Ῥ" U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA
+<U0314> <Greek_RHO> : "Ῥ" U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA
+<dead_dasia> <Greek_RHO> : "Ῥ" U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA
<Multi_key> <parenleft> <Greek_RHO> : "Ῥ" U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA
<Multi_key> <diaeresis> <dead_grave> : "῭" U1FED # GREEK DIALYTIKA AND VARIA
<Multi_key> <diaeresis> <grave> : "῭" U1FED # GREEK DIALYTIKA AND VARIA
<Multi_key> <diaeresis> <combining_grave> : "῭" U1FED # GREEK DIALYTIKA AND VARIA
-<dead_iota> <U10001F7C> : "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001F7C> : "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
+<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
@@ -4855,15 +5441,15 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <Greek_iota> <apostrophe> <Greek_omega> : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
<dead_iota> <combining_acute> <Greek_omega> : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <combining_acute> <Greek_omega> : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-<U10000342> <Greek_omega> : "ῶ" U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+<U0342> <Greek_omega> : "ῶ" U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
<dead_tilde> <Greek_omega> : "ῶ" U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
<Multi_key> <asciitilde> <Greek_omega> : "ῶ" U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
-<dead_iota> <U10001FF6> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10001FF6> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-<dead_iota> <U10000342> <Greek_omega> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U1FF6> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U1FF6> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+<dead_iota> <U0342> <Greek_omega> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <dead_tilde> <Greek_omega> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <asciitilde> <Greek_omega> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-<Multi_key> <Greek_iota> <U10000342> <Greek_omega> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+<Multi_key> <Greek_iota> <U0342> <Greek_omega> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_tilde> <Greek_omega> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <asciitilde> <Greek_omega> : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
<dead_grave> <Greek_OMICRON> : "Ὸ" U1FF8 # GREEK CAPITAL LETTER OMICRON WITH VARIA
@@ -4910,8 +5496,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10002212> : "⁻" U207B # SUPERSCRIPT MINUS
-<Multi_key> <asciicircum> <U10002212> : "⁻" U207B # SUPERSCRIPT MINUS
+<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
@@ -4970,8 +5556,8 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10002212> : "₋" U208B # SUBSCRIPT MINUS
-<Multi_key> <underbar> <U10002212> : "₋" U208B # SUBSCRIPT MINUS
+<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
@@ -4982,57 +5568,69 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <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> <U10002194> : "↮" U21AE # LEFT RIGHT ARROW WITH STROKE
-<Multi_key> <KP_Divide> <U10002194> : "↮" U21AE # LEFT RIGHT ARROW WITH STROKE
-<Multi_key> <U10002203> <U10000338> : "∄" U2204 # THERE DOES NOT EXIST
-<Multi_key> <U10002208> <U10000338> : "∉" U2209 # NOT AN ELEMENT OF
-<Multi_key> <U1000220B> <U10000338> : "∌" U220C # DOES NOT CONTAIN AS MEMBER
-<Multi_key> <U10002223> <U10000338> : "∤" U2224 # DOES NOT DIVIDE
-<Multi_key> <U10002225> <U10000338> : "∦" U2226 # NOT PARALLEL TO
-<Multi_key> <U1000223C> <U10000338> : "≁" U2241 # NOT TILDE
-<Multi_key> <U10002243> <U10000338> : "≄" U2244 # NOT ASYMPTOTICALLY EQUAL TO
-<Multi_key> <approximate> <U10000338> : "≇" U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO
-<Multi_key> <U10002248> <U10000338> : "≉" U2249 # NOT ALMOST EQUAL TO
-<Multi_key> <equal> <U10000338> : "≠" U2260 # NOT EQUAL TO
-<Multi_key> <KP_Equal> <U10000338> : "≠" U2260 # NOT EQUAL TO
-<Multi_key> <identical> <U10000338> : "≢" U2262 # NOT IDENTICAL TO
-<Multi_key> <U1000224D> <U10000338> : "≭" U226D # NOT EQUIVALENT TO
-<Multi_key> <less> <U10000338> : "≮" U226E # NOT LESS-THAN
-<Multi_key> <leftcaret> <U10000338> : "≮" U226E # NOT LESS-THAN
-<Multi_key> <greater> <U10000338> : "≯" U226F # NOT GREATER-THAN
-<Multi_key> <rightcaret> <U10000338> : "≯" U226F # NOT GREATER-THAN
-<Multi_key> <lessthanequal> <U10000338> : "≰" U2270 # NEITHER LESS-THAN NOR EQUAL TO
-<Multi_key> <greaterthanequal> <U10000338> : "≱" U2271 # NEITHER GREATER-THAN NOR EQUAL TO
-<Multi_key> <U10002272> <U10000338> : "≴" U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO
-<Multi_key> <U10002273> <U10000338> : "≵" U2275 # NEITHER GREATER-THAN NOR EQUIVALENT TO
-<Multi_key> <U10002276> <U10000338> : "≸" U2278 # NEITHER LESS-THAN NOR GREATER-THAN
-<Multi_key> <U10002277> <U10000338> : "≹" U2279 # NEITHER GREATER-THAN NOR LESS-THAN
-<Multi_key> <U1000227A> <U10000338> : "⊀" U2280 # DOES NOT PRECEDE
-<Multi_key> <U1000227B> <U10000338> : "⊁" U2281 # DOES NOT SUCCEED
-<Multi_key> <includedin> <U10000338> : "⊄" U2284 # NOT A SUBSET OF
-<Multi_key> <leftshoe> <U10000338> : "⊄" U2284 # NOT A SUBSET OF
-<Multi_key> <includes> <U10000338> : "⊅" U2285 # NOT A SUPERSET OF
-<Multi_key> <rightshoe> <U10000338> : "⊅" U2285 # NOT A SUPERSET OF
-<Multi_key> <U10002286> <U10000338> : "⊈" U2288 # NEITHER A SUBSET OF NOR EQUAL TO
-<Multi_key> <U10002287> <U10000338> : "⊉" U2289 # NEITHER A SUPERSET OF NOR EQUAL TO
-<Multi_key> <righttack> <U10000338> : "⊬" U22AC # DOES NOT PROVE
-<Multi_key> <U100022A8> <U10000338> : "⊭" U22AD # NOT TRUE
-<Multi_key> <U100022A9> <U10000338> : "⊮" U22AE # DOES NOT FORCE
-<Multi_key> <U100022AB> <U10000338> : "⊯" U22AF # NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
-<Multi_key> <U1000227C> <U10000338> : "⋠" U22E0 # DOES NOT PRECEDE OR EQUAL
-<Multi_key> <U1000227D> <U10000338> : "⋡" U22E1 # DOES NOT SUCCEED OR EQUAL
-<Multi_key> <U10002291> <U10000338> : "⋢" U22E2 # NOT SQUARE IMAGE OF OR EQUAL TO
-<Multi_key> <U10002292> <U10000338> : "⋣" U22E3 # NOT SQUARE ORIGINAL OF OR EQUAL TO
-<Multi_key> <U100022B2> <U10000338> : "⋪" U22EA # NOT NORMAL SUBGROUP OF
-<Multi_key> <U100022B3> <U10000338> : "⋫" U22EB # DOES NOT CONTAIN AS NORMAL SUBGROUP
-<Multi_key> <U100022B4> <U10000338> : "⋬" U22EC # NOT NORMAL SUBGROUP OF OR EQUAL TO
-<Multi_key> <U100022B5> <U10000338> : "⋭" U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL
+<Multi_key> <slash> <U2194> : "↮" U21AE # LEFT RIGHT ARROW WITH STROKE
+<Multi_key> <KP_Divide> <U2194> : "↮" U21AE # LEFT RIGHT ARROW WITH STROKE
+<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> <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> <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
@@ -5154,34 +5752,34 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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
-<Multi_key> <U10002ADD> <U10000338> : "⫝̸" U2ADC # FORKING
-<dead_voiced_sound> <U1000304B> : "が" U304C # HIRAGANA LETTER GA
-<dead_voiced_sound> <U1000304D> : "ぎ" U304E # HIRAGANA LETTER GI
-<dead_voiced_sound> <U1000304F> : "ぐ" U3050 # HIRAGANA LETTER GU
-<dead_voiced_sound> <U10003051> : "げ" U3052 # HIRAGANA LETTER GE
-<dead_voiced_sound> <U10003053> : "ご" U3054 # HIRAGANA LETTER GO
-<dead_voiced_sound> <U10003055> : "ざ" U3056 # HIRAGANA LETTER ZA
-<dead_voiced_sound> <U10003057> : "じ" U3058 # HIRAGANA LETTER ZI
-<dead_voiced_sound> <U10003059> : "ず" U305A # HIRAGANA LETTER ZU
-<dead_voiced_sound> <U1000305B> : "ぜ" U305C # HIRAGANA LETTER ZE
-<dead_voiced_sound> <U1000305D> : "ぞ" U305E # HIRAGANA LETTER ZO
-<dead_voiced_sound> <U1000305F> : "だ" U3060 # HIRAGANA LETTER DA
-<dead_voiced_sound> <U10003061> : "ぢ" U3062 # HIRAGANA LETTER DI
-<dead_voiced_sound> <U10003064> : "づ" U3065 # HIRAGANA LETTER DU
-<dead_voiced_sound> <U10003066> : "で" U3067 # HIRAGANA LETTER DE
-<dead_voiced_sound> <U10003068> : "ど" U3069 # HIRAGANA LETTER DO
-<dead_voiced_sound> <U1000306F> : "ば" U3070 # HIRAGANA LETTER BA
-<dead_semivoiced_sound> <U1000306F> : "ぱ" U3071 # HIRAGANA LETTER PA
-<dead_voiced_sound> <U10003072> : "び" U3073 # HIRAGANA LETTER BI
-<dead_semivoiced_sound> <U10003072> : "ぴ" U3074 # HIRAGANA LETTER PI
-<dead_voiced_sound> <U10003075> : "ぶ" U3076 # HIRAGANA LETTER BU
-<dead_semivoiced_sound> <U10003075> : "ぷ" U3077 # HIRAGANA LETTER PU
-<dead_voiced_sound> <U10003078> : "べ" U3079 # HIRAGANA LETTER BE
-<dead_semivoiced_sound> <U10003078> : "ぺ" U307A # HIRAGANA LETTER PE
-<dead_voiced_sound> <U1000307B> : "ぼ" U307C # HIRAGANA LETTER BO
-<dead_semivoiced_sound> <U1000307B> : "ぽ" U307D # HIRAGANA LETTER PO
-<dead_voiced_sound> <U10003046> : "ゔ" U3094 # HIRAGANA LETTER VU
-<dead_voiced_sound> <U1000309D> : "ゞ" U309E # HIRAGANA VOICED ITERATION MARK
+<Multi_key> <U2ADD> <U0338> : "⫝̸" U2ADC # FORKING
+<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
@@ -5209,38 +5807,38 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U100030F0> : "ヸ" U30F8 # KATAKANA LETTER VI
-<dead_voiced_sound> <U100030F1> : "ヹ" U30F9 # KATAKANA LETTER VE
+<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> <U100030FD> : "ヾ" U30FE # KATAKANA VOICED ITERATION MARK
-<dead_circumflex> <U10004E00> : "㆒" U3192 # IDEOGRAPHIC ANNOTATION ONE MARK
-<Multi_key> <asciicircum> <U10004E00> : "㆒" U3192 # IDEOGRAPHIC ANNOTATION ONE MARK
-<dead_circumflex> <U10004E8C> : "㆓" U3193 # IDEOGRAPHIC ANNOTATION TWO MARK
-<Multi_key> <asciicircum> <U10004E8C> : "㆓" U3193 # IDEOGRAPHIC ANNOTATION TWO MARK
-<dead_circumflex> <U10004E09> : "㆔" U3194 # IDEOGRAPHIC ANNOTATION THREE MARK
-<Multi_key> <asciicircum> <U10004E09> : "㆔" U3194 # IDEOGRAPHIC ANNOTATION THREE MARK
-<dead_circumflex> <U100056DB> : "㆕" U3195 # IDEOGRAPHIC ANNOTATION FOUR MARK
-<Multi_key> <asciicircum> <U100056DB> : "㆕" U3195 # IDEOGRAPHIC ANNOTATION FOUR MARK
-<dead_circumflex> <U10004E0A> : "㆖" U3196 # IDEOGRAPHIC ANNOTATION TOP MARK
-<Multi_key> <asciicircum> <U10004E0A> : "㆖" U3196 # IDEOGRAPHIC ANNOTATION TOP MARK
-<dead_circumflex> <U10004E2D> : "㆗" U3197 # IDEOGRAPHIC ANNOTATION MIDDLE MARK
-<Multi_key> <asciicircum> <U10004E2D> : "㆗" U3197 # IDEOGRAPHIC ANNOTATION MIDDLE MARK
-<dead_circumflex> <U10004E0B> : "㆘" U3198 # IDEOGRAPHIC ANNOTATION BOTTOM MARK
-<Multi_key> <asciicircum> <U10004E0B> : "㆘" U3198 # IDEOGRAPHIC ANNOTATION BOTTOM MARK
-<dead_circumflex> <U10007532> : "㆙" U3199 # IDEOGRAPHIC ANNOTATION FIRST MARK
-<Multi_key> <asciicircum> <U10007532> : "㆙" U3199 # IDEOGRAPHIC ANNOTATION FIRST MARK
-<dead_circumflex> <U10004E59> : "㆚" U319A # IDEOGRAPHIC ANNOTATION SECOND MARK
-<Multi_key> <asciicircum> <U10004E59> : "㆚" U319A # IDEOGRAPHIC ANNOTATION SECOND MARK
-<dead_circumflex> <U10004E19> : "㆛" U319B # IDEOGRAPHIC ANNOTATION THIRD MARK
-<Multi_key> <asciicircum> <U10004E19> : "㆛" U319B # IDEOGRAPHIC ANNOTATION THIRD MARK
-<dead_circumflex> <U10004E01> : "㆜" U319C # IDEOGRAPHIC ANNOTATION FOURTH MARK
-<Multi_key> <asciicircum> <U10004E01> : "㆜" U319C # IDEOGRAPHIC ANNOTATION FOURTH MARK
-<dead_circumflex> <U10005929> : "㆝" U319D # IDEOGRAPHIC ANNOTATION HEAVEN MARK
-<Multi_key> <asciicircum> <U10005929> : "㆝" U319D # IDEOGRAPHIC ANNOTATION HEAVEN MARK
-<dead_circumflex> <U10005730> : "㆞" U319E # IDEOGRAPHIC ANNOTATION EARTH MARK
-<Multi_key> <asciicircum> <U10005730> : "㆞" U319E # IDEOGRAPHIC ANNOTATION EARTH MARK
-<dead_circumflex> <U10004EBA> : "㆟" U319F # IDEOGRAPHIC ANNOTATION MAN MARK
-<Multi_key> <asciicircum> <U10004EBA> : "㆟" U319F # IDEOGRAPHIC ANNOTATION MAN MARK
+<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
@@ -5324,83 +5922,83 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U10001100> <parenright> : "㉠" U3260 # CIRCLED HANGUL KIYEOK
-<Multi_key> <parenleft> <U10001102> <parenright> : "㉡" U3261 # CIRCLED HANGUL NIEUN
-<Multi_key> <parenleft> <U10001103> <parenright> : "㉢" U3262 # CIRCLED HANGUL TIKEUT
-<Multi_key> <parenleft> <U10001105> <parenright> : "㉣" U3263 # CIRCLED HANGUL RIEUL
-<Multi_key> <parenleft> <U10001106> <parenright> : "㉤" U3264 # CIRCLED HANGUL MIEUM
-<Multi_key> <parenleft> <U10001107> <parenright> : "㉥" U3265 # CIRCLED HANGUL PIEUP
-<Multi_key> <parenleft> <U10001109> <parenright> : "㉦" U3266 # CIRCLED HANGUL SIOS
-<Multi_key> <parenleft> <U1000110B> <parenright> : "㉧" U3267 # CIRCLED HANGUL IEUNG
-<Multi_key> <parenleft> <U1000110C> <parenright> : "㉨" U3268 # CIRCLED HANGUL CIEUC
-<Multi_key> <parenleft> <U1000110E> <parenright> : "㉩" U3269 # CIRCLED HANGUL CHIEUCH
-<Multi_key> <parenleft> <U1000110F> <parenright> : "㉪" U326A # CIRCLED HANGUL KHIEUKH
-<Multi_key> <parenleft> <U10001110> <parenright> : "㉫" U326B # CIRCLED HANGUL THIEUTH
-<Multi_key> <parenleft> <U10001111> <parenright> : "㉬" U326C # CIRCLED HANGUL PHIEUPH
-<Multi_key> <parenleft> <U10001112> <parenright> : "㉭" U326D # CIRCLED HANGUL HIEUH
-<Multi_key> <parenleft> <U10001100> <U10001161> <parenright> : "㉮" U326E # CIRCLED HANGUL KIYEOK A
-<Multi_key> <parenleft> <U10001102> <U10001161> <parenright> : "㉯" U326F # CIRCLED HANGUL NIEUN A
-<Multi_key> <parenleft> <U10001103> <U10001161> <parenright> : "㉰" U3270 # CIRCLED HANGUL TIKEUT A
-<Multi_key> <parenleft> <U10001105> <U10001161> <parenright> : "㉱" U3271 # CIRCLED HANGUL RIEUL A
-<Multi_key> <parenleft> <U10001106> <U10001161> <parenright> : "㉲" U3272 # CIRCLED HANGUL MIEUM A
-<Multi_key> <parenleft> <U10001107> <U10001161> <parenright> : "㉳" U3273 # CIRCLED HANGUL PIEUP A
-<Multi_key> <parenleft> <U10001109> <U10001161> <parenright> : "㉴" U3274 # CIRCLED HANGUL SIOS A
-<Multi_key> <parenleft> <U1000110B> <U10001161> <parenright> : "㉵" U3275 # CIRCLED HANGUL IEUNG A
-<Multi_key> <parenleft> <U1000110C> <U10001161> <parenright> : "㉶" U3276 # CIRCLED HANGUL CIEUC A
-<Multi_key> <parenleft> <U1000110E> <U10001161> <parenright> : "㉷" U3277 # CIRCLED HANGUL CHIEUCH A
-<Multi_key> <parenleft> <U1000110F> <U10001161> <parenright> : "㉸" U3278 # CIRCLED HANGUL KHIEUKH A
-<Multi_key> <parenleft> <U10001110> <U10001161> <parenright> : "㉹" U3279 # CIRCLED HANGUL THIEUTH A
-<Multi_key> <parenleft> <U10001111> <U10001161> <parenright> : "㉺" U327A # CIRCLED HANGUL PHIEUPH A
-<Multi_key> <parenleft> <U10001112> <U10001161> <parenright> : "㉻" U327B # CIRCLED HANGUL HIEUH A
-<Multi_key> <parenleft> <U10004E00> <parenright> : "㊀" U3280 # CIRCLED IDEOGRAPH ONE
-<Multi_key> <parenleft> <U10004E8C> <parenright> : "㊁" U3281 # CIRCLED IDEOGRAPH TWO
-<Multi_key> <parenleft> <U10004E09> <parenright> : "㊂" U3282 # CIRCLED IDEOGRAPH THREE
-<Multi_key> <parenleft> <U100056DB> <parenright> : "㊃" U3283 # CIRCLED IDEOGRAPH FOUR
-<Multi_key> <parenleft> <U10004E94> <parenright> : "㊄" U3284 # CIRCLED IDEOGRAPH FIVE
-<Multi_key> <parenleft> <U1000516D> <parenright> : "㊅" U3285 # CIRCLED IDEOGRAPH SIX
-<Multi_key> <parenleft> <U10004E03> <parenright> : "㊆" U3286 # CIRCLED IDEOGRAPH SEVEN
-<Multi_key> <parenleft> <U1000516B> <parenright> : "㊇" U3287 # CIRCLED IDEOGRAPH EIGHT
-<Multi_key> <parenleft> <U10004E5D> <parenright> : "㊈" U3288 # CIRCLED IDEOGRAPH NINE
-<Multi_key> <parenleft> <U10005341> <parenright> : "㊉" U3289 # CIRCLED IDEOGRAPH TEN
-<Multi_key> <parenleft> <U10006708> <parenright> : "㊊" U328A # CIRCLED IDEOGRAPH MOON
-<Multi_key> <parenleft> <U1000706B> <parenright> : "㊋" U328B # CIRCLED IDEOGRAPH FIRE
-<Multi_key> <parenleft> <U10006C34> <parenright> : "㊌" U328C # CIRCLED IDEOGRAPH WATER
-<Multi_key> <parenleft> <U10006728> <parenright> : "㊍" U328D # CIRCLED IDEOGRAPH WOOD
-<Multi_key> <parenleft> <U100091D1> <parenright> : "㊎" U328E # CIRCLED IDEOGRAPH METAL
-<Multi_key> <parenleft> <U1000571F> <parenright> : "㊏" U328F # CIRCLED IDEOGRAPH EARTH
-<Multi_key> <parenleft> <U100065E5> <parenright> : "㊐" U3290 # CIRCLED IDEOGRAPH SUN
-<Multi_key> <parenleft> <U1000682A> <parenright> : "㊑" U3291 # CIRCLED IDEOGRAPH STOCK
-<Multi_key> <parenleft> <U10006709> <parenright> : "㊒" U3292 # CIRCLED IDEOGRAPH HAVE
-<Multi_key> <parenleft> <U1000793E> <parenright> : "㊓" U3293 # CIRCLED IDEOGRAPH SOCIETY
-<Multi_key> <parenleft> <U1000540D> <parenright> : "㊔" U3294 # CIRCLED IDEOGRAPH NAME
-<Multi_key> <parenleft> <U10007279> <parenright> : "㊕" U3295 # CIRCLED IDEOGRAPH SPECIAL
-<Multi_key> <parenleft> <U10008CA1> <parenright> : "㊖" U3296 # CIRCLED IDEOGRAPH FINANCIAL
-<Multi_key> <parenleft> <U1000795D> <parenright> : "㊗" U3297 # CIRCLED IDEOGRAPH CONGRATULATION
-<Multi_key> <parenleft> <U100052B4> <parenright> : "㊘" U3298 # CIRCLED IDEOGRAPH LABOR
-<Multi_key> <parenleft> <U100079D8> <parenright> : "㊙" U3299 # CIRCLED IDEOGRAPH SECRET
-<Multi_key> <parenleft> <U10007537> <parenright> : "㊚" U329A # CIRCLED IDEOGRAPH MALE
-<Multi_key> <parenleft> <U10005973> <parenright> : "㊛" U329B # CIRCLED IDEOGRAPH FEMALE
-<Multi_key> <parenleft> <U10009069> <parenright> : "㊜" U329C # CIRCLED IDEOGRAPH SUITABLE
-<Multi_key> <parenleft> <U1000512A> <parenright> : "㊝" U329D # CIRCLED IDEOGRAPH EXCELLENT
-<Multi_key> <parenleft> <U10005370> <parenright> : "㊞" U329E # CIRCLED IDEOGRAPH PRINT
-<Multi_key> <parenleft> <U10006CE8> <parenright> : "㊟" U329F # CIRCLED IDEOGRAPH ATTENTION
-<Multi_key> <parenleft> <U10009805> <parenright> : "㊠" U32A0 # CIRCLED IDEOGRAPH ITEM
-<Multi_key> <parenleft> <U10004F11> <parenright> : "㊡" U32A1 # CIRCLED IDEOGRAPH REST
-<Multi_key> <parenleft> <U10005199> <parenright> : "㊢" U32A2 # CIRCLED IDEOGRAPH COPY
-<Multi_key> <parenleft> <U10006B63> <parenright> : "㊣" U32A3 # CIRCLED IDEOGRAPH CORRECT
-<Multi_key> <parenleft> <U10004E0A> <parenright> : "㊤" U32A4 # CIRCLED IDEOGRAPH HIGH
-<Multi_key> <parenleft> <U10004E2D> <parenright> : "㊥" U32A5 # CIRCLED IDEOGRAPH CENTRE
-<Multi_key> <parenleft> <U10004E0B> <parenright> : "㊦" U32A6 # CIRCLED IDEOGRAPH LOW
-<Multi_key> <parenleft> <U10005DE6> <parenright> : "㊧" U32A7 # CIRCLED IDEOGRAPH LEFT
-<Multi_key> <parenleft> <U100053F3> <parenright> : "㊨" U32A8 # CIRCLED IDEOGRAPH RIGHT
-<Multi_key> <parenleft> <U1000533B> <parenright> : "㊩" U32A9 # CIRCLED IDEOGRAPH MEDICINE
-<Multi_key> <parenleft> <U10005B97> <parenright> : "㊪" U32AA # CIRCLED IDEOGRAPH RELIGION
-<Multi_key> <parenleft> <U10005B66> <parenright> : "㊫" U32AB # CIRCLED IDEOGRAPH STUDY
-<Multi_key> <parenleft> <U100076E3> <parenright> : "㊬" U32AC # CIRCLED IDEOGRAPH SUPERVISE
-<Multi_key> <parenleft> <U10004F01> <parenright> : "㊭" U32AD # CIRCLED IDEOGRAPH ENTERPRISE
-<Multi_key> <parenleft> <U10008CC7> <parenright> : "㊮" U32AE # CIRCLED IDEOGRAPH RESOURCE
-<Multi_key> <parenleft> <U10005354> <parenright> : "㊯" U32AF # CIRCLED IDEOGRAPH ALLIANCE
-<Multi_key> <parenleft> <U1000591C> <parenright> : "㊰" U32B0 # CIRCLED IDEOGRAPH NIGHT
+<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
@@ -5507,74 +6105,74 @@ XCOMM group 1: cluster jamos made of three basic jamos
<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> <U100030F0> <parenright> : "㋼" U32FC # CIRCLED KATAKANA WI
-<Multi_key> <parenleft> <U100030F1> <parenright> : "㋽" U32FD # CIRCLED KATAKANA WE
+<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> <U100005B4> <hebrew_yod> : "יִ" UFB1D # HEBREW LETTER YOD WITH HIRIQ
-<Multi_key> <U100005B7> <U100005F2> : "ײַ" UFB1F # HEBREW LIGATURE YIDDISH YOD YOD PATAH
-<Multi_key> <U100005C1> <hebrew_shin> : "שׁ" UFB2A # HEBREW LETTER SHIN WITH SHIN DOT
-<Multi_key> <U100005C2> <hebrew_shin> : "שׂ" UFB2B # HEBREW LETTER SHIN WITH SIN DOT
-<Multi_key> <U100005C1> <U1000FB49> : "שּׁ" UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
-<Multi_key> <U100005C1> <U100005BC> <hebrew_shin> : "שּׁ" UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
-<Multi_key> <U100005C2> <U1000FB49> : "שּׂ" UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
-<Multi_key> <U100005C2> <U100005BC> <hebrew_shin> : "שּׂ" UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
-<Multi_key> <U100005B7> <hebrew_aleph> : "אַ" UFB2E # HEBREW LETTER ALEF WITH PATAH
-<Multi_key> <U100005B8> <hebrew_aleph> : "אָ" UFB2F # HEBREW LETTER ALEF WITH QAMATS
-<Multi_key> <U100005BC> <hebrew_aleph> : "אּ" UFB30 # HEBREW LETTER ALEF WITH MAPIQ
-<Multi_key> <U100005BC> <hebrew_bet> : "בּ" UFB31 # HEBREW LETTER BET WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_beth> : "בּ" UFB31 # HEBREW LETTER BET WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_gimel> : "גּ" UFB32 # HEBREW LETTER GIMEL WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_gimmel> : "גּ" UFB32 # HEBREW LETTER GIMEL WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_dalet> : "דּ" UFB33 # HEBREW LETTER DALET WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_daleth> : "דּ" UFB33 # HEBREW LETTER DALET WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_he> : "הּ" UFB34 # HEBREW LETTER HE WITH MAPIQ
-<Multi_key> <U100005BC> <hebrew_waw> : "וּ" UFB35 # HEBREW LETTER VAV WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_zain> : "זּ" UFB36 # HEBREW LETTER ZAYIN WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_zayin> : "זּ" UFB36 # HEBREW LETTER ZAYIN WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_tet> : "טּ" UFB38 # HEBREW LETTER TET WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_teth> : "טּ" UFB38 # HEBREW LETTER TET WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_yod> : "יּ" UFB39 # HEBREW LETTER YOD WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_finalkaph> : "ךּ" UFB3A # HEBREW LETTER FINAL KAF WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_kaph> : "כּ" UFB3B # HEBREW LETTER KAF WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_lamed> : "לּ" UFB3C # HEBREW LETTER LAMED WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_mem> : "מּ" UFB3E # HEBREW LETTER MEM WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_nun> : "נּ" UFB40 # HEBREW LETTER NUN WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_samech> : "סּ" UFB41 # HEBREW LETTER SAMEKH WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_samekh> : "סּ" UFB41 # HEBREW LETTER SAMEKH WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_finalpe> : "ףּ" UFB43 # HEBREW LETTER FINAL PE WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_pe> : "פּ" UFB44 # HEBREW LETTER PE WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_zade> : "צּ" UFB46 # HEBREW LETTER TSADI WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_zadi> : "צּ" UFB46 # HEBREW LETTER TSADI WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_kuf> : "קּ" UFB47 # HEBREW LETTER QOF WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_qoph> : "קּ" UFB47 # HEBREW LETTER QOF WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_resh> : "רּ" UFB48 # HEBREW LETTER RESH WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_shin> : "שּ" UFB49 # HEBREW LETTER SHIN WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_taf> : "תּ" UFB4A # HEBREW LETTER TAV WITH DAGESH
-<Multi_key> <U100005BC> <hebrew_taw> : "תּ" UFB4A # HEBREW LETTER TAV WITH DAGESH
-<Multi_key> <U100005B9> <hebrew_waw> : "וֹ" UFB4B # HEBREW LETTER VAV WITH HOLAM
-<Multi_key> <U100005BF> <hebrew_bet> : "בֿ" UFB4C # HEBREW LETTER BET WITH RAFE
-<Multi_key> <U100005BF> <hebrew_beth> : "בֿ" UFB4C # HEBREW LETTER BET WITH RAFE
-<Multi_key> <U100005BF> <hebrew_kaph> : "כֿ" UFB4D # HEBREW LETTER KAF WITH RAFE
-<Multi_key> <U100005BF> <hebrew_pe> : "פֿ" UFB4E # HEBREW LETTER PE WITH RAFE
-<Multi_key> <U1001D157> <U1001D165> : "텞" U1D15E # MUSICAL SYMBOL HALF NOTE
-<Multi_key> <U1001D158> <U1001D165> : "텟" U1D15F # MUSICAL SYMBOL QUARTER NOTE
-<Multi_key> <U1001D15F> <U1001D16E> : "텠" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
-##<Multi_key> <U1001D158> <U1001D165> <U1001D16E> : "텠" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
-<Multi_key> <U1001D15F> <U1001D16F> : "텡" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
-##<Multi_key> <U1001D158> <U1001D165> <U1001D16F> : "텡" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
-<Multi_key> <U1001D15F> <U1001D170> : "텢" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
-##<Multi_key> <U1001D158> <U1001D165> <U1001D170> : "텢" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
-<Multi_key> <U1001D15F> <U1001D171> : "텣" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
-##<Multi_key> <U1001D158> <U1001D165> <U1001D171> : "텣" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
-<Multi_key> <U1001D15F> <U1001D172> : "텤" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
-##<Multi_key> <U1001D158> <U1001D165> <U1001D172> : "텤" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
-<Multi_key> <U1001D1B9> <U1001D165> : "톻" U1D1BB # MUSICAL SYMBOL MINIMA
-<Multi_key> <U1001D1BA> <U1001D165> : "톼" U1D1BC # MUSICAL SYMBOL MINIMA BLACK
-<Multi_key> <U1001D1BB> <U1001D16E> : "톽" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
-##<Multi_key> <U1001D1B9> <U1001D165> <U1001D16E> : "톽" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
-<Multi_key> <U1001D1BC> <U1001D16E> : "톾" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
-##<Multi_key> <U1001D1BA> <U1001D165> <U1001D16E> : "톾" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
-<Multi_key> <U1001D1BB> <U1001D16F> : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE
-##<Multi_key> <U1001D1B9> <U1001D165> <U1001D16F> : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE
-<Multi_key> <U1001D1BC> <U1001D16F> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
-##<Multi_key> <U1001D1BA> <U1001D165> <U1001D16F> : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+<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
diff --git a/lib/libX11/nls/en_US.UTF-8/Makefile.in b/lib/libX11/nls/en_US.UTF-8/Makefile.in
index 12e48c0d2..2466509a7 100644
--- a/lib/libX11/nls/en_US.UTF-8/Makefile.in
+++ b/lib/libX11/nls/en_US.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/georgian-academy/Makefile.in b/lib/libX11/nls/georgian-academy/Makefile.in
index 1fdb21345..b2d30ef74 100644
--- a/lib/libX11/nls/georgian-academy/Makefile.in
+++ b/lib/libX11/nls/georgian-academy/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-academy
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/georgian-ps/Makefile.in b/lib/libX11/nls/georgian-ps/Makefile.in
index be362ae3a..182e31254 100644
--- a/lib/libX11/nls/georgian-ps/Makefile.in
+++ b/lib/libX11/nls/georgian-ps/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-ps
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ibm-cp1133/Makefile.in b/lib/libX11/nls/ibm-cp1133/Makefile.in
index ea7384d1f..e65f8f547 100644
--- a/lib/libX11/nls/ibm-cp1133/Makefile.in
+++ b/lib/libX11/nls/ibm-cp1133/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ibm-cp1133
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iscii-dev/Makefile.in b/lib/libX11/nls/iscii-dev/Makefile.in
index 2d7a65f92..0b8410197 100644
--- a/lib/libX11/nls/iscii-dev/Makefile.in
+++ b/lib/libX11/nls/iscii-dev/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iscii-dev
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/isiri-3342/Makefile.in b/lib/libX11/nls/isiri-3342/Makefile.in
index c38792f32..374bc4ff5 100644
--- a/lib/libX11/nls/isiri-3342/Makefile.in
+++ b/lib/libX11/nls/isiri-3342/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/isiri-3342
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-1/Makefile.in b/lib/libX11/nls/iso8859-1/Makefile.in
index 40e3dcccf..8851b1d5c 100644
--- a/lib/libX11/nls/iso8859-1/Makefile.in
+++ b/lib/libX11/nls/iso8859-1/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-1
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-10/Makefile.in b/lib/libX11/nls/iso8859-10/Makefile.in
index 705c8fefe..25eb71c71 100644
--- a/lib/libX11/nls/iso8859-10/Makefile.in
+++ b/lib/libX11/nls/iso8859-10/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-10
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-11/Makefile.in b/lib/libX11/nls/iso8859-11/Makefile.in
index 4660bf16d..fbcd38049 100644
--- a/lib/libX11/nls/iso8859-11/Makefile.in
+++ b/lib/libX11/nls/iso8859-11/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-11
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-13/Makefile.in b/lib/libX11/nls/iso8859-13/Makefile.in
index 17f3c7679..b5706ad58 100644
--- a/lib/libX11/nls/iso8859-13/Makefile.in
+++ b/lib/libX11/nls/iso8859-13/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-13
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-14/Makefile.in b/lib/libX11/nls/iso8859-14/Makefile.in
index 152797266..9d47fb14d 100644
--- a/lib/libX11/nls/iso8859-14/Makefile.in
+++ b/lib/libX11/nls/iso8859-14/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-14
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-15/Compose.pre b/lib/libX11/nls/iso8859-15/Compose.pre
index b936e58e5..d9264cd3d 100644
--- a/lib/libX11/nls/iso8859-15/Compose.pre
+++ b/lib/libX11/nls/iso8859-15/Compose.pre
@@ -56,8 +56,12 @@ XCOMM Special Character
<Multi_key> <equal> <L> : "\243" sterling
<Multi_key> <C> <equal> : "\244" EuroSign
<Multi_key> <equal> <C> : "\244" EuroSign
+<Multi_key> <c> <equal> : "\244" EuroSign
+<Multi_key> <equal> <c> : "\244" EuroSign
<Multi_key> <E> <equal> : "\244" EuroSign
+<Multi_key> <equal> <E> : "\244" EuroSign
<Multi_key> <e> <equal> : "\244" EuroSign
+<Multi_key> <equal> <e> : "\244" EuroSign
<Multi_key> <y> <minus> : "\245" yen
<Multi_key> <minus> <y> : "\245" yen
<Multi_key> <Y> <minus> : "\245" yen
diff --git a/lib/libX11/nls/iso8859-15/Makefile.in b/lib/libX11/nls/iso8859-15/Makefile.in
index e2a4c1bf5..f9672183c 100644
--- a/lib/libX11/nls/iso8859-15/Makefile.in
+++ b/lib/libX11/nls/iso8859-15/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-15
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-2/Makefile.in b/lib/libX11/nls/iso8859-2/Makefile.in
index fcb24816e..fd3561dcc 100644
--- a/lib/libX11/nls/iso8859-2/Makefile.in
+++ b/lib/libX11/nls/iso8859-2/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-2
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-3/Compose.pre b/lib/libX11/nls/iso8859-3/Compose.pre
index 71a588576..fe52a597c 100644
--- a/lib/libX11/nls/iso8859-3/Compose.pre
+++ b/lib/libX11/nls/iso8859-3/Compose.pre
@@ -47,6 +47,10 @@ XCOMM Special Character
<Multi_key> <equal> <L> : "\243" sterling
<Multi_key> <C> <equal> : "\244" EuroSign
<Multi_key> <equal> <C> : "\244" EuroSign
+<Multi_key> <c> <equal> : "\244" EuroSign
+<Multi_key> <equal> <c> : "\244" EuroSign
+<Multi_key> <E> <equal> : "\244" EuroSign
+<Multi_key> <equal> <E> : "\244" EuroSign
<Multi_key> <e> <equal> : "\244" EuroSign
<Multi_key> <equal> <e> : "\244" EuroSign
<Multi_key> <y> <minus> : "\245" yen
diff --git a/lib/libX11/nls/iso8859-3/Makefile.in b/lib/libX11/nls/iso8859-3/Makefile.in
index 626c77118..a3e40aa65 100644
--- a/lib/libX11/nls/iso8859-3/Makefile.in
+++ b/lib/libX11/nls/iso8859-3/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-3
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-4/Makefile.in b/lib/libX11/nls/iso8859-4/Makefile.in
index c398bc117..d7378f006 100644
--- a/lib/libX11/nls/iso8859-4/Makefile.in
+++ b/lib/libX11/nls/iso8859-4/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-4
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-5/Makefile.in b/lib/libX11/nls/iso8859-5/Makefile.in
index cb8adf731..9d18d574f 100644
--- a/lib/libX11/nls/iso8859-5/Makefile.in
+++ b/lib/libX11/nls/iso8859-5/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-5
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-6/Makefile.in b/lib/libX11/nls/iso8859-6/Makefile.in
index 642e87149..65430dd27 100644
--- a/lib/libX11/nls/iso8859-6/Makefile.in
+++ b/lib/libX11/nls/iso8859-6/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-6
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-7/Makefile.in b/lib/libX11/nls/iso8859-7/Makefile.in
index 4f9dc1b59..51e926f2c 100644
--- a/lib/libX11/nls/iso8859-7/Makefile.in
+++ b/lib/libX11/nls/iso8859-7/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-7
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-8/Makefile.in b/lib/libX11/nls/iso8859-8/Makefile.in
index ef1387e91..97b887151 100644
--- a/lib/libX11/nls/iso8859-8/Makefile.in
+++ b/lib/libX11/nls/iso8859-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-9/Compose.pre b/lib/libX11/nls/iso8859-9/Compose.pre
index 13ae0b40f..748e8ace6 100644
--- a/lib/libX11/nls/iso8859-9/Compose.pre
+++ b/lib/libX11/nls/iso8859-9/Compose.pre
@@ -55,6 +55,10 @@ XCOMM Special Character
<Multi_key> <equal> <L> : "\243" sterling
<Multi_key> <C> <equal> : "\244" EuroSign
<Multi_key> <equal> <C> : "\244" EuroSign
+<Multi_key> <c> <equal> : "\244" EuroSign
+<Multi_key> <equal> <c> : "\244" EuroSign
+<Multi_key> <E> <equal> : "\244" EuroSign
+<Multi_key> <equal> <E> : "\244" EuroSign
<Multi_key> <e> <equal> : "\244" EuroSign
<Multi_key> <equal> <e> : "\244" EuroSign
<Multi_key> <y> <minus> : "\245" yen
diff --git a/lib/libX11/nls/iso8859-9/Makefile.in b/lib/libX11/nls/iso8859-9/Makefile.in
index 777b63025..65bba0c82 100644
--- a/lib/libX11/nls/iso8859-9/Makefile.in
+++ b/lib/libX11/nls/iso8859-9/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/iso8859-9e/Compose.pre b/lib/libX11/nls/iso8859-9e/Compose.pre
index a87899ad3..f8c08f64b 100644
--- a/lib/libX11/nls/iso8859-9e/Compose.pre
+++ b/lib/libX11/nls/iso8859-9e/Compose.pre
@@ -54,6 +54,10 @@ XCOMM Special Character
<Multi_key> <equal> <L> : "\243" sterling
<Multi_key> <C> <equal> : "\244" EuroSign
<Multi_key> <equal> <C> : "\244" EuroSign
+<Multi_key> <c> <equal> : "\244" EuroSign
+<Multi_key> <equal> <c> : "\244" EuroSign
+<Multi_key> <E> <equal> : "\244" EuroSign
+<Multi_key> <equal> <E> : "\244" EuroSign
<Multi_key> <e> <equal> : "\244" EuroSign
<Multi_key> <equal> <e> : "\244" EuroSign
<Multi_key> <y> <minus> : "\245" yen
diff --git a/lib/libX11/nls/iso8859-9e/Makefile.in b/lib/libX11/nls/iso8859-9e/Makefile.in
index ff9166773..8ba278f43 100644
--- a/lib/libX11/nls/iso8859-9e/Makefile.in
+++ b/lib/libX11/nls/iso8859-9e/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-9e
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ja.JIS/Makefile.in b/lib/libX11/nls/ja.JIS/Makefile.in
index cb987e471..1331aa552 100644
--- a/lib/libX11/nls/ja.JIS/Makefile.in
+++ b/lib/libX11/nls/ja.JIS/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ja.JIS
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ja.S90/Makefile.in b/lib/libX11/nls/ja.S90/Makefile.in
index 78d2a2c49..c202adb6a 100644
--- a/lib/libX11/nls/ja.S90/Makefile.in
+++ b/lib/libX11/nls/ja.S90/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ja.S90
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ja.SJIS/Makefile.in b/lib/libX11/nls/ja.SJIS/Makefile.in
index 252ca7322..f68547020 100644
--- a/lib/libX11/nls/ja.SJIS/Makefile.in
+++ b/lib/libX11/nls/ja.SJIS/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ja.SJIS
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ja.U90/Makefile.in b/lib/libX11/nls/ja.U90/Makefile.in
index 7d7b60068..acce1651c 100644
--- a/lib/libX11/nls/ja.U90/Makefile.in
+++ b/lib/libX11/nls/ja.U90/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ja.U90
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ja/Makefile.in b/lib/libX11/nls/ja/Makefile.in
index 1bc64363a..99fa0a6e5 100644
--- a/lib/libX11/nls/ja/Makefile.in
+++ b/lib/libX11/nls/ja/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ja
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ja_JP.UTF-8/Makefile.in b/lib/libX11/nls/ja_JP.UTF-8/Makefile.in
index 3e5e4c174..9acbc9ed6 100644
--- a/lib/libX11/nls/ja_JP.UTF-8/Makefile.in
+++ b/lib/libX11/nls/ja_JP.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ja_JP.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ko/Makefile.in b/lib/libX11/nls/ko/Makefile.in
index a07453b42..dc4a9d290 100644
--- a/lib/libX11/nls/ko/Makefile.in
+++ b/lib/libX11/nls/ko/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ko
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/ko_KR.UTF-8/Makefile.in b/lib/libX11/nls/ko_KR.UTF-8/Makefile.in
index 48e900135..c7b0891b0 100644
--- a/lib/libX11/nls/ko_KR.UTF-8/Makefile.in
+++ b/lib/libX11/nls/ko_KR.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/ko_KR.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/koi8-c/Makefile.in b/lib/libX11/nls/koi8-c/Makefile.in
index 34b1bf93b..a6dc60056 100644
--- a/lib/libX11/nls/koi8-c/Makefile.in
+++ b/lib/libX11/nls/koi8-c/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-c
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/koi8-r/Makefile.in b/lib/libX11/nls/koi8-r/Makefile.in
index 0c3ad963b..bfcc184d6 100644
--- a/lib/libX11/nls/koi8-r/Makefile.in
+++ b/lib/libX11/nls/koi8-r/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-r
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/koi8-u/Makefile.in b/lib/libX11/nls/koi8-u/Makefile.in
index bec54672c..d8d8afc50 100644
--- a/lib/libX11/nls/koi8-u/Makefile.in
+++ b/lib/libX11/nls/koi8-u/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/koi8-u
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/locale.alias.pre b/lib/libX11/nls/locale.alias.pre
index a74ca759e..87f521726 100644
--- a/lib/libX11/nls/locale.alias.pre
+++ b/lib/libX11/nls/locale.alias.pre
@@ -146,6 +146,15 @@ bs_BA.iso88592: bs_BA.ISO8859-2
bs_BA.ISO-8859-2: bs_BA.ISO8859-2
bs_BA.ISO_8859-2: bs_BA.ISO8859-2
ca: ca_ES.ISO8859-1
+ca_AD: ca_AD.ISO8859-1
+ca_AD@euro: ca_AD.ISO8859-15
+ca_AD.iso88591: ca_AD.ISO8859-1
+ca_AD.ISO-8859-1: ca_AD.ISO8859-1
+ca_AD.iso885915: ca_AD.ISO8859-15
+ca_AD.utf8: ca_AD.UTF-8
+ca_AD.ISO-8859-15: ca_AD.ISO8859-15
+ca_AD.ISO-8859-15@euro: ca_AD.ISO8859-15
+ca_AD.UTF-8@euro: ca_AD.UTF-8
ca_ES: ca_ES.ISO8859-1
ca_ES@euro: ca_ES.ISO8859-15
ca_ES.iso88591: ca_ES.ISO8859-1
@@ -155,6 +164,24 @@ ca_ES.utf8: ca_ES.UTF-8
ca_ES.ISO-8859-15: ca_ES.ISO8859-15
ca_ES.ISO-8859-15@euro: ca_ES.ISO8859-15
ca_ES.UTF-8@euro: ca_ES.UTF-8
+ca_FR: ca_FR.ISO8859-1
+ca_FR@euro: ca_FR.ISO8859-15
+ca_FR.iso88591: ca_FR.ISO8859-1
+ca_FR.ISO-8859-1: ca_FR.ISO8859-1
+ca_FR.iso885915: ca_FR.ISO8859-15
+ca_FR.utf8: ca_FR.UTF-8
+ca_FR.ISO-8859-15: ca_FR.ISO8859-15
+ca_FR.ISO-8859-15@euro: ca_FR.ISO8859-15
+ca_FR.UTF-8@euro: ca_FR.UTF-8
+ca_IT: ca_IT.ISO8859-1
+ca_IT@euro: ca_IT.ISO8859-15
+ca_IT.iso88591: ca_IT.ISO8859-1
+ca_IT.ISO-8859-1: ca_IT.ISO8859-1
+ca_IT.iso885915: ca_IT.ISO8859-15
+ca_IT.utf8: ca_IT.UTF-8
+ca_IT.ISO-8859-15: ca_IT.ISO8859-15
+ca_IT.ISO-8859-15@euro: ca_IT.ISO8859-15
+ca_IT.UTF-8@euro: ca_IT.UTF-8
cs: cs_CZ.ISO8859-2
cs_CS: cs_CZ.ISO8859-2
cs_CS.ISO8859-2: cs_CZ.ISO8859-2
@@ -1237,7 +1264,10 @@ Arabic_Tunisia.1256: ar_TN.iso8859-6
Arabic_Yemen.1256: ar_YE.iso8859-6
Belarusian_Belarus.1251: be_BY.iso8859-5
Bulgarian_Bulgaria.1251: bg_BG.iso8859-5
+Catalan_Andorra.1252: ca_AD.iso8859-1
Catalan_Spain.1252: ca_ES.iso8859-1
+Catalan_France.1252: ca_FR.iso8859-1
+Catalan_Italy.1252: ca_IT.iso8859-1
Czech_Czech Republic.1250: cs_CZ.iso8859-2
Danish_Denmark.1252: da_DK.iso8859-1
German_Austria.1252: de_AT.iso8859-1
diff --git a/lib/libX11/nls/locale.dir.pre b/lib/libX11/nls/locale.dir.pre
index 275c8c842..6489388db 100644
--- a/lib/libX11/nls/locale.dir.pre
+++ b/lib/libX11/nls/locale.dir.pre
@@ -34,12 +34,18 @@ microsoft-cp1251/XLC_LOCALE: be_BY.CP1251
iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5
microsoft-cp1251/XLC_LOCALE: bg_BG.CP1251
koi8-r/XLC_LOCALE: bg_BG.KOI8-R
-iso8859-2/XLC_LOCALE bs_BA.ISO8859-2
+iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2
iso8859-1/XLC_LOCALE: br_FR.ISO8859-1
iso8859-14/XLC_LOCALE: br_FR.ISO8859-14
iso8859-15/XLC_LOCALE: br_FR.ISO8859-15
+iso8859-1/XLC_LOCALE: ca_AD.ISO8859-1
+iso8859-15/XLC_LOCALE: ca_AD.ISO8859-15
iso8859-1/XLC_LOCALE: ca_ES.ISO8859-1
iso8859-15/XLC_LOCALE: ca_ES.ISO8859-15
+iso8859-1/XLC_LOCALE: ca_FR.ISO8859-1
+iso8859-15/XLC_LOCALE: ca_FR.ISO8859-15
+iso8859-1/XLC_LOCALE: ca_IT.ISO8859-1
+iso8859-15/XLC_LOCALE: ca_IT.ISO8859-15
iso8859-2/XLC_LOCALE: cs_CZ.ISO8859-2
iso8859-1/XLC_LOCALE: cy_GB.ISO8859-1
iso8859-14/XLC_LOCALE: cy_GB.ISO8859-14
@@ -263,7 +269,7 @@ en_US.UTF-8/XLC_LOCALE: ar_LB.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_LY.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_MA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_OM.UTF-8
-en_US.UTF-8/XLC_LOCALE bs_BA.UTF-8
+en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_QA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8
@@ -278,7 +284,10 @@ en_US.UTF-8/XLC_LOCALE: bg_BG.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_BD.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8
+en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
+en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8
+en_US.UTF-8/XLC_LOCALE: ca_IT.UTF-8
en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
diff --git a/lib/libX11/nls/microsoft-cp1251/Makefile.in b/lib/libX11/nls/microsoft-cp1251/Makefile.in
index 9f27abfc0..a0b4a95a7 100644
--- a/lib/libX11/nls/microsoft-cp1251/Makefile.in
+++ b/lib/libX11/nls/microsoft-cp1251/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1251
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/microsoft-cp1255/Makefile.in b/lib/libX11/nls/microsoft-cp1255/Makefile.in
index b602339eb..c1d336a35 100644
--- a/lib/libX11/nls/microsoft-cp1255/Makefile.in
+++ b/lib/libX11/nls/microsoft-cp1255/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1255
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/microsoft-cp1256/Makefile.in b/lib/libX11/nls/microsoft-cp1256/Makefile.in
index 454d54516..6d10bbbf0 100644
--- a/lib/libX11/nls/microsoft-cp1256/Makefile.in
+++ b/lib/libX11/nls/microsoft-cp1256/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/microsoft-cp1256
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/mulelao-1/Makefile.in b/lib/libX11/nls/mulelao-1/Makefile.in
index 80262dd3a..dfbdbdc44 100644
--- a/lib/libX11/nls/mulelao-1/Makefile.in
+++ b/lib/libX11/nls/mulelao-1/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/mulelao-1
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/nokhchi-1/Makefile.in b/lib/libX11/nls/nokhchi-1/Makefile.in
index 0fe1b2351..2ad11487c 100644
--- a/lib/libX11/nls/nokhchi-1/Makefile.in
+++ b/lib/libX11/nls/nokhchi-1/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/nokhchi-1
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/pt_BR.UTF-8/Makefile.in b/lib/libX11/nls/pt_BR.UTF-8/Makefile.in
index 4b2192da7..d8d7e3d39 100644
--- a/lib/libX11/nls/pt_BR.UTF-8/Makefile.in
+++ b/lib/libX11/nls/pt_BR.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/pt_BR.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/tatar-cyr/Makefile.in b/lib/libX11/nls/tatar-cyr/Makefile.in
index 47079859d..f4ae25585 100644
--- a/lib/libX11/nls/tatar-cyr/Makefile.in
+++ b/lib/libX11/nls/tatar-cyr/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/tatar-cyr
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/th_TH.UTF-8/Makefile.in b/lib/libX11/nls/th_TH.UTF-8/Makefile.in
index c35319642..453cc3fe5 100644
--- a/lib/libX11/nls/th_TH.UTF-8/Makefile.in
+++ b/lib/libX11/nls/th_TH.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/th_TH/Makefile.in b/lib/libX11/nls/th_TH/Makefile.in
index ffad30711..6752d5296 100644
--- a/lib/libX11/nls/th_TH/Makefile.in
+++ b/lib/libX11/nls/th_TH/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/th_TH
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/tscii-0/Makefile.in b/lib/libX11/nls/tscii-0/Makefile.in
index 9159a425e..b32dfffaf 100644
--- a/lib/libX11/nls/tscii-0/Makefile.in
+++ b/lib/libX11/nls/tscii-0/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/tscii-0
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/vi_VN.tcvn/Makefile.in b/lib/libX11/nls/vi_VN.tcvn/Makefile.in
index 92ad0a2b9..63a4ca596 100644
--- a/lib/libX11/nls/vi_VN.tcvn/Makefile.in
+++ b/lib/libX11/nls/vi_VN.tcvn/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.tcvn
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/vi_VN.viscii/Makefile.in b/lib/libX11/nls/vi_VN.viscii/Makefile.in
index 12a5b48e2..a8274e05c 100644
--- a/lib/libX11/nls/vi_VN.viscii/Makefile.in
+++ b/lib/libX11/nls/vi_VN.viscii/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/vi_VN.viscii
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_CN.UTF-8/Makefile.in b/lib/libX11/nls/zh_CN.UTF-8/Makefile.in
index 3627639f2..afd28481a 100644
--- a/lib/libX11/nls/zh_CN.UTF-8/Makefile.in
+++ b/lib/libX11/nls/zh_CN.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_CN.gb18030/Makefile.in b/lib/libX11/nls/zh_CN.gb18030/Makefile.in
index 7a9607a6d..5db44f7db 100644
--- a/lib/libX11/nls/zh_CN.gb18030/Makefile.in
+++ b/lib/libX11/nls/zh_CN.gb18030/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gb18030
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_CN.gbk/Makefile.in b/lib/libX11/nls/zh_CN.gbk/Makefile.in
index 55a0f199d..6105cdce0 100644
--- a/lib/libX11/nls/zh_CN.gbk/Makefile.in
+++ b/lib/libX11/nls/zh_CN.gbk/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN.gbk
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_CN/Makefile.in b/lib/libX11/nls/zh_CN/Makefile.in
index 4e078d302..92afed6d8 100644
--- a/lib/libX11/nls/zh_CN/Makefile.in
+++ b/lib/libX11/nls/zh_CN/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_CN
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_HK.UTF-8/Makefile.in b/lib/libX11/nls/zh_HK.UTF-8/Makefile.in
index 17d0b46b9..f32dce346 100644
--- a/lib/libX11/nls/zh_HK.UTF-8/Makefile.in
+++ b/lib/libX11/nls/zh_HK.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_HK.big5/Makefile.in b/lib/libX11/nls/zh_HK.big5/Makefile.in
index 51e43c501..a7d901949 100644
--- a/lib/libX11/nls/zh_HK.big5/Makefile.in
+++ b/lib/libX11/nls/zh_HK.big5/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in b/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in
index e829e4a5d..ed31048a9 100644
--- a/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in
+++ b/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_HK.big5hkscs
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_TW.UTF-8/Makefile.in b/lib/libX11/nls/zh_TW.UTF-8/Makefile.in
index 3fae1b700..9c85b197d 100644
--- a/lib/libX11/nls/zh_TW.UTF-8/Makefile.in
+++ b/lib/libX11/nls/zh_TW.UTF-8/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.UTF-8
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_TW.big5/Makefile.in b/lib/libX11/nls/zh_TW.big5/Makefile.in
index af595ac29..9282010ea 100644
--- a/lib/libX11/nls/zh_TW.big5/Makefile.in
+++ b/lib/libX11/nls/zh_TW.big5/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW.big5
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/nls/zh_TW/Makefile.in b/lib/libX11/nls/zh_TW/Makefile.in
index 083cf7e3f..edb41399f 100644
--- a/lib/libX11/nls/zh_TW/Makefile.in
+++ b/lib/libX11/nls/zh_TW/Makefile.in
@@ -96,6 +96,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
x11thislocaledir = $(X11_LOCALEDATADIR)/zh_TW
-SED = sed
SUFFIXES = .pre
WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
diff --git a/lib/libX11/src/ConnDis.c b/lib/libX11/src/ConnDis.c
index 8b8639932..7be521dd7 100644
--- a/lib/libX11/src/ConnDis.c
+++ b/lib/libX11/src/ConnDis.c
@@ -303,7 +303,11 @@ _X11TransConnectDisplay (
#if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN) || defined(OS2PIPECONN)
if (!pprotocol) {
+#ifdef HAVE_LAUNCHD
+ if (!phostname || phostname[0]=='/') {
+#else
if (!phostname) {
+#endif
#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
pprotocol = copystring ("local", 5);
#if defined(TCPCONN)
@@ -449,6 +453,14 @@ _X11TransConnectDisplay (
*fullnamep = (char *) Xmalloc (len);
if (!*fullnamep) goto bad;
+#ifdef HAVE_LAUNCHD
+ if (phostname && strlen(phostname) > 11 && !strncmp(phostname, "/tmp/launch", 11))
+ sprintf (*fullnamep, "%s%s%d",
+ (phostname ? phostname : ""),
+ (dnet ? "::" : ":"),
+ idisplay);
+ else
+#endif
sprintf (*fullnamep, "%s%s%d.%d",
(phostname ? phostname : ""),
(dnet ? "::" : ":"),
diff --git a/lib/libX11/src/CrCmap.c b/lib/libX11/src/CrCmap.c
index c53faeb86..4ed67adc5 100644
--- a/lib/libX11/src/CrCmap.c
+++ b/lib/libX11/src/CrCmap.c
@@ -33,11 +33,11 @@ in this Software without prior written authorization from The Open Group.
#include "Xcmsint.h"
-Colormap XCreateColormap(dpy, w, visual, alloc)
-register Display *dpy;
-Window w;
-Visual *visual;
-int alloc;
+Colormap XCreateColormap(
+ register Display *dpy,
+ Window w,
+ Visual *visual,
+ int alloc)
{
register xCreateColormapReq *req;
Colormap mid;
@@ -53,7 +53,9 @@ int alloc;
UnlockDisplay(dpy);
SyncHandle();
+#ifdef XCMS
_XcmsAddCmapRec(dpy, mid, w, visual);
+#endif
return(mid);
}
diff --git a/lib/libX11/src/FreeCmap.c b/lib/libX11/src/FreeCmap.c
index c399c1f27..651aa14a5 100644
--- a/lib/libX11/src/FreeCmap.c
+++ b/lib/libX11/src/FreeCmap.c
@@ -46,6 +46,9 @@ XFreeColormap(
UnlockDisplay(dpy);
SyncHandle();
+#ifdef XCMS
_XcmsDeleteCmapRec(dpy, cmap);
+#endif
+
return 1;
}
diff --git a/lib/libX11/src/GetColor.c b/lib/libX11/src/GetColor.c
index 530f479db..1166be5f7 100644
--- a/lib/libX11/src/GetColor.c
+++ b/lib/libX11/src/GetColor.c
@@ -51,6 +51,7 @@ XColor *exact_def) /* RETURN */
XcmsColor cmsColor_exact;
Status ret;
+#ifdef XCMS
/*
* Let's Attempt to use Xcms and i18n approach to Parse Color
*/
@@ -76,6 +77,7 @@ XColor *exact_def) /* RETURN */
break;
}
}
+#endif
/*
* Xcms and i18n approach failed.
diff --git a/lib/libX11/src/LookupCol.c b/lib/libX11/src/LookupCol.c
index 02f831a6c..1473138e1 100644
--- a/lib/libX11/src/LookupCol.c
+++ b/lib/libX11/src/LookupCol.c
@@ -49,6 +49,7 @@ XLookupColor (
XcmsCCC ccc;
XcmsColor cmsColor_exact;
+#ifdef XCMS
/*
* Let's Attempt to use Xcms and i18n approach to Parse Color
*/
@@ -73,6 +74,7 @@ XLookupColor (
break;
}
}
+#endif
/*
* Xcms and i18n methods failed, so lets pass it to the server
diff --git a/lib/libX11/src/Makefile.am b/lib/libX11/src/Makefile.am
index 18e4cbb0c..564e03f3e 100644
--- a/lib/libX11/src/Makefile.am
+++ b/lib/libX11/src/Makefile.am
@@ -402,6 +402,19 @@ lint: $(BUILT_SOURCES)
done
endif LINT
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
+
+CLEANFILES += $(lintlib_DATA)
+
+$(LINTLIB): $(libX11_la_SOURCES)
+ $(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
+endif MAKE_LINT_LIB
+
#
# Building ks_tables.h requires the makekeys utility
#
@@ -413,6 +426,6 @@ ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
mv ks_tables_h $@
$(top_builddir)/src/util/makekeys$(EXEEXT): force
- cd util; $(MAKE)
+ cd util && $(MAKE)
force:
diff --git a/lib/libX11/src/Makefile.in b/lib/libX11/src/Makefile.in
index fa1e8f58b..75814831e 100644
--- a/lib/libX11/src/Makefile.in
+++ b/lib/libX11/src/Makefile.in
@@ -55,6 +55,7 @@ host_triplet = @host@
@XCB_FALSE@ ConnDis.c \
@XCB_FALSE@ x11_trans.c
+@MAKE_LINT_LIB_TRUE@am__append_7 = $(lintlib_DATA)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in
@@ -72,7 +73,8 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(x11datadir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)" \
+ "$(DESTDIR)$(x11datadir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
@XCB_TRUE@libX11_xcb_la_DEPENDENCIES = libX11.la
@@ -221,8 +223,9 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
+lintlibDATA_INSTALL = $(INSTALL_DATA)
x11dataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(x11data_DATA)
+DATA = $(lintlib_DATA) $(x11data_DATA)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = util xcms xlibi18n xkb
@@ -256,6 +259,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -276,6 +280,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
# Building ks_tables.h requires the makekeys utility
#
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -283,6 +288,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -292,11 +298,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -311,6 +320,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -359,7 +369,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -404,7 +416,7 @@ target_alias = @target_alias@
SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
lib_LTLIBRARIES = libX11.la $(am__append_5)
BUILT_SOURCES = ks_tables.h
-CLEANFILES = ks_tables.h ks_tables_h
+CLEANFILES = ks_tables.h ks_tables_h $(am__append_7)
AM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
@@ -526,6 +538,9 @@ libX11_la_LIBADD = \
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+@MAKE_LINT_LIB_TRUE@lintlibdir = $(libdir)
+@MAKE_LINT_LIB_TRUE@lintlib_DATA = $(LINTLIB)
+@MAKE_LINT_LIB_TRUE@lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -910,6 +925,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-lintlibDATA: $(lintlib_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(lintlibdir)" || $(mkdir_p) "$(DESTDIR)$(lintlibdir)"
+ @list='$(lintlib_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(lintlibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(lintlibdir)/$$f'"; \
+ $(lintlibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(lintlibdir)/$$f"; \
+ done
+
+uninstall-lintlibDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lintlib_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(lintlibdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(lintlibdir)/$$f"; \
+ done
install-x11dataDATA: $(x11data_DATA)
@$(NORMAL_INSTALL)
test -z "$(x11datadir)" || $(mkdir_p) "$(DESTDIR)$(x11datadir)"
@@ -1108,7 +1140,7 @@ check: $(BUILT_SOURCES)
all-am: Makefile $(LTLIBRARIES) $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(x11datadir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)" "$(DESTDIR)$(x11datadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -1159,7 +1191,7 @@ info: info-recursive
info-am:
-install-data-am: install-x11dataDATA
+install-data-am: install-lintlibDATA install-x11dataDATA
install-exec-am: install-libLTLIBRARIES
@@ -1188,7 +1220,7 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-x11dataDATA
+ uninstall-lintlibDATA uninstall-x11dataDATA
uninstall-info: uninstall-info-recursive
@@ -1200,13 +1232,14 @@ uninstall-info: uninstall-info-recursive
dvi dvi-am html html-am info info-am install install-am \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-libLTLIBRARIES \
- install-man install-strip install-x11dataDATA installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-libLTLIBRARIES uninstall-x11dataDATA
+ install-lintlibDATA install-man install-strip \
+ install-x11dataDATA installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-lintlibDATA uninstall-x11dataDATA
preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
@@ -1222,6 +1255,9 @@ preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
@LINT_TRUE@ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \
@LINT_TRUE@ done
+@MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libX11_la_SOURCES)
+@MAKE_LINT_LIB_TRUE@ $(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
+
ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
$(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
mv ks_tables_h $@
diff --git a/lib/libX11/src/ParseCol.c b/lib/libX11/src/ParseCol.c
index 3736fada2..e500ec6c1 100644
--- a/lib/libX11/src/ParseCol.c
+++ b/lib/libX11/src/ParseCol.c
@@ -86,6 +86,7 @@ XParseColor (
}
+#ifdef XCMS
/*
* Let's Attempt to use Xcms and i18n approach to Parse Color
*/
@@ -109,6 +110,7 @@ XParseColor (
break;
}
}
+#endif
/*
* Xcms and i18n methods failed, so lets pass it to the server
diff --git a/lib/libX11/src/SetLocale.c b/lib/libX11/src/SetLocale.c
index 6730338b4..2302c4473 100644
--- a/lib/libX11/src/SetLocale.c
+++ b/lib/libX11/src/SetLocale.c
@@ -121,7 +121,7 @@ _Xsetlocale(
#else /* X_LOCALE */
-#ifdef __DARWIN__
+#ifdef __APPLE__
char *
_Xsetlocale(
int category,
@@ -130,7 +130,7 @@ _Xsetlocale(
{
return setlocale(category, name);
}
-#endif /* __DARWIN__ */
+#endif /* __APPLE__ */
/*
* _XlcMapOSLocaleName is an implementation dependent routine that derives
diff --git a/lib/libX11/src/SetStCmap.c b/lib/libX11/src/SetStCmap.c
index b5a93e36e..7978f1dd8 100644
--- a/lib/libX11/src/SetStCmap.c
+++ b/lib/libX11/src/SetStCmap.c
@@ -62,11 +62,11 @@ SOFTWARE.
* in the XStandardColormap structure.
*/
-void XSetStandardColormap(dpy, w, cmap, property)
- Display *dpy;
- Window w;
- XStandardColormap *cmap;
- Atom property; /* XA_RGB_BEST_MAP, etc. */
+void XSetStandardColormap(
+ Display *dpy,
+ Window w,
+ XStandardColormap *cmap,
+ Atom property) /* XA_RGB_BEST_MAP, etc. */
{
Screen *sp;
XStandardColormap stdcmap;
@@ -88,6 +88,9 @@ void XSetStandardColormap(dpy, w, cmap, property)
stdcmap.visualid = sp->root_visual->visualid;
stdcmap.killid = None; /* don't know how to kill this one */
+#ifdef XCMS
XSetRGBColormaps (dpy, w, &stdcmap, 1, property);
+#endif
+
return;
}
diff --git a/lib/libX11/src/StNColor.c b/lib/libX11/src/StNColor.c
index f7dbcb065..3e3c36912 100644
--- a/lib/libX11/src/StNColor.c
+++ b/lib/libX11/src/StNColor.c
@@ -48,6 +48,7 @@ int flags) /* DoRed, DoGreen, DoBlue */
XcmsColor cmsColor_exact;
XColor scr_def;
+#ifdef XCMS
/*
* Let's Attempt to use Xcms approach to Parse Color
*/
@@ -64,6 +65,7 @@ int flags) /* DoRed, DoGreen, DoBlue */
* name. Thus pass name to the X Server.
*/
}
+#endif
/*
* The Xcms and i18n methods failed, so lets pass it to the server
diff --git a/lib/libX11/src/WMProps.c b/lib/libX11/src/WMProps.c
index 62c6a8d12..a581f335c 100644
--- a/lib/libX11/src/WMProps.c
+++ b/lib/libX11/src/WMProps.c
@@ -71,19 +71,19 @@ SOFTWARE.
* WM_CLIENT_MACHINE type: TEXT format: varies?
* WM_NORMAL_HINTS type: WM_SIZE_HINTS format: 32
* WM_CLASS type: STRING/STRING format: 8
+ * WM_LOCALE_NAME type: STRING format: 8
*/
-void XSetWMProperties (dpy, w, windowName, iconName, argv, argc, sizeHints,
- wmHints, classHints)
- Display *dpy;
- Window w; /* window to decorate */
- XTextProperty *windowName; /* name of application */
- XTextProperty *iconName; /* name string for icon */
- char **argv; /* command line */
- int argc; /* size of command line */
- XSizeHints *sizeHints; /* size hints for window in its normal state */
- XWMHints *wmHints; /* miscelaneous window manager hints */
- XClassHint *classHints; /* resource name and class */
+void XSetWMProperties (
+ Display *dpy,
+ Window w, /* window to decorate */
+ XTextProperty *windowName, /* name of application */
+ XTextProperty *iconName, /* name string for icon */
+ char **argv, /* command line */
+ int argc, /* size of command line */
+ XSizeHints *sizeHints, /* size hints for window in its normal state */
+ XWMHints *wmHints, /* miscelaneous window manager hints */
+ XClassHint *classHints) /* resource name and class */
{
XTextProperty textprop;
char hostName[256];
diff --git a/lib/libX11/src/XErrorDB b/lib/libX11/src/XErrorDB
index 2e34b1d66..70715a543 100644
--- a/lib/libX11/src/XErrorDB
+++ b/lib/libX11/src/XErrorDB
@@ -498,6 +498,18 @@ XRequest.GLX.17: X_GLXVendorPrivateWithReply
XRequest.GLX.18: X_GLXQueryExtensionsString
XRequest.GLX.19: X_GLXQueryServerString
XRequest.GLX.20: X_GLXClientInfo
+XRequest.GLX.21: X_GLXGetFBConfigs
+XRequest.GLX.22: X_GLXCreatePixmap
+XRequest.GLX.23: X_GLXDestroyPixmap
+XRequest.GLX.24: X_GLXCreateNewContext
+XRequest.GLX.25: X_GLXQueryContext
+XRequest.GLX.26: X_GLXMakeContextCurrent
+XRequest.GLX.27: X_GLXCreatePbuffer
+XRequest.GLX.28: X_GLXDestroyPbuffer
+XRequest.GLX.29: X_GLXGetDrawableAttributes
+XRequest.GLX.30: X_GLXChangeDrawableAttributes
+XRequest.GLX.31: X_GLXCreateWindow
+XRequest.GLX.32: X_GLXDestroyWindow
! GL Non-rendering Commands
XRequest.GLX.103: X_GLXDeleteLists
XRequest.GLX.102: X_GLXEndList
@@ -555,6 +567,10 @@ XProtoError.GLX.5: GLXBadCurrentWindow
XProtoError.GLX.6: GLXBadRenderRequest
XProtoError.GLX.7: GLXBadLargeRequest
XProtoError.GLX.8: GLXUnsupportedPrivateRequest
+XProtoError.GLX.9: GLXBadFBConfig
+XProtoError.GLX.10: GLXBadPbuffer
+XProtoError.GLX.11: GLXBadCurrentDrawable
+XProtoError.GLX.12: GLXBadWindow
! XC-MISC extension, an X Consortium standard
XRequest.XC-MISC.0: XCMiscGetVersion
XRequest.XC-MISC.1: XCMiscGetXIDRange
@@ -618,7 +634,7 @@ XProtoError.XFree86-Misc.5: XF86MiscModInDevDisabled
XProtoError.XFree86-Misc.6: XF86MiscModInDevClientNotLocal
XProtoError.XFree86-Misc.7: XF86MiscNoModule
! XFree86-DGA -- not an X Consortium standard
-XRequest.XFree86-DGA.0: XDGAQueryVersion
+XRequest.XFree86-DGA.0: XF86DGAQueryVersion
XRequest.XFree86-DGA.1: XF86DGAGetVideoLL
XRequest.XFree86-DGA.2: XF86DGADirectVideo
XRequest.XFree86-DGA.3: XF86DGAGetViewPortSize
@@ -875,6 +891,12 @@ XRequest.RENDER.27: RenderCreateCursor
XRequest.RENDER.28: RenderSetPictureTransform
XRequest.RENDER.29: RenderQueryFilters
XRequest.RENDER.30: RenderSetPictureFilter
+XRequest.RENDER.31: RenderCreateAnimCursor
+XRequest.RENDER.32: RenderAddTraps
+XRequest.RENDER.33: RenderCreateSolidFill
+XRequest.RENDER.34: RenderCreateLinearGradient
+XRequest.RENDER.35: RenderCreateRadialGradient
+XRequest.RENDER.36: RenderCreateConicalGradient
XProtoError.RENDER.0: RenderBadFormat (invalid PictFormat parameter)
XlibMessage.RENDER.0: PictFormat id in failed request: 0x%lx
XProtoError.RENDER.1: RenderBadPicture (invalid Picture parameter)
@@ -915,6 +937,8 @@ XRequest.XFIXES.25: XFixesGetCursorImageAndName
XRequest.XFIXES.26: XFixesChangeCursor
XRequest.XFIXES.27: XFixesChangeCursorByName
XRequest.XFIXES.28: XFixesExpandRegion
+XRequest.XFIXES.29: XFixesHideCursor
+XRequest.XFIXES.30: XFixesShowCursor
XProtoError.XFIXES.0: BadRegion (invalid Region parameter)
XlibMessage.XFIXES.0: Region id in failed request: 0x%lx
! DAMAGE extension
diff --git a/lib/libX11/src/XKeysymDB b/lib/libX11/src/XKeysymDB
index f14695057..539044417 100644
--- a/lib/libX11/src/XKeysymDB
+++ b/lib/libX11/src/XKeysymDB
@@ -199,6 +199,11 @@ XeroxPointerButton5 :10070005
! The definitions here should match <X11/XF86keysym.h>
XF86ModeLock :1008FF01
+XF86MonBrightnessUp :1008FF02
+XF86MonBrightnessDown :1008FF03
+XF86KbdLightOnOff :1008FF04
+XF86KbdBrightnessUp :1008FF05
+XF86KbdBrightnessDown :1008FF06
XF86Standby :1008FF10
XF86AudioLowerVolume :1008FF11
XF86AudioMute :1008FF12
diff --git a/lib/libX11/src/Xrm.c b/lib/libX11/src/Xrm.c
index a932a5ce2..65d058fa5 100644
--- a/lib/libX11/src/Xrm.c
+++ b/lib/libX11/src/Xrm.c
@@ -808,6 +808,7 @@ void XrmCombineDatabase(
}
}
(from->methods->destroy)(from->mbstate);
+ _XUnlockMutex(&from->linfo);
_XFreeMutex(&from->linfo);
Xfree((char *)from);
_XUnlockMutex(&(*into)->linfo);
@@ -2656,6 +2657,7 @@ void XrmDestroyDatabase(
else
DestroyNTable(table);
}
+ _XUnlockMutex(&db->linfo);
_XFreeMutex(&db->linfo);
(*db->methods->destroy)(db->mbstate);
Xfree((char *)db);
diff --git a/lib/libX11/src/config.h.in b/lib/libX11/src/config.h.in
index 80093dd12..e95cb99e3 100644
--- a/lib/libX11/src/config.h.in
+++ b/lib/libX11/src/config.h.in
@@ -36,6 +36,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* launchd support available */
+#undef HAVE_LAUNCHD
+
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -45,6 +48,9 @@
/* Use shl_load to load shared libraries */
#undef HAVE_SHL_LOAD
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -117,6 +123,9 @@
/* Support TCP socket connections */
#undef TCPCONN
+/* launchd support available */
+#undef TRANS_REOPEN
+
/* Support UNIX socket connections */
#undef UNIXCONN
diff --git a/lib/libX11/src/util/Makefile.in b/lib/libX11/src/util/Makefile.in
index 84725e101..21e8425fa 100644
--- a/lib/libX11/src/util/Makefile.in
+++ b/lib/libX11/src/util/Makefile.in
@@ -97,6 +97,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -113,6 +114,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -120,6 +122,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -129,11 +132,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -148,6 +154,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -196,7 +203,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/src/xcb_disp.c b/lib/libX11/src/xcb_disp.c
index 1d8231a58..079c87ffa 100644
--- a/lib/libX11/src/xcb_disp.c
+++ b/lib/libX11/src/xcb_disp.c
@@ -63,13 +63,22 @@ int _XConnectXCB(Display *dpy, _Xconst char *display, char **fullnamep, int *scr
if(!dpy->xcb)
return 0;
- if(!xcb_parse_display(display, &host, &n, screenp))
- return 0;
+#ifdef HAVE_LAUNCHD
+ if(!display || !*display) display = getenv("DISPLAY");
+
+ if(display && strlen(display)>11 && !strncmp(display, "/tmp/launch", 11)) {
+ /* do nothing -- the magic happens inside of xcb_connect */
+ } else
+#endif
+ {
+ if(!xcb_parse_display(display, &host, &n, screenp))
+ return 0;
- len = strlen(host) + (1 + 20 + 1 + 20 + 1);
- *fullnamep = Xmalloc(len);
- snprintf(*fullnamep, len, "%s:%d.%d", host, n, *screenp);
- free(host);
+ len = strlen(host) + (1 + 20 + 1 + 20 + 1);
+ *fullnamep = Xmalloc(len);
+ snprintf(*fullnamep, len, "%s:%d.%d", host, n, *screenp);
+ free(host);
+ }
_XLockMutex(_Xglobal_lock);
if(xauth.name && xauth.data)
diff --git a/lib/libX11/src/xcb_io.c b/lib/libX11/src/xcb_io.c
index 7717679e0..5f0718496 100644
--- a/lib/libX11/src/xcb_io.c
+++ b/lib/libX11/src/xcb_io.c
@@ -2,6 +2,7 @@
* This file is licensed under the MIT license. See the file COPYING. */
#include "Xlibint.h"
+#include "locking.h"
#include "Xxcbint.h"
#include <xcb/xcbext.h>
#include <xcb/xcbxlib.h>
@@ -67,16 +68,13 @@ static void check_internal_connections(Display *dpy)
}
}
-static void handle_event(Display *dpy, xcb_generic_event_t *e)
+static void condition_wait(Display *dpy, xcondition_t cv)
{
- if(!e)
- _XIOError(dpy);
- dpy->last_request_read = e->full_sequence;
- if(e->response_type == X_Error)
- _XError(dpy, (xError *) e);
- else
- _XEnq(dpy, (xEvent *) e);
- free(e);
+ _XPutXCBBuffer(dpy);
+ xcb_xlib_unlock(dpy->xcb->connection);
+ ConditionWait(dpy, cv);
+ xcb_xlib_lock(dpy->xcb->connection);
+ _XGetXCBBuffer(dpy);
}
static void call_handlers(Display *dpy, xcb_generic_reply_t *buf)
@@ -92,59 +90,89 @@ static void call_handlers(Display *dpy, xcb_generic_reply_t *buf)
_XError(dpy, (xError *) buf);
}
-static void process_responses(Display *dpy, int wait_for_first_event, xcb_generic_error_t **current_error, unsigned long current_request)
+static xcb_generic_event_t * wait_or_poll_for_event(Display *dpy, int wait)
+{
+ xcb_connection_t *c = dpy->xcb->connection;
+ xcb_generic_event_t *event;
+ if(wait)
+ {
+ UnlockDisplay(dpy);
+ event = xcb_wait_for_event(c);
+ LockDisplay(dpy);
+ }
+ else
+ event = xcb_poll_for_event(c);
+ return event;
+}
+
+static void process_responses(Display *dpy, int wait_for_first_event, xcb_generic_error_t **current_error, unsigned int current_request)
{
void *reply;
xcb_generic_event_t *event = dpy->xcb->next_event;
xcb_generic_error_t *error;
- PendingRequest *req;
xcb_connection_t *c = dpy->xcb->connection;
if(!event && dpy->xcb->event_owner == XlibOwnsEventQueue)
- {
- if(wait_for_first_event)
- {
- UnlockDisplay(dpy);
- event = xcb_wait_for_event(c);
- LockDisplay(dpy);
- }
- else
- event = xcb_poll_for_event(c);
- }
+ event = wait_or_poll_for_event(dpy, wait_for_first_event);
while(1)
{
- req = dpy->xcb->pending_requests;
- if(event && XCB_SEQUENCE_COMPARE(event->full_sequence, <=, current_request)
- && (!req || XCB_SEQUENCE_COMPARE(event->full_sequence, <=, req->sequence)))
+ PendingRequest *req = dpy->xcb->pending_requests;
+ assert(!(req && current_request && !XCB_SEQUENCE_COMPARE(req->sequence, <=, current_request)));
+ if(event && (!req || XCB_SEQUENCE_COMPARE(event->full_sequence, <=, req->sequence)))
{
- if(current_error && event->response_type == 0 && event->full_sequence == current_request)
+ dpy->last_request_read = event->full_sequence;
+ if(event->response_type != X_Error)
{
+ _XEnq(dpy, (xEvent *) event);
+ wait_for_first_event = 0;
+ }
+ else if(current_error && event->full_sequence == current_request)
+ {
+ /* This can only occur when called from
+ * _XReply, which doesn't need a new event. */
*current_error = (xcb_generic_error_t *) event;
event = 0;
break;
}
- handle_event(dpy, event);
- event = xcb_poll_for_event(c);
+ else
+ _XError(dpy, (xError *) event);
+ free(event);
+ event = wait_or_poll_for_event(dpy, wait_for_first_event);
+ }
+ else if(req && req->waiters != -1)
+ {
+ if(req->sequence == current_request)
+ break;
+ if(!current_request && !wait_for_first_event)
+ break;
+ dpy->xcb->next_event = event;
+ req->waiters++;
+ assert(req->waiters > 0);
+ condition_wait(dpy, &req->condition);
+ --req->waiters;
+ event = dpy->xcb->next_event;
}
- else if(req && XCB_SEQUENCE_COMPARE(req->sequence, <, current_request)
- && xcb_poll_for_reply(dpy->xcb->connection, req->sequence, &reply, &error))
+ else if(req && xcb_poll_for_reply(dpy->xcb->connection, req->sequence, &reply, &error))
{
- dpy->xcb->pending_requests = req->next;
+ unsigned int sequence = req->sequence;
if(!reply)
+ {
+ dpy->xcb->pending_requests = req->next;
+ if(!dpy->xcb->pending_requests)
+ dpy->xcb->pending_requests_tail = &dpy->xcb->pending_requests;
+ free(req);
reply = error;
+ }
if(reply)
{
- dpy->last_request_read = req->sequence;
+ dpy->last_request_read = sequence;
call_handlers(dpy, reply);
+ free(reply);
}
- free(req);
- free(reply);
}
else
break;
}
- if(!dpy->xcb->pending_requests)
- dpy->xcb->pending_requests_tail = &dpy->xcb->pending_requests;
dpy->xcb->next_event = event;
@@ -152,10 +180,13 @@ static void process_responses(Display *dpy, int wait_for_first_event, xcb_generi
_XIOError(dpy);
assert_sequence_less(dpy->last_request_read, dpy->request);
+ assert(!wait_for_first_event);
}
int _XEventsQueued(Display *dpy, int mode)
{
+ if(dpy->flags & XlibDisplayIOError)
+ return 0;
if(dpy->xcb->event_owner != XlibOwnsEventQueue)
return 0;
@@ -163,7 +194,7 @@ int _XEventsQueued(Display *dpy, int mode)
_XSend(dpy, 0, 0);
else
check_internal_connections(dpy);
- process_responses(dpy, 0, 0, dpy->request);
+ process_responses(dpy, 0, 0, 0);
return dpy->qlen;
}
@@ -172,11 +203,13 @@ int _XEventsQueued(Display *dpy, int mode)
*/
void _XReadEvents(Display *dpy)
{
+ if(dpy->flags & XlibDisplayIOError)
+ return;
_XSend(dpy, 0, 0);
if(dpy->xcb->event_owner != XlibOwnsEventQueue)
return;
check_internal_connections(dpy);
- process_responses(dpy, 1, 0, dpy->request);
+ process_responses(dpy, 1, 0, 0);
}
/*
@@ -189,6 +222,8 @@ void _XReadEvents(Display *dpy)
void _XSend(Display *dpy, const char *data, long size)
{
xcb_connection_t *c = dpy->xcb->connection;
+ if(dpy->flags & XlibDisplayIOError)
+ return;
assert(!dpy->xcb->request_extra);
dpy->xcb->request_extra = data;
@@ -247,9 +282,11 @@ XID _XAllocID(Display *dpy)
XID ret = dpy->xcb->next_xid;
dpy->xcb->next_xid = 0;
- assert(!(dpy->flags & XlibDisplayPrivSync));
- dpy->savedsynchandler = dpy->synchandler;
- dpy->flags |= XlibDisplayPrivSync;
+ if(!(dpy->flags & XlibDisplayPrivSync))
+ {
+ dpy->savedsynchandler = dpy->synchandler;
+ dpy->flags |= XlibDisplayPrivSync;
+ }
dpy->synchandler = _XIDHandler;
return ret;
}
@@ -272,6 +309,33 @@ static void _XFreeReplyData(Display *dpy, Bool force)
dpy->xcb->reply_data = 0;
}
+static PendingRequest * insert_pending_request(Display *dpy)
+{
+ PendingRequest **cur = &dpy->xcb->pending_requests;
+ while(*cur && XCB_SEQUENCE_COMPARE((*cur)->sequence, <, dpy->request))
+ cur = &((*cur)->next);
+ if(*cur && (*cur)->sequence == dpy->request)
+ {
+ /* Replacing an existing PendingRequest should only happen once,
+ when calling _XReply, and the replaced PendingRequest must
+ not have a condition set. */
+ assert((*cur)->waiters == -1);
+ }
+ else
+ {
+ PendingRequest *node = malloc(sizeof(PendingRequest));
+ assert(node);
+ node->next = *cur;
+ node->sequence = dpy->request;
+ if(cur == dpy->xcb->pending_requests_tail)
+ dpy->xcb->pending_requests_tail = &(node->next);
+ *cur = node;
+ }
+ (*cur)->waiters = 0;
+ xcondition_init(&((*cur)->condition));
+ return *cur;
+}
+
/*
* _XReply - Wait for a reply packet and copy its contents into the
* specified rep.
@@ -282,17 +346,34 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard)
{
xcb_generic_error_t *error;
xcb_connection_t *c = dpy->xcb->connection;
- unsigned long request = dpy->request;
char *reply;
+ PendingRequest *current;
assert(!dpy->xcb->reply_data);
- UnlockDisplay(dpy);
- reply = xcb_wait_for_reply(c, request, &error);
+ if(dpy->flags & XlibDisplayIOError)
+ return 0;
+
+ /* Internals of UnlockDisplay done by hand here, so that we can
+ insert_pending_request *after* we _XPutXCBBuffer, but before we
+ unlock the display. */
+ _XPutXCBBuffer(dpy);
+ current = insert_pending_request(dpy);
+ if(!dpy->lock || dpy->lock->locking_level == 0)
+ xcb_xlib_unlock(dpy->xcb->connection);
+ if(dpy->xcb->lock_fns.unlock_display)
+ dpy->xcb->lock_fns.unlock_display(dpy);
+ reply = xcb_wait_for_reply(c, current->sequence, &error);
LockDisplay(dpy);
check_internal_connections(dpy);
- process_responses(dpy, 0, &error, request);
+ process_responses(dpy, 0, &error, current->sequence);
+
+ if(current->waiters)
+ { /* The ConditionBroadcast macro contains an if; braces needed here. */
+ ConditionBroadcast(dpy, &current->condition);
+ }
+ --current->waiters;
if(error)
{
@@ -347,7 +428,7 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard)
return 0;
}
- dpy->last_request_read = request;
+ dpy->last_request_read = current->sequence;
/* there's no error and we have a reply. */
dpy->xcb->reply_data = reply;
diff --git a/lib/libX11/src/xcms/Makefile.in b/lib/libX11/src/xcms/Makefile.in
index a66b54bed..d23ea2e27 100644
--- a/lib/libX11/src/xcms/Makefile.in
+++ b/lib/libX11/src/xcms/Makefile.in
@@ -117,6 +117,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -133,6 +134,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -140,6 +142,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -149,11 +152,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -168,6 +174,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -216,7 +223,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/src/xkb/Makefile.in b/lib/libX11/src/xkb/Makefile.in
index a396cd531..389523dfb 100644
--- a/lib/libX11/src/xkb/Makefile.in
+++ b/lib/libX11/src/xkb/Makefile.in
@@ -100,6 +100,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -116,6 +117,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -123,6 +125,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -132,11 +135,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -151,6 +157,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -199,7 +206,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/src/xkb/XKBBind.c b/lib/libX11/src/xkb/XKBBind.c
index e190d0052..4dc92654e 100644
--- a/lib/libX11/src/xkb/XKBBind.c
+++ b/lib/libX11/src/xkb/XKBBind.c
@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
changes= xkbi->changes;
else bzero(&changes,sizeof(changes));
XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
- LockDisplay(dpy);
if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
#ifdef DEBUG
fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
@@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
xkbi->flags&= ~XkbMapPending;
bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
}
- UnlockDisplay(dpy);
return rtrn;
}
return BadMatch;
diff --git a/lib/libX11/src/xlibi18n/Makefile.in b/lib/libX11/src/xlibi18n/Makefile.in
index b879c6a00..2eca18e11 100644
--- a/lib/libX11/src/xlibi18n/Makefile.in
+++ b/lib/libX11/src/xlibi18n/Makefile.in
@@ -135,6 +135,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -151,6 +152,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -158,6 +160,7 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINT = @LINT@
+LINTLIB = @LINTLIB@
LINT_FALSE = @LINT_FALSE@
LINT_FLAGS = @LINT_FLAGS@
LINT_TRUE = @LINT_TRUE@
@@ -167,11 +170,14 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANPAGES_FALSE = @MANPAGES_FALSE@
MANPAGES_TRUE = @MANPAGES_TRUE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
OS2_FALSE = @OS2_FALSE@
OS2_TRUE = @OS2_TRUE@
@@ -186,6 +192,7 @@ PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -234,7 +241,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
diff --git a/lib/libX11/src/xlibi18n/XimintP.h b/lib/libX11/src/xlibi18n/XimintP.h
index f10d9baad..d36abdc64 100644
--- a/lib/libX11/src/xlibi18n/XimintP.h
+++ b/lib/libX11/src/xlibi18n/XimintP.h
@@ -244,6 +244,7 @@ typedef struct _XicProtoPrivateRec {
#define IC_CONNECTED (1L)
#define FABLICATED (1L << 1)
#define NEED_SYNC_REPLY (1L << 2)
+#define FOCUSED (1L << 3)
/*
* macro for the flag of XICPrivateRec
@@ -269,6 +270,13 @@ typedef struct _XicProtoPrivateRec {
#define UNMARK_NEED_SYNC_REPLY(ic) \
(((Xic)ic)->private.proto.flag &= ~NEED_SYNC_REPLY)
+#define IS_FOCUSED(ic) \
+ (((Xic)ic)->private.proto.flag & FOCUSED)
+#define MARK_FOCUSED(ic) \
+ (((Xic)ic)->private.proto.flag |= FOCUSED)
+#define UNMARK_FOCUSED(ic) \
+ (((Xic)ic)->private.proto.flag &= ~FOCUSED)
+
/*
* macro for the filter_event_mask of XICPrivateRec
*/
diff --git a/lib/libX11/src/xlibi18n/XlcPubI.h b/lib/libX11/src/xlibi18n/XlcPubI.h
index 2b4b30f8e..4544fb8cf 100644
--- a/lib/libX11/src/xlibi18n/XlcPubI.h
+++ b/lib/libX11/src/xlibi18n/XlcPubI.h
@@ -240,7 +240,7 @@ _Xsetlocale(
int category,
_Xconst char *name);
#else
-#ifdef __DARWIN__
+#ifdef __APPLE__
extern char *
_Xsetlocale(
int category,