Module Name:    xsrc
Committed By:   mrg
Date:           Fri Nov 11 04:45:23 UTC 2022

Modified Files:
        xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
        xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Removed Files:
        xsrc/external/mit/libX11/dist: NEWS
        xsrc/external/mit/libX11/dist/src: UIThrStubs.c

Log Message:
merge libX11 1.8.2.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libX11/dist/NEWS
cvs rdiff -u -r1.9 -r1.10 \
    xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libX11/dist/src/UIThrStubs.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.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/nls/en_US.UTF-8/Compose.pre
diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.9 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.10
--- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre:1.9	Wed Jul 13 19:57:48 2022
+++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre	Fri Nov 11 04:45:23 2022
@@ -14,6 +14,8 @@ XCOMM Spacing versions of accents (mostl
 <dead_grave> <dead_grave>		: "`"	grave # GRAVE ACCENT
 <dead_circumflex> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
 <dead_circumflex> <dead_circumflex>	: "^"	asciicircum # CIRCUMFLEX ACCENT
+<Multi_key> <greater> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
+<Multi_key> <space> <greater>		: "^"	asciicircum # CIRCUMFLEX ACCENT
 <dead_abovering> <space>		: "°"	degree # DEGREE SIGN
 <dead_abovering> <dead_abovering>	: "°"	degree # DEGREE SIGN
 <Multi_key> <o> <o>			: "°"	degree # DEGREE SIGN
@@ -22,13 +24,14 @@ XCOMM Spacing versions of accents (mostl
 <dead_macron> <space>			: "¯"	macron # MACRON
 <dead_macron> <dead_macron>		: "¯"	macron # MACRON
 <Multi_key> <minus> <asciicircum>	: "¯"	macron # MACRON
-<Multi_key> <asciicircum> <minus>	: "¯"	macron # MACRON
+<Multi_key> <underscore> <space>	: "¯"	macron # MACRON
+<Multi_key> <space> <underscore>	: "¯"	macron # MACRON
 <Multi_key> <underscore> <underscore>	: "¯"	macron # MACRON
 <Multi_key> <underscore> <asciicircum>	: "¯"	macron # MACRON
 <dead_breve> <space>			: "˘"	breve # BREVE
 <dead_breve> <dead_breve>		: "˘"	breve # BREVE
-<Multi_key> <space> <parenleft>		: "˘"	breve # BREVE
 <Multi_key> <parenleft> <space>		: "˘"	breve # BREVE
+<Multi_key> <space> <parenleft>		: "˘"	breve # BREVE
 <dead_abovedot> <space>			: "˙"	abovedot # DOT ABOVE
 <dead_abovedot> <dead_abovedot>		: "˙"	abovedot # DOT ABOVE
 <Multi_key> <period> <space>		: "˙"	abovedot # DOT ABOVE
@@ -40,8 +43,8 @@ XCOMM Spacing versions of accents (mostl
 <dead_doubleacute> <dead_doubleacute>	: "˝"	U2dd # DOUBLE ACUTE ACCENT
 <dead_caron> <space>			: "ˇ"	caron # CARON
 <dead_caron> <dead_caron>		: "ˇ"	caron # CARON
-<Multi_key> <space> <less>		: "ˇ"	caron # CARON
 <Multi_key> <less> <space>		: "ˇ"	caron # CARON
+<Multi_key> <space> <less>		: "ˇ"	caron # CARON
 <dead_cedilla> <space>			: "¸"	cedilla # CEDILLA
 <dead_cedilla> <dead_cedilla>		: "¸"	cedilla # CEDILLA
 <Multi_key> <comma> <space>		: "¸"	cedilla # CEDILLA
@@ -56,17 +59,18 @@ XCOMM Spacing versions of accents (mostl
 XCOMM ASCII characters that may be difficult to access on some keyboards.
 <Multi_key> <plus> <plus>		: "#"	numbersign # NUMBER SIGN
 <Multi_key> <A> <T>			: "@"	at # COMMERCIAL AT
+
 <Multi_key> <parenleft> <parenleft>	: "["	bracketleft # LEFT SQUARE BRACKET
+<Multi_key> <parenright> <parenright>	: "]"	bracketright # RIGHT SQUARE BRACKET
+
 <Multi_key> <slash> <slash>		: "\\"	backslash # REVERSE SOLIDUS
 <Multi_key> <slash> <less>		: "\\"	backslash # REVERSE SOLIDUS
 <Multi_key> <less> <slash>		: "\\"	backslash # REVERSE SOLIDUS
-<Multi_key> <parenright> <parenright>	: "]"	bracketright # RIGHT SQUARE BRACKET
-
-<Multi_key> <greater> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
-<Multi_key> <space> <greater>		: "^"	asciicircum # CIRCUMFLEX ACCENT
 
 <Multi_key> <parenleft> <minus>		: "{"	braceleft # LEFT CURLY BRACKET
 <Multi_key> <minus> <parenleft>		: "{"	braceleft # LEFT CURLY BRACKET
+<Multi_key> <parenright> <minus>	: "}"	braceright # RIGHT CURLY BRACKET
+<Multi_key> <minus> <parenright>	: "}"	braceright # RIGHT CURLY BRACKET
 
 <Multi_key> <slash> <asciicircum>	: "|"	bar # VERTICAL LINE
 <Multi_key> <asciicircum> <slash>	: "|"	bar # VERTICAL LINE
@@ -75,9 +79,6 @@ XCOMM ASCII characters that may be diffi
 <Multi_key> <v> <l>			: "|"	bar # VERTICAL LINE
 <Multi_key> <l> <v>			: "|"	bar # VERTICAL LINE
 
-<Multi_key> <parenright> <minus>	: "}"	braceright # RIGHT CURLY BRACKET
-<Multi_key> <minus> <parenright>	: "}"	braceright # RIGHT CURLY BRACKET
-
 <Multi_key> <L> <T>			: "<"	less # LESS-THAN
 <Multi_key> <l> <t>			: "<"	less # LESS-THAN
 <Multi_key> <G> <T>			: ">"	greater # GREATER-THAN
@@ -294,6 +295,11 @@ XCOMM Latin-1 Supplement
 <Multi_key> <asciicircum> <underscore> <a>	: "ª"	ordfeminine # FEMININE ORDINAL INDICATOR
 <dead_circumflex> <Multi_key> <underscore> <o>	: "º"	masculine # MASCULINE ORDINAL INDICATOR
 <Multi_key> <asciicircum> <underscore> <o>	: "º"	masculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <1>			: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <asciicircum> <1>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <1> <asciicircum>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<dead_circumflex> <KP_1>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <asciicircum> <KP_1>	: "¹"	onesuperior # SUPERSCRIPT ONE
 <dead_circumflex> <2>			: "²"	twosuperior # SUPERSCRIPT TWO
 <Multi_key> <asciicircum> <2>		: "²"	twosuperior # SUPERSCRIPT TWO
 <Multi_key> <2> <asciicircum>		: "²"	twosuperior # SUPERSCRIPT TWO
@@ -307,11 +313,6 @@ XCOMM Latin-1 Supplement
 <Multi_key> <m> <u>			: "µ"	mu # MICRO SIGN
 <Multi_key> <slash> <u>			: "µ"	mu # MICRO SIGN
 <Multi_key> <u> <slash>			: "µ"	mu # MICRO SIGN
-<dead_circumflex> <1>			: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <asciicircum> <1>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <1> <asciicircum>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<dead_circumflex> <KP_1>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <asciicircum> <KP_1>	: "¹"	onesuperior # SUPERSCRIPT ONE
 <Multi_key> <1> <4>			: "¼"	onequarter # VULGAR FRACTION ONE QUARTER
 <Multi_key> <1> <2>			: "½"	onehalf # VULGAR FRACTION ONE HALF
 <Multi_key> <3> <4>			: "¾"	threequarters # VULGAR FRACTION THREE QUARTERS
@@ -706,20 +707,18 @@ XCOMM Latin Extended-A
 <dead_breve> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <U> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <u> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
-<Multi_key> <G> <U>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
-<Multi_key> <G> <u>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <b> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <breve> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G> <breve>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
+<Multi_key> <G> <U>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G> <parenleft>		: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <dead_breve> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <U> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <u> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
-<Multi_key> <g> <U>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
-<Multi_key> <g> <u>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <b> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <breve> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g> <breve>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
+<Multi_key> <g> <U>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g> <parenleft>		: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <dead_abovedot> <G>			: "Ġ"	U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE
 <Multi_key> <period> <G>		: "Ġ"	U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE
@@ -1417,8 +1416,14 @@ XCOMM Latin Extended-B
 <dead_macron> <y>				: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
 <Multi_key> <macron> <y>			: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
 <Multi_key> <underscore> <y>			: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
-<Multi_key> <e> <e>				: "ə"	U0259 # LATIN SMALL LETTER SCHWA
+/* Four sequences for Samogitian. */
+<Multi_key> <minus> <period> <E>		: "Ė̄"	# LATIN CAPITAL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <underscore> <period> <E>		: "Ė̄"	# LATIN CAPITAL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <minus> <period> <e>		: "ė̄"	# LATIN SMALL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <underscore> <period> <e>		: "ė̄"	# LATIN SMALL LETTER E WITH DOT ABOVE plus combining macron
 
+XCOMM IPA Extensions
+<Multi_key> <e> <e>				: "ə"	U0259 # LATIN SMALL LETTER SCHWA
 <dead_stroke> <i>				: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
 <Multi_key> <slash> <i>				: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
 <Multi_key> <KP_Divide> <i>			: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
@@ -4428,6 +4433,7 @@ XCOMM Superscripts and Subscripts
 <dead_circumflex> <KP_Add>			: "⁺"	U207A # SUPERSCRIPT PLUS SIGN
 <Multi_key> <asciicircum> <KP_Add>		: "⁺"	U207A # SUPERSCRIPT PLUS SIGN
 <dead_circumflex> <minus>			: "⁻"	U207B # SUPERSCRIPT MINUS
+<Multi_key> <asciicircum> <minus>		: "⁻"	U207B # SUPERSCRIPT MINUS
 <dead_circumflex> <U2212>			: "⁻"	U207B # SUPERSCRIPT MINUS
 <Multi_key> <asciicircum> <U2212>		: "⁻"	U207B # SUPERSCRIPT MINUS
 <dead_circumflex> <equal>			: "⁼"	U207C # SUPERSCRIPT EQUALS SIGN
@@ -4462,6 +4468,7 @@ XCOMM Superscripts and Subscripts
 <Multi_key> <underscore> <KP_9>			: "₉"	U2089 # SUBSCRIPT NINE
 <Multi_key> <underscore> <plus>			: "₊"	U208A # SUBSCRIPT PLUS SIGN
 <Multi_key> <underscore> <KP_Add>		: "₊"	U208A # SUBSCRIPT PLUS SIGN
+<Multi_key> <underscore> <minus>		: "₋"	U208B # SUBSCRIPT MINUS
 <Multi_key> <underscore> <U2212>		: "₋"	U208B # SUBSCRIPT MINUS
 <Multi_key> <underscore> <equal>		: "₌"	U208C # SUBSCRIPT EQUALS SIGN
 <Multi_key> <underscore> <KP_Equal>		: "₌"	U208C # SUBSCRIPT EQUALS SIGN
@@ -4469,20 +4476,17 @@ XCOMM Superscripts and Subscripts
 <Multi_key> <underscore> <parenright>		: "₎"	U208E # SUBSCRIPT RIGHT PARENTHESIS
 
 XCOMM Letterlike Symbols
+<Multi_key> <C> <C>			: "ℂ"	U2102 # DOUBLE-STRUCK CAPITAL C
+<Multi_key> <N> <N>			: "ℕ"	U2115 # DOUBLE-STRUCK CAPITAL N
+<Multi_key> <Q> <Q>			: "ℚ"	U211A # DOUBLE-STRUCK CAPITAL Q
+<Multi_key> <R> <R>			: "ℝ"	U211D # DOUBLE-STRUCK CAPITAL R
+<Multi_key> <Z> <Z>			: "ℤ"	U2124 # DOUBLE-STRUCK CAPITAL Z
 <dead_circumflex> <Multi_key> <S> <M>	: "℠"	U2120 # SERVICE MARK
 <Multi_key> <S> <M>			: "℠"	U2120 # SERVICE MARK
-<dead_circumflex> <Multi_key> <s> <M>	: "℠"	U2120 # SERVICE MARK
-<Multi_key> <s> <M>			: "℠"	U2120 # SERVICE MARK
-<dead_circumflex> <Multi_key> <S> <m>	: "℠"	U2120 # SERVICE MARK
-<Multi_key> <S> <m>			: "℠"	U2120 # SERVICE MARK
 <dead_circumflex> <Multi_key> <s> <m>	: "℠"	U2120 # SERVICE MARK
 <Multi_key> <s> <m>			: "℠"	U2120 # SERVICE MARK
 <dead_circumflex> <Multi_key> <T> <M>	: "™"	U2122 # TRADE MARK SIGN
 <Multi_key> <T> <M>			: "™"	U2122 # TRADE MARK SIGN
-<dead_circumflex> <Multi_key> <t> <M>	: "™"	U2122 # TRADE MARK SIGN
-<Multi_key> <t> <M>			: "™"	U2122 # TRADE MARK SIGN
-<dead_circumflex> <Multi_key> <T> <m>	: "™"	U2122 # TRADE MARK SIGN
-<Multi_key> <T> <m>			: "™"	U2122 # TRADE MARK SIGN
 <dead_circumflex> <Multi_key> <t> <m>	: "™"	U2122 # TRADE MARK SIGN
 <Multi_key> <t> <m>			: "™"	U2122 # TRADE MARK SIGN
 
@@ -4529,6 +4533,7 @@ XCOMM Mathematical Operators
 <Multi_key> <braceleft> <braceright>	: "∅"	U2205 # EMPTY SET
 <Multi_key> <U2208> <U0338>		: "∉"	U2209 # NOT AN ELEMENT OF
 <Multi_key> <U220B> <U0338>		: "∌"	U220C # DOES NOT CONTAIN AS MEMBER
+<Multi_key> <minus> <underscore>	: "−"	U2212 # MINUS SIGN
 <Multi_key> <U2223> <U0338>		: "∤"	U2224 # DOES NOT DIVIDE
 <Multi_key> <U2225> <U0338>		: "∦"	U2226 # NOT PARALLEL TO
 <Multi_key> <U223C> <U0338>		: "≁"	U2241 # NOT TILDE
@@ -4544,9 +4549,7 @@ XCOMM Mathematical Operators
 <Multi_key> <greater> <equal>		: "≥"	U2265 # GREATER-THAN OR EQUAL TO
 <Multi_key> <U224D> <U0338>		: "≭"	U226D # NOT EQUIVALENT TO
 <Multi_key> <less> <U0338>		: "≮"	U226E # NOT LESS-THAN
-<Multi_key> <leftcaret> <U0338>		: "≮"	U226E # NOT LESS-THAN
 <Multi_key> <greater> <U0338>		: "≯"	U226F # NOT GREATER-THAN
-<Multi_key> <rightcaret> <U0338>	: "≯"	U226F # NOT GREATER-THAN
 <Multi_key> <lessthanequal> <U0338>	: "≰"	U2270 # NEITHER LESS-THAN NOR EQUAL TO
 <Multi_key> <greaterthanequal> <U0338>	: "≱"	U2271 # NEITHER GREATER-THAN NOR EQUAL TO
 <Multi_key> <U2272> <U0338>		: "≴"	U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO
@@ -4596,48 +4599,26 @@ XCOMM Enclosed Alphanumerics
 <Multi_key> <parenleft> <9> <parenright>		: "⑨"	U2468 # CIRCLED DIGIT NINE
 <Multi_key> <parenleft> <KP_9> <parenright>		: "⑨"	U2468 # CIRCLED DIGIT NINE
 <Multi_key> <parenleft> <1> <0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
-<Multi_key> <parenleft> <1> <KP_0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
-<Multi_key> <parenleft> <KP_1> <0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
 <Multi_key> <parenleft> <KP_1> <KP_0> <parenright>	: "⑩"	U2469 # CIRCLED NUMBER TEN
 <Multi_key> <parenleft> <1> <1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
-<Multi_key> <parenleft> <1> <KP_1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
-<Multi_key> <parenleft> <KP_1> <1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
 <Multi_key> <parenleft> <KP_1> <KP_1> <parenright>	: "⑪"	U246A # CIRCLED NUMBER ELEVEN
 <Multi_key> <parenleft> <1> <2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
-<Multi_key> <parenleft> <1> <KP_2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
-<Multi_key> <parenleft> <KP_1> <2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
 <Multi_key> <parenleft> <KP_1> <KP_2> <parenright>	: "⑫"	U246B # CIRCLED NUMBER TWELVE
 <Multi_key> <parenleft> <1> <3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
-<Multi_key> <parenleft> <1> <KP_3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
-<Multi_key> <parenleft> <KP_1> <3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
 <Multi_key> <parenleft> <KP_1> <KP_3> <parenright>	: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
 <Multi_key> <parenleft> <1> <4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
-<Multi_key> <parenleft> <1> <KP_4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
-<Multi_key> <parenleft> <KP_1> <4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
 <Multi_key> <parenleft> <KP_1> <KP_4> <parenright>	: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
 <Multi_key> <parenleft> <1> <5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
-<Multi_key> <parenleft> <1> <KP_5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
-<Multi_key> <parenleft> <KP_1> <5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
 <Multi_key> <parenleft> <KP_1> <KP_5> <parenright>	: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
 <Multi_key> <parenleft> <1> <6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
-<Multi_key> <parenleft> <1> <KP_6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
-<Multi_key> <parenleft> <KP_1> <6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
 <Multi_key> <parenleft> <KP_1> <KP_6> <parenright>	: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
 <Multi_key> <parenleft> <1> <7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
-<Multi_key> <parenleft> <1> <KP_7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
-<Multi_key> <parenleft> <KP_1> <7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
 <Multi_key> <parenleft> <KP_1> <KP_7> <parenright>	: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
 <Multi_key> <parenleft> <1> <8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
-<Multi_key> <parenleft> <1> <KP_8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
-<Multi_key> <parenleft> <KP_1> <8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
 <Multi_key> <parenleft> <KP_1> <KP_8> <parenright>	: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
 <Multi_key> <parenleft> <1> <9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
-<Multi_key> <parenleft> <1> <KP_9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
-<Multi_key> <parenleft> <KP_1> <9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
 <Multi_key> <parenleft> <KP_1> <KP_9> <parenright>	: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
 <Multi_key> <parenleft> <2> <0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
-<Multi_key> <parenleft> <2> <KP_0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
-<Multi_key> <parenleft> <KP_2> <0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
 <Multi_key> <parenleft> <KP_2> <KP_0> <parenright>	: "⑳"	U2473 # CIRCLED NUMBER TWENTY
 <Multi_key> <parenleft> <A> <parenright>	: "Ⓐ"	U24B6 # CIRCLED LATIN CAPITAL LETTER A
 <Multi_key> <parenleft> <B> <parenright>	: "Ⓑ"	U24B7 # CIRCLED LATIN CAPITAL LETTER B
@@ -4798,64 +4779,34 @@ XCOMM Kanbun
 
 XCOMM Enclosed CJK Letters and Months
 <Multi_key> <parenleft> <2> <1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
-<Multi_key> <parenleft> <2> <KP_1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
-<Multi_key> <parenleft> <KP_2> <1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
 <Multi_key> <parenleft> <KP_2> <KP_1> <parenright>	: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
 <Multi_key> <parenleft> <2> <2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
-<Multi_key> <parenleft> <2> <KP_2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
-<Multi_key> <parenleft> <KP_2> <2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
 <Multi_key> <parenleft> <KP_2> <KP_2> <parenright>	: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
 <Multi_key> <parenleft> <2> <3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
-<Multi_key> <parenleft> <2> <KP_3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
-<Multi_key> <parenleft> <KP_2> <3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
 <Multi_key> <parenleft> <KP_2> <KP_3> <parenright>	: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
 <Multi_key> <parenleft> <2> <4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
-<Multi_key> <parenleft> <2> <KP_4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
-<Multi_key> <parenleft> <KP_2> <4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
 <Multi_key> <parenleft> <KP_2> <KP_4> <parenright>	: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
 <Multi_key> <parenleft> <2> <5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
-<Multi_key> <parenleft> <2> <KP_5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
-<Multi_key> <parenleft> <KP_2> <5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
 <Multi_key> <parenleft> <KP_2> <KP_5> <parenright>	: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
 <Multi_key> <parenleft> <2> <6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
-<Multi_key> <parenleft> <2> <KP_6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
-<Multi_key> <parenleft> <KP_2> <6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
 <Multi_key> <parenleft> <KP_2> <KP_6> <parenright>	: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
 <Multi_key> <parenleft> <2> <7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
-<Multi_key> <parenleft> <2> <KP_7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
-<Multi_key> <parenleft> <KP_2> <7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
 <Multi_key> <parenleft> <KP_2> <KP_7> <parenright>	: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
 <Multi_key> <parenleft> <2> <8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
-<Multi_key> <parenleft> <2> <KP_8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
-<Multi_key> <parenleft> <KP_2> <8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
 <Multi_key> <parenleft> <KP_2> <KP_8> <parenright>	: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
 <Multi_key> <parenleft> <2> <9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
-<Multi_key> <parenleft> <2> <KP_9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
-<Multi_key> <parenleft> <KP_2> <9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
 <Multi_key> <parenleft> <KP_2> <KP_9> <parenright>	: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
 <Multi_key> <parenleft> <3> <0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
-<Multi_key> <parenleft> <3> <KP_0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
-<Multi_key> <parenleft> <KP_3> <0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
 <Multi_key> <parenleft> <KP_3> <KP_0> <parenright>	: "㉚"	U325A # CIRCLED NUMBER THIRTY
 <Multi_key> <parenleft> <3> <1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
-<Multi_key> <parenleft> <3> <KP_1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
-<Multi_key> <parenleft> <KP_3> <1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
 <Multi_key> <parenleft> <KP_3> <KP_1> <parenright>	: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
 <Multi_key> <parenleft> <3> <2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
-<Multi_key> <parenleft> <3> <KP_2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
-<Multi_key> <parenleft> <KP_3> <2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
 <Multi_key> <parenleft> <KP_3> <KP_2> <parenright>	: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
 <Multi_key> <parenleft> <3> <3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
-<Multi_key> <parenleft> <3> <KP_3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
-<Multi_key> <parenleft> <KP_3> <3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
 <Multi_key> <parenleft> <KP_3> <KP_3> <parenright>	: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
 <Multi_key> <parenleft> <3> <4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
-<Multi_key> <parenleft> <3> <KP_4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
-<Multi_key> <parenleft> <KP_3> <4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
 <Multi_key> <parenleft> <KP_3> <KP_4> <parenright>	: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
 <Multi_key> <parenleft> <3> <5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
-<Multi_key> <parenleft> <3> <KP_5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
-<Multi_key> <parenleft> <KP_3> <5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
 <Multi_key> <parenleft> <KP_3> <KP_5> <parenright>	: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
 <Multi_key> <parenleft> <U1100> <parenright>		: "㉠"	U3260 # CIRCLED HANGUL KIYEOK
 <Multi_key> <parenleft> <U1102> <parenright>		: "㉡"	U3261 # CIRCLED HANGUL NIEUN
@@ -4935,64 +4886,34 @@ XCOMM Enclosed CJK Letters and Months
 <Multi_key> <parenleft> <U5354> <parenright>	: "㊯"	U32AF # CIRCLED IDEOGRAPH ALLIANCE
 <Multi_key> <parenleft> <U591C> <parenright>	: "㊰"	U32B0 # CIRCLED IDEOGRAPH NIGHT
 <Multi_key> <parenleft> <3> <6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
-<Multi_key> <parenleft> <3> <KP_6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
-<Multi_key> <parenleft> <KP_3> <6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
 <Multi_key> <parenleft> <KP_3> <KP_6> <parenright>	: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
 <Multi_key> <parenleft> <3> <7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
-<Multi_key> <parenleft> <3> <KP_7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
-<Multi_key> <parenleft> <KP_3> <7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
 <Multi_key> <parenleft> <KP_3> <KP_7> <parenright>	: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
 <Multi_key> <parenleft> <3> <8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
-<Multi_key> <parenleft> <3> <KP_8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
-<Multi_key> <parenleft> <KP_3> <8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
 <Multi_key> <parenleft> <KP_3> <KP_8> <parenright>	: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
 <Multi_key> <parenleft> <3> <9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
-<Multi_key> <parenleft> <3> <KP_9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
-<Multi_key> <parenleft> <KP_3> <9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
 <Multi_key> <parenleft> <KP_3> <KP_9> <parenright>	: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
 <Multi_key> <parenleft> <4> <0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
-<Multi_key> <parenleft> <4> <KP_0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
-<Multi_key> <parenleft> <KP_4> <0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
 <Multi_key> <parenleft> <KP_4> <KP_0> <parenright>	: "㊵"	U32B5 # CIRCLED NUMBER FORTY
 <Multi_key> <parenleft> <4> <1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
-<Multi_key> <parenleft> <4> <KP_1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
-<Multi_key> <parenleft> <KP_4> <1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
 <Multi_key> <parenleft> <KP_4> <KP_1> <parenright>	: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
 <Multi_key> <parenleft> <4> <2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
-<Multi_key> <parenleft> <4> <KP_2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
-<Multi_key> <parenleft> <KP_4> <2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
 <Multi_key> <parenleft> <KP_4> <KP_2> <parenright>	: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
 <Multi_key> <parenleft> <4> <3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
-<Multi_key> <parenleft> <4> <KP_3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
-<Multi_key> <parenleft> <KP_4> <3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
 <Multi_key> <parenleft> <KP_4> <KP_3> <parenright>	: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
 <Multi_key> <parenleft> <4> <4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
-<Multi_key> <parenleft> <4> <KP_4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
-<Multi_key> <parenleft> <KP_4> <4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
 <Multi_key> <parenleft> <KP_4> <KP_4> <parenright>	: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
 <Multi_key> <parenleft> <4> <5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
-<Multi_key> <parenleft> <4> <KP_5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
-<Multi_key> <parenleft> <KP_4> <5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
 <Multi_key> <parenleft> <KP_4> <KP_5> <parenright>	: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
 <Multi_key> <parenleft> <4> <6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
-<Multi_key> <parenleft> <4> <KP_6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
-<Multi_key> <parenleft> <KP_4> <6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
 <Multi_key> <parenleft> <KP_4> <KP_6> <parenright>	: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
 <Multi_key> <parenleft> <4> <7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
-<Multi_key> <parenleft> <4> <KP_7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
-<Multi_key> <parenleft> <KP_4> <7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
 <Multi_key> <parenleft> <KP_4> <KP_7> <parenright>	: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
 <Multi_key> <parenleft> <4> <8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
-<Multi_key> <parenleft> <4> <KP_8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
-<Multi_key> <parenleft> <KP_4> <8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
 <Multi_key> <parenleft> <KP_4> <KP_8> <parenright>	: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
 <Multi_key> <parenleft> <4> <9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
-<Multi_key> <parenleft> <4> <KP_9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
-<Multi_key> <parenleft> <KP_4> <9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
 <Multi_key> <parenleft> <KP_4> <KP_9> <parenright>	: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
 <Multi_key> <parenleft> <5> <0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
-<Multi_key> <parenleft> <5> <KP_0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
-<Multi_key> <parenleft> <KP_5> <0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
 <Multi_key> <parenleft> <KP_5> <KP_0> <parenright>	: "㊿"	U32BF # CIRCLED NUMBER FIFTY
 <Multi_key> <parenleft> <kana_A> <parenright>	: "㋐"	U32D0 # CIRCLED KATAKANA A
 <Multi_key> <parenleft> <kana_I> <parenright>	: "㋑"	U32D1 # CIRCLED KATAKANA I
@@ -5109,31 +5030,21 @@ XCOMM Arabic Lam-Alef ligatures
 <UFEF5>	: "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
 
 XCOMM French-Dvorak Bépo compositions
-<dead_abovedot> <Amacron>		: "Ǡ"	U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-<dead_abovedot> <amacron>		: "ǡ"	U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
 <dead_abovedot> <j>			: "ȷ"	U0237 # LATIN SMALL LETTER DOTLESS J
 <dead_abovedot> <L>			: "Ŀ"	U013F # LATIN CAPITAL LETTER L WITH MIDDLE DOT
 <dead_abovedot> <l>			: "ŀ"	U0140 # LATIN SMALL LETTER L WITH MIDDLE DOT
-<dead_abovedot> <Omacron>		: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<dead_abovedot> <omacron>		: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
 <dead_abovedot> <nobreakspace>		: "̇"	U0307 #  COMBINING DOT ABOVE
-<dead_acute> <Sabovedot>		: "Ṥ"	U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_acute> <sabovedot>		: "ṥ"	U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_acute> <V>			: "Ǘ"	U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <v>			: "ǘ"	U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <nobreakspace>		: "́"	U0301 # COMBINING ACUTE ACCENT
-<dead_belowdot> <Sabovedot>		: "Ṩ"	U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_belowdot> <sabovedot>		: "ṩ"	U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_belowdot> <dead_belowdot>		: "̣"	U0323 # COMBINING DOT BELOW
 <dead_belowdot> <nobreakspace>		: "̣"	U0323 # COMBINING DOT BELOW
 <dead_belowdot> <space>			: "̣"	U0323 # COMBINING DOT BELOW
 <dead_breve> <Aacute>			: "Ắ"	Abreveacute # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <dead_breve> <Agrave>			: "Ằ"	Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <Ahook>			: "Ẳ"	Abrevehook # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_breve> <Atilde>			: "Ẵ"	Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <dead_breve> <aacute>			: "ắ"	abreveacute # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <dead_breve> <agrave>			: "ằ"	abrevegrave # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <ahook>			: "ẳ"	abrevehook # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_breve> <atilde>			: "ẵ"	abrevetilde # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <dead_breve> <nobreakspace>		: "̆"	U0306 # COMBINING BREVE
 <dead_caron> <parenleft>		: "₍"	U208D # SUBSCRIPT LEFT PARENTHESIS
@@ -5152,13 +5063,10 @@ XCOMM French-Dvorak Bépo compositions
 <dead_caron> <9>			: "₉"	ninesubscript # SUBSCRIPT NINE
 <dead_caron> <equal>			: "₌"	U208C # SUBSCRIPT EQUALS SIGN
 <dead_caron> <U01F2>			: "Dž"	U01C5 # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
-<dead_caron> <Sabovedot>		: "Ṧ"	U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-<dead_caron> <sabovedot>		: "ṧ"	U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
 <dead_caron> <V>			: "Ǚ"	U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <v>			: "ǚ"	U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <nobreakspace>		: "̌"	U030C # COMBINING CARON
 <dead_cedilla> <Cacute>			: "Ḉ"	U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<dead_cedilla> <ColonSign>		: "₵"	U20B5 # CEDI SIGN
 <dead_cedilla> <cacute>			: "ḉ"	U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <dead_cedilla> <cent>			: "₵"	U20B5 # CEDI SIGN
 <dead_cedilla> <U0114>			: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
@@ -5166,27 +5074,21 @@ XCOMM French-Dvorak Bépo compositions
 <dead_cedilla> <nobreakspace>		: "̧"	U0327 # COMBINING CEDILLA
 <dead_circumflex> <Aacute>		: "Ấ"	Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <Agrave>		: "Ầ"	Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ahook>		: "Ẩ"	Acircumflexhook # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <Atilde>		: "Ẫ"	Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <aacute>		: "ấ"	acircumflexacute # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <agrave>		: "ầ"	acircumflexgrave # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ahook>		: "ẩ"	acircumflexhook # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <atilde>		: "ẫ"	acircumflextilde # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <Eacute>		: "Ế"	Ecircumflexacute # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <Egrave>		: "Ề"	Ecircumflexgrave # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ehook>		: "Ể"	Ecircumflexhook # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <Etilde>		: "Ễ"	Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <eacute>		: "ế"	ecircumflexacute # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <egrave>		: "ề"	ecircumflexgrave # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ehook>		: "ể"	ecircumflexhook # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <etilde>		: "ễ"	ecircumflextilde # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <Oacute>		: "Ố"	Ocircumflexacute # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <Ograve>		: "Ồ"	Ocircumflexgrave # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ohook>		: "Ổ"	Ocircumflexhook # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <Otilde>		: "Ỗ"	Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <oacute>		: "ố"	ocircumflexacute # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <ograve>		: "ồ"	ocircumflexgrave # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ohook>		: "ổ"	ocircumflexhook # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <otilde>		: "ỗ"	ocircumflextilde # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <nobreakspace>	: "̂"	U0302 # COMBINING CIRCUMFLEX ACCENT
 <dead_belowcomma> <S>			: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
@@ -5253,12 +5155,8 @@ XCOMM French-Dvorak Bépo compositions
 <dead_currency> <dead_currency>		: "¤"	currency # CURRENCY SIGN
 <dead_currency> <nobreakspace>		: "¤"	currency # CURRENCY SIGN
 <dead_currency> <space>			: "¤"	currency # CURRENCY SIGN
-<dead_diaeresis> <Amacron>		: "Ǟ"	U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-<dead_diaeresis> <amacron>		: "ǟ"	U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
 <dead_diaeresis> <Iacute>		: "Ḯ"	U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <dead_diaeresis> <iacute>		: "ḯ"	U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <Omacron>		: "Ȫ"	U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-<dead_diaeresis> <omacron>		: "ȫ"	U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
 <dead_diaeresis> <Uacute>		: "Ǘ"	U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_diaeresis> <U01D3>		: "Ǚ"	U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <dead_diaeresis> <Ugrave>		: "Ǜ"	U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
@@ -5393,8 +5291,6 @@ XCOMM French-Dvorak Bépo compositions
 <dead_macron> <V>			: "Ǖ"	U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
 <dead_macron> <v>			: "ǖ"	U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
 <dead_macron> <nobreakspace>		: "̄"	U0304 # COMBINING MACRON
-<dead_ogonek> <Omacron>			: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<dead_ogonek> <omacron>			: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
 <dead_ogonek> <nobreakspace>		: "̨"	U0328 # COMBINING OGONEK
 <dead_abovering> <Aacute>		: "Ǻ"	U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <dead_abovering> <aacute>		: "ǻ"	U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
@@ -5431,10 +5327,8 @@ XCOMM French-Dvorak Bépo compositions
 <dead_stroke> <space>			: "/"	slash # SOLIDUS
 <dead_tilde> <Oacute>			: "Ṍ"	U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <dead_tilde> <Odiaeresis>		: "Ṏ"	U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<dead_tilde> <Omacron>			: "Ȭ"	U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <dead_tilde> <oacute>			: "ṍ"	U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <dead_tilde> <odiaeresis>		: "ṏ"	U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<dead_tilde> <omacron>			: "ȭ"	U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <dead_tilde> <Uacute>			: "Ṹ"	U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <dead_tilde> <uacute>			: "ṹ"	U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <dead_tilde> <equal>			: "≃"	similarequal # ASYMPTOTICALLY EQUAL TO

Index: xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c
diff -u xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.9 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.10
--- xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c:1.9	Mon Jul  8 22:59:16 2019
+++ xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.c	Fri Nov 11 04:45:23 2022
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors 
 
 */
 /*
- * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

Reply via email to