diff -Naur xc/doc/specs/i18n/Framework.ms xc.tis/doc/specs/i18n/Framework.ms --- xc/doc/specs/i18n/Framework.ms Tue Jan 2 13:49:25 2001 +++ xc.tis/doc/specs/i18n/Framework.ms Tue Jan 2 13:51:57 2001 @@ -650,7 +650,7 @@ @defined as GR .\" CNS11643.1986-0:GL .\" CNS11643.1986-1:GL -.\" TIS620.2533-1:GR +.\" TIS620-0:GR .sp 6p _ .TE diff -Naur xc/extras/X-TrueType/ISO8859.11/main.c xc.tis/extras/X-TrueType/ISO8859.11/main.c --- xc/extras/X-TrueType/ISO8859.11/main.c Tue Jan 2 13:49:51 2001 +++ xc.tis/extras/X-TrueType/ISO8859.11/main.c Tue Jan 2 13:51:57 2001 @@ -49,6 +49,7 @@ static CharSetRelation const charSetRelations[] = { { "iso8859", NULL, "11", ISO8859_11, { 0x20, 0xff, 0, 0, 0x20 } }, + { "tis620", NULL, "0", ISO8859_11, { 0x20, 0xff, 0, 0, 0x20 } }, { "tis620", "2529", NULL, ISO8859_11, { 0x20, 0xff, 0, 0, 0x20 } }, { "tis620", "2533", NULL, ISO8859_11, { 0x20, 0xff, 0, 0, 0x20 } }, { NULL, NULL, NULL, 0, { 0, 0, 0, 0, 0 } } diff -Naur xc/fonts/encodings/iso8859-11.enc xc.tis/fonts/encodings/iso8859-11.enc --- xc/fonts/encodings/iso8859-11.enc Tue Jan 2 13:50:47 2001 +++ xc.tis/fonts/encodings/iso8859-11.enc Tue Jan 2 13:56:32 2001 @@ -1,6 +1,8 @@ STARTENCODING iso8859-11 +ALIAS tis620-0 ALIAS tis620.2529-1 -ALIAS 620.2533-0 +ALIAS tis620.2533-1 +ALIAS tis620.2533-0 STARTMAPPING unicode 0xA1 0x0E01 # THAI CHARACTER KO KAI 0xA2 0x0E02 # THAI CHARACTER KHO KHAI diff -Naur xc/lib/X11/XKBCvt.c xc.tis/lib/X11/XKBCvt.c --- xc/lib/X11/XKBCvt.c Tue Jan 2 13:47:09 2001 +++ xc.tis/lib/X11/XKBCvt.c Tue Jan 2 13:51:57 2001 @@ -266,7 +266,7 @@ */ #define CHARSET_FILE "/usr/lib/X11/input/charsets" -static char *_XkbKnownLanguages = "c=ascii:da,de,en,es,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:eo=iso8859-3:sp=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:he=iso8859-8:tr=iso8859-9:lt,lv=iso8859-13:et,fi=iso8859-15:ru=koi8-r:uk=koi8-u:th,th_TH,th_TH.TACTIS=tactis:hy=armscii-8:vi=tcvn-5712:ka=georgian-academy:be,bg=microsoft-cp1251"; +static char *_XkbKnownLanguages = "c=ascii:da,de,en,es,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:eo=iso8859-3:sp=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:he=iso8859-8:tr=iso8859-9:lt,lv=iso8859-13:et,fi=iso8859-15:ru=koi8-r:uk=koi8-u:th,th_TH,th_TH.TIS620=tis620:hy=armscii-8:vi=tcvn-5712:ka=georgian-academy:be,bg=microsoft-cp1251"; char * _XkbGetCharset() diff -Naur xc/lib/X11/XimThai.h xc.tis/lib/X11/XimThai.h --- xc/lib/X11/XimThai.h Tue Jan 2 13:47:10 2001 +++ xc.tis/lib/X11/XimThai.h Tue Jan 2 13:51:57 2001 @@ -61,7 +61,7 @@ #include -/* Classification of characters in TACTIS according to WTT */ +/* Classification of characters in TIS620 according to WTT */ #define CTRL 0 /* control chars */ #define NON 1 /* non composibles */ diff -Naur xc/lib/X11/imConv.c xc.tis/lib/X11/imConv.c --- xc/lib/X11/imConv.c Tue Jan 2 13:47:10 2001 +++ xc.tis/lib/X11/imConv.c Tue Jan 2 13:51:57 2001 @@ -76,7 +76,7 @@ static struct SubstRec SubstTable[] = { {"STRING", "ISO8859-1"}, - {"TACTIS", "TIS620.2533-1"}, + {"TIS620", "TIS620-0"}, {"UTF-8", "ISO10646-1"} }; #define num_substitute (sizeof SubstTable / sizeof SubstTable[0]) diff -Naur xc/lib/X11/lcCT.c xc.tis/lib/X11/lcCT.c --- xc/lib/X11/lcCT.c Tue Jan 2 13:47:10 2001 +++ xc.tis/lib/X11/lcCT.c Tue Jan 2 13:51:57 2001 @@ -78,7 +78,7 @@ { "ISO8859-16:GR", /* ISO-8859-16 226 */ "\033-f" }, { "JISX0201.1976-0:GL", /* ISO-646-JP 14 */ "\033(J" }, { "JISX0201.1976-0:GR", "\033)I" }, - { "TIS620.2533-1:GR", /* TIS-620 166 */ "\033-T" }, + { "TIS620-0:GR", /* TIS-620 166 */ "\033-T" }, /* Registered character sets with two byte per character */ { "GB2312.1980-0:GL", /* GB_2312-80 58 */ "\033$(A" }, diff -Naur xc/lib/X11/lcUTF8.c xc.tis/lib/X11/lcUTF8.c --- xc/lib/X11/lcUTF8.c Tue Jan 2 13:47:11 2001 +++ xc.tis/lib/X11/lcUTF8.c Tue Jan 2 13:51:57 2001 @@ -267,7 +267,7 @@ { "JISX0201.1976-0", NULLQUARK, jisx0201_mbtowc, jisx0201_wctomb }, - { "TIS620.2533-1", NULLQUARK, + { "TIS620-0", NULLQUARK, tis620_mbtowc, tis620_wctomb }, { "GB2312.1980-0", NULLQUARK, diff -Naur xc/lib/X11/lcUniConv/8bit_tab_to_h.c xc.tis/lib/X11/lcUniConv/8bit_tab_to_h.c --- xc/lib/X11/lcUniConv/8bit_tab_to_h.c Tue Jan 2 13:47:11 2001 +++ xc.tis/lib/X11/lcUniConv/8bit_tab_to_h.c Tue Jan 2 13:51:58 2001 @@ -19,7 +19,7 @@ * ./8bit_tab_to_h ISO-8859-14 iso8859_14 < tab8859_14 * ./8bit_tab_to_h ISO-8859-15 iso8859_15 < tab8859_15 * ./8bit_tab_to_h JISX0201.1976-0 jisx0201 < jis0201 - * ./8bit_tab_to_h TIS620.2533-1 tis620 < tabtis620 + * ./8bit_tab_to_h TIS620-0 tis620 < tabtis620 * ./8bit_tab_to_h KOI8-R koi8_r < tabkoi8_r * ./8bit_tab_to_h KOI8-U koi8_u < tabkoi8_u * ./8bit_tab_to_h ARMSCII-8 armscii_8 < tabarmscii_8 diff -Naur xc/lib/X11/lcUniConv/tis620.h xc.tis/lib/X11/lcUniConv/tis620.h --- xc/lib/X11/lcUniConv/tis620.h Tue Jan 2 13:47:11 2001 +++ xc.tis/lib/X11/lcUniConv/tis620.h Tue Jan 2 13:51:58 2001 @@ -1,7 +1,7 @@ /* $XFree86: xc/lib/X11/lcUniConv/tis620.h,v 1.3 2000/11/29 17:40:35 dawes Exp $ */ /* - * TIS620.2533-1 + * TIS620-0 */ static const unsigned short tis620_2uni[96] = { diff -Naur xc/nls/Compose/Imakefile xc.tis/nls/Compose/Imakefile --- xc/nls/Compose/Imakefile Tue Jan 2 13:48:55 2001 +++ xc.tis/nls/Compose/Imakefile Tue Jan 2 13:51:58 2001 @@ -53,7 +53,7 @@ ComposeTarget(koi8-c) ComposeTarget(mk_MK.UTF-8) ComposeTarget(mulelao-1) -ComposeTarget(th_TH.TACTIS) +ComposeTarget(th_TH) ComposeTarget(vi_VN.tcvn) ComposeTarget(vi_VN.viscii) ComposeTarget(zh) diff -Naur xc/nls/Compose/th_TH xc.tis/nls/Compose/th_TH --- xc/nls/Compose/th_TH Thu Jan 1 07:00:00 1970 +++ xc.tis/nls/Compose/th_TH Tue Jan 2 13:51:58 2001 @@ -0,0 +1,15 @@ +# +# th_TH Compose Sequence +# +# Sequence Definition +# +# $XFree86:$ +# +# This file currently has no entries. It appears that a compose file (even +# just an empty one) is required for the appropriate keysyms to work for +# this encoding. +# +# Means +# Special Character + +# End of Sequence Definition diff -Naur xc/nls/Compose/th_TH.TACTIS xc.tis/nls/Compose/th_TH.TACTIS --- xc/nls/Compose/th_TH.TACTIS Tue Jan 2 13:48:55 2001 +++ xc.tis/nls/Compose/th_TH.TACTIS Thu Jan 1 07:00:00 1970 @@ -1,15 +0,0 @@ -# -# th_TH.TACTIS Compose Sequence -# -# Sequence Definition -# -# $XFree86: xc/nls/Compose/th_TH.TACTIS,v 1.1 1999/08/28 09:00:39 dawes Exp $ -# -# This file currently has no entries. It appears that a compose file (even -# just an empty one) is required for the appropriate keysyms to work for -# this encoding. -# -# Means -# Special Character - -# End of Sequence Definition diff -Naur xc/nls/XLC_LOCALE/Imakefile xc.tis/nls/XLC_LOCALE/Imakefile --- xc/nls/XLC_LOCALE/Imakefile Tue Jan 2 13:48:55 2001 +++ xc.tis/nls/XLC_LOCALE/Imakefile Tue Jan 2 13:52:41 2001 @@ -87,7 +87,7 @@ LTarget(zh) LTarget(zh_TW) LTarget(zh_TW.big5) -LTarget(th_TH.TACTIS) +LTarget(th_TH) LTarget(en_US.UTF-8) #ifdef UXPArchitecture LTarget(ja.U90) diff -Naur xc/nls/XLC_LOCALE/th_TH xc.tis/nls/XLC_LOCALE/th_TH --- xc/nls/XLC_LOCALE/th_TH Thu Jan 1 07:00:00 1970 +++ xc.tis/nls/XLC_LOCALE/th_TH Tue Jan 2 13:52:41 2001 @@ -0,0 +1,67 @@ +XCOMM $XConsortium: th_TH$ +XCOMM XLocale Database Sample for th_TH +XCOMM +XCOMM $XFree86:$ +XCOMM +XCOMM Modified from origial th_TH.TACTIS + +XCOMM +XCOMM XLC_FONTSET category +XCOMM +XLC_FONTSET +XCOMM fs0 class (7 bit ASCII) +fs0 { + charset ISO8859-1:GL + font ISO8859-1:GL +} +XCOMM fs1 class (Thai) +fs1 { + charset TIS620-0:GR + font TIS620-0:GR +} +END XLC_FONTSET + +XCOMM +XCOMM XLC_XLOCALE category +XCOMM +XLC_XLOCALE + +encoding_name TIS620 +mb_cur_max 1 +state_depend_encoding False + +#if WCHAR32 +wc_encoding_mask \x30000000 +wc_shift_bits 7 +#else +wc_encoding_mask \x00008080 +wc_shift_bits 8 +#endif + +#ifndef X_LOCALE +use_stdc_env True +force_convert_to_mb True +#endif + +XCOMM cs0 class +cs0 { + side GL:Default + length 1 + wc_encoding \x00000000 + ct_encoding ISO8859-1:GL +} + + +XCOMM cs1 class +cs1 { + side GR:Default + length 1 +#if WCHAR32 + wc_encoding \x30000000 +#else + wc_encoding \x00008080 +#endif + ct_encoding TIS620-0:GR +} + +END XLC_XLOCALE diff -Naur xc/nls/XLC_LOCALE/th_TH.TACTIS xc.tis/nls/XLC_LOCALE/th_TH.TACTIS --- xc/nls/XLC_LOCALE/th_TH.TACTIS Tue Jan 2 13:48:55 2001 +++ xc.tis/nls/XLC_LOCALE/th_TH.TACTIS Thu Jan 1 07:00:00 1970 @@ -1,66 +0,0 @@ -XCOMM $XConsortium: th_TH.TACTIS /main/7 1996/09/28 16:52:32 rws $ -XCOMM XLocale Database Sample for th_TH.TACTIS -XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/th_TH.TACTIS,v 1.2 1999/06/06 14:06:02 dawes Exp $ -XCOMM - -XCOMM -XCOMM XLC_FONTSET category -XCOMM -XLC_FONTSET -XCOMM fs0 class (7 bit ASCII) -fs0 { - charset ISO8859-1:GL - font ISO8859-1:GL -} -XCOMM fs1 class (Thai) -fs1 { - charset TIS620.2533-1:GR - font TIS620.2533-1:GR -} -END XLC_FONTSET - -XCOMM -XCOMM XLC_XLOCALE category -XCOMM -XLC_XLOCALE - -encoding_name TACTIS -mb_cur_max 1 -state_depend_encoding False - -#if WCHAR32 -wc_encoding_mask \x30000000 -wc_shift_bits 7 -#else -wc_encoding_mask \x00008080 -wc_shift_bits 8 -#endif - -#ifndef X_LOCALE -use_stdc_env True -force_convert_to_mb True -#endif - -XCOMM cs0 class -cs0 { - side GL:Default - length 1 - wc_encoding \x00000000 - ct_encoding ISO8859-1:GL -} - - -XCOMM cs1 class -cs1 { - side GR:Default - length 1 -#if WCHAR32 - wc_encoding \x30000000 -#else - wc_encoding \x00008080 -#endif - ct_encoding TIS620.2533-1:GR -} - -END XLC_XLOCALE diff -Naur xc/nls/compose.dir xc.tis/nls/compose.dir --- xc/nls/compose.dir Tue Jan 2 13:48:55 2001 +++ xc.tis/nls/compose.dir Tue Jan 2 13:53:16 2001 @@ -196,7 +196,7 @@ tscii-0/Compose ta_IN.TSCII-0 koi8-c/Compose tg_TJ.KOI8-C iso8859-1/Compose tl_PH.ISO8859-1 -th_TH.TACTIS/Compose th_TH.TACTIS +th_TH/Compose th_TH.TIS620 iso8859-9/Compose tr_TR.ISO8859-9 tatar-cyr/Compose tt_RU.TATAR-CYR koi8-c/Compose tt_RU.KOI8-C @@ -402,7 +402,7 @@ tscii-0/Compose: ta_IN.TSCII-0 koi8-c/Compose: tg_TJ.KOI8-C iso8859-1/Compose: tl_PH.ISO8859-1 -th_TH.TACTIS/Compose: th_TH.TACTIS +th_TH/Compose: th_TH.TIS620 iso8859-9/Compose: tr_TR.ISO8859-9 tatar-cyr/Compose: tt_RU.TATAR-CYR koi8-c/Compose: tt_RU.KOI8-C diff -Naur xc/nls/locale.alias xc.tis/nls/locale.alias --- xc/nls/locale.alias Tue Jan 2 13:48:55 2001 +++ xc.tis/nls/locale.alias Tue Jan 2 13:53:16 2001 @@ -421,9 +421,9 @@ sv_SE.iso88591 sv_SE.ISO8859-1 sv_SE.ISO_8859-1 sv_SE.ISO8859-1 sv_SE.iso885915 sv_SE.ISO8859-15 -th th_TH.TACTIS -th_TH th_TH.TACTIS -th_TH.tis620 th_TH.TACTIS +th th_TH.TIS620 +th_TH th_TH.TIS620 +th_TH.tis620 th_TH.TIS620 tr tr_TR.ISO8859-9 tr_TR tr_TR.ISO8859-9 tr_TR.iso88599 tr_TR.ISO8859-9 @@ -989,9 +989,9 @@ tg: tg_TJ.KOI8-C tg_TJ: tg_TJ.KOI8-C tg_TJ.koi8c: tg_TJ.KOI8-C -th: th_TH.TACTIS -th_TH: th_TH.TACTIS -th_TH.tis620: th_TH.TACTIS +th: th_TH.TIS620 +th_TH: th_TH.TIS620 +th_TH.tis620: th_TH.TIS620 tl: tl_PH.ISO8859-1 tl_PH: tl_PH.ISO8859-1 tl_PH.iso88591: tl_PH.ISO8859-1 diff -Naur xc/nls/locale.dir xc.tis/nls/locale.dir --- xc/nls/locale.dir Tue Jan 2 13:48:55 2001 +++ xc.tis/nls/locale.dir Tue Jan 2 13:53:16 2001 @@ -182,7 +182,7 @@ iso8859-15/XLC_LOCALE sv_SE.ISO8859-15 tscii-0/XLC_LOCALE ta_IN.TSCII-0 koi8-c/XLC_LOCALE tg_TJ.KOI8-C -th_TH.TACTIS/XLC_LOCALE th_TH.TACTIS +th_TH/XLC_LOCALE th_TH.TIS620 iso8859-1/XLC_LOCALE tl_PH.ISO8859-1 iso8859-9/XLC_LOCALE tr_TR.ISO8859-9 tatar-cyr/XLC_LOCALE tt_RU.TATAR-CYR @@ -516,7 +516,7 @@ iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15 tscii-0/XLC_LOCALE: ta_IN.TSCII-0 koi8-c/XLC_LOCALE: tg_TJ.KOI8-C -th_TH.TACTIS/XLC_LOCALE: th_TH.TACTIS +th_TH/XLC_LOCALE: th_TH.TIS620 iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1 iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9 tatar-cyr/XLC_LOCALE: tt_RU.TATAR-CYR