From 606c02ff5139cb6bedfc63024b460091026c2eaa Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 29 Jan 2004 08:06:35 +0000 Subject: Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 --- man/XIfEvent.man | 40 +++- modules/im/ximcp/imLcIm.c | 4 +- modules/im/ximcp/imThaiFlt.c | 44 ++-- nls/en_US.UTF-8/Compose.pre | 496 +++++++++++++++++++++++-------------------- nls/locale.alias.pre | 3 +- src/CrGlCur.c | 6 +- src/xlibi18n/ICWrap.c | 4 +- 7 files changed, 330 insertions(+), 267 deletions(-) diff --git a/man/XIfEvent.man b/man/XIfEvent.man index e467b77..0499caf 100644 --- a/man/XIfEvent.man +++ b/man/XIfEvent.man @@ -40,7 +40,7 @@ .\" of this documentation for any purpose. .\" It is provided ``as is'' without express or implied warranty. .\" -.\" $XFree86: xc/doc/man/X11/XIfEvent.man,v 1.3 2003/04/28 22:17:55 herrb Exp $ +.\" $XFree86: xc/doc/man/X11/XIfEvent.man,v 1.4 2004/01/12 20:54:21 herrb Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface @@ -207,6 +207,44 @@ copies the matched event into the client-supplied structure without removing the event from the queue. .ZN XPeekIfEvent flushes the output buffer if it blocks waiting for additional events. +.LP +Each of these functions requires you to pass a predicate procedure that +determines if an event matches what you want. +Your predicate procedure must decide if the event is useful +without calling any Xlib functions. +If the predicate directly or indirectly causes the state of the event queue +to change, the result is not defined. +If Xlib has been initialized for threads, the predicate is called with +the display locked and the result of a call by the predicate to any +Xlib function that locks the display is not defined unless the caller +has first called +.ZN XLockDisplay . +.LP +The predicate procedure and its associated arguments are: +.sM +.HP +Bool (\^*\fIpredicate\fP\^)\^(\^Display *\fIdisplay\fP, XEvent *\fIevent\fP, XPointer \fIarg\fP\^) +.IP \fIdisplay\fP 1i +Specifies the connection to the X server. +.IP \fIevent\fP 1i +Specifies the +.ZN XEvent +structure. +.IP \fIarg\fP 1i +Specifies the argument passed in from the +.ZN XIfEvent , +.ZN XCheckIfEvent , +or +.ZN XPeekIfEvent +function. +.LP +.eM +The predicate procedure is called once for each +event in the queue until it finds a match. +After finding a match, the predicate procedure must return +.ZN True . +If it did not find a match, it must return +.ZN False . .SH "SEE ALSO" XAnyEvent(3X11), XNextEvent(3X11), diff --git a/modules/im/ximcp/imLcIm.c b/modules/im/ximcp/imLcIm.c index 2e622f6..b049bb7 100644 --- a/modules/im/ximcp/imLcIm.c +++ b/modules/im/ximcp/imLcIm.c @@ -32,7 +32,7 @@ THIS SOFTWARE. frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcIm.c,v 1.12 2003/09/06 14:06:32 pascal Exp $ */ +/* $XFree86: xc/lib/X11/imLcIm.c,v 1.13 2004/01/06 13:49:27 pascal Exp $ */ #include /* @@ -91,6 +91,8 @@ _XimLocalIMFree( Xim im) { XimFreeDefaultTree(im->private.local.top); + im->private.local.top = NULL; + if(im->core.im_resources) { Xfree(im->core.im_resources); im->core.im_resources = NULL; diff --git a/modules/im/ximcp/imThaiFlt.c b/modules/im/ximcp/imThaiFlt.c index b674b0d..02eb7a8 100644 --- a/modules/im/ximcp/imThaiFlt.c +++ b/modules/im/ximcp/imThaiFlt.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.21 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.23 2003/12/31 01:18:42 tsi Exp $ */ /* **++ @@ -230,7 +230,7 @@ THAI_chtype (unsigned char ch) return tactis_chtype[ch]; } - +#ifdef UNUSED /* returns the display level */ Private int THAI_chlevel (unsigned char ch) @@ -311,7 +311,7 @@ THAI_istone (unsigned char ch) { return (tactis_chtype[ch] == TONE); } - +#endif Private Bool THAI_iscomposible ( @@ -353,7 +353,7 @@ THAI_isaccepted ( return iskeyvalid; } -#if 0 +#ifdef UNUSED Private void THAI_apply_write_rules( unsigned char *instr, @@ -427,7 +427,7 @@ Output parameters: } return position; } -#endif + Private int THAI_apply_scm( @@ -462,25 +462,21 @@ THAI_apply_scm( return 0; /* probably not right but better than returning garbage */ } + /* The following functions are copied from XKeyBind.c */ -#if 0 Private void ComputeMaskFromKeytrans(); -#endif Private int IsCancelComposeKey(KeySym *symbol, XKeyEvent *event); Private void SetLed(Display *dpy, int num, int state); -#if 0 Private CARD8 FindKeyCode(); -#endif + /* The following functions are specific to this module */ -#if 0 Private int XThaiTranslateKey(); Private int XThaiTranslateKeySym(); -#endif -#if 0 + Private KeySym HexIMNormalKey( XicThaiPart *thai_part, KeySym symbol, @@ -493,9 +489,7 @@ Private KeySym HexIMSecondComposeKey( XicThaiPart *thai_part, KeySym symbol XKeyEvent *event); -#endif Private KeySym HexIMComposeSequence(KeySym ks1, KeySym ks2); -#if 0 Private void InitIscMode(Xic ic); Private Bool ThaiComposeConvert( Display *dpy, @@ -514,11 +508,12 @@ Private Bool ThaiComposeConvert( (0<=(wc)&&(wc)<=0x7F) ? \ (wc) : \ ((0x0E01<=(wc)&&(wc)<=0x0E5F) ? ((wc)-0x0E00+0xA0) : 0)) +/* "c" is an unsigned char */ #define tis2ucs(c) \ ( \ ((c)<=0x7F) ? \ (wchar_t)(c) : \ - ((0x0A1<=(c)&&(c)<=0x0FF) ? ((wchar_t)(c)-0xA0+0x0E00) : 0)) + ((0x0A1<=(c)) ? ((wchar_t)(c)-0xA0+0x0E00) : 0)) /* * Macros to save and recall last input character in XIC @@ -645,12 +640,12 @@ IC_RealDeletePreviousChar(Xic ic) #define COMPOSE_LED 2 -#if 0 +#ifdef UNUSED typedef KeySym (*StateProc)( XicThaiPart *thai_part, KeySym symbol, XKeyEvent *event); -#endif + /* * macros to classify XKeyEvent state field @@ -675,7 +670,7 @@ typedef KeySym (*StateProc)( !IsShift((event)->state)) \ ? True : False) -#if 0 + /* * State handler to implement the Thai hex input method. */ @@ -686,7 +681,7 @@ Private StateProc state_handler[] = { HexIMFirstComposeKey, HexIMSecondComposeKey }; -#endif + /* * Table for 'Thai Compose' character input. @@ -718,6 +713,7 @@ struct _XKeytrans { int mlen; /* length of modifier list */ }; + /* Convert keysym to 'Thai Compose' keysym */ /* The current implementation use latin-1 keysyms */ Private Bool @@ -740,7 +736,6 @@ ThaiComposeConvert( return False; } -#if 0 Private int XThaiTranslateKey( register Display *dpy, @@ -931,7 +926,6 @@ XThaiTranslateKeySym( return 1; } } -#endif /* * given a KeySym, returns the first keycode containing it, if any. @@ -954,7 +948,6 @@ FindKeyCode( return 0; } -#if 0 /* * given a list of modifiers, computes the mask necessary for later matching. * This routine must lookup the key in the Keymap and then search to see @@ -988,7 +981,6 @@ ComputeMaskFromKeytrans( } p->state &= AllMods; } -#endif /************************************************************************ * @@ -1157,7 +1149,7 @@ void SetLed( led_control.led = num; XChangeKeyboardControl (dpy, KBLed | KBLedMode, &led_control); } - +#endif /* * Initialize ISC mode from im modifier @@ -1252,7 +1244,7 @@ XPointer client_data; int isc_mode; /* Thai Input Sequence Check mode */ unsigned char previous_char; /* Last inputted Thai char */ unsigned char new_char; -#if 0 +#ifdef UNUSED unsigned int modifiers; KeySym lsym,usym; int state; @@ -1298,7 +1290,7 @@ XPointer client_data; { return False; } -#if 0 +#ifdef UNUSED if (! XThaiTranslateKey(ev->xkey.display, ev->xkey.keycode, ev->xkey.state, &modifiers, &symbol, &lsym, &usym)) return False; diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index 98e92a2..5320440 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -1,7 +1,7 @@ XCOMM UTF-8 (Unicode) compose sequence XCOMM David.Monniaux@ens.fr XCOMM -XCOMM $XFree86: xc/nls/Compose/en_US.UTF-8,v 1.10 2003/12/05 04:10:28 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/en_US.UTF-8,v 1.12 2004/01/09 14:46:06 pascal Exp $ XCOMM Part 1 - Manual definitions @@ -77,7 +77,7 @@ XCOMM on some keyboards. : "~" asciitilde XCOMM Spaces - : " " nobreakspace # NO-BREAK SPACE + : " " nobreakspace # NO-BREAK SPACE : " " U2008 # PUNCTUATION SPACE : "©" copyright @@ -99,7 +99,6 @@ XCOMM Spaces

: "¶" paragraph : "±" plusminus : "¿" questiondown - : "Ə" U018f : "đ" dstroke : "Đ" Dstroke : "ß" ssharp @@ -155,6 +154,14 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN : "€" EuroSign # EURO SIGN : "€" EuroSign # EURO SIGN + : "¢" U00A2 # CENT SIGN + : "¢" U00A2 # CENT SIGN + : "¢" U00A2 # CENT SIGN + : "¢" U00A2 # CENT SIGN + : "¢" U00A2 # CENT SIGN + : "¢" U00A2 # CENT SIGN + : "¢" U00A2 # CENT SIGN + : "¢" U00A2 # CENT SIGN : "£" U00a3 # POUND SIGN : "£" U00a3 # POUND SIGN : "¥" yen @@ -192,237 +199,239 @@ XCOMM There are some conflicts among sequences, but I left them alone. XCOMM XCOMM group 1: cluster jamos made of three basic jamos - : "ᄢ" U1122 : ᄇᅠ ᄉᅠ ᄀᅠ = ᄢᅠ - : "ᄣ" U1123 : ᄇᅠ ᄉᅠ ᄃᅠ = ᄣᅠ - : "ᄤ" U1124 : ᄇᅠ ᄉᅠ ᄇᅠ = ᄤᅠ - : "ᄥ" U1125 : ᄇᅠ ᄉᅠ ᄉᅠ = ᄥᅠ - : "ᄦ" U1126 : ᄇᅠ ᄉᅠ ᄌᅠ = ᄦᅠ - : "ᄬ" U112c : ᄇᅠ ᄇᅠ ᄋᅠ = ᄬᅠ - : "ᄳ" U1133 : ᄉᅠ ᄇᅠ ᄀᅠ = ᄳᅠ - : "ᄴ" U1134 : ᄉᅠ ᄉᅠ ᄉᅠ = ᄴᅠ - : "ᅫ" U116b : ᅟᅩ ᅟᅡ ᅟᅵ = ᅟᅫ - : "ᅰ" U1170 : ᅟᅮ ᅟᅥ ᅟᅵ = ᅟᅰ - : "ᆋ" U118b : ᅟᅮ ᅟᅥ ᅟᅳ = ᅟᆋ - : "ᇄ" U11c4 : ᅟᅠᆨ ᅟᅠᆺ ᅟᅠᆨ = ᅟᅠᇄ - : "ᇌ" U11cc : ᅟᅠᆯ ᅟᅠᆨ ᅟᅠᆺ = ᅟᅠᇌ - : "ᇏ" U11cf : ᅟᅠᆯ ᅟᅠᆮ ᅟᅠᇂ = ᅟᅠᇏ - : "ᇑ" U11d1 : ᅟᅠᆯ ᅟᅠᆷ ᅟᅠᆨ = ᅟᅠᇑ - : "ᇒ" U11d2 : ᅟᅠᆯ ᅟᅠᆷ ᅟᅠᆺ = ᅟᅠᇒ - : "ᇓ" U11d3 : ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᆺ = ᅟᅠᇓ - : "ᇔ" U11d4 : ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᇂ = ᅟᅠᇔ - : "ᇕ" U11d5 : ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᆼ = ᅟᅠᇕ - : "ᇖ" U11d6 : ᅟᅠᆯ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇖ - : "ᇞ" U11de : ᅟᅠᆷ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇞ - : "ᇭ" U11ed : ᅟᅠᆼ ᅟᅠᆨ ᅟᅠᆨ = ᅟᅠᇭ - : "ᄁ" U1101 : ᄀᅠ ᄀᅠ = ᄁᅠ - : "ᄄ" U1104 : ᄃᅠ ᄃᅠ = ᄄᅠ - : "ᄈ" U1108 : ᄇᅠ ᄇᅠ = ᄈᅠ - : "ᄊ" U110a : ᄉᅠ ᄉᅠ = ᄊᅠ - : "ᄍ" U110d : ᄌᅠ ᄌᅠ = ᄍᅠ - : "ᄓ" U1113 : ᄂᅠ ᄀᅠ = ᄓᅠ - : "ᄔ" U1114 : ᄂᅠ ᄂᅠ = ᄔᅠ - : "ᄕ" U1115 : ᄂᅠ ᄃᅠ = ᄕᅠ - : "ᄖ" U1116 : ᄂᅠ ᄇᅠ = ᄖᅠ - : "ᄗ" U1117 : ᄃᅠ ᄀᅠ = ᄗᅠ - : "ᄘ" U1118 : ᄅᅠ ᄂᅠ = ᄘᅠ - : "ᄙ" U1119 : ᄅᅠ ᄅᅠ = ᄙᅠ - : "ᄚ" U111a : ᄅᅠ ᄒᅠ = ᄚᅠ - : "ᄛ" U111b : ᄅᅠ ᄋᅠ = ᄛᅠ - : "ᄜ" U111c : ᄆᅠ ᄇᅠ = ᄜᅠ - : "ᄝ" U111d : ᄆᅠ ᄋᅠ = ᄝᅠ - : "ᄞ" U111e : ᄇᅠ ᄀᅠ = ᄞᅠ - : "ᄟ" U111f : ᄇᅠ ᄂᅠ = ᄟᅠ - : "ᄠ" U1120 : ᄇᅠ ᄃᅠ = ᄠᅠ - : "ᄡ" U1121 : ᄇᅠ ᄉᅠ = ᄡᅠ - : "ᄧ" U1127 : ᄇᅠ ᄌᅠ = ᄧᅠ - : "ᄨ" U1128 : ᄇᅠ ᄎᅠ = ᄨᅠ - : "ᄩ" U1129 : ᄇᅠ ᄐᅠ = ᄩᅠ - : "ᄪ" U112a : ᄇᅠ ᄑᅠ = ᄪᅠ - : "ᄫ" U112b : ᄇᅠ ᄋᅠ = ᄫᅠ - : "ᄭ" U112d : ᄉᅠ ᄀᅠ = ᄭᅠ - : "ᄮ" U112e : ᄉᅠ ᄂᅠ = ᄮᅠ - : "ᄯ" U112f : ᄉᅠ ᄃᅠ = ᄯᅠ - : "ᄰ" U1130 : ᄉᅠ ᄅᅠ = ᄰᅠ - : "ᄱ" U1131 : ᄉᅠ ᄆᅠ = ᄱᅠ - : "ᄲ" U1132 : ᄉᅠ ᄇᅠ = ᄲᅠ - : "ᄵ" U1135 : ᄉᅠ ᄋᅠ = ᄵᅠ - : "ᄶ" U1136 : ᄉᅠ ᄌᅠ = ᄶᅠ - : "ᄷ" U1137 : ᄉᅠ ᄎᅠ = ᄷᅠ - : "ᄸ" U1138 : ᄉᅠ ᄏᅠ = ᄸᅠ - : "ᄹ" U1139 : ᄉᅠ ᄐᅠ = ᄹᅠ - : "ᄺ" U113a : ᄉᅠ ᄑᅠ = ᄺᅠ - : "ᄻ" U113b : ᄉᅠ ᄒᅠ = ᄻᅠ - : "ᄽ" U113d : ᄼᅠ ᄼᅠ = ᄽᅠ - : "ᄿ" U113f : ᄾᅠ ᄾᅠ = ᄿᅠ - : "ᅁ" U1141 : ᄋᅠ ᄀᅠ = ᅁᅠ - : "ᅂ" U1142 : ᄋᅠ ᄃᅠ = ᅂᅠ - : "ᅃ" U1143 : ᄋᅠ ᄆᅠ = ᅃᅠ - : "ᅄ" U1144 : ᄋᅠ ᄇᅠ = ᅄᅠ - : "ᅅ" U1145 : ᄋᅠ ᄉᅠ = ᅅᅠ - : "ᅆ" U1146 : ᄋᅠ ᅀᅠ = ᅆᅠ - : "ᅇ" U1147 : ᄋᅠ ᄋᅠ = ᅇᅠ - : "ᅈ" U1148 : ᄋᅠ ᄌᅠ = ᅈᅠ - : "ᅉ" U1149 : ᄋᅠ ᄎᅠ = ᅉᅠ - : "ᅊ" U114a : ᄋᅠ ᄐᅠ = ᅊᅠ - : "ᅋ" U114b : ᄋᅠ ᄑᅠ = ᅋᅠ - : "ᅍ" U114d : ᄌᅠ ᄋᅠ = ᅍᅠ - : "ᅏ" U114f : ᅎᅠ ᅎᅠ = ᅏᅠ - : "ᅑ" U1151 : ᅐᅠ ᅐᅠ = ᅑᅠ - : "ᅒ" U1152 : ᄎᅠ ᄏᅠ = ᅒᅠ - : "ᅓ" U1153 : ᄎᅠ ᄒᅠ = ᅓᅠ - : "ᅖ" U1156 : ᄑᅠ ᄇᅠ = ᅖᅠ - : "ᅗ" U1157 : ᄑᅠ ᄋᅠ = ᅗᅠ - : "ᅘ" U1158 : ᄒᅠ ᄒᅠ = ᅘᅠ - : "ᅢ" U1162 : ᅟᅡ ᅟᅵ = ᅟᅢ - : "ᅤ" U1164 : ᅟᅣ ᅟᅵ = ᅟᅤ - : "ᅦ" U1166 : ᅟᅥ ᅟᅵ = ᅟᅦ - : "ᅨ" U1168 : ᅟᅧ ᅟᅵ = ᅟᅨ - : "ᅪ" U116a : ᅟᅩ ᅟᅡ = ᅟᅪ - : "ᅬ" U116c : ᅟᅩ ᅟᅵ = ᅟᅬ - : "ᅯ" U116f : ᅟᅮ ᅟᅥ = ᅟᅯ - : "ᅱ" U1171 : ᅟᅮ ᅟᅵ = ᅟᅱ - : "ᅴ" U1174 : ᅟᅳ ᅟᅵ = ᅟᅴ - : "ᅶ" U1176 : ᅟᅡ ᅟᅩ = ᅟᅶ - : "ᅷ" U1177 : ᅟᅡ ᅟᅮ = ᅟᅷ - : "ᅸ" U1178 : ᅟᅣ ᅟᅩ = ᅟᅸ - : "ᅹ" U1179 : ᅟᅣ ᅟᅭ = ᅟᅹ - : "ᅺ" U117a : ᅟᅥ ᅟᅩ = ᅟᅺ - : "ᅻ" U117b : ᅟᅥ ᅟᅮ = ᅟᅻ - : "ᅼ" U117c : ᅟᅥ ᅟᅳ = ᅟᅼ - : "ᅽ" U117d : ᅟᅧ ᅟᅩ = ᅟᅽ - : "ᅾ" U117e : ᅟᅧ ᅟᅮ = ᅟᅾ - : "ᅿ" U117f : ᅟᅩ ᅟᅥ = ᅟᅿ - : "ᆀ" U1180 : ᅟᅩ ᅟᅦ = ᅟᆀ - : "ᆁ" U1181 : ᅟᅩ ᅟᅨ = ᅟᆁ - : "ᆂ" U1182 : ᅟᅩ ᅟᅩ = ᅟᆂ - : "ᆃ" U1183 : ᅟᅩ ᅟᅮ = ᅟᆃ - : "ᆄ" U1184 : ᅟᅭ ᅟᅣ = ᅟᆄ - : "ᆅ" U1185 : ᅟᅭ ᅟᅤ = ᅟᆅ - : "ᆆ" U1186 : ᅟᅭ ᅟᅧ = ᅟᆆ - : "ᆇ" U1187 : ᅟᅭ ᅟᅩ = ᅟᆇ - : "ᆈ" U1188 : ᅟᅭ ᅟᅵ = ᅟᆈ - : "ᆉ" U1189 : ᅟᅮ ᅟᅡ = ᅟᆉ - : "ᆊ" U118a : ᅟᅮ ᅟᅢ = ᅟᆊ - : "ᆌ" U118c : ᅟᅮ ᅟᅨ = ᅟᆌ - : "ᆍ" U118d : ᅟᅮ ᅟᅮ = ᅟᆍ - : "ᆎ" U118e : ᅟᅲ ᅟᅡ = ᅟᆎ - : "ᆏ" U118f : ᅟᅲ ᅟᅥ = ᅟᆏ - : "ᆐ" U1190 : ᅟᅲ ᅟᅦ = ᅟᆐ - : "ᆑ" U1191 : ᅟᅲ ᅟᅧ = ᅟᆑ - : "ᆒ" U1192 : ᅟᅲ ᅟᅨ = ᅟᆒ - : "ᆓ" U1193 : ᅟᅲ ᅟᅮ = ᅟᆓ - : "ᆔ" U1194 : ᅟᅲ ᅟᅵ = ᅟᆔ - : "ᆕ" U1195 : ᅟᅳ ᅟᅮ = ᅟᆕ - : "ᆖ" U1196 : ᅟᅳ ᅟᅳ = ᅟᆖ - : "ᆗ" U1197 : ᅟᅴ ᅟᅮ = ᅟᆗ - : "ᆘ" U1198 : ᅟᅵ ᅟᅡ = ᅟᆘ - : "ᆙ" U1199 : ᅟᅵ ᅟᅣ = ᅟᆙ - : "ᆚ" U119a : ᅟᅵ ᅟᅩ = ᅟᆚ - : "ᆛ" U119b : ᅟᅵ ᅟᅮ = ᅟᆛ - : "ᆜ" U119c : ᅟᅵ ᅟᅳ = ᅟᆜ - : "ᆝ" U119d : ᅟᅵ ᅟᆞ = ᅟᆝ - : "ᆟ" U119f : ᅟᆞ ᅟᅥ = ᅟᆟ - : "ᆠ" U11a0 : ᅟᆞ ᅟᅮ = ᅟᆠ - : "ᆡ" U11a1 : ᅟᆞ ᅟᅵ = ᅟᆡ - : "ᆢ" U11a2 : ᅟᆞ ᅟᆞ = ᅟᆢ - : "ᆩ" U11a9 : ᅟᅠᆨ ᅟᅠᆨ = ᅟᅠᆩ - : "ᆪ" U11aa : ᅟᅠᆨ ᅟᅠᆺ = ᅟᅠᆪ - : "ᆬ" U11ac : ᅟᅠᆫ ᅟᅠᆽ = ᅟᅠᆬ - : "ᆭ" U11ad : ᅟᅠᆫ ᅟᅠᇂ = ᅟᅠᆭ - : "ᆰ" U11b0 : ᅟᅠᆯ ᅟᅠᆨ = ᅟᅠᆰ - : "ᆱ" U11b1 : ᅟᅠᆯ ᅟᅠᆷ = ᅟᅠᆱ - : "ᆲ" U11b2 : ᅟᅠᆯ ᅟᅠᆸ = ᅟᅠᆲ - : "ᆳ" U11b3 : ᅟᅠᆯ ᅟᅠᆺ = ᅟᅠᆳ - : "ᆴ" U11b4 : ᅟᅠᆯ ᅟᅠᇀ = ᅟᅠᆴ - : "ᆵ" U11b5 : ᅟᅠᆯ ᅟᅠᇁ = ᅟᅠᆵ - : "ᆶ" U11b6 : ᅟᅠᆯ ᅟᅠᇂ = ᅟᅠᆶ - : "ᆹ" U11b9 : ᅟᅠᆸ ᅟᅠᆺ = ᅟᅠᆹ - : "ᆻ" U11bb : ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᆻ - : "ᇃ" U11c3 : ᅟᅠᆨ ᅟᅠᆯ = ᅟᅠᇃ - : "ᇅ" U11c5 : ᅟᅠᆫ ᅟᅠᆨ = ᅟᅠᇅ - : "ᇆ" U11c6 : ᅟᅠᆫ ᅟᅠᆮ = ᅟᅠᇆ - : "ᇇ" U11c7 : ᅟᅠᆫ ᅟᅠᆺ = ᅟᅠᇇ - : "ᇈ" U11c8 : ᅟᅠᆫ ᅟᅠᇫ = ᅟᅠᇈ - : "ᇉ" U11c9 : ᅟᅠᆫ ᅟᅠᇀ = ᅟᅠᇉ - : "ᇊ" U11ca : ᅟᅠᆮ ᅟᅠᆨ = ᅟᅠᇊ - : "ᇋ" U11cb : ᅟᅠᆮ ᅟᅠᆯ = ᅟᅠᇋ - : "ᇍ" U11cd : ᅟᅠᆯ ᅟᅠᆫ = ᅟᅠᇍ - : "ᇎ" U11ce : ᅟᅠᆯ ᅟᅠᆮ = ᅟᅠᇎ - : "ᇐ" U11d0 : ᅟᅠᆯ ᅟᅠᆯ = ᅟᅠᇐ - : "ᇗ" U11d7 : ᅟᅠᆯ ᅟᅠᇫ = ᅟᅠᇗ - : "ᇘ" U11d8 : ᅟᅠᆯ ᅟᅠᆿ = ᅟᅠᇘ - : "ᇙ" U11d9 : ᅟᅠᆯ ᅟᅠᇹ = ᅟᅠᇙ - : "ᇚ" U11da : ᅟᅠᆷ ᅟᅠᆨ = ᅟᅠᇚ - : "ᇛ" U11db : ᅟᅠᆷ ᅟᅠᆯ = ᅟᅠᇛ - : "ᇜ" U11dc : ᅟᅠᆷ ᅟᅠᆸ = ᅟᅠᇜ - : "ᇝ" U11dd : ᅟᅠᆷ ᅟᅠᆺ = ᅟᅠᇝ - : "ᇟ" U11df : ᅟᅠᆷ ᅟᅠᇫ = ᅟᅠᇟ - : "ᇠ" U11e0 : ᅟᅠᆷ ᅟᅠᆾ = ᅟᅠᇠ - : "ᇡ" U11e1 : ᅟᅠᆷ ᅟᅠᇂ = ᅟᅠᇡ - : "ᇢ" U11e2 : ᅟᅠᆷ ᅟᅠᆼ = ᅟᅠᇢ - : "ᇣ" U11e3 : ᅟᅠᆸ ᅟᅠᆯ = ᅟᅠᇣ - : "ᇤ" U11e4 : ᅟᅠᆸ ᅟᅠᇁ = ᅟᅠᇤ - : "ᇥ" U11e5 : ᅟᅠᆸ ᅟᅠᇂ = ᅟᅠᇥ - : "ᇦ" U11e6 : ᅟᅠᆸ ᅟᅠᆼ = ᅟᅠᇦ - : "ᇧ" U11e7 : ᅟᅠᆺ ᅟᅠᆨ = ᅟᅠᇧ - : "ᇨ" U11e8 : ᅟᅠᆺ ᅟᅠᆮ = ᅟᅠᇨ - : "ᇩ" U11e9 : ᅟᅠᆺ ᅟᅠᆯ = ᅟᅠᇩ - : "ᇪ" U11ea : ᅟᅠᆺ ᅟᅠᆸ = ᅟᅠᇪ - : "ᇬ" U11ec : ᅟᅠᆼ ᅟᅠᆨ = ᅟᅠᇬ - : "ᇮ" U11ee : ᅟᅠᆼ ᅟᅠᆼ = ᅟᅠᇮ - : "ᇯ" U11ef : ᅟᅠᆼ ᅟᅠᆿ = ᅟᅠᇯ - : "ᇱ" U11f1 : ᅟᅠᇰ ᅟᅠᆺ = ᅟᅠᇱ - : "ᇲ" U11f2 : ᅟᅠᇰ ᅟᅠᇫ = ᅟᅠᇲ - : "ᇳ" U11f3 : ᅟᅠᇁ ᅟᅠᆸ = ᅟᅠᇳ - : "ᇴ" U11f4 : ᅟᅠᇁ ᅟᅠᆼ = ᅟᅠᇴ - : "ᇵ" U11f5 : ᅟᅠᇂ ᅟᅠᆫ = ᅟᅠᇵ - : "ᇶ" U11f6 : ᅟᅠᇂ ᅟᅠᆯ = ᅟᅠᇶ - : "ᇷ" U11f7 : ᅟᅠᇂ ᅟᅠᆷ = ᅟᅠᇷ - : "ᇸ" U11f8 : ᅟᅠᇂ ᅟᅠᆸ = ᅟᅠᇸ - : "ᄢ" U1122 : ᄡᅠ ᄀᅠ = ᄢᅠ - : "ᄣ" U1123 : ᄡᅠ ᄃᅠ = ᄣᅠ - : "ᄤ" U1124 : ᄡᅠ ᄇᅠ = ᄤᅠ - : "ᄥ" U1125 : ᄡᅠ ᄉᅠ = ᄥᅠ - : "ᄦ" U1126 : ᄡᅠ ᄌᅠ = ᄦᅠ - : "ᄬ" U112c : ᄈᅠ ᄋᅠ = ᄬᅠ - : "ᄳ" U1133 : ᄲᅠ ᄀᅠ = ᄳᅠ - : "ᄴ" U1134 : ᄊᅠ ᄉᅠ = ᄴᅠ - : "ᅫ" U116b : ᅟᅪ ᅟᅵ = ᅟᅫ - : "ᅰ" U1170 : ᅟᅯ ᅟᅵ = ᅟᅰ - : "ᆋ" U118b : ᅟᅯ ᅟᅳ = ᅟᆋ - : "ᇄ" U11c4 : ᅟᅠᆪ ᅟᅠᆨ = ᅟᅠᇄ - : "ᇌ" U11cc : ᅟᅠᆰ ᅟᅠᆺ = ᅟᅠᇌ - : "ᇏ" U11cf : ᅟᅠᇎ ᅟᅠᇂ = ᅟᅠᇏ - : "ᇑ" U11d1 : ᅟᅠᆱ ᅟᅠᆨ = ᅟᅠᇑ - : "ᇒ" U11d2 : ᅟᅠᆱ ᅟᅠᆺ = ᅟᅠᇒ - : "ᇓ" U11d3 : ᅟᅠᆲ ᅟᅠᆺ = ᅟᅠᇓ - : "ᇔ" U11d4 : ᅟᅠᆲ ᅟᅠᇂ = ᅟᅠᇔ - : "ᇕ" U11d5 : ᅟᅠᆲ ᅟᅠᆼ = ᅟᅠᇕ - : "ᇖ" U11d6 : ᅟᅠᆳ ᅟᅠᆺ = ᅟᅠᇖ - : "ᇞ" U11de : ᅟᅠᇝ ᅟᅠᆺ = ᅟᅠᇞ - : "ᇭ" U11ed : ᅟᅠᇬ ᅟᅠᆨ = ᅟᅠᇭ - : "ᄢ" U1122 : ᄇᅠ ᄭᅠ = ᄢᅠ - : "ᄣ" U1123 : ᄇᅠ ᄯᅠ = ᄣᅠ - : "ᄤ" U1124 : ᄇᅠ ᄲᅠ = ᄤᅠ - : "ᄥ" U1125 : ᄇᅠ ᄊᅠ = ᄥᅠ - : "ᄦ" U1126 : ᄇᅠ ᄶᅠ = ᄦᅠ - : "ᄬ" U112c : ᄇᅠ ᄫᅠ = ᄬᅠ - : "ᄳ" U1133 : ᄉᅠ ᄞᅠ = ᄳᅠ - : "ᄴ" U1134 : ᄉᅠ ᄊᅠ = ᄴᅠ - : "ᅫ" U116b : ᅟᅩ ᅟᅢ = ᅟᅫ - : "ᅰ" U1170 : ᅟᅮ ᅟᅦ = ᅟᅰ - : "ᆋ" U118b : ᅟᅮ ᅟᅼ = ᅟᆋ - : "ᇄ" U11c4 : ᅟᅠᆨ ᅟᅠᇧ = ᅟᅠᇄ - : "ᇌ" U11cc : ᅟᅠᆯ ᅟᅠᆪ = ᅟᅠᇌ - : "ᇑ" U11d1 : ᅟᅠᆯ ᅟᅠᇚ = ᅟᅠᇑ - : "ᇒ" U11d2 : ᅟᅠᆯ ᅟᅠᇝ = ᅟᅠᇒ - : "ᇓ" U11d3 : ᅟᅠᆯ ᅟᅠᆹ = ᅟᅠᇓ - : "ᇔ" U11d4 : ᅟᅠᆯ ᅟᅠᇥ = ᅟᅠᇔ - : "ᇕ" U11d5 : ᅟᅠᆯ ᅟᅠᇦ = ᅟᅠᇕ - : "ᇖ" U11d6 : ᅟᅠᆯ ᅟᅠᆻ = ᅟᅠᇖ - : "ᇞ" U11de : ᅟᅠᆷ ᅟᅠᆻ = ᅟᅠᇞ - : "ᇭ" U11ed : ᅟᅠᆼ ᅟᅠᆩ = ᅟᅠᇭ + : "ᄢ" U1122 # ᄇᅠ ᄉᅠ ᄀᅠ = ᄢᅠ + : "ᄣ" U1123 # ᄇᅠ ᄉᅠ ᄃᅠ = ᄣᅠ + : "ᄤ" U1124 # ᄇᅠ ᄉᅠ ᄇᅠ = ᄤᅠ + : "ᄥ" U1125 # ᄇᅠ ᄉᅠ ᄉᅠ = ᄥᅠ + : "ᄦ" U1126 # ᄇᅠ ᄉᅠ ᄌᅠ = ᄦᅠ + : "ᄬ" U112c # ᄇᅠ ᄇᅠ ᄋᅠ = ᄬᅠ + : "ᄳ" U1133 # ᄉᅠ ᄇᅠ ᄀᅠ = ᄳᅠ + : "ᄴ" U1134 # ᄉᅠ ᄉᅠ ᄉᅠ = ᄴᅠ + : "ᅫ" U116b # ᅟᅩ ᅟᅡ ᅟᅵ = ᅟᅫ + : "ᅰ" U1170 # ᅟᅮ ᅟᅥ ᅟᅵ = ᅟᅰ + : "ᆋ" U118b # ᅟᅮ ᅟᅥ ᅟᅳ = ᅟᆋ + : "ᇄ" U11c4 # ᅟᅠᆨ ᅟᅠᆺ ᅟᅠᆨ = ᅟᅠᇄ + : "ᇌ" U11cc # ᅟᅠᆯ ᅟᅠᆨ ᅟᅠᆺ = ᅟᅠᇌ + : "ᇏ" U11cf # ᅟᅠᆯ ᅟᅠᆮ ᅟᅠᇂ = ᅟᅠᇏ + : "ᇑ" U11d1 # ᅟᅠᆯ ᅟᅠᆷ ᅟᅠᆨ = ᅟᅠᇑ + : "ᇒ" U11d2 # ᅟᅠᆯ ᅟᅠᆷ ᅟᅠᆺ = ᅟᅠᇒ + : "ᇓ" U11d3 # ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᆺ = ᅟᅠᇓ + : "ᇔ" U11d4 # ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᇂ = ᅟᅠᇔ + : "ᇕ" U11d5 # ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᆼ = ᅟᅠᇕ + : "ᇖ" U11d6 # ᅟᅠᆯ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇖ + : "ᇞ" U11de # ᅟᅠᆷ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇞ + : "ᇭ" U11ed # ᅟᅠᆼ ᅟᅠᆨ ᅟᅠᆨ = ᅟᅠᇭ + : "ᄁ" U1101 # ᄀᅠ ᄀᅠ = ᄁᅠ + : "ᄄ" U1104 # ᄃᅠ ᄃᅠ = ᄄᅠ + : "ᄈ" U1108 # ᄇᅠ ᄇᅠ = ᄈᅠ + : "ᄊ" U110a # ᄉᅠ ᄉᅠ = ᄊᅠ + : "ᄍ" U110d # ᄌᅠ ᄌᅠ = ᄍᅠ + : "ᄓ" U1113 # ᄂᅠ ᄀᅠ = ᄓᅠ + : "ᄔ" U1114 # ᄂᅠ ᄂᅠ = ᄔᅠ + : "ᄕ" U1115 # ᄂᅠ ᄃᅠ = ᄕᅠ + : "ᄖ" U1116 # ᄂᅠ ᄇᅠ = ᄖᅠ + : "ᄗ" U1117 # ᄃᅠ ᄀᅠ = ᄗᅠ + : "ᄘ" U1118 # ᄅᅠ ᄂᅠ = ᄘᅠ + : "ᄙ" U1119 # ᄅᅠ ᄅᅠ = ᄙᅠ + : "ᄚ" U111a # ᄅᅠ ᄒᅠ = ᄚᅠ + : "ᄛ" U111b # ᄅᅠ ᄋᅠ = ᄛᅠ + : "ᄜ" U111c # ᄆᅠ ᄇᅠ = ᄜᅠ + : "ᄝ" U111d # ᄆᅠ ᄋᅠ = ᄝᅠ + : "ᄞ" U111e # ᄇᅠ ᄀᅠ = ᄞᅠ + : "ᄟ" U111f # ᄇᅠ ᄂᅠ = ᄟᅠ + : "ᄠ" U1120 # ᄇᅠ ᄃᅠ = ᄠᅠ + : "ᄡ" U1121 # ᄇᅠ ᄉᅠ = ᄡᅠ + : "ᄧ" U1127 # ᄇᅠ ᄌᅠ = ᄧᅠ + : "ᄨ" U1128 # ᄇᅠ ᄎᅠ = ᄨᅠ + : "ᄩ" U1129 # ᄇᅠ ᄐᅠ = ᄩᅠ + : "ᄪ" U112a # ᄇᅠ ᄑᅠ = ᄪᅠ + : "ᄫ" U112b # ᄇᅠ ᄋᅠ = ᄫᅠ + : "ᄭ" U112d # ᄉᅠ ᄀᅠ = ᄭᅠ + : "ᄮ" U112e # ᄉᅠ ᄂᅠ = ᄮᅠ + : "ᄯ" U112f # ᄉᅠ ᄃᅠ = ᄯᅠ + : "ᄰ" U1130 # ᄉᅠ ᄅᅠ = ᄰᅠ + : "ᄱ" U1131 # ᄉᅠ ᄆᅠ = ᄱᅠ + : "ᄲ" U1132 # ᄉᅠ ᄇᅠ = ᄲᅠ + : "ᄵ" U1135 # ᄉᅠ ᄋᅠ = ᄵᅠ + : "ᄶ" U1136 # ᄉᅠ ᄌᅠ = ᄶᅠ + : "ᄷ" U1137 # ᄉᅠ ᄎᅠ = ᄷᅠ + : "ᄸ" U1138 # ᄉᅠ ᄏᅠ = ᄸᅠ + : "ᄹ" U1139 # ᄉᅠ ᄐᅠ = ᄹᅠ + : "ᄺ" U113a # ᄉᅠ ᄑᅠ = ᄺᅠ + : "ᄻ" U113b # ᄉᅠ ᄒᅠ = ᄻᅠ + : "ᄽ" U113d # ᄼᅠ ᄼᅠ = ᄽᅠ + : "ᄿ" U113f # ᄾᅠ ᄾᅠ = ᄿᅠ + : "ᅁ" U1141 # ᄋᅠ ᄀᅠ = ᅁᅠ + : "ᅂ" U1142 # ᄋᅠ ᄃᅠ = ᅂᅠ + : "ᅃ" U1143 # ᄋᅠ ᄆᅠ = ᅃᅠ + : "ᅄ" U1144 # ᄋᅠ ᄇᅠ = ᅄᅠ + : "ᅅ" U1145 # ᄋᅠ ᄉᅠ = ᅅᅠ + : "ᅆ" U1146 # ᄋᅠ ᅀᅠ = ᅆᅠ + : "ᅇ" U1147 # ᄋᅠ ᄋᅠ = ᅇᅠ + : "ᅈ" U1148 # ᄋᅠ ᄌᅠ = ᅈᅠ + : "ᅉ" U1149 # ᄋᅠ ᄎᅠ = ᅉᅠ + : "ᅊ" U114a # ᄋᅠ ᄐᅠ = ᅊᅠ + : "ᅋ" U114b # ᄋᅠ ᄑᅠ = ᅋᅠ + : "ᅍ" U114d # ᄌᅠ ᄋᅠ = ᅍᅠ + : "ᅏ" U114f # ᅎᅠ ᅎᅠ = ᅏᅠ + : "ᅑ" U1151 # ᅐᅠ ᅐᅠ = ᅑᅠ + : "ᅒ" U1152 # ᄎᅠ ᄏᅠ = ᅒᅠ + : "ᅓ" U1153 # ᄎᅠ ᄒᅠ = ᅓᅠ + : "ᅖ" U1156 # ᄑᅠ ᄇᅠ = ᅖᅠ + : "ᅗ" U1157 # ᄑᅠ ᄋᅠ = ᅗᅠ + : "ᅘ" U1158 # ᄒᅠ ᄒᅠ = ᅘᅠ + : "ᅢ" U1162 # ᅟᅡ ᅟᅵ = ᅟᅢ + : "ᅤ" U1164 # ᅟᅣ ᅟᅵ = ᅟᅤ + : "ᅦ" U1166 # ᅟᅥ ᅟᅵ = ᅟᅦ + : "ᅨ" U1168 # ᅟᅧ ᅟᅵ = ᅟᅨ + : "ᅪ" U116a # ᅟᅩ ᅟᅡ = ᅟᅪ + : "ᅬ" U116c # ᅟᅩ ᅟᅵ = ᅟᅬ + : "ᅯ" U116f # ᅟᅮ ᅟᅥ = ᅟᅯ + : "ᅱ" U1171 # ᅟᅮ ᅟᅵ = ᅟᅱ + : "ᅴ" U1174 # ᅟᅳ ᅟᅵ = ᅟᅴ + : "ᅶ" U1176 # ᅟᅡ ᅟᅩ = ᅟᅶ + : "ᅷ" U1177 # ᅟᅡ ᅟᅮ = ᅟᅷ + : "ᅸ" U1178 # ᅟᅣ ᅟᅩ = ᅟᅸ + : "ᅹ" U1179 # ᅟᅣ ᅟᅭ = ᅟᅹ + : "ᅺ" U117a # ᅟᅥ ᅟᅩ = ᅟᅺ + : "ᅻ" U117b # ᅟᅥ ᅟᅮ = ᅟᅻ + : "ᅼ" U117c # ᅟᅥ ᅟᅳ = ᅟᅼ + : "ᅽ" U117d # ᅟᅧ ᅟᅩ = ᅟᅽ + : "ᅾ" U117e # ᅟᅧ ᅟᅮ = ᅟᅾ + : "ᅿ" U117f # ᅟᅩ ᅟᅥ = ᅟᅿ + : "ᆀ" U1180 # ᅟᅩ ᅟᅦ = ᅟᆀ + : "ᆁ" U1181 # ᅟᅩ ᅟᅨ = ᅟᆁ + : "ᆂ" U1182 # ᅟᅩ ᅟᅩ = ᅟᆂ + : "ᆃ" U1183 # ᅟᅩ ᅟᅮ = ᅟᆃ + : "ᆄ" U1184 # ᅟᅭ ᅟᅣ = ᅟᆄ + : "ᆅ" U1185 # ᅟᅭ ᅟᅤ = ᅟᆅ + : "ᆆ" U1186 # ᅟᅭ ᅟᅧ = ᅟᆆ + : "ᆇ" U1187 # ᅟᅭ ᅟᅩ = ᅟᆇ + : "ᆈ" U1188 # ᅟᅭ ᅟᅵ = ᅟᆈ + : "ᆉ" U1189 # ᅟᅮ ᅟᅡ = ᅟᆉ + : "ᆊ" U118a # ᅟᅮ ᅟᅢ = ᅟᆊ + : "ᆌ" U118c # ᅟᅮ ᅟᅨ = ᅟᆌ + : "ᆍ" U118d # ᅟᅮ ᅟᅮ = ᅟᆍ + : "ᆎ" U118e # ᅟᅲ ᅟᅡ = ᅟᆎ + : "ᆏ" U118f # ᅟᅲ ᅟᅥ = ᅟᆏ + : "ᆐ" U1190 # ᅟᅲ ᅟᅦ = ᅟᆐ + : "ᆑ" U1191 # ᅟᅲ ᅟᅧ = ᅟᆑ + : "ᆒ" U1192 # ᅟᅲ ᅟᅨ = ᅟᆒ + : "ᆓ" U1193 # ᅟᅲ ᅟᅮ = ᅟᆓ + : "ᆔ" U1194 # ᅟᅲ ᅟᅵ = ᅟᆔ + : "ᆕ" U1195 # ᅟᅳ ᅟᅮ = ᅟᆕ + : "ᆖ" U1196 # ᅟᅳ ᅟᅳ = ᅟᆖ + : "ᆗ" U1197 # ᅟᅴ ᅟᅮ = ᅟᆗ + : "ᆘ" U1198 # ᅟᅵ ᅟᅡ = ᅟᆘ + : "ᆙ" U1199 # ᅟᅵ ᅟᅣ = ᅟᆙ + : "ᆚ" U119a # ᅟᅵ ᅟᅩ = ᅟᆚ + : "ᆛ" U119b # ᅟᅵ ᅟᅮ = ᅟᆛ + : "ᆜ" U119c # ᅟᅵ ᅟᅳ = ᅟᆜ + : "ᆝ" U119d # ᅟᅵ ᅟᆞ = ᅟᆝ + : "ᆟ" U119f # ᅟᆞ ᅟᅥ = ᅟᆟ + : "ᆠ" U11a0 # ᅟᆞ ᅟᅮ = ᅟᆠ + : "ᆡ" U11a1 # ᅟᆞ ᅟᅵ = ᅟᆡ + : "ᆢ" U11a2 # ᅟᆞ ᅟᆞ = ᅟᆢ + : "ᆩ" U11a9 # ᅟᅠᆨ ᅟᅠᆨ = ᅟᅠᆩ + : "ᆪ" U11aa # ᅟᅠᆨ ᅟᅠᆺ = ᅟᅠᆪ + : "ᆬ" U11ac # ᅟᅠᆫ ᅟᅠᆽ = ᅟᅠᆬ + : "ᆭ" U11ad # ᅟᅠᆫ ᅟᅠᇂ = ᅟᅠᆭ + : "ᆰ" U11b0 # ᅟᅠᆯ ᅟᅠᆨ = ᅟᅠᆰ + : "ᆱ" U11b1 # ᅟᅠᆯ ᅟᅠᆷ = ᅟᅠᆱ + : "ᆲ" U11b2 # ᅟᅠᆯ ᅟᅠᆸ = ᅟᅠᆲ + : "ᆳ" U11b3 # ᅟᅠᆯ ᅟᅠᆺ = ᅟᅠᆳ + : "ᆴ" U11b4 # ᅟᅠᆯ ᅟᅠᇀ = ᅟᅠᆴ + : "ᆵ" U11b5 # ᅟᅠᆯ ᅟᅠᇁ = ᅟᅠᆵ + : "ᆶ" U11b6 # ᅟᅠᆯ ᅟᅠᇂ = ᅟᅠᆶ + : "ᆹ" U11b9 # ᅟᅠᆸ ᅟᅠᆺ = ᅟᅠᆹ + : "ᆻ" U11bb # ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᆻ + : "ᇃ" U11c3 # ᅟᅠᆨ ᅟᅠᆯ = ᅟᅠᇃ + : "ᇅ" U11c5 # ᅟᅠᆫ ᅟᅠᆨ = ᅟᅠᇅ + : "ᇆ" U11c6 # ᅟᅠᆫ ᅟᅠᆮ = ᅟᅠᇆ + : "ᇇ" U11c7 # ᅟᅠᆫ ᅟᅠᆺ = ᅟᅠᇇ + : "ᇈ" U11c8 # ᅟᅠᆫ ᅟᅠᇫ = ᅟᅠᇈ + : "ᇉ" U11c9 # ᅟᅠᆫ ᅟᅠᇀ = ᅟᅠᇉ + : "ᇊ" U11ca # ᅟᅠᆮ ᅟᅠᆨ = ᅟᅠᇊ + : "ᇋ" U11cb # ᅟᅠᆮ ᅟᅠᆯ = ᅟᅠᇋ + : "ᇍ" U11cd # ᅟᅠᆯ ᅟᅠᆫ = ᅟᅠᇍ + : "ᇎ" U11ce # ᅟᅠᆯ ᅟᅠᆮ = ᅟᅠᇎ + : "ᇐ" U11d0 # ᅟᅠᆯ ᅟᅠᆯ = ᅟᅠᇐ + : "ᇗ" U11d7 # ᅟᅠᆯ ᅟᅠᇫ = ᅟᅠᇗ + : "ᇘ" U11d8 # ᅟᅠᆯ ᅟᅠᆿ = ᅟᅠᇘ + : "ᇙ" U11d9 # ᅟᅠᆯ ᅟᅠᇹ = ᅟᅠᇙ + : "ᇚ" U11da # ᅟᅠᆷ ᅟᅠᆨ = ᅟᅠᇚ + : "ᇛ" U11db # ᅟᅠᆷ ᅟᅠᆯ = ᅟᅠᇛ + : "ᇜ" U11dc # ᅟᅠᆷ ᅟᅠᆸ = ᅟᅠᇜ + : "ᇝ" U11dd # ᅟᅠᆷ ᅟᅠᆺ = ᅟᅠᇝ + : "ᇟ" U11df # ᅟᅠᆷ ᅟᅠᇫ = ᅟᅠᇟ + : "ᇠ" U11e0 # ᅟᅠᆷ ᅟᅠᆾ = ᅟᅠᇠ + : "ᇡ" U11e1 # ᅟᅠᆷ ᅟᅠᇂ = ᅟᅠᇡ + : "ᇢ" U11e2 # ᅟᅠᆷ ᅟᅠᆼ = ᅟᅠᇢ + : "ᇣ" U11e3 # ᅟᅠᆸ ᅟᅠᆯ = ᅟᅠᇣ + : "ᇤ" U11e4 # ᅟᅠᆸ ᅟᅠᇁ = ᅟᅠᇤ + : "ᇥ" U11e5 # ᅟᅠᆸ ᅟᅠᇂ = ᅟᅠᇥ + : "ᇦ" U11e6 # ᅟᅠᆸ ᅟᅠᆼ = ᅟᅠᇦ + : "ᇧ" U11e7 # ᅟᅠᆺ ᅟᅠᆨ = ᅟᅠᇧ + : "ᇨ" U11e8 # ᅟᅠᆺ ᅟᅠᆮ = ᅟᅠᇨ + : "ᇩ" U11e9 # ᅟᅠᆺ ᅟᅠᆯ = ᅟᅠᇩ + : "ᇪ" U11ea # ᅟᅠᆺ ᅟᅠᆸ = ᅟᅠᇪ + : "ᇬ" U11ec # ᅟᅠᆼ ᅟᅠᆨ = ᅟᅠᇬ + : "ᇮ" U11ee # ᅟᅠᆼ ᅟᅠᆼ = ᅟᅠᇮ + : "ᇯ" U11ef # ᅟᅠᆼ ᅟᅠᆿ = ᅟᅠᇯ + : "ᇱ" U11f1 # ᅟᅠᇰ ᅟᅠᆺ = ᅟᅠᇱ + : "ᇲ" U11f2 # ᅟᅠᇰ ᅟᅠᇫ = ᅟᅠᇲ + : "ᇳ" U11f3 # ᅟᅠᇁ ᅟᅠᆸ = ᅟᅠᇳ + : "ᇴ" U11f4 # ᅟᅠᇁ ᅟᅠᆼ = ᅟᅠᇴ + : "ᇵ" U11f5 # ᅟᅠᇂ ᅟᅠᆫ = ᅟᅠᇵ + : "ᇶ" U11f6 # ᅟᅠᇂ ᅟᅠᆯ = ᅟᅠᇶ + : "ᇷ" U11f7 # ᅟᅠᇂ ᅟᅠᆷ = ᅟᅠᇷ + : "ᇸ" U11f8 # ᅟᅠᇂ ᅟᅠᆸ = ᅟᅠᇸ + : "ᄢ" U1122 # ᄡᅠ ᄀᅠ = ᄢᅠ + : "ᄣ" U1123 # ᄡᅠ ᄃᅠ = ᄣᅠ + : "ᄤ" U1124 # ᄡᅠ ᄇᅠ = ᄤᅠ + : "ᄥ" U1125 # ᄡᅠ ᄉᅠ = ᄥᅠ + : "ᄦ" U1126 # ᄡᅠ ᄌᅠ = ᄦᅠ + : "ᄬ" U112c # ᄈᅠ ᄋᅠ = ᄬᅠ + : "ᄳ" U1133 # ᄲᅠ ᄀᅠ = ᄳᅠ + : "ᄴ" U1134 # ᄊᅠ ᄉᅠ = ᄴᅠ + : "ᅫ" U116b # ᅟᅪ ᅟᅵ = ᅟᅫ + : "ᅰ" U1170 # ᅟᅯ ᅟᅵ = ᅟᅰ + : "ᆋ" U118b # ᅟᅯ ᅟᅳ = ᅟᆋ + : "ᇄ" U11c4 # ᅟᅠᆪ ᅟᅠᆨ = ᅟᅠᇄ + : "ᇌ" U11cc # ᅟᅠᆰ ᅟᅠᆺ = ᅟᅠᇌ + : "ᇏ" U11cf # ᅟᅠᇎ ᅟᅠᇂ = ᅟᅠᇏ + : "ᇑ" U11d1 # ᅟᅠᆱ ᅟᅠᆨ = ᅟᅠᇑ + : "ᇒ" U11d2 # ᅟᅠᆱ ᅟᅠᆺ = ᅟᅠᇒ + : "ᇓ" U11d3 # ᅟᅠᆲ ᅟᅠᆺ = ᅟᅠᇓ + : "ᇔ" U11d4 # ᅟᅠᆲ ᅟᅠᇂ = ᅟᅠᇔ + : "ᇕ" U11d5 # ᅟᅠᆲ ᅟᅠᆼ = ᅟᅠᇕ + : "ᇖ" U11d6 # ᅟᅠᆳ ᅟᅠᆺ = ᅟᅠᇖ + : "ᇞ" U11de # ᅟᅠᇝ ᅟᅠᆺ = ᅟᅠᇞ + : "ᇭ" U11ed # ᅟᅠᇬ ᅟᅠᆨ = ᅟᅠᇭ + : "ᄢ" U1122 # ᄇᅠ ᄭᅠ = ᄢᅠ + : "ᄣ" U1123 # ᄇᅠ ᄯᅠ = ᄣᅠ + : "ᄤ" U1124 # ᄇᅠ ᄲᅠ = ᄤᅠ + : "ᄥ" U1125 # ᄇᅠ ᄊᅠ = ᄥᅠ + : "ᄦ" U1126 # ᄇᅠ ᄶᅠ = ᄦᅠ + : "ᄬ" U112c # ᄇᅠ ᄫᅠ = ᄬᅠ + : "ᄳ" U1133 # ᄉᅠ ᄞᅠ = ᄳᅠ + : "ᄴ" U1134 # ᄉᅠ ᄊᅠ = ᄴᅠ + : "ᅫ" U116b # ᅟᅩ ᅟᅢ = ᅟᅫ + : "ᅰ" U1170 # ᅟᅮ ᅟᅦ = ᅟᅰ + : "ᆋ" U118b # ᅟᅮ ᅟᅼ = ᅟᆋ + : "ᇄ" U11c4 # ᅟᅠᆨ ᅟᅠᇧ = ᅟᅠᇄ + : "ᇌ" U11cc # ᅟᅠᆯ ᅟᅠᆪ = ᅟᅠᇌ + : "ᇑ" U11d1 # ᅟᅠᆯ ᅟᅠᇚ = ᅟᅠᇑ + : "ᇒ" U11d2 # ᅟᅠᆯ ᅟᅠᇝ = ᅟᅠᇒ + : "ᇓ" U11d3 # ᅟᅠᆯ ᅟᅠᆹ = ᅟᅠᇓ + : "ᇔ" U11d4 # ᅟᅠᆯ ᅟᅠᇥ = ᅟᅠᇔ + : "ᇕ" U11d5 # ᅟᅠᆯ ᅟᅠᇦ = ᅟᅠᇕ + : "ᇖ" U11d6 # ᅟᅠᆯ ᅟᅠᆻ = ᅟᅠᇖ + : "ᇞ" U11de # ᅟᅠᆷ ᅟᅠᆻ = ᅟᅠᇞ + : "ᇭ" U11ed # ᅟᅠᆼ ᅟᅠᆩ = ᅟᅠᇭ + : "¬" U00AC # NOT SIGN + : "¬" U00AC # NOT SIGN : "ª" U00AA # FEMININE ORDINAL INDICATOR : "ª" U00AA # FEMININE ORDINAL INDICATOR : "ª" U00AA # FEMININE ORDINAL INDICATOR @@ -437,6 +446,7 @@ XCOMM group 1: cluster jamos made of three basic jamos <3> : "³" U00B3 # SUPERSCRIPT THREE : "³" U00B3 # SUPERSCRIPT THREE : "³" U00B3 # SUPERSCRIPT THREE + : "µ" U00B5 # MICRO SIGN <1> : "¹" U00B9 # SUPERSCRIPT ONE <1> : "¹" U00B9 # SUPERSCRIPT ONE : "¹" U00B9 # SUPERSCRIPT ONE @@ -445,6 +455,9 @@ XCOMM group 1: cluster jamos made of three basic jamos : "º" U00BA # MASCULINE ORDINAL INDICATOR : "º" U00BA # MASCULINE ORDINAL INDICATOR : "º" U00BA # MASCULINE ORDINAL INDICATOR + <1> <4> : "¼" U00BC # VULGAR FRACTION ONE QUARTER + <1> <2> : "½" U00BD # VULGAR FRACTION ONE HALF + <3> <4> : "¾" U00BE # VULGAR FRACTION THREE QUARTERS : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE @@ -485,6 +498,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX : "Ï" U00CF # LATIN CAPITAL LETTER I WITH DIAERESIS : "Ï" U00CF # LATIN CAPITAL LETTER I WITH DIAERESIS + : "Ð" U00D0 # LATIN CAPITAL LETTER ETH : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE @@ -502,6 +516,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "Õ" U00D5 # LATIN CAPITAL LETTER O WITH TILDE : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS + : "×" U00D7 # MULTIPLICATION SIGN : "Ø" U00D8 # LATIN CAPITAL LETTER O WITH STROKE : "Ø" U00D8 # LATIN CAPITAL LETTER O WITH STROKE : "Ù" U00D9 # LATIN CAPITAL LETTER U WITH GRAVE @@ -519,6 +534,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE + : "Þ" U00DE # LATIN CAPITAL LETTER THORN : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE @@ -559,6 +575,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX : "ï" U00EF # LATIN SMALL LETTER I WITH DIAERESIS : "ï" U00EF # LATIN SMALL LETTER I WITH DIAERESIS + : "ð" U00F0 # LATIN SMALL LETTER ETH : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE @@ -576,6 +593,8 @@ XCOMM group 1: cluster jamos made of three basic jamos : "õ" U00F5 # LATIN SMALL LETTER O WITH TILDE : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS + : "÷" U00F7 # DIVISION SIGN + : "÷" U00F7 # DIVISION SIGN : "ø" U00F8 # LATIN SMALL LETTER O WITH STROKE : "ø" U00F8 # LATIN SMALL LETTER O WITH STROKE : "ù" U00F9 # LATIN SMALL LETTER U WITH GRAVE @@ -593,6 +612,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE + : "þ" U00FE # LATIN SMALL LETTER THORN : "ÿ" U00FF # LATIN SMALL LETTER Y WITH DIAERESIS : "ÿ" U00FF # LATIN SMALL LETTER Y WITH DIAERESIS : "Ā" U0100 # LATIN CAPITAL LETTER A WITH MACRON @@ -713,6 +733,8 @@ XCOMM group 1: cluster jamos made of three basic jamos : "į" U012F # LATIN SMALL LETTER I WITH OGONEK : "İ" U0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE : "İ" U0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE + : "ı" U0131 # LATIN SMALL LETTER DOTLESS I + : "ı" U0131 # LATIN SMALL LETTER DOTLESS I : "Ĵ" U0134 # LATIN CAPITAL LETTER J WITH CIRCUMFLEX : "Ĵ" U0134 # LATIN CAPITAL LETTER J WITH CIRCUMFLEX : "ĵ" U0135 # LATIN SMALL LETTER J WITH CIRCUMFLEX @@ -721,6 +743,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH CEDILLA : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA + : "ĸ" U0138 # LATIN SMALL LETTER KRA : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE @@ -757,6 +780,8 @@ XCOMM group 1: cluster jamos made of three basic jamos : "Ň" U0147 # LATIN CAPITAL LETTER N WITH CARON : "ň" U0148 # LATIN SMALL LETTER N WITH CARON : "ň" U0148 # LATIN SMALL LETTER N WITH CARON + : "Ŋ" U014A # LATIN CAPITAL LETTER ENG + : "ŋ" U014B # LATIN SMALL LETTER ENG : "Ō" U014C # LATIN CAPITAL LETTER O WITH MACRON : "Ō" U014C # LATIN CAPITAL LETTER O WITH MACRON : "Ō" U014C # LATIN CAPITAL LETTER O WITH MACRON @@ -1085,7 +1110,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE - : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE + : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE @@ -1097,7 +1122,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE - : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE + : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE @@ -1243,6 +1268,7 @@ XCOMM group 1: cluster jamos made of three basic jamos : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON + : "ə" U0259 # LATIN SMALL LETTER SCHWA : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE : "ʡ" U02A1 # LATIN LETTER GLOTTAL STOP WITH STROKE diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre index 91426f8..848a632 100644 --- a/nls/locale.alias.pre +++ b/nls/locale.alias.pre @@ -5,7 +5,7 @@ XCOMM Each alias name is described within one line. XCOMM The first word is the alias name (simplified locale name) XCOMM the second word is full locale name. XCOMM -XCOMM $XFree86: xc/nls/locale.alias,v 1.64 2003/12/18 04:14:22 dawes Exp $ +XCOMM $XFree86: xc/nls/locale.alias,v 1.65 2004/01/03 03:31:00 dawes Exp $ XCOMM POSIX: C @@ -419,6 +419,7 @@ kl_GL.iso885915: kl_GL.ISO8859-15 ko: ko_KR.eucKR ko_KR: ko_KR.eucKR ko_KR.EUC: ko_KR.eucKR +ko_KR.EUC-KR: ko_KR.eucKR ko_KR.euc: ko_KR.eucKR ko_KR.euckr: ko_KR.eucKR ko_KR.utf8: ko_KR.UTF-8 diff --git a/src/CrGlCur.c b/src/CrGlCur.c index 05e46a2..6261460 100644 --- a/src/CrGlCur.c +++ b/src/CrGlCur.c @@ -24,12 +24,16 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.7 2003/04/13 19:22:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.8 2004/01/13 19:08:04 dawes Exp $ */ #include "Xlibint.h" #ifdef USE_DYNAMIC_XCURSOR +#ifdef __UNIXOS2__ +#define RTLD_LAZY 1 +#define LIBXCURSOR "Xcursor.dll" +#endif #include #include #if defined(hpux) diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c index 9b63519..01bfb9e 100644 --- a/src/xlibi18n/ICWrap.c +++ b/src/xlibi18n/ICWrap.c @@ -64,7 +64,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ICWrap.c,v 1.10 2003/04/25 14:12:38 tsi Exp $ */ +/* $XFree86: xc/lib/X11/ICWrap.c,v 1.11 2004/01/04 18:44:46 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" @@ -346,7 +346,7 @@ void XSetICFocus(ic) XIC ic; { - if (ic->core.im) + if (ic && ic->core.im) (*ic->methods->set_focus) (ic); } -- cgit v1.2.3