Module Name: xsrc
Committed By: mrg
Date: Tue Oct 3 19:17:42 UTC 2023
Modified Files:
xsrc/external/mit/libX11/dist: ChangeLog README.md configure
configure.ac
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: OpenDis.c
xsrc/external/mit/libXpm/dist/src: create.c
Removed Files:
xsrc/external/mit/libX11/dist/man/xkb: XkbAllocDeviceLedInfo.man
XkbChangeIndicators.man XkbGetAccessXTimeout.man
XkbGetBounceKeysDelay.man XkbGetIndicatorChanges.man
XkbGetNameChanges.man XkbGetSlowKeysDelay.man
XkbGetStickyKeysOptions.man XkbKeySymsOffset.man XkbKeyType.man
XkbKeyTypeIndex.man XkbNoteIndicatorChanges.man
XkbSAActionSetCtrls.man XkbSetAccessXTimeout.man
XkbSetBounceKeysDelay.man
Log Message:
merge libX11 1.8.7 and libXpm 3.5.17.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/README.md
cvs rdiff -u -r1.1.1.5 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbAllocDeviceLedInfo.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbChangeIndicators.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetIndicatorChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetStickyKeysOptions.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyType.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbNoteIndicatorChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSetAccessXTimeout.man
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetAccessXTimeout.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSAActionSetCtrls.man
cvs rdiff -u -r1.1.1.7 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetBounceKeysDelay.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetSlowKeysDelay.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSetBounceKeysDelay.man
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetNameChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeySymsOffset.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyTypeIndex.man
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/OpenDis.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXpm/dist/src/create.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/ChangeLog
diff -u xsrc/external/mit/libX11/dist/ChangeLog:1.5 xsrc/external/mit/libX11/dist/ChangeLog:1.6
--- xsrc/external/mit/libX11/dist/ChangeLog:1.5 Mon Jun 19 04:46:11 2023
+++ xsrc/external/mit/libX11/dist/ChangeLog Tue Oct 3 19:17:41 2023
@@ -1,3 +1,408 @@
+commit c745719e23af44a4b40ab4508447637b35d91a1e
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Oct 3 09:00:01 2023 -0700
+
+ libX11 1.8.7
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 7916869d16bdd115ac5be30a67c3749907aea6a0
+Author: Yair Mizrahi <ya...@jfrog.com>
+Date: Thu Sep 7 16:15:32 2023 -0700
+
+ CVE-2023-43787: Integer overflow in XCreateImage() leading to a heap overflow
+
+ When the format is `Pixmap` it calculates the size of the image data as:
+ ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
+ There is no validation on the `width` of the image, and so this
+ calculation exceeds the capacity of a 4-byte integer, causing an overflow.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit b4031fc023816aca07fbd592ed97010b9b48784b
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Sep 7 16:12:27 2023 -0700
+
+ XCreatePixmap: trigger BadValue error for out-of-range dimensions
+
+ The CreatePixmap request specifies height & width of the image as CARD16
+ (unsigned 16-bit integer), so if either is larger than that, set it to 0
+ so the X server returns a BadValue error as the protocol requires.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 73a37d5f2fcadd6540159b432a70d80f442ddf4a
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Sep 7 15:55:04 2023 -0700
+
+ XPutImage: clip images to maximum height & width allowed by protocol
+
+ The PutImage request specifies height & width of the image as CARD16
+ (unsigned 16-bit integer), same as the maximum dimensions of an X11
+ Drawable, which the image is being copied to.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 204c3393c4c90a29ed6bef64e43849536e863a86
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Sep 7 15:54:30 2023 -0700
+
+ CVE-2023-43786: stack exhaustion from infinite recursion in PutSubImage()
+
+ When splitting a single line of pixels into chunks to send to the
+ X server, be sure to take into account the number of bits per pixel,
+ so we don't just loop forever trying to send more pixels than fit in
+ the given request size and not breaking them down into a small enough
+ chunk to fix.
+
+ Fixes: "almost complete rewrite" (Dec. 12, 1987) from X11R2
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 6858d468d9ca55fb4c5fd70b223dbc78a3358a7f
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Sep 17 14:19:40 2023 -0700
+
+ CVE-2023-43785: out-of-bounds memory access in _XkbReadKeySyms()
+
+ Make sure we allocate enough memory in the first place, and
+ also handle error returns from _XkbReadBufferCopyKeySyms() when
+ it detects out-of-bounds issues.
+
+ Reported-by: Gregory James DUCK <gjd...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 78b37accff1abbe713349d59fdefd963ffa04bbc
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Sep 17 10:11:02 2023 -0700
+
+ XOpenDisplay: ensure each screen has a valid root_visual pointer
+
+ Other code assumes this pointer cannot be NULL, so fail the connection
+ if a bug has caused the X server to give a non-existent visual ID for
+ the default visual of any screen.
+
+ Reported-by: Gregory James DUCK <gjd...@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 3962080b7846d79fd3cf10b16eddacf68eb321b7
+Author: Antti Savolainen <antti.s...@gmail.com>
+Date: Tue Aug 8 11:37:03 2023 +0000
+
+ Add two compose sequences for dagger/obelisk symbols
+
+ The dagger symbol has several modern uses such as marking someone as
+ dead or something as extinct. Historically it has been used to indicate
+ a footnote.
+
+commit 15bbc81cf6b7c76b8a59cab6d77c9aba88b8562d
+Author: Christopher Chavez <chrischa...@gmx.us>
+Date: Sat Jul 29 16:58:05 2023 +0000
+
+ Xutil.h: use Bool for XEmptyRegion(), XEqualRegion()
+
+commit 5433cb93513c31e9cba2a447cf48d4b9aeb53285
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Mon Jul 17 08:02:09 2023 +0200
+
+ nls: add two compose sequences for currency symbol `฿` (the Thai baht)
+
+ The compose sequences are obvious: the capital B plus the vertical bar.
+
+ Signed-off-by: Benno Schulenberg <bensb...@telfort.nl>
+
+commit 2ff401a472c5f210844cc358d5a27bd340546796
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Mon Jul 17 07:56:14 2023 +0200
+
+ nls: reshuffle the compose sequences for currencies into ascending order
+
+ That is: sort them according to code point.
+
+commit c0e2d42d411be3245498ffe6484b35421f096c02
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Mon Jul 17 07:27:14 2023 +0200
+
+ nls: add compose sequences for `₲` (guaraní), `₭` (kip), and `₮` (tugrik)
+
+ When Ghana, Nigeria, Costa Rica and El Salvador have compose sequences
+ for their currency symbols (cedi: `₵`, naira: `₦`, colón: `₡`), then
+ Paraguay, Laos, and Mongolia deserve to have such sequences as well.
+
+ The sequences should be obvious: the relevant capital letter of the
+ name of the currency (G, K, T) plus a vertical bar, a minus sign,
+ and an equals sign, respectively.
+
+ Also add two sequences for `$` (the dollar sign), for consistency.
+
+ Drop the tentative comments for drachma, penny, and austral, as those
+ currencies have been obsolete for more than twenty years.
+
+ Signed-off-by: Benno Schulenberg <bensb...@telfort.nl>
+
+commit d9fe5dc735c75398e36998c226d2418137229673
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Mon Jul 17 07:06:51 2023 +0200
+
+ nls: change result of sequence `<C> <bar>` from `¢` (CENT) to `₵` (CEDI)
+
+ As a cent is a small coin, it makes no sense to use an uppercase letter
+ to compose the `¢` symbol -- having four sequences with a lowercase `c`
+ plus a `bar` or a `slash` available for composing `¢` should be enough.
+
+ Use the sequence `<C> <bar` (with the uppercase `C`) for composing `₵`
+ (the CEDI SIGN) instead.
+
+ Signed-off-by: Benno Schulenberg <bensb...@telfort.nl>
+
+commit 031e63060ed11eb8a876aac7515bc5a67371ed6b
+Author: Antti Savolainen <antti.s...@gmail.com>
+Date: Thu Aug 17 18:25:20 2023 +0300
+
+ nls: add a compose sequence with double dead_tilde for ≈ (almost equal to)
+
+ Some keyboards lack direct asciitilde and instead have only dead tilde.
+ This compose sequence allows those keyboards to type the almost equal
+ to sign.
+
+commit df2a18c4643bb4a50f2f795a75a905a1032a004a
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Mon Jul 17 17:03:16 2023 +0200
+
+ nls: delete twenty seven untypable Greek compose sequences
+
+ Only a few keyboard layouts contain the `dead_iota` keysym, and none
+ of those layouts contains the `acute` keysym, so compose sequences
+ that combine the two symbols cannot be typed and are thus useless.
+
+ Signed-off-by: Benno Schulenberg <bensb...@telfort.nl>
+
+commit 44f908d9283710ffc75b22d2ae7a8948119b3e61
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 15:11:04 2023 -0700
+
+ docs: fix names for XkbKeyKeyType & XkbKeyKeyTypeIndex
+
+ Implementation had "Key" twice in these macro names,
+ but the docs had only listed it once.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 7b16c55063ba4eb258bf91c170e378c1e2d398bd
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 15:01:09 2023 -0700
+
+ docs: remove XkbKeySymsOffset
+
+ This function was documented but never implemented.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 41a157dfeefe943f5a79948e4f9ef93473144fd8
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 14:52:18 2023 -0700
+
+ docs: remove XkbGetNameChanges
+
+ This function was documented but never implemented.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 3442a8cee25dc0254ee69bcf83a89d287a86c97a
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 14:44:18 2023 -0700
+
+ docs: remove XkbChangeIndicators and Xkb{Get,Note}IndicatorChanges
+
+ These functions were documented but never implemented.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit b7a15d6c6efd0bfddc81cf8443073c4bc1c9772d
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 14:31:20 2023 -0700
+
+ docs: XkbSAActionSetCtrls is really named XkbActionSetCtrls
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit a1d8dd726757e00e3a774b92456f5c742492475b
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 14:18:32 2023 -0700
+
+ docs: remove XkbGetStickyKeysOptions & XkbSetStickyKeysOptions
+
+ These functions were documented but never implemented.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit bf13f197406fe745c5ff46a4748a41b6646aebf6
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 14:09:35 2023 -0700
+
+ docs: remove XkbGetSlowKeysDelay & XkbSetSlowKeysDelay
+
+ These functions were documented but never implemented.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit caab7321d2ec14ee776ec329ed2facf0816a3136
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 14:04:15 2023 -0700
+
+ docs: remove XkbGetAccessXTimeout & XkbSetAccessXTimeout
+
+ These functions were documented but never implemented.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 843e89bd2467a58cb454705a09d095726b96d93f
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 12:58:47 2023 -0700
+
+ docs: remove XkbAllocDeviceLedInfo
+
+ This function was documented but never implemented.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 2686dd7a9d6e8e02ce2868e446cdec11617ffab4
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Aug 20 12:41:42 2023 -0700
+
+ docs: finish removing XkbGetBounceKeysDelay & XkbSetBounceKeysDelay
+
+ These functions were documented but never implemented.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 188991fe7e41bbf2f384d0875ab2e25c936b0b41
+Author: G. Branden Robinson <g.branden.robin...@gmail.com>
+Date: Sat Jul 29 10:10:00 2023 -0700
+
+ configure script reports stray, confusing "yes"
+
+ Closes issue #194
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 70f44d76fd8fad96f33ba5c80a394d68b77dda03
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Sun Jul 16 17:08:52 2023 +0200
+
+ nls: add, correct, and normalize some comments of compose sequences
+
+ Add comments for the Khmer digraphs, correct the comments for the
+ Arabic lam-alef decompositions, and normalize the comments for the
+ Breton digraphs and trigraphs.
+
+ Signed-off-by: Benno Schulenberg <bensb...@telfort.nl>
+
+commit 2a57c32e14779cf1c0c1d2da98a9cac21c00c095
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Sun Jun 25 10:01:05 2023 +0200
+
+ nls: harmonize the comments for compose sequences with combining accents
+
+ Replace the "WITH" with "plus" and lowercase the "AND" in the comments
+ for sequences with combining accents, to make it slightly clearer that
+ the resulting string consists of multiple code points. Also, use the
+ word "COMBINING" in the names of the accents, so that these sequences
+ can be easily grepped, and drop the redundant word "ACCENT".
+
+ Signed-off-by: Benno Schulenberg <bensb...@telfort.nl>
+
+commit 757ab5ddd86f6cdce24b8ae2c43206b7beb7ab44
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Aug 14 08:33:28 2023 -0700
+
+ Remove XkbSetBounceKeysDelay.man from list of man pages to build
+
+ Fixes: f90e6bfa ("rm XkbSetBounceKeysDelay.man")
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit f90e6bface92fd192b26f03b7ae745661d9c2690
+Author: Walter Harms <wha...@bfs.de>
+Date: Sun Aug 13 22:42:50 2023 +0200
+
+ rm XkbSetBounceKeysDelay.man
+
+ there is no function XkbSetBounceKeysDelay().
+ It is listed in the specs but never implemented if someone
+ does it, feel free to get the file back.
+
+ closes issue #105
+
+commit b2c3fb7b4dd4c4c7b9d28c7af7776cccc8e0a98b
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Sat Jul 8 08:11:39 2023 +0200
+
+ nls: use the shorter and more consistent name for the dead capital schwa
+
+ The `dead_SCHWA` name is available since xorgproto-2023.1, which was
+ released last month.
+
+commit e45dff5c2a51ad0392061208a8ad33211d952385
+Author: jmcwilliams403 <jmcwilliams...@gmail.com>
+Date: Fri Jun 16 11:37:20 2023 -0400
+
+ NLS: Drop two math sequences, slightly clean up APL sequences.
+
+ * Two compose sequences containing `leftshoe` and `rightshoe` are
+ dropped as no keyboard layout uses these keysyms.
+ * The compose sequences for `therefore` and `because` in the APL
+ block are moved to ascending Unicode order.
+ * The comments for the compose sequences for `U2299` are corrected to
+ more accurately reflect its sequence nodes and its real name in
+ Unicode.
+
+commit af2b6dfab1616dc85be9c9b196e4c56d00447851
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Sun Jun 25 09:09:21 2023 +0200
+
+ nls: delete twenty eight compose sequences that cannot be typed
+
+ The letters `Ǫ` (U+01EA, O with ogonek), `Ȩ` (U+0228, E with cedilla),
+ `Ȯ` (U+022E, O with dot above), `Ạ` (U+1EA0, A with dot below), and
+ their lowercase forms do not occur in any layout of xkeyboard-config,
+ meaning that the compose sequences that contained these letters could
+ not be typed. Delete their dead weight.
+
+ Signed-off-by: Benno Schulenberg <bensb...@telfort.nl>
+
+commit ab0442d3fa835ce16559b29532ac7f674f8557f4
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Sat Jun 24 09:46:07 2023 +0200
+
+ nls: remove four unobvious and redundant compose sequences for ¥ (yen)
+
+ Composing ¥ with Y and a minus sign seems to have been added in analogy
+ to composing £ with L and a minus sign. But ¥ clearly has a double line
+ through it, so using the equals sign for this is far more logical (and
+ those compose sequences of course exist). Also, L plus an equals sign
+ produces ₤ (lira), not £ (sterling). So... make these sequences more
+ consistent and allow composing ¥ only with Y/y plus an equals sign.
+
+ Signed-off-by: Benno Schulenberg <bensb...@telfort.nl>
+
+commit 933912480c08495428d45988eebb48fcbe62f14b
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Sat Jun 24 10:02:45 2023 +0200
+
+ nls: order a few compose sequences left first, and in mirroring pairs
+
+commit 178c4fefd3b0b4be5e69274108b86a51f08ec3a6
+Author: Benno Schulenberg <bensb...@telfort.nl>
+Date: Fri Jun 16 09:33:03 2023 +0200
+
+ nls: remove three duplicated combining acute accents
+
+ For the Cyrillic YU with combining acute accent, the string between
+ the quotes contained two U+0301 code points, whereas one is enough,
+ like for all the neighboring strings.
+
+ (This duplication was found by accident with `nano --mini --cons`.)
+
commit 695e90ad26f632feb0f58ad94882fb3a263bf114
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu Jun 15 09:14:48 2023 -0700
@@ -3389,7 +3794,7 @@ Date: Fri Jun 7 23:35:33 2019 +0200
Tested-by: Jean-Philippe Mengual <jpmeng...@hypra.fr>
commit 99a2cf1aa0b58391078d5d3edf0a7dab18c7745d
-Author: Tapani Pälli <tapani.pa...@intel.com>
+Author: Tapani Pälli <tapani.pa...@intel.com>
Date: Mon May 13 08:29:49 2019 +0300
Protect colormap add/removal with display lock
@@ -3415,7 +3820,7 @@ Date: Wed Mar 13 13:12:20 2019 +0000
Windows.
commit 87c77a1e6d7034536e9d25ce24a667ebf53486a7
-Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
+Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
Date: Mon Mar 11 14:19:52 2019 +0000
locale.alias.pre - add the de_IT locale
@@ -3423,7 +3828,7 @@ Date: Mon Mar 11 14:19:52 2019 +0000
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 568f77f414072506bbe48646637c872987c97e63
-Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
+Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
Date: Mon Mar 11 14:17:10 2019 +0000
locale.dir.pre - add the de_IT locale
@@ -3431,7 +3836,7 @@ Date: Mon Mar 11 14:17:10 2019 +0000
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 38c0c92feaef7dc4a72920b1dd79872e6578086c
-Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
+Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
Date: Mon Mar 11 14:12:07 2019 +0000
compose.dir.pre - add de_IT locale
@@ -3439,7 +3844,7 @@ Date: Mon Mar 11 14:12:07 2019 +0000
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 49f835611ba6ab82e68b7b851507931c142db7a5
-Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
+Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
Date: Tue Jan 29 15:34:34 2019 +0000
Update locale.alias.pre - introduce the de_LI aliases (equivalent to de_CH)
@@ -3447,7 +3852,7 @@ Date: Tue Jan 29 15:34:34 2019 +0000
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit ed669234d0cd5933618aa5fd2da697b59845b9be
-Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
+Author: Matthias Dieter Wallnöfer <matthias.wallnoe...@lugbz.org>
Date: Tue Jan 29 15:28:18 2019 +0000
locale.dir.pre - fix the de_LI latin15 locale
@@ -3769,7 +4174,7 @@ Date: Tue Oct 9 10:26:05 2018 -0400
Signed-off-by: Matt Turner <matts...@gmail.com>
commit 823a0f8a820247b6c1e092f679b49cbdc2ea5c95
-Author: Michel Dänzer <michel.daen...@amd.com>
+Author: Michel Dänzer <michel.daen...@amd.com>
Date: Fri Sep 28 17:24:17 2018 +0200
poll_for_event: Allow using xcb_poll_for_queued_event
@@ -3781,7 +4186,7 @@ Date: Fri Sep 28 17:24:17 2018 +0200
Reviewed-by: Uli Schlachter <psyc...@znc.in>
commit 406afe4b0f1b655c0db19bbc9a0c48da9a46acf5
-Author: Michel Dänzer <michel.daen...@amd.com>
+Author: Michel Dänzer <michel.daen...@amd.com>
Date: Tue Sep 25 17:10:58 2018 +0200
poll_for_response: Call poll_for_event again if xcb_poll_for_reply fails
@@ -4310,7 +4715,7 @@ Date: Fri Feb 10 18:48:18 2017 +0500
Signed-off-by: Mihail Konev <k....@ya.ru>
commit 23d9623c661694aba8cf1e8f277dffa7a86cf065
-Author: Petr Písař < <petr.pi...@atlas.cz>
+Author: Petr Písař <petr.pi...@atlas.cz>
Date: Sun Oct 30 12:49:11 2016 +0100
Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8
@@ -8803,7 +9208,7 @@ Date: Sun Feb 12 19:01:43 2012 -0800
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
commit f180e043f55531933bedfa6e0ff36a00a9ec07f3
-Author: Frédéric Boiteux < <fboit...@calistel.com>
+Author: Frédéric Boiteux <fboit...@calistel.com>
Date: Wed Nov 30 12:47:31 2011 +0000
Compositions with the dead greek symbol
@@ -10383,7 +10788,7 @@ Date: Mon Mar 14 14:45:35 2011 -0700
Signed-off-by: Jamey Sharp <ja...@minilop.net>
commit 690f8bffd48a4e7e74298360ddd0431dc95dcd3f
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Tue Jan 18 15:58:20 2011 +0200
xkb: XkbPropertyPtr determined allocation success from wrong variables
@@ -10399,7 +10804,7 @@ Date: Tue Jan 18 15:58:20 2011 +0200
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
commit 6a4d027284e7bb5dd458157947bbb1ff580ad071
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 10 16:37:22 2011 +0200
keyBind: Use Xcalloc to initialize allocated _XKeytrans
@@ -10412,7 +10817,7 @@ Date: Mon Jan 10 16:37:22 2011 +0200
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
commit b993d73bb3214ecc24646f5427c8003b816c6921
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 10 16:22:45 2011 +0200
im/ximcp: release modifiermap before returning
@@ -10524,7 +10929,7 @@ Date: Fri Feb 11 14:20:24 2011 -0800
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 502d414118c97d35a44f8e295709682022876331
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Thu Feb 3 17:08:57 2011 +0200
xcms/cmsProp: don't deal with uninitialized values, fail instead
@@ -10598,7 +11003,7 @@ Date: Wed Feb 2 08:56:00 2011 -0800
Reviewed-by: Julien Cristau <jcris...@debian.org>
commit 450e17422c0e374d25c643f343ea268cec68da38
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:01:57 2011 +0200
XlibInt: Use strncpy+zero termination instead of strcpy to enforce buffer size
@@ -10628,7 +11033,7 @@ Date: Mon Jan 31 14:02:13 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 03f81ad8fb9783986cf9b17661dd31e95c396681
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:02:16 2011 +0200
xlibi18n/lcFile: Removed superfluous check for NULL target_dir
@@ -10643,7 +11048,7 @@ Date: Mon Jan 31 14:02:16 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 1346b9ea3b3882201ff8c3ee462ff4b0d4edf639
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:02:15 2011 +0200
ximcp/imLckup: Handle negative return value from _Xlcwctomb
@@ -10664,7 +11069,7 @@ Date: Mon Jan 31 14:02:15 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 79a5c86e020f08cc108184298a72e2777036de39
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:02:14 2011 +0200
ximcp/imTrX: Handle failing XGetWindowProperty
@@ -10696,7 +11101,7 @@ Date: Mon Jan 31 14:02:12 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 2b16a7e683e355c9746290b2cee2fd0dd2bf342a
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:02:10 2011 +0200
GetProp: Zero-initialized error so its resourceID field is initialized
@@ -10736,7 +11141,7 @@ Date: Mon Jan 31 14:02:08 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit be3e6c205d94dedc1cdebf5d17b987f0f828377a
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:02:06 2011 +0200
Xrm: Handle the extremely unlikely situation of fstat failing
@@ -10749,7 +11154,7 @@ Date: Mon Jan 31 14:02:06 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 3fae16c64d6ef76fd4a25a54c7f7de76596457db
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:02:05 2011 +0200
Xrm: NEWTABLE had a memory leak after a memory allocation error
@@ -10765,7 +11170,7 @@ Date: Mon Jan 31 14:02:05 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 7110ac653349a23c80c365f11f6270dc27c8975a
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:02:03 2011 +0200
ImUtil: Handle a memory leak in one early return branch
@@ -10780,7 +11185,7 @@ Date: Mon Jan 31 14:02:03 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit d695f5da9f5b778e54b6987d9177048e32818c4d
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:02:01 2011 +0200
ximcp/imRm: Handle leaking colormap_ret
@@ -10795,7 +11200,7 @@ Date: Mon Jan 31 14:02:01 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit f9eda19d08c1ea0973dfe0bc10a2519d6fd26cc7
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:01:59 2011 +0200
ximcp/imRmAttr: Handle leaking missing_list
@@ -10810,7 +11215,7 @@ Date: Mon Jan 31 14:01:59 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit 3183269e0979c9dbce9d55d9e03937897dc9fb3b
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:01:58 2011 +0200
ximcp/imRmAttr: Handle leaking colormap_ret
@@ -10824,7 +11229,7 @@ Date: Mon Jan 31 14:01:58 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit f66a032a937030f2d9baa81744d36dc585bb085c
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:01:56 2011 +0200
xlibi18n/lcGeneric: Initialize uninitialized local variable
@@ -10837,7 +11242,7 @@ Date: Mon Jan 31 14:01:56 2011 +0200
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
commit d0266e06d38110ec908ca28379014eff743630b7
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 31 14:01:54 2011 +0200
xcmx/cmxColNm: Removed unused assignments to pBuf (in two functions)
@@ -10884,7 +11289,7 @@ Date: Mon Jan 31 14:50:19 2011 -0500
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
commit e994ab227ed28655565c3193e63733630105e7f9
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Tue Jan 18 12:49:48 2011 +0200
Comparing array against NULL is not useful "&xkb->server->vmods != NULL"
@@ -10895,7 +11300,7 @@ Date: Tue Jan 18 12:49:48 2011 +0200
Signed-off-by: Erkki Seppälä <erkki.sepp...@vincit.fi>
commit 4115f051e62f9b098efce691e070d44f09f30f1c
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Wed Jan 12 15:51:11 2011 +0200
Variable "entry" tracked as NULL was dereferenced.
@@ -10907,7 +11312,7 @@ Date: Wed Jan 12 15:51:11 2011 +0200
Signed-off-by: Erkki Seppälä <erkki.sepp...@vincit.fi>
commit 0edb76d1d5fdca5a2543332699be2e72386dab24
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Thu Jan 27 09:54:00 2011 +0200
Dereferencing possibly NULL "str" in call to function "memcpy" (Deref assumed on the basis of 'nonnull' parameter attribute.)
@@ -10919,7 +11324,7 @@ Date: Thu Jan 27 09:54:00 2011 +0200
Signed-off-by: Erkki Seppälä <erkki.sepp...@vincit.fi>
commit 59da8a211ef723909d0530c0331d541db8e63378
-Author: Erkki Seppälä < <erkki.sepp...@vincit.fi>
+Author: Erkki Seppälä <erkki.sepp...@vincit.fi>
Date: Mon Jan 10 16:17:47 2011 +0200
Using freed pointer "e"
@@ -12764,7 +13169,7 @@ Date: Tue Jan 26 19:41:08 2010 -0500
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
commit eb289b34bfc9978eef724e0f268975938334c06c
-Author: Kristian Høgsberg <k...@bitplanet.net>
+Author: Kristian Høgsberg <k...@bitplanet.net>
Date: Thu Jan 21 13:39:17 2010 -0500
XErrorDB: Add new DRI2 request names
@@ -14070,7 +14475,7 @@ Date: Sat Feb 21 14:48:42 2009 -0500
Signed-off-by: Chris Ball <c...@laptop.org>
commit da6bbca07c796c69172a649405474f03bee66754
-Author: Emilio Jesús Gallego Arias <egall...@babel.ls.fi.upm.es>
+Author: Emilio Jesús Gallego Arias <egall...@babel.ls.fi.upm.es>
Date: Sat Feb 21 20:17:23 2009 +0100
xcb_io: Avoid datatype overflow on AMD64 and friends.
@@ -14751,7 +15156,7 @@ Date: Wed Sep 17 10:43:52 2008 -0400
Bug #17616: Fix an XCB leak when the client has a non-fatal error handler.
commit db0b85db29699be6bf7e78dede655d59ba926dfc
-Author: Rafael Ávila de Espíndola < <rafael.espind...@gmail.com>
+Author: Rafael Ávila de Espíndola <rafael.espind...@gmail.com>
Date: Sun Sep 14 19:15:26 2008 -0400
Fix problem with <dead_acute> <c> in pt_BR.UTF-8
@@ -15157,7 +15562,7 @@ Date: Thu Feb 28 20:17:41 2008 -0800
Man page typo fixes
commit 1a1a42a3ca1dfaf42f1094936b71c140fc030fcb
-Author: Søren Sandmann Pedersen <sandm...@redhat.com>
+Author: Søren Sandmann Pedersen <sandm...@redhat.com>
Date: Sun Feb 24 20:03:35 2008 -0500
XIM: Fix a hand when switching input context.
@@ -15387,7 +15792,7 @@ Date: Fri Aug 31 17:30:33 2007 -0700
Bug #2081: Note the range limitation of XSetScreenSaver arguments.
commit 31540f1438ec63faf37044f2fd654b335ddf80f0
-Author: Kristian Høgsberg <k...@redhat.com>
+Author: Kristian Høgsberg <k...@redhat.com>
Date: Wed Aug 29 19:50:57 2007 -0400
Add GLX 1.4 requests and errors.
@@ -16242,7 +16647,7 @@ Date: Wed Nov 8 12:17:41 2006 -0800
This fixes an XCB locking assertion failure, particularly with emacs.
commit e494ecaac1ec8a22bd9a85f800fca74d02e9d358
-Author: Diego 'Flameeyes' Pettenò <flamee...@gentoo.org>
+Author: Diego 'Flameeyes' Pettenò <flamee...@gentoo.org>
Date: Tue Nov 7 09:32:00 2006 -0800
Add xcb-xlib dependency to x11.pc when built against XCB.
@@ -17529,7 +17934,7 @@ Date: Fri Oct 7 15:00:00 2005 +0000
Add missing dist tarball files
commit 440399b470c97b159a530602fff11c315aca8d97
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Wed Oct 5 18:27:10 2005 +0000
Add el_GR.UTF-8 compose file
@@ -17584,7 +17989,7 @@ Date: Fri Sep 2 23:00:30 2005 +0000
Issue an error if XTRANS macros were not found when generating configure from configure.ac to flag errors early, instead of when people wonder why libX11 can't talk to an Xserver because it has no transports defined
commit 3eb9f2d693af89d04e2fd92492c8205dce332c9c
-Author: Kristian Høgsberg <k...@redhat.com>
+Author: Kristian Høgsberg <k...@redhat.com>
Date: Thu Sep 1 19:24:13 2005 +0000
Use $(X11_LOCALEDATADIR) instead of @X11_LOCALEDATADIR@ so this install destination can be overridden at make install time.
@@ -17865,7 +18270,7 @@ Date: Fri Jul 1 22:13:35 2005 +0000
Added if not already present.
commit c162d60ad8f124563f94a2a266de59373936266c
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Wed Jun 22 22:46:31 2005 +0000
Apply these patches from Theo van Klaveren:
@@ -17990,7 +18395,7 @@ Date: Thu May 19 00:10:07 2005 +0000
Require automake 1.7 in AM_INIT_AUTOMAKE
commit cd4657c175dbab6aaca36f18a0ca92c95b5567dd
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Tue May 17 22:32:09 2005 +0000
- Check for xproto as its CFLAGS are needed in the .pc file
@@ -18012,7 +18417,7 @@ Date: Mon May 16 22:35:27 2005 +0000
Remove the entries from the xlibs tree, as they are not relevant here.
commit 8bd3aea84ce54b8b76a898f3ae00e2b499c14a5e
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Mon May 16 21:48:36 2005 +0000
Mon May 16 17:48:03 2005 Søren Sandmann <sandm...@redhat.com>
@@ -18026,7 +18431,7 @@ Date: Mon May 16 21:27:35 2005 +0000
Remove the entries from the xlibs tree, as they are not relevant here.
commit 7eee605e3aeed549d1053325a03027c5e8cbf71b
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Fri May 13 22:53:36 2005 +0000
- For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in <X11/...>
@@ -18160,7 +18565,7 @@ Date: Mon Nov 15 13:29:56 2004 +0000
Bugzilla #1864, http://freedesktop.org/bugzilla/show_bug.cgi?id=1864 Initialize pointer to NULL to avoid freeing random memory
commit 436108cd6c84053698e5ca629096f59b34f50c2a
-Author: Kristian Høgsberg <k...@redhat.com>
+Author: Kristian Høgsberg <k...@redhat.com>
Date: Thu Nov 11 15:37:01 2004 +0000
Fix #1818
@@ -18218,7 +18623,7 @@ Date: Wed Oct 13 07:38:00 2004 +0000
Use attributes instead of pragmas for weak symbols on gcc 2.95 as well. Using pragmas may result in the symbols being undefined with big -O. (FreeBSD ports/69708, Masakazu HIGAKI <higam...@dream.com>)
commit d80237db627bf71ad5615ff4ba05e6ab436aa740
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Fri Oct 8 22:57:56 2004 +0000
Fri Oct 8 18:53:11 2004 Soeren Sandmann <sandm...@redhat.com>
@@ -18304,7 +18709,7 @@ Date: Tue Jul 27 06:06:05 2004 +0000
- remove unused file.
commit 6e884b12911eedfb003e90a3829ce66f7fc9cf2d
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Tue Jul 20 17:48:09 2004 +0000
Tue Jul 20 19:38:06 2004 Soeren Sandmann <sandm...@daimi.au.dk>
Index: xsrc/external/mit/libX11/dist/configure
diff -u xsrc/external/mit/libX11/dist/configure:1.5 xsrc/external/mit/libX11/dist/configure:1.6
--- xsrc/external/mit/libX11/dist/configure:1.5 Mon Jun 19 04:46:12 2023
+++ xsrc/external/mit/libX11/dist/configure Tue Oct 3 19:17:41 2023
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libX11 1.8.6.
+# Generated by GNU Autoconf 2.71 for libX11 1.8.7.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues>.
#
@@ -682,8 +682,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libX11'
PACKAGE_TARNAME='libX11'
-PACKAGE_VERSION='1.8.6'
-PACKAGE_STRING='libX11 1.8.6'
+PACKAGE_VERSION='1.8.7'
+PACKAGE_STRING='libX11 1.8.7'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues'
PACKAGE_URL=''
@@ -1551,7 +1551,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.8.6 to adapt to many kinds of systems.
+\`configure' configures libX11 1.8.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1622,7 +1622,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libX11 1.8.6:";;
+ short | recursive ) echo "Configuration of libX11 1.8.7:";;
esac
cat <<\_ACEOF
@@ -1794,7 +1794,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libX11 configure 1.8.6
+libX11 configure 1.8.7
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2262,7 +2262,7 @@ cat >config.log <<_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.8.6, which was
+It was created by libX11 $as_me 1.8.7, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4910,7 +4910,7 @@ fi
# Define the identity of the package.
PACKAGE='libX11'
- VERSION='1.8.6'
+ VERSION='1.8.7'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -21661,8 +21661,6 @@ fi
# Check for dlopen
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if run-time linking is supported" >&5
-printf %s "checking if run-time linking is supported... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
printf %s "checking for library containing dlopen... " >&6; }
if test ${ac_cv_search_dlopen+y}
@@ -21806,6 +21804,8 @@ then :
fi
fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if run-time linking is supported" >&5
+printf %s "checking if run-time linking is supported... " >&6; }
if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then
HAVE_LOADABLE_MODULES=yes
else
@@ -23676,7 +23676,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libX11 $as_me 1.8.6, which was
+This file was extended by libX11 $as_me 1.8.7, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23744,7 +23744,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-libX11 config.status 1.8.6
+libX11 config.status 1.8.7
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Index: xsrc/external/mit/libX11/dist/configure.ac
diff -u xsrc/external/mit/libX11/dist/configure.ac:1.5 xsrc/external/mit/libX11/dist/configure.ac:1.6
--- xsrc/external/mit/libX11/dist/configure.ac:1.5 Mon Jun 19 04:46:12 2023
+++ xsrc/external/mit/libX11/dist/configure.ac Tue Oct 3 19:17:41 2023
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.70])
-AC_INIT([libX11], [1.8.6],
+AC_INIT([libX11], [1.8.7],
[https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
@@ -98,7 +98,6 @@ m4_pattern_forbid([^XTRANS_CONNECTION_FL
XTRANS_CONNECTION_FLAGS
# Check for dlopen
-AC_MSG_CHECKING([if run-time linking is supported])
AC_SEARCH_LIBS(dlopen,[dl svld])
if test "x$ac_cv_search_dlopen" = xno; then
AC_SEARCH_LIBS(shl_load,[dld])
@@ -111,6 +110,7 @@ else
AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries])
AC_CHECK_HEADERS([dlfcn.h])
fi
+AC_MSG_CHECKING([if run-time linking is supported])
if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then
HAVE_LOADABLE_MODULES=yes
else
Index: xsrc/external/mit/libX11/dist/README.md
diff -u xsrc/external/mit/libX11/dist/README.md:1.4 xsrc/external/mit/libX11/dist/README.md:1.5
--- xsrc/external/mit/libX11/dist/README.md:1.4 Mon Jun 19 04:46:11 2023
+++ xsrc/external/mit/libX11/dist/README.md Tue Oct 3 19:17:41 2023
@@ -31,6 +31,17 @@ For patch submission instructions, see:
https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+## Release 1.8.7
+
+ * Security fixes and hardening in XImage and pixmap handling code
+ (CVE-2023-43786, CVE-2023-43787, !234)
+ * Fix buffer allocation in _XkbReadKeySyms() (CVE-2023-43785)
+ * Fail XOpenDisplay() if server-provided default visual is invalid (!233)
+ * Bring XKB docs in line with actual implementation (!231, !228)
+ * Xutil.h: declare XEmptyRegion() and XEqualRegion() as Bool (!225)
+ * Assorted updates to en_US.UTF-8 compose keys (!213, !214, !215, !216,
+ !217, !219, !220, !222, !223, !226, !227, !229)
+
## Release 1.8.6
* Add bounds checks in InitExt.c (CVE-2023-3138)
Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.12 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.13
--- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.12 Mon Jun 19 04:46:12 2023
+++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre Tue Oct 3 19:17:42 2023
@@ -112,6 +112,8 @@ XCOMM Special punctuation
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
<Multi_key> <question> <exclam> : "⸘" U2E18 # INVERTED INTERROBANG
<Multi_key> <minus> <minus> <space> : "" U00ad # SOFT HYPHEN
+<Multi_key> <bar> <minus> : "†" U2020 # DAGGER
+<Multi_key> <bar> <equal> : "‡" U2021 # DOUBLE DAGGER
<Multi_key> <percent> <o> : "‰" U2030 # PER MILLE SIGN
XCOMM Some ligatures
@@ -133,8 +135,8 @@ XCOMM Some ligatures
XCOMM Quotation marks
<Multi_key> <less> <less> : "«" guillemotleft # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
<Multi_key> <greater> <greater> : "»" guillemotright # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-<Multi_key> <period> <greater> : "›" U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
<Multi_key> <period> <less> : "‹" U2039 # SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+<Multi_key> <period> <greater> : "›" U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
<Multi_key> <less> <apostrophe> : "‘" U2018 # LEFT SINGLE QUOTATION MARK
<Multi_key> <apostrophe> <less> : "‘" U2018 # LEFT SINGLE QUOTATION MARK
<Multi_key> <greater> <apostrophe> : "’" U2019 # RIGHT SINGLE QUOTATION MARK
@@ -149,6 +151,22 @@ XCOMM Quotation marks
<Multi_key> <quotedbl> <comma> : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
XCOMM Currencies
+<Multi_key> <S> <bar> : "$" dollar # DOLLAR SIGN
+<Multi_key> <bar> <S> : "$" dollar # DOLLAR SIGN
+<Multi_key> <c> <bar> : "¢" cent # CENT SIGN
+<Multi_key> <bar> <c> : "¢" cent # CENT SIGN
+<Multi_key> <c> <slash> : "¢" cent # CENT SIGN
+<Multi_key> <slash> <c> : "¢" cent # CENT SIGN
+<Multi_key> <L> <minus> : "£" sterling # POUND SIGN
+<Multi_key> <minus> <L> : "£" sterling # POUND SIGN
+<Multi_key> <l> <minus> : "£" sterling # POUND SIGN
+<Multi_key> <minus> <l> : "£" sterling # POUND SIGN
+<Multi_key> <Y> <equal> : "¥" yen # YEN SIGN
+<Multi_key> <equal> <Y> : "¥" yen # YEN SIGN
+<Multi_key> <y> <equal> : "¥" yen # YEN SIGN
+<Multi_key> <equal> <y> : "¥" yen # YEN SIGN
+<Multi_key> <B> <bar> : "฿" U0e3f # THAI CURRENCY SYMBOL BAHT
+<Multi_key> <bar> <B> : "฿" U0e3f # THAI CURRENCY SYMBOL BAHT
<Multi_key> <C> <E> : "₠" U20a0 # EURO-CURRENCY SIGN
<Multi_key> <C> <slash> : "₡" U20a1 # COLON SIGN
<Multi_key> <slash> <C> : "₡" U20a1 # COLON SIGN
@@ -179,46 +197,28 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN
<Multi_key> <equal> <Cyrillic_ES> : "€" EuroSign # EURO SIGN
<Multi_key> <Cyrillic_IE> <equal> : "€" EuroSign # EURO SIGN
<Multi_key> <equal> <Cyrillic_IE> : "€" EuroSign # EURO SIGN
-<Multi_key> <P> <equal> : "₽" U20bd # ROUBLE SIGN
-<Multi_key> <p> <equal> : "₽" U20bd # ROUBLE SIGN
-<Multi_key> <equal> <P> : "₽" U20bd # ROUBLE SIGN
-<Multi_key> <equal> <p> : "₽" U20bd # ROUBLE SIGN
-<Multi_key> <Cyrillic_ZE> <equal> : "₽" U20bd # ROUBLE SIGN
-<Multi_key> <Cyrillic_ze> <equal> : "₽" U20bd # ROUBLE SIGN
-<Multi_key> <equal> <Cyrillic_ZE> : "₽" U20bd # ROUBLE SIGN
-<Multi_key> <equal> <Cyrillic_ze> : "₽" U20bd # ROUBLE SIGN
-XCOMM "₭" U20ad KIP SIGN
-XCOMM "₮" U20ae TUGRIK SIGN
-XCOMM "₯" U20af DRACHMA SIGN
-XCOMM "₰" U20b0 GERMAN PENNY SIGN
+<Multi_key> <K> <minus> : "₭" U20ad # KIP SIGN
+<Multi_key> <minus> <K> : "₭" U20ad # KIP SIGN
+<Multi_key> <T> <equal> : "₮" U20ae # TUGRIK SIGN
+<Multi_key> <equal> <T> : "₮" U20ae # TUGRIK SIGN
XCOMM "₱" U20b1 PESO SIGN
-XCOMM "₲" U20b2 GUARANI SIGN
-XCOMM "₳" U20b3 AUSTRAL SIGN
+<Multi_key> <G> <bar> : "₲" U20b2 # GUARANI SIGN
+<Multi_key> <bar> <G> : "₲" U20b2 # GUARANI SIGN
XCOMM "₴" U20b4 HRYVNIA SIGN
-XCOMM "₵" U20b5 CEDI SIGN
+<Multi_key> <C> <bar> : "₵" U20b5 # CEDI SIGN
+<Multi_key> <bar> <C> : "₵" U20b5 # CEDI SIGN
<Multi_key> <R> <equal> : "₹" U20b9 # INDIAN RUPEE SIGN
<Multi_key> <equal> <R> : "₹" U20b9 # INDIAN RUPEE SIGN
<Multi_key> <r> <equal> : "₹" U20b9 # INDIAN RUPEE SIGN
<Multi_key> <equal> <r> : "₹" U20b9 # INDIAN RUPEE SIGN
-
-<Multi_key> <C> <bar> : "¢" cent # CENT SIGN
-<Multi_key> <bar> <C> : "¢" cent # CENT SIGN
-<Multi_key> <c> <bar> : "¢" cent # CENT SIGN
-<Multi_key> <bar> <c> : "¢" cent # CENT SIGN
-<Multi_key> <c> <slash> : "¢" cent # CENT SIGN
-<Multi_key> <slash> <c> : "¢" cent # CENT SIGN
-<Multi_key> <L> <minus> : "£" sterling # POUND SIGN
-<Multi_key> <minus> <L> : "£" sterling # POUND SIGN
-<Multi_key> <l> <minus> : "£" sterling # POUND SIGN
-<Multi_key> <minus> <l> : "£" sterling # POUND SIGN
-<Multi_key> <Y> <equal> : "¥" yen # YEN SIGN
-<Multi_key> <equal> <Y> : "¥" yen # YEN SIGN
-<Multi_key> <y> <equal> : "¥" yen # YEN SIGN
-<Multi_key> <equal> <y> : "¥" yen # YEN SIGN
-<Multi_key> <Y> <minus> : "¥" yen # YEN SIGN
-<Multi_key> <minus> <Y> : "¥" yen # YEN SIGN
-<Multi_key> <y> <minus> : "¥" yen # YEN SIGN
-<Multi_key> <minus> <y> : "¥" yen # YEN SIGN
+<Multi_key> <P> <equal> : "₽" U20bd # ROUBLE SIGN
+<Multi_key> <equal> <P> : "₽" U20bd # ROUBLE SIGN
+<Multi_key> <p> <equal> : "₽" U20bd # ROUBLE SIGN
+<Multi_key> <equal> <p> : "₽" U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ZE> <equal> : "₽" U20bd # ROUBLE SIGN
+<Multi_key> <equal> <Cyrillic_ZE> : "₽" U20bd # ROUBLE SIGN
+<Multi_key> <Cyrillic_ze> <equal> : "₽" U20bd # ROUBLE SIGN
+<Multi_key> <equal> <Cyrillic_ze> : "₽" U20bd # ROUBLE SIGN
XCOMM Dashes
<Multi_key> <minus> <minus> <period> : "–" U2013 # EN DASH
@@ -365,11 +365,11 @@ XCOMM Latin-1 Supplement
<Multi_key> <I> <quotedbl> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <I> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
<Multi_key> <I> <diaeresis> : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
-<dead_acute> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <apostrophe> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <J> <apostrophe> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <acute> <J> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <J> <acute> : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301
+<dead_acute> <J> : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE
+<Multi_key> <apostrophe> <J> : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE
+<Multi_key> <J> <apostrophe> : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE
+<Multi_key> <acute> <J> : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE
+<Multi_key> <J> <acute> : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE
<Multi_key> <D> <H> : "Ð" ETH # LATIN CAPITAL LETTER ETH
<dead_tilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
<Multi_key> <asciitilde> <N> : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
@@ -490,11 +490,11 @@ XCOMM Latin-1 Supplement
<Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
-<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
-<Multi_key> <j> <acute> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<dead_acute> <j> : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE
+<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE
+<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE
+<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE
+<Multi_key> <j> <acute> : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE
<Multi_key> <d> <h> : "ð" eth # LATIN SMALL LETTER ETH
<dead_tilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
<Multi_key> <asciitilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
@@ -1219,18 +1219,12 @@ XCOMM Latin Extended-B
<Multi_key> <o> <semicolon> : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK
<Multi_key> <comma> <o> : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK
<Multi_key> <o> <comma> : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK
-<dead_macron> <U01EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <macron> <U01EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <underscore> <U01EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
<dead_macron> <dead_ogonek> <O> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
<dead_macron> <Multi_key> <semicolon> <O> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
<Multi_key> <macron> <dead_ogonek> <O> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
<Multi_key> <macron> <semicolon> <O> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
<Multi_key> <underscore> <dead_ogonek> <O> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
<Multi_key> <underscore> <semicolon> <O> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<dead_macron> <U01EB> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <macron> <U01EB> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<Multi_key> <underscore> <U01EB> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
<dead_macron> <dead_ogonek> <o> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
<dead_macron> <Multi_key> <semicolon> <o> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
<Multi_key> <macron> <dead_ogonek> <o> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
@@ -1390,18 +1384,12 @@ XCOMM Latin Extended-B
<Multi_key> <period> <O> : "Ȯ" U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE
<dead_abovedot> <o> : "ȯ" U022F # LATIN SMALL LETTER O WITH DOT ABOVE
<Multi_key> <period> <o> : "ȯ" U022F # LATIN SMALL LETTER O WITH DOT ABOVE
-<dead_macron> <U022E> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <macron> <U022E> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <underscore> <U022E> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
<dead_macron> <dead_abovedot> <O> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
<dead_macron> <Multi_key> <period> <O> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
<Multi_key> <macron> <dead_abovedot> <O> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
<Multi_key> <macron> <period> <O> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
<Multi_key> <underscore> <dead_abovedot> <O> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
<Multi_key> <underscore> <period> <O> : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<dead_macron> <U022F> : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <macron> <U022F> : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
-<Multi_key> <underscore> <U022F> : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
<dead_macron> <dead_abovedot> <o> : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
<dead_macron> <Multi_key> <period> <o> : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
<Multi_key> <macron> <dead_abovedot> <o> : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
@@ -2077,9 +2065,6 @@ XCOMM Latin Extended Additional
<dead_belowcircumflex> <e> : "ḙ" U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
<dead_belowtilde> <E> : "Ḛ" U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW
<dead_belowtilde> <e> : "ḛ" U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW
-<dead_breve> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <U> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <b> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <Multi_key> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <Multi_key> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
@@ -2089,9 +2074,6 @@ XCOMM Latin Extended Additional
<Multi_key> <b> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<dead_breve> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <U> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <b> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <Multi_key> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <Multi_key> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
@@ -2558,15 +2540,11 @@ XCOMM Latin Extended Additional
<dead_tilde> <Multi_key> <asciicircum> <a> : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
<Multi_key> <asciitilde> <dead_circumflex> <a> : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
<Multi_key> <asciitilde> <asciicircum> <a> : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <U1EA0> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U1EA0> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<dead_circumflex> <dead_belowdot> <A> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<dead_circumflex> <Multi_key> <exclam> <A> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<Multi_key> <asciicircum> <dead_belowdot> <A> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<Multi_key> <asciicircum> <exclam> <A> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<dead_belowdot> <Acircumflex> : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_circumflex> <U1EA1> : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<Multi_key> <asciicircum> <U1EA1> : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<dead_circumflex> <dead_belowdot> <a> : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<dead_circumflex> <Multi_key> <exclam> <a> : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
<Multi_key> <asciicircum> <dead_belowdot> <a> : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
@@ -2634,9 +2612,6 @@ XCOMM Latin Extended Additional
<dead_tilde> <Multi_key> <b> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<Multi_key> <asciitilde> <dead_breve> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<Multi_key> <asciitilde> <b> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<dead_breve> <U1EA0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <U1EA0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <U1EA0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
<dead_breve> <dead_belowdot> <A> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
<dead_breve> <Multi_key> <exclam> <A> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
<Multi_key> <U> <dead_belowdot> <A> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
@@ -2644,9 +2619,6 @@ XCOMM Latin Extended Additional
<Multi_key> <b> <dead_belowdot> <A> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
<Multi_key> <b> <exclam> <A> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
<dead_belowdot> <Abreve> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<dead_breve> <U1EA1> : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <U> <U1EA1> : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<Multi_key> <b> <U1EA1> : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
<dead_breve> <dead_belowdot> <a> : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
<dead_breve> <Multi_key> <exclam> <a> : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
<Multi_key> <U> <dead_belowdot> <a> : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
@@ -3416,8 +3388,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_alpha> : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
@@ -3428,8 +3398,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_alpha> : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_alpha> : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
@@ -3480,8 +3448,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_ALPHA> : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
@@ -3492,8 +3458,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_ALPHA> : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_ALPHA> : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
@@ -3544,8 +3508,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_eta> : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
@@ -3556,8 +3518,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_eta> : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_eta> : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
@@ -3608,8 +3568,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_ETA> : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
@@ -3620,8 +3578,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_ETA> : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_ETA> : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
@@ -3672,8 +3628,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_omega> : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
@@ -3684,8 +3638,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_omega> : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_omega> : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
@@ -3736,8 +3688,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <grave> <parenleft> <Greek_OMEGA> : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_psili> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
@@ -3748,8 +3698,6 @@ XCOMM Greek Extended
<Multi_key> <Greek_iota> <apostrophe> <parenright> <Greek_OMEGA> : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <dead_acute> <Multi_key> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <parenleft> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <dead_dasia> <Greek_OMEGA> : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
@@ -3787,7 +3735,6 @@ XCOMM Greek Extended
<dead_iota> <Greek_alpha> : "ᾳ" U1FB3 # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
<Multi_key> <Greek_iota> <Greek_alpha> : "ᾳ" U1FB3 # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
<dead_iota> <dead_acute> <Greek_alpha> : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <Greek_alpha> : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <Greek_alpha> : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <Greek_alpha> : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <Greek_alpha> : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
@@ -3817,7 +3764,6 @@ XCOMM Greek Extended
<dead_iota> <Greek_eta> : "ῃ" U1FC3 # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
<Multi_key> <Greek_iota> <Greek_eta> : "ῃ" U1FC3 # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
<dead_iota> <dead_acute> <Greek_eta> : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <Greek_eta> : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <Greek_eta> : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <Greek_eta> : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <Greek_eta> : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
@@ -3897,7 +3843,6 @@ XCOMM Greek Extended
<dead_iota> <Greek_omega> : "ῳ" U1FF3 # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
<Multi_key> <Greek_iota> <Greek_omega> : "ῳ" U1FF3 # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
<dead_iota> <dead_acute> <Greek_omega> : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-<dead_iota> <Multi_key> <acute> <Greek_omega> : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
<dead_iota> <Multi_key> <apostrophe> <Greek_omega> : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <dead_acute> <Greek_omega> : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
<Multi_key> <Greek_iota> <acute> <Greek_omega> : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
@@ -4091,9 +4036,7 @@ XCOMM Mathematical Operators
<Multi_key> <U227A> <slash> : "⊀" U2280 # DOES NOT PRECEDE
<Multi_key> <U227B> <slash> : "⊁" U2281 # DOES NOT SUCCEED
<Multi_key> <includedin> <slash> : "⊄" U2284 # NOT A SUBSET OF
-<Multi_key> <leftshoe> <slash> : "⊄" U2284 # NOT A SUBSET OF
<Multi_key> <includes> <slash> : "⊅" U2285 # NOT A SUPERSET OF
-<Multi_key> <rightshoe> <slash> : "⊅" U2285 # NOT A SUPERSET OF
<Multi_key> <U2286> <slash> : "⊈" U2288 # NEITHER A SUBSET OF NOR EQUAL TO
<Multi_key> <U2287> <slash> : "⊉" U2289 # NEITHER A SUPERSET OF NOR EQUAL TO
<Multi_key> <righttack> <slash> : "⊬" U22AC # DOES NOT PROVE
@@ -4549,25 +4492,25 @@ XCOMM Musical notes
<Multi_key> <U1D1BC> <U1D16F> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
XCOMM Khmer digraphs
-<U17ff> : "ាំ"
-<U17fe> : "ោះ"
-<U17fd> : "េះ"
-<U17fc> : "ុំ"
-<U17fb> : "ុះ"
-
-XCOMM Arabic Lam-Alef ligatures
-<UFEFB> : "لا" # ARABIC LIGATURE LAM WITH ALEF
-<UFEF7> : "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
-<UFEF9> : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
-<UFEF5> : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
+<U17ff> : "ាំ" # KHMER VOWEL SIGN AA plus KHMER SIGN NIKAHIT
+<U17fe> : "ោះ" # KHMER VOWEL SIGN OO plus KHMER SIGN REAHMUK
+<U17fd> : "េះ" # KHMER VOWEL SIGN E plus KHMER SIGN REAHMUK
+<U17fc> : "ុំ" # KHMER VOWEL SIGN U plus KHMER SIGN NIKAHIT
+<U17fb> : "ុះ" # KHMER VOWEL SIGN U plus KHMER SIGN REAHMUK
+
+XCOMM Decomposition of four Arabic Lam-Alef ligatures
+<UFEFB> : "لا" # ARABIC LETTER LAM plus ARABIC LETTER ALEF
+<UFEF7> : "لأ" # ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH HAMZA ABOVE
+<UFEF9> : "لإ" # ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH HAMZA BELOW
+<UFEF5> : "لآ" # ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH MADDA ABOVE
XCOMM Breton N-graphs
-<ch> : "ch" # LATIN SMALL LETTER C U0063 followed by LATIN SMALL LETTER H U0068
-<Ch> : "Ch" # LATIN CAPITAL LETTER C U0043 followed by LATIN SMALL LETTER H U0068
-<CH> : "CH" # LATIN CAPITAL LETTER C U0043 followed by LATIN CAPITAL LETTER H U0048
-<c_h> : "c’h" # LATIN SMALL LETTER C U0063 followed by RIGHT SINGLE QUOTATION MARK U2019 and LATIN SMALL LETTER H U0068
-<C_h> : "C’h" # LATIN CAPITAL LETTER C U0043 followed by RIGHT SINGLE QUOTATION MARK U2019 and LATIN SMALL LETTER H U0068
-<C_H> : "C’H" # LATIN CAPITAL LETTER C U0043 followed by RIGHT SINGLE QUOTATION MARK U2019 and LATIN CAPITAL LETTER H U0048
+<ch> : "ch" # LATIN SMALL LETTER C plus LATIN SMALL LETTER H
+<Ch> : "Ch" # LATIN CAPITAL LETTER C plus LATIN SMALL LETTER H
+<CH> : "CH" # LATIN CAPITAL LETTER C plus LATIN CAPITAL LETTER H
+<c_h> : "c’h" # LATIN SMALL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN SMALL LETTER H
+<C_h> : "C’h" # LATIN CAPITAL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN SMALL LETTER H
+<C_H> : "C’H" # LATIN CAPITAL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN CAPITAL LETTER H
XCOMM French-Dvorak Bépo compositions
<dead_abovedot> <j> : "ȷ" U0237 # LATIN SMALL LETTER DOTLESS J
@@ -4872,166 +4815,166 @@ XCOMM French-Dvorak Bépo compositions
<dead_stroke> <dead_greek> <r> : "ϼ" U03FC # GREEK RHO WITH STROKE SYMBOL
XCOMM Cyrillic (NFDs -- Normalized Form Canonical Decomposition)
-<dead_doublegrave> <Cyrillic_a> : "а̏" # CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_a> : "а̏" # CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_a> : "а̑" # CYRILLIC SMALL LETTER A WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_a> : "а̀" # CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_a> : "а̀" # CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_a> : "а̂" # CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_a> : "а̂" # CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_A> : "А̏" # CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_A> : "А̏" # CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_A> : "А̑" # CYRILLIC CAPITAL LETTER A WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_A> : "А̀" # CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_A> : "А̀" # CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_A> : "А̂" # CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_A> : "А̂" # CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_ie> : "е̏" # CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_ie>: "е̏" # CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_ie> : "е̑" # CYRILLIC SMALL LETTER IE WITH COMBINING INVERTED BREVE
-<dead_acute> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_ie> : "е̂" # CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_ie> : "е̂" # CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_IE> : "Е̏" # CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_IE>: "Е̏" # CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_IE> : "Е̑" # CYRILLIC CAPITAL LETTER IE WITH COMBINING INVERTED BREVE
-<dead_acute> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_IE> : "Е̂" # CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_IE> : "Е̂" # CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_i> : "и̏" # CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_i> : "и̏" # CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_i> : "и̑" # CYRILLIC SMALL LETTER I WITH COMBINING INVERTED BREVE
-<dead_acute> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT
-<dead_circumflex> <Cyrillic_i> : "и̂" # CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_i> : "и̂" # CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_I> : "И̏" # CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_I> : "И̏" # CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_I> : "И̑" # CYRILLIC CAPITAL LETTER I WITH COMBINING INVERTED BREVE
-<dead_acute> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT
-<dead_circumflex> <Cyrillic_I> : "И̂" # CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_I> : "И̂" # CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_o> : "о̏" # CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_o> : "о̏" # CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_o> : "о̑" # CYRILLIC SMALL LETTER O WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_o> : "о̀" # CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_o> : "о̀" # CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_o> : "о̂" # CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_o> : "о̂" # CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_O> : "О̏" # CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_O> : "О̏" # CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_O> : "О̑" # CYRILLIC CAPITAL LETTER O WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_O> : "О̀" # CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_O> : "О̀" # CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_O> : "О̂" # CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_O> : "О̂" # CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_u> : "у̏" # CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_u> : "у̏" # CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_u> : "у̑" # CYRILLIC SMALL LETTER U WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_u> : "у̀" # CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_u> : "у̀" # CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT
-<dead_circumflex> <Cyrillic_u> : "у̂" # CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_u> : "у̂" # CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_U> : "У̏" # CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_U> : "У̏" # CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_U> : "У̑" # CYRILLIC CAPITAL LETTER U WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_U> : "У̀" # CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_U> : "У̀" # CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT
-<dead_circumflex> <Cyrillic_U> : "У̂" # CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_U> : "У̂" # CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_er> : "р̏" # CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_er>: "р̏" # CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_er> : "р̑" # CYRILLIC SMALL LETTER ER WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_er> : "р̀" # CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_er> : "р̀" # CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_er> : "р̂" # CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_er> : "р̂" # CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<dead_doublegrave> <Cyrillic_ER> : "Р̏" # CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
-<Multi_key> <grave><grave> <Cyrillic_ER>: "Р̏" # CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT
-<dead_invertedbreve> <Cyrillic_ER> : "Р̑" # CYRILLIC CAPITAL LETTER ER WITH COMBINING INVERTED BREVE
-<dead_grave> <Cyrillic_ER> : "Р̀" # CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT
-<Multi_key> <grave> <Cyrillic_ER> : "Р̀" # CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT
-<dead_acute> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT
-<dead_macron> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
-<Multi_key> <macron> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
-<Multi_key> <underscore> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON
-<dead_circumflex> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
-<dead_acute> <Cyrillic_yeru> : "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_yeru> : "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_yeru>: "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_YERU> : "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_YERU> : "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_YERU>: "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_YU> : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_YU> : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_YU> : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT
-<dead_acute> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
-<Multi_key> <acute> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
-<Multi_key> <apostrophe> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT
+<dead_doublegrave> <Cyrillic_a> : "а̏" # CYRILLIC SMALL LETTER A plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_a> : "а̏" # CYRILLIC SMALL LETTER A plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_a> : "а̑" # CYRILLIC SMALL LETTER A plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_a> : "а̀" # CYRILLIC SMALL LETTER A plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_a> : "а̀" # CYRILLIC SMALL LETTER A plus COMBINING GRAVE
+<dead_acute> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_a> : "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE
+<dead_macron> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_a> : "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_a> : "а̂" # CYRILLIC SMALL LETTER A plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_a> : "а̂" # CYRILLIC SMALL LETTER A plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_A> : "А̏" # CYRILLIC CAPITAL LETTER A plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_A> : "А̏" # CYRILLIC CAPITAL LETTER A plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_A> : "А̑" # CYRILLIC CAPITAL LETTER A plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_A> : "А̀" # CYRILLIC CAPITAL LETTER A plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_A> : "А̀" # CYRILLIC CAPITAL LETTER A plus COMBINING GRAVE
+<dead_acute> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_A> : "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE
+<dead_macron> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_A> : "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_A> : "А̂" # CYRILLIC CAPITAL LETTER A plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_A> : "А̂" # CYRILLIC CAPITAL LETTER A plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_ie> : "е̏" # CYRILLIC SMALL LETTER IE plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_ie>: "е̏" # CYRILLIC SMALL LETTER IE plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_ie> : "е̑" # CYRILLIC SMALL LETTER IE plus COMBINING INVERTED BREVE
+<dead_acute> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_ie> : "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE
+<dead_macron> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_ie> : "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_ie> : "е̂" # CYRILLIC SMALL LETTER IE plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_ie> : "е̂" # CYRILLIC SMALL LETTER IE plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_IE> : "Е̏" # CYRILLIC CAPITAL LETTER IE plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_IE>: "Е̏" # CYRILLIC CAPITAL LETTER IE plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_IE> : "Е̑" # CYRILLIC CAPITAL LETTER IE plus COMBINING INVERTED BREVE
+<dead_acute> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_IE> : "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE
+<dead_macron> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_IE> : "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_IE> : "Е̂" # CYRILLIC CAPITAL LETTER IE plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_IE> : "Е̂" # CYRILLIC CAPITAL LETTER IE plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_i> : "и̏" # CYRILLIC SMALL LETTER I plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_i> : "и̏" # CYRILLIC SMALL LETTER I plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_i> : "и̑" # CYRILLIC SMALL LETTER I plus COMBINING INVERTED BREVE
+<dead_acute> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_i> : "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE
+<dead_circumflex> <Cyrillic_i> : "и̂" # CYRILLIC SMALL LETTER I plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_i> : "и̂" # CYRILLIC SMALL LETTER I plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_I> : "И̏" # CYRILLIC CAPITAL LETTER I plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_I> : "И̏" # CYRILLIC CAPITAL LETTER I plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_I> : "И̑" # CYRILLIC CAPITAL LETTER I plus COMBINING INVERTED BREVE
+<dead_acute> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_I> : "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE
+<dead_circumflex> <Cyrillic_I> : "И̂" # CYRILLIC CAPITAL LETTER I plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_I> : "И̂" # CYRILLIC CAPITAL LETTER I plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_o> : "о̏" # CYRILLIC SMALL LETTER O plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_o> : "о̏" # CYRILLIC SMALL LETTER O plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_o> : "о̑" # CYRILLIC SMALL LETTER O plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_o> : "о̀" # CYRILLIC SMALL LETTER O plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_o> : "о̀" # CYRILLIC SMALL LETTER O plus COMBINING GRAVE
+<dead_acute> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_o> : "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE
+<dead_macron> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_o> : "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_o> : "о̂" # CYRILLIC SMALL LETTER O plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_o> : "о̂" # CYRILLIC SMALL LETTER O plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_O> : "О̏" # CYRILLIC CAPITAL LETTER O plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_O> : "О̏" # CYRILLIC CAPITAL LETTER O plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_O> : "О̑" # CYRILLIC CAPITAL LETTER O plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_O> : "О̀" # CYRILLIC CAPITAL LETTER O plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_O> : "О̀" # CYRILLIC CAPITAL LETTER O plus COMBINING GRAVE
+<dead_acute> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_O> : "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE
+<dead_macron> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_O> : "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_O> : "О̂" # CYRILLIC CAPITAL LETTER O plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_O> : "О̂" # CYRILLIC CAPITAL LETTER O plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_u> : "у̏" # CYRILLIC SMALL LETTER U plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_u> : "у̏" # CYRILLIC SMALL LETTER U plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_u> : "у̑" # CYRILLIC SMALL LETTER U plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_u> : "у̀" # CYRILLIC SMALL LETTER U plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_u> : "у̀" # CYRILLIC SMALL LETTER U plus COMBINING GRAVE
+<dead_acute> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_u> : "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE
+<dead_circumflex> <Cyrillic_u> : "у̂" # CYRILLIC SMALL LETTER U plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_u> : "у̂" # CYRILLIC SMALL LETTER U plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_U> : "У̏" # CYRILLIC CAPITAL LETTER U plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_U> : "У̏" # CYRILLIC CAPITAL LETTER U plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_U> : "У̑" # CYRILLIC CAPITAL LETTER U plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_U> : "У̀" # CYRILLIC CAPITAL LETTER U plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_U> : "У̀" # CYRILLIC CAPITAL LETTER U plus COMBINING GRAVE
+<dead_acute> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_U> : "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE
+<dead_circumflex> <Cyrillic_U> : "У̂" # CYRILLIC CAPITAL LETTER U plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_U> : "У̂" # CYRILLIC CAPITAL LETTER U plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_er> : "р̏" # CYRILLIC SMALL LETTER ER plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_er>: "р̏" # CYRILLIC SMALL LETTER ER plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_er> : "р̑" # CYRILLIC SMALL LETTER ER plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_er> : "р̀" # CYRILLIC SMALL LETTER ER plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_er> : "р̀" # CYRILLIC SMALL LETTER ER plus COMBINING GRAVE
+<dead_acute> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_er> : "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE
+<dead_macron> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_er> : "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_er> : "р̂" # CYRILLIC SMALL LETTER ER plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_er> : "р̂" # CYRILLIC SMALL LETTER ER plus COMBINING CIRCUMFLEX
+<dead_doublegrave> <Cyrillic_ER> : "Р̏" # CYRILLIC CAPITAL LETTER ER plus COMBINING DOUBLE GRAVE
+<Multi_key> <grave><grave> <Cyrillic_ER>: "Р̏" # CYRILLIC CAPITAL LETTER ER plus COMBINING DOUBLE GRAVE
+<dead_invertedbreve> <Cyrillic_ER> : "Р̑" # CYRILLIC CAPITAL LETTER ER plus COMBINING INVERTED BREVE
+<dead_grave> <Cyrillic_ER> : "Р̀" # CYRILLIC CAPITAL LETTER ER plus COMBINING GRAVE
+<Multi_key> <grave> <Cyrillic_ER> : "Р̀" # CYRILLIC CAPITAL LETTER ER plus COMBINING GRAVE
+<dead_acute> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_ER> : "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE
+<dead_macron> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON
+<Multi_key> <macron> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON
+<Multi_key> <underscore> <Cyrillic_ER> : "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON
+<dead_circumflex> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER plus COMBINING CIRCUMFLEX
+<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER plus COMBINING CIRCUMFLEX
+<dead_acute> <Cyrillic_yeru> : "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_yeru> : "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_yeru>: "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE
+<dead_acute> <Cyrillic_YERU> : "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_YERU> : "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_YERU>: "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE
+<dead_acute> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_e> : "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE
+<dead_acute> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_E> : "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE
+<dead_acute> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_yu> : "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE
+<dead_acute> <Cyrillic_YU> : "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_YU> : "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_YU> : "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE
+<dead_acute> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_ya> : "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE
+<dead_acute> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE
+<Multi_key> <acute> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE
+<Multi_key> <apostrophe> <Cyrillic_YA> : "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE
/*
* APL support, by Geoff Streeter, 2012-01-04
@@ -5049,7 +4992,10 @@ XCOMM Characters from "Mathematical Oper
<Multi_key> <v> <slash> : "√" U221a # v / SQUARE ROOT
<Multi_key> <slash> <v> : "√" U221a # / v SQUARE ROOT
<Multi_key> <8> <8> : "∞" U221e # 8 8 INFINITY
+<Multi_key> <colon> <period> : "∴" U2234 # : . THEREFORE
+<Multi_key> <period> <colon> : "∵" U2235 # . : BECAUSE
<Multi_key> <asciitilde> <asciitilde> : "≈" U2248 # ~ ~ ALMOST EQUAL TO
+<Multi_key> <dead_tilde> <dead_tilde> : "≈" U2248 # ~ ~ ALMOST EQUAL TO
<Multi_key> <equal> <underscore> : "≡" U2261 # = _ IDENTICAL TO
<Multi_key> <underscore> <U2260> : "≢" U2262 # _ ≠ NOT IDENTICAL TO
<Multi_key> <U2260> <underscore> : "≢" U2262 # ≠ _ NOT IDENTICAL TO
@@ -5063,14 +5009,12 @@ XCOMM Characters from "Mathematical Oper
<Multi_key> <U2283> <underscore> : "⊇" U2287 # ⊃ _ SUPERSET OF OR EQUAL TO
<Multi_key> <U25cb> <minus> : "⊖" U2296 # ○ - CIRCLED MINUS
<Multi_key> <minus> <U25cb> : "⊖" U2296 # - ○ CIRCLED MINUS
-<Multi_key> <U25cb> <period> : "⊙" U2299 # ○ - CIRCLED DOT
-<Multi_key> <period> <U25cb> : "⊙" U2299 # - ○ CIRCLED DOT
+<Multi_key> <U25cb> <period> : "⊙" U2299 # ○ . CIRCLED DOT OPERATOR
+<Multi_key> <period> <U25cb> : "⊙" U2299 # . ○ CIRCLED DOT OPERATOR
<Multi_key> <less> <greater> : "⋄" U22c4 # < > DIAMOND OPERATOR
<Multi_key> <greater> <less> : "⋄" U22c4 # > < DIAMOND OPERATOR
<Multi_key> <U2227> <U2228> : "⋄" U22c4 # ∧ ∨ DIAMOND OPERATOR
<Multi_key> <U2228> <U2227> : "⋄" U22c4 # ∨ ∧ DIAMOND OPERATOR
-<Multi_key> <colon> <period> : "∴" therefore # : . THEREFORE
-<Multi_key> <period> <colon> : "∵" because # . : BECAUSE
XCOMM Characters from "Miscellaneous Technical"
<Multi_key> <U22a5> <U22a4> : "⌶" U2336 # ⊥ ⊤ APL FUNCTIONAL SYMBOL I-BEAM
@@ -5203,103 +5147,103 @@ XCOMM Characters from "Miscellaneous Tec
<Multi_key> <underscore> <U2375> : "⍹" U2379 # _ ⍵ APL FUNCTIONAL SYMBOL OMEGA UNDERBAR
XCOMM Diacritics used in African languages
-<dead_acute> <U025B> : "ɛ́" # LATIN SMALL LETTER EPSILON WITH ACUTE
-<dead_grave> <U025B> : "ɛ̀" # LATIN SMALL LETTER EPSILON WITH GRAVE
-<dead_circumflex> <U025B> : "ɛ̂" # LATIN SMALL LETTER EPSILON WITH CIRCUMFLEX
-<dead_caron> <U025B> : "ɛ̌" # LATIN SMALL LETTER EPSILON WITH CARON
-<dead_macron> <U025B> : "ɛ̄" # LATIN SMALL LETTER EPSILON WITH MACRON
-<dead_tilde> <U025B> : "ɛ̃" # LATIN SMALL LETTER EPSILON WITH TILDE
-<dead_acute> <dead_tilde> <U025B> : "ɛ̃́" # LATIN SMALL LETTER EPSILON WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U025B> : "ɛ̃̀" # LATIN SMALL LETTER EPSILON WITH TILDE AND GRAVE
-<dead_acute> <U0190> : "Ɛ́" # LATIN CAPITAL LETTER EPSILON WITH ACUTE
-<dead_grave> <U0190> : "Ɛ̀" # LATIN CAPITAL LETTER EPSILON WITH GRAVE
-<dead_circumflex> <U0190> : "Ɛ̂" # LATIN CAPITAL LETTER EPSILON WITH CIRCUMFLEX
-<dead_caron> <U0190> : "Ɛ̌" # LATIN CAPITAL LETTER EPSILON WITH CARON
-<dead_macron> <U0190> : "Ɛ̄" # LATIN CAPITAL LETTER EPSILON WITH MACRON
-<dead_tilde> <U0190> : "Ɛ̃" # LATIN CAPITAL LETTER EPSILON WITH TILDE
-<dead_acute> <dead_tilde> <U0190> : "Ɛ̃́" # LATIN CAPITAL LETTER EPSILON WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U0190> : "Ɛ̃̀" # LATIN CAPITAL LETTER EPSILON WITH TILDE AND GRAVE
-<dead_acute> <U0269> : "ɩ́" # LATIN SMALL LETTER IOTA WITH ACUTE
-<dead_grave> <U0269> : "ɩ̀" # LATIN SMALL LETTER IOTA WITH GRAVE
-<dead_circumflex> <U0269> : "ɩ̂" # LATIN SMALL LETTER IOTA WITH CIRCUMFLEX
-<dead_caron> <U0269> : "ɩ̌" # LATIN SMALL LETTER IOTA WITH CARON
-<dead_macron> <U0269> : "ɩ̄" # LATIN SMALL LETTER IOTA WITH MACRON
-<dead_acute> <U0196> : "Ɩ́" # LATIN CAPITAL LETTER IOTA WITH ACUTE
-<dead_grave> <U0196> : "Ɩ̀" # LATIN CAPITAL LETTER IOTA WITH GRAVE
-<dead_circumflex> <U0196> : "Ɩ̂" # LATIN CAPITAL LETTER IOTA WITH CIRCUMFLEX
-<dead_caron> <U0196> : "Ɩ̌" # LATIN CAPITAL LETTER IOTA WITH CARON
-<dead_macron> <U0196> : "Ɩ̄" # LATIN CAPITAL LETTER IOTA WITH MACRON
-<dead_acute> <U0254> : "ɔ́" # LATIN SMALL LETTER OPEN O WITH ACUTE
-<dead_grave> <U0254> : "ɔ̀" # LATIN SMALL LETTER OPEN O WITH GRAVE
-<dead_circumflex> <U0254> : "ɔ̂" # LATIN SMALL LETTER OPEN O WITH CIRCUMFLEX
-<dead_caron> <U0254> : "ɔ̌" # LATIN SMALL LETTER OPEN O WITH CARON
-<dead_macron> <U0254> : "ɔ̄" # LATIN SMALL LETTER OPEN O WITH MACRON
-<dead_tilde> <U0254> : "ɔ̃" # LATIN SMALL LETTER OPEN O WITH TILDE
-<dead_acute> <dead_tilde> <U0254> : "ɔ̃́" # LATIN SMALL LETTER OPEN O WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U0254> : "ɔ̃̀" # LATIN SMALL LETTER OPEN O WITH TILDE AND GRAVE
-<dead_acute> <U0186> : "Ɔ́" # LATIN CAPITAL LETTER OPEN O WITH ACUTE
-<dead_grave> <U0186> : "Ɔ̀" # LATIN CAPITAL LETTER OPEN O WITH GRAVE
-<dead_circumflex> <U0186> : "Ɔ̂" # LATIN CAPITAL LETTER OPEN O WITH CIRCUMFLEX
-<dead_caron> <U0186> : "Ɔ̌" # LATIN CAPITAL LETTER OPEN O WITH CARON
-<dead_macron> <U0186> : "Ɔ̄" # LATIN CAPITAL LETTER OPEN O WITH MACRON
-<dead_tilde> <U0186> : "Ɔ̃" # LATIN CAPITAL LETTER OPEN O WITH TILDE
-<dead_acute> <dead_tilde> <U0186> : "Ɔ̃́" # LATIN CAPITAL LETTER OPEN O WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U0186> : "Ɔ̃̀" # LATIN CAPITAL LETTER OPEN O WITH TILDE AND GRAVE
-<dead_acute> <U01DD> : "ǝ́" # LATIN SMALL LETTER TURNED E WITH ACUTE
-<dead_grave> <U01DD> : "ǝ̀" # LATIN SMALL LETTER TURNED E WITH GRAVE
-<dead_circumflex> <U01DD> : "ǝ̂" # LATIN SMALL LETTER TURNED E WITH CIRCUMFLEX
-<dead_caron> <U01DD> : "ǝ̌" # LATIN SMALL LETTER TURNED E WITH CARON
-<dead_macron> <U01DD> : "ǝ̄" # LATIN SMALL LETTER TURNED E WITH MACRON
-<dead_tilde> <U01DD> : "ǝ̃" # LATIN SMALL LETTER TURNED E WITH TILDE
-<dead_acute> <dead_tilde> <U01DD> : "ǝ̃́" # LATIN SMALL LETTER TURNED E WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U01DD> : "ǝ̃̀" # LATIN SMALL LETTER TURNED E WITH TILDE AND GRAVE
-<dead_acute> <U018E> : "Ǝ́" # LATIN CAPITAL LETTER TURNED E WITH ACUTE
-<dead_grave> <U018E> : "Ǝ̀" # LATIN CAPITAL LETTER TURNED E WITH GRAVE
-<dead_circumflex> <U018E> : "Ǝ̂" # LATIN CAPITAL LETTER TURNED E WITH CIRCUMFLEX
-<dead_caron> <U018E> : "Ǝ̌" # LATIN CAPITAL LETTER TURNED E WITH CARON
-<dead_macron> <U018E> : "Ǝ̄" # LATIN CAPITAL LETTER TURNED E WITH MACRON
-<dead_tilde> <U018E> : "Ǝ̃" # LATIN CAPITAL LETTER TURNED E WITH TILDE
-<dead_acute> <dead_tilde> <U018E> : "Ǝ̃́" # LATIN CAPITAL LETTER TURNED E WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <U018E> : "Ǝ̃̀" # LATIN CAPITAL LETTER TURNED E WITH TILDE AND GRAVE
-<dead_acute> <U028B> : "ʋ́" # LATIN SMALL LETTER V WITH HOOK WITH ACUTE
-<dead_grave> <U028B> : "ʋ̀" # LATIN SMALL LETTER V WITH HOOK WITH GRAVE
-<dead_circumflex> <U028B> : "ʋ̂" # LATIN SMALL LETTER V WITH HOOK WITH CIRCUMFLEX
-<dead_caron> <U028B> : "ʋ̌" # LATIN SMALL LETTER V WITH HOOK WITH CARON
-<dead_macron> <U028B> : "ʋ̄" # LATIN SMALL LETTER V WITH HOOK WITH MACRON
-<dead_acute> <U01B2> : "Ʋ́" # LATIN CAPITAL LETTER V WITH HOOK WITH ACUTE
-<dead_grave> <U01B2> : "Ʋ̀" # LATIN CAPITAL LETTER V WITH HOOK WITH GRAVE
-<dead_circumflex> <U01B2> : "Ʋ̂" # LATIN CAPITAL LETTER V WITH HOOK WITH CIRCUMFLEX
-<dead_caron> <U01B2> : "Ʋ̌" # LATIN CAPITAL LETTER V WITH HOOK WITH CARON
-<dead_macron> <U01B2> : "Ʋ̄" # LATIN CAPITAL LETTER V WITH HOOK WITH MACRON
-<dead_acute> <U028A> : "ʊ́" # LATIN SMALL LETTER UPSILON WITH ACUTE
-<dead_grave> <U028A> : "ʊ̀" # LATIN SMALL LETTER UPSILONK WITH GRAVE
-<dead_circumflex> <U028A> : "ʊ̂" # LATIN SMALL LETTER UPSILON WITH CIRCUMFLEX
-<dead_caron> <U028A> : "ʊ̌" # LATIN SMALL LETTER UPSILON WITH CARON
-<dead_macron> <U028A> : "ʊ̄" # LATIN SMALL LETTER UPSILON WITH MACRON
-<dead_acute> <U01B1> : "Ʊ́" # LATIN CAPITAL LETTER UPSILON WITH ACUTE
-<dead_grave> <U01B1> : "Ʊ̀" # LATIN CAPITAL LETTER UPSILONK WITH GRAVE
-<dead_circumflex> <U01B1> : "Ʊ̂" # LATIN CAPITAL LETTER UPSILON WITH CIRCUMFLEX
-<dead_caron> <U01B1> : "Ʊ̌" # LATIN CAPITAL LETTER UPSILON WITH CARON
-<dead_macron> <U01B1> : "Ʊ̄" # LATIN CAPITAL LETTER UPSILON WITH MACRON
-<dead_acute> <dead_tilde> <a> : "ã́" # LATIN SMALL LETTER A WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <a> : "ã̀" # LATIN SMALL LETTER A WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <A> : "Ã́" # LATIN CAPITAL LETTER A WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <A> : "Ã̀" # LATIN CAPITAL LETTER A WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <e> : "ẽ́" # LATIN SMALL LETTER E WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <e> : "ẽ̀" # LATIN SMALL LETTER E WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <E> : "Ẽ́" # LATIN CAPITAL LETTER E WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <E> : "Ẽ̀" # LATIN CAPITAL LETTER E WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <i> : "ĩ́" # LATIN SMALL LETTER I WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <i> : "ĩ̀" # LATIN SMALL LETTER I WITH TILDE AND GRAVE
-<dead_acute> <dead_tilde> <I> : "Ĩ́" # LATIN CAPITAL LETTER I WITH TILDE AND ACUTE
-<dead_grave> <dead_tilde> <I> : "Ĩ̀" # LATIN CAPITAL LETTER I WITH TILDE AND GRAVE
-<dead_grave> <dead_tilde> <o> : "õ̀" # LATIN SMALL LETTER O WITH TILDE AND GRAVE
-<dead_grave> <dead_tilde> <O> : "Õ̀" # LATIN CAPITAL LETTER O WITH TILDE AND GRAVE
-<dead_grave> <dead_tilde> <u> : "ũ̀" # LATIN SMALL LETTER U WITH TILDE AND GRAVE
-<dead_grave> <dead_tilde> <U> : "Ũ̀" # LATIN CAPITAL LETTER U WITH TILDE AND GRAVE
-<dead_grave> <m> : "m̀" # LATIN SMALL LETTER M WITH GRAVE
-<dead_grave> <M> : "M̀" # LATIN CAPITAL LETTER M WITH GRAVE
-<dead_acute> <eng> : "ŋ́" # LATIN SMALL LETTER ENG WITH ACUTE
-<dead_grave> <eng> : "ŋ̀" # LATIN SMALL LETTER ENG WITH GRAVE
-<dead_acute> <ENG> : "Ŋ́" # LATIN CAPITAL LETTER ENG WITH ACUTE
-<dead_grave> <ENG> : "Ŋ̀" # LATIN CAPITAL LETTER ENG WITH GRAVE
+<dead_acute> <U025B> : "ɛ́" # LATIN SMALL LETTER EPSILON plus COMBINING ACUTE
+<dead_grave> <U025B> : "ɛ̀" # LATIN SMALL LETTER EPSILON plus COMBINING GRAVE
+<dead_circumflex> <U025B> : "ɛ̂" # LATIN SMALL LETTER EPSILON plus COMBINING CIRCUMFLEX
+<dead_caron> <U025B> : "ɛ̌" # LATIN SMALL LETTER EPSILON plus COMBINING CARON
+<dead_macron> <U025B> : "ɛ̄" # LATIN SMALL LETTER EPSILON plus COMBINING MACRON
+<dead_tilde> <U025B> : "ɛ̃" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U025B> : "ɛ̃́" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U025B> : "ɛ̃̀" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U0190> : "Ɛ́" # LATIN CAPITAL LETTER EPSILON plus COMBINING ACUTE
+<dead_grave> <U0190> : "Ɛ̀" # LATIN CAPITAL LETTER EPSILON plus COMBINING GRAVE
+<dead_circumflex> <U0190> : "Ɛ̂" # LATIN CAPITAL LETTER EPSILON plus COMBINING CIRCUMFLEX
+<dead_caron> <U0190> : "Ɛ̌" # LATIN CAPITAL LETTER EPSILON plus COMBINING CARON
+<dead_macron> <U0190> : "Ɛ̄" # LATIN CAPITAL LETTER EPSILON plus COMBINING MACRON
+<dead_tilde> <U0190> : "Ɛ̃" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U0190> : "Ɛ̃́" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U0190> : "Ɛ̃̀" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U0269> : "ɩ́" # LATIN SMALL LETTER IOTA plus COMBINING ACUTE
+<dead_grave> <U0269> : "ɩ̀" # LATIN SMALL LETTER IOTA plus COMBINING GRAVE
+<dead_circumflex> <U0269> : "ɩ̂" # LATIN SMALL LETTER IOTA plus COMBINING CIRCUMFLEX
+<dead_caron> <U0269> : "ɩ̌" # LATIN SMALL LETTER IOTA plus COMBINING CARON
+<dead_macron> <U0269> : "ɩ̄" # LATIN SMALL LETTER IOTA plus COMBINING MACRON
+<dead_acute> <U0196> : "Ɩ́" # LATIN CAPITAL LETTER IOTA plus COMBINING ACUTE
+<dead_grave> <U0196> : "Ɩ̀" # LATIN CAPITAL LETTER IOTA plus COMBINING GRAVE
+<dead_circumflex> <U0196> : "Ɩ̂" # LATIN CAPITAL LETTER IOTA plus COMBINING CIRCUMFLEX
+<dead_caron> <U0196> : "Ɩ̌" # LATIN CAPITAL LETTER IOTA plus COMBINING CARON
+<dead_macron> <U0196> : "Ɩ̄" # LATIN CAPITAL LETTER IOTA plus COMBINING MACRON
+<dead_acute> <U0254> : "ɔ́" # LATIN SMALL LETTER OPEN O plus COMBINING ACUTE
+<dead_grave> <U0254> : "ɔ̀" # LATIN SMALL LETTER OPEN O plus COMBINING GRAVE
+<dead_circumflex> <U0254> : "ɔ̂" # LATIN SMALL LETTER OPEN O plus COMBINING CIRCUMFLEX
+<dead_caron> <U0254> : "ɔ̌" # LATIN SMALL LETTER OPEN O plus COMBINING CARON
+<dead_macron> <U0254> : "ɔ̄" # LATIN SMALL LETTER OPEN O plus COMBINING MACRON
+<dead_tilde> <U0254> : "ɔ̃" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U0254> : "ɔ̃́" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U0254> : "ɔ̃̀" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U0186> : "Ɔ́" # LATIN CAPITAL LETTER OPEN O plus COMBINING ACUTE
+<dead_grave> <U0186> : "Ɔ̀" # LATIN CAPITAL LETTER OPEN O plus COMBINING GRAVE
+<dead_circumflex> <U0186> : "Ɔ̂" # LATIN CAPITAL LETTER OPEN O plus COMBINING CIRCUMFLEX
+<dead_caron> <U0186> : "Ɔ̌" # LATIN CAPITAL LETTER OPEN O plus COMBINING CARON
+<dead_macron> <U0186> : "Ɔ̄" # LATIN CAPITAL LETTER OPEN O plus COMBINING MACRON
+<dead_tilde> <U0186> : "Ɔ̃" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U0186> : "Ɔ̃́" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U0186> : "Ɔ̃̀" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U01DD> : "ǝ́" # LATIN SMALL LETTER TURNED E plus COMBINING ACUTE
+<dead_grave> <U01DD> : "ǝ̀" # LATIN SMALL LETTER TURNED E plus COMBINING GRAVE
+<dead_circumflex> <U01DD> : "ǝ̂" # LATIN SMALL LETTER TURNED E plus COMBINING CIRCUMFLEX
+<dead_caron> <U01DD> : "ǝ̌" # LATIN SMALL LETTER TURNED E plus COMBINING CARON
+<dead_macron> <U01DD> : "ǝ̄" # LATIN SMALL LETTER TURNED E plus COMBINING MACRON
+<dead_tilde> <U01DD> : "ǝ̃" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U01DD> : "ǝ̃́" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U01DD> : "ǝ̃̀" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U018E> : "Ǝ́" # LATIN CAPITAL LETTER TURNED E plus COMBINING ACUTE
+<dead_grave> <U018E> : "Ǝ̀" # LATIN CAPITAL LETTER TURNED E plus COMBINING GRAVE
+<dead_circumflex> <U018E> : "Ǝ̂" # LATIN CAPITAL LETTER TURNED E plus COMBINING CIRCUMFLEX
+<dead_caron> <U018E> : "Ǝ̌" # LATIN CAPITAL LETTER TURNED E plus COMBINING CARON
+<dead_macron> <U018E> : "Ǝ̄" # LATIN CAPITAL LETTER TURNED E plus COMBINING MACRON
+<dead_tilde> <U018E> : "Ǝ̃" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE
+<dead_acute> <dead_tilde> <U018E> : "Ǝ̃́" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <U018E> : "Ǝ̃̀" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <U028B> : "ʋ́" # LATIN SMALL LETTER V WITH HOOK plus COMBINING ACUTE
+<dead_grave> <U028B> : "ʋ̀" # LATIN SMALL LETTER V WITH HOOK plus COMBINING GRAVE
+<dead_circumflex> <U028B> : "ʋ̂" # LATIN SMALL LETTER V WITH HOOK plus COMBINING CIRCUMFLEX
+<dead_caron> <U028B> : "ʋ̌" # LATIN SMALL LETTER V WITH HOOK plus COMBINING CARON
+<dead_macron> <U028B> : "ʋ̄" # LATIN SMALL LETTER V WITH HOOK plus COMBINING MACRON
+<dead_acute> <U01B2> : "Ʋ́" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING ACUTE
+<dead_grave> <U01B2> : "Ʋ̀" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING GRAVE
+<dead_circumflex> <U01B2> : "Ʋ̂" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING CIRCUMFLEX
+<dead_caron> <U01B2> : "Ʋ̌" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING CARON
+<dead_macron> <U01B2> : "Ʋ̄" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING MACRON
+<dead_acute> <U028A> : "ʊ́" # LATIN SMALL LETTER UPSILON plus COMBINING ACUTE
+<dead_grave> <U028A> : "ʊ̀" # LATIN SMALL LETTER UPSILONK plus COMBINING GRAVE
+<dead_circumflex> <U028A> : "ʊ̂" # LATIN SMALL LETTER UPSILON plus COMBINING CIRCUMFLEX
+<dead_caron> <U028A> : "ʊ̌" # LATIN SMALL LETTER UPSILON plus COMBINING CARON
+<dead_macron> <U028A> : "ʊ̄" # LATIN SMALL LETTER UPSILON plus COMBINING MACRON
+<dead_acute> <U01B1> : "Ʊ́" # LATIN CAPITAL LETTER UPSILON plus COMBINING ACUTE
+<dead_grave> <U01B1> : "Ʊ̀" # LATIN CAPITAL LETTER UPSILONK plus COMBINING GRAVE
+<dead_circumflex> <U01B1> : "Ʊ̂" # LATIN CAPITAL LETTER UPSILON plus COMBINING CIRCUMFLEX
+<dead_caron> <U01B1> : "Ʊ̌" # LATIN CAPITAL LETTER UPSILON plus COMBINING CARON
+<dead_macron> <U01B1> : "Ʊ̄" # LATIN CAPITAL LETTER UPSILON plus COMBINING MACRON
+<dead_acute> <dead_tilde> <a> : "ã́" # LATIN SMALL LETTER A plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <a> : "ã̀" # LATIN SMALL LETTER A plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <A> : "Ã́" # LATIN CAPITAL LETTER A plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <A> : "Ã̀" # LATIN CAPITAL LETTER A plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <e> : "ẽ́" # LATIN SMALL LETTER E plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <e> : "ẽ̀" # LATIN SMALL LETTER E plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <E> : "Ẽ́" # LATIN CAPITAL LETTER E plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <E> : "Ẽ̀" # LATIN CAPITAL LETTER E plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <i> : "ĩ́" # LATIN SMALL LETTER I plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <i> : "ĩ̀" # LATIN SMALL LETTER I plus COMBINING TILDE and COMBINING GRAVE
+<dead_acute> <dead_tilde> <I> : "Ĩ́" # LATIN CAPITAL LETTER I plus COMBINING TILDE and COMBINING ACUTE
+<dead_grave> <dead_tilde> <I> : "Ĩ̀" # LATIN CAPITAL LETTER I plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <dead_tilde> <o> : "õ̀" # LATIN SMALL LETTER O plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <dead_tilde> <O> : "Õ̀" # LATIN CAPITAL LETTER O plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <dead_tilde> <u> : "ũ̀" # LATIN SMALL LETTER U plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <dead_tilde> <U> : "Ũ̀" # LATIN CAPITAL LETTER U plus COMBINING TILDE and COMBINING GRAVE
+<dead_grave> <m> : "m̀" # LATIN SMALL LETTER M plus COMBINING GRAVE
+<dead_grave> <M> : "M̀" # LATIN CAPITAL LETTER M plus COMBINING GRAVE
+<dead_acute> <eng> : "ŋ́" # LATIN SMALL LETTER ENG plus COMBINING ACUTE
+<dead_grave> <eng> : "ŋ̀" # LATIN SMALL LETTER ENG plus COMBINING GRAVE
+<dead_acute> <ENG> : "Ŋ́" # LATIN CAPITAL LETTER ENG plus COMBINING ACUTE
+<dead_grave> <ENG> : "Ŋ̀" # LATIN CAPITAL LETTER ENG plus COMBINING GRAVE
Index: xsrc/external/mit/libX11/dist/src/OpenDis.c
diff -u xsrc/external/mit/libX11/dist/src/OpenDis.c:1.3 xsrc/external/mit/libX11/dist/src/OpenDis.c:1.4
--- xsrc/external/mit/libX11/dist/src/OpenDis.c:1.3 Mon Dec 19 13:20:17 2022
+++ xsrc/external/mit/libX11/dist/src/OpenDis.c Tue Oct 3 19:17:42 2023
@@ -473,6 +473,10 @@ XOpenDisplay (
}
}
sp->root_visual = _XVIDtoVisual(dpy, root_visualID);
+ if (sp->root_visual == NULL) {
+ OutOfMemory(dpy);
+ return(NULL);
+ }
}
if(usedbytes != setuplength){
Index: xsrc/external/mit/libXpm/dist/src/create.c
diff -u xsrc/external/mit/libXpm/dist/src/create.c:1.6 xsrc/external/mit/libXpm/dist/src/create.c:1.7
--- xsrc/external/mit/libXpm/dist/src/create.c:1.6 Mon Jun 19 06:44:23 2023
+++ xsrc/external/mit/libXpm/dist/src/create.c Tue Oct 3 19:17:42 2023
@@ -997,6 +997,11 @@ CreateXImage(
*image_return = NULL;
return XpmNoMemory;
}
+ if (width != 0 && (*image_return)->bits_per_pixel >= INT_MAX / width) {
+ XDestroyImage(*image_return);
+ *image_return = NULL;
+ return XpmNoMemory;
+ }
/* now that bytes_per_line must have been set properly alloc data */
if((*image_return)->bytes_per_line == 0 || height == 0) {
XDestroyImage(*image_return);
@@ -1652,7 +1657,7 @@ XpmCreatePixmapFromXpmImage(
Pixmap *shapemask_return,
XpmAttributes *attributes)
{
- XImage *ximage, *shapeimage;
+ XImage *ximage = NULL, *shapeimage = NULL;
int ErrorStatus;
/* initialize return values */
@@ -1668,16 +1673,34 @@ XpmCreatePixmapFromXpmImage(
&shapeimage : NULL),
attributes);
if (ErrorStatus < 0)
- return (ErrorStatus);
+ goto cleanup;
/* create the pixmaps and destroy images */
if (pixmap_return && ximage) {
- xpmCreatePixmapFromImage(display, d, ximage, pixmap_return);
- XDestroyImage(ximage);
+ ErrorStatus =
+ xpmCreatePixmapFromImage(display, d, ximage, pixmap_return);
+ if (ErrorStatus < 0) /* fatal error */
+ goto cleanup;
}
if (shapemask_return && shapeimage) {
- xpmCreatePixmapFromImage(display, d, shapeimage, shapemask_return);
+ ErrorStatus =
+ xpmCreatePixmapFromImage(display, d, shapeimage, shapemask_return);
+ }
+
+ cleanup:
+ if (ximage != NULL)
+ XDestroyImage(ximage);
+ if (shapeimage != NULL)
XDestroyImage(shapeimage);
+ if (ErrorStatus < 0) {
+ if (pixmap_return && *pixmap_return) {
+ XFreePixmap(display, *pixmap_return);
+ *pixmap_return = 0;
+ }
+ if (shapemask_return && *shapemask_return) {
+ XFreePixmap(display, *shapemask_return);
+ *shapemask_return = 0;
+ }
}
return (ErrorStatus);
}
