diff -u -r -N nls.old/Compose/Imakefile nls/Compose/Imakefile --- nls.old/Compose/Imakefile 2003-10-28 11:56:41.000000000 +0100 +++ nls/Compose/Imakefile 2003-10-28 11:57:01.000000000 +0100 @@ -59,6 +59,8 @@ ComposeTarget(vi_VN.viscii) ComposeTarget(zh_CN) ComposeTarget(zh_CN.gbk) +ComposeTarget(zh_CN.gb18030) ComposeTarget(zh_TW) ComposeTarget(zh_TW.big5) - +ComposeTarget(zh_HK.big5) +ComposeTarget(zh_HK.big5hkscs) diff -u -r -N nls.old/Compose/zh_CN.gb18030 nls/Compose/zh_CN.gb18030 --- nls.old/Compose/zh_CN.gb18030 1970-01-01 01:00:00.000000000 +0100 +++ nls/Compose/zh_CN.gb18030 2003-10-28 11:57:01.000000000 +0100 @@ -0,0 +1,15 @@ +XCOMM +XCOMM zh_CN.GB18030 Compose Sequence +XCOMM +XCOMM Sequence Definition +XCOMM +XCOMM $XFree86: xc/nls/Compose/zh_CN.gb18030,v 1.2 2001/04/26 21:09:40 dawes Exp $ +XCOMM +XCOMM This file currently has no entries. It appears that a compose file (even +XCOMM just an empty one) is required for the appropriate keysyms to work for +XCOMM this encoding. +XCOMM +XCOMM Means +XCOMM Special Character + +XCOMM End of Sequence Definition diff -u -r -N nls.old/Compose/zh_HK.big5 nls/Compose/zh_HK.big5 --- nls.old/Compose/zh_HK.big5 1970-01-01 01:00:00.000000000 +0100 +++ nls/Compose/zh_HK.big5 2003-10-28 11:57:01.000000000 +0100 @@ -0,0 +1,13 @@ +XCOMM +XCOMM zh_HK.big5 Compose Sequence +XCOMM +XCOMM Sequence Definition +XCOMM +XCOMM This file currently has no entries. It appears that a compose file (even +XCOMM just an empty one) is required for the appropriate keysyms to work for +XCOMM this encoding. +XCOMM +XCOMM Means +XCOMM Special Character + +XCOMM End of Sequence Definition diff -u -r -N nls.old/Compose/zh_HK.big5hkscs nls/Compose/zh_HK.big5hkscs --- nls.old/Compose/zh_HK.big5hkscs 1970-01-01 01:00:00.000000000 +0100 +++ nls/Compose/zh_HK.big5hkscs 2003-10-28 11:57:01.000000000 +0100 @@ -0,0 +1,13 @@ +XCOMM +XCOMM zh_HK.big5hkscs Compose Sequence +XCOMM +XCOMM Sequence Definition +XCOMM +XCOMM This file currently has no entries. It appears that a compose file (even +XCOMM just an empty one) is required for the appropriate keysyms to work for +XCOMM this encoding. +XCOMM +XCOMM Means +XCOMM Special Character + +XCOMM End of Sequence Definition diff -u -r -N nls.old/XI18N_OBJS/zh_CN.gb18030 nls/XI18N_OBJS/zh_CN.gb18030 --- nls.old/XI18N_OBJS/zh_CN.gb18030 1970-01-01 01:00:00.000000000 +0100 +++ nls/XI18N_OBJS/zh_CN.gb18030 2003-10-28 11:57:04.000000000 +0100 @@ -0,0 +1,7 @@ +# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME +# +# XI18N objects table for zh_CN.gb18030 locale +# +XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister +XOM common/xomGeneric _XomGenericOpenOM # XOM_open diff -u -r -N nls.old/XI18N_OBJS/zh_HK.UTF-8 nls/XI18N_OBJS/zh_HK.UTF-8 --- nls.old/XI18N_OBJS/zh_HK.UTF-8 1970-01-01 01:00:00.000000000 +0100 +++ nls/XI18N_OBJS/zh_HK.UTF-8 2003-10-28 11:57:04.000000000 +0100 @@ -0,0 +1,7 @@ +# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME +# +# XI18N objects table for zh_HK.UTF-8 locale +# +XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister +XOM common/xomGeneric _XomGenericOpenOM # XOM_open diff -u -r -N nls.old/XI18N_OBJS/zh_HK.big5 nls/XI18N_OBJS/zh_HK.big5 --- nls.old/XI18N_OBJS/zh_HK.big5 1970-01-01 01:00:00.000000000 +0100 +++ nls/XI18N_OBJS/zh_HK.big5 2003-10-28 11:57:04.000000000 +0100 @@ -0,0 +1,7 @@ +# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME +# +# XI18N objects table for zh_HK.big5 locale +# +XLC common/xlibi18n _XlcGenericLoader # XLC_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister +XOM common/xomGeneric _XomGenericOpenOM # XOM_open diff -u -r -N nls.old/XLC_LOCALE/Imakefile nls/XLC_LOCALE/Imakefile --- nls.old/XLC_LOCALE/Imakefile 2003-10-28 11:56:41.000000000 +0100 +++ nls/XLC_LOCALE/Imakefile 2003-10-28 11:57:04.000000000 +0100 @@ -77,9 +77,11 @@ LTarget(vi_VN.viscii) LTarget(zh_CN) LTarget(zh_CN.gbk) +LTarget(zh_CN.gb18030) LTarget(zh_CN.UTF-8) LTarget(zh_HK.big5) LTarget(zh_HK.big5hkscs) +LTarget(zh_HK.UTF-8) LTarget(zh_TW) LTarget(zh_TW.big5) LTarget(zh_TW.UTF-8) diff -u -r -N nls.old/XLC_LOCALE/zh_CN.gb18030 nls/XLC_LOCALE/zh_CN.gb18030 --- nls.old/XLC_LOCALE/zh_CN.gb18030 1970-01-01 01:00:00.000000000 +0100 +++ nls/XLC_LOCALE/zh_CN.gb18030 2003-10-28 11:57:04.000000000 +0100 @@ -0,0 +1,106 @@ +XCOMM XFree86 NLS for Chinese encoding GB18030 +XCOMM Modified from xc/nls/XLC_LOCALE/en_US.UTF-8 +XCOMM by James Su + +XCOMM +XCOMM XLC_FONTSET category +XCOMM +XLC_FONTSET + +on_demand_loading True + +object_name generic + +XCOMM We leave the legacy encodings in for the moment, because we don't +XCOMM have that many ISO10646 fonts yet. +XCOMM fs0 class (7 bit ASCII) +fs0 { + charset { + name ISO8859-1:GL + } + font { + primary ISO8859-1:GL + vertical_rotate all + } +} + +XCOMM fs1 class (ISO8859 families) +fs1 { + charset { + name ISO8859-1:GR + } + font { + primary ISO8859-1:GR + } +} + +XCOMM fs2 class (Chinese Han Character) +fs2 { + charset { + name GB2312.1980-0:GL + } + font { + primary GB2312.1980-0:GL + } +} + +XCOMM fs3 class (Chinese Han Character GBK) +fs3 { + charset { + name GBK-0:GLGR + } + font { + primary GBK-0:GLGR + substitute GB13000.1993-1:GLGR + } +} + +XCOMM fs4 class +fs4 { + charset { + name ISO10646-1 + } + font { + primary GB18030-0 + substitute GBK2K-0 + } +} +END XLC_FONTSET + +XCOMM +XCOMM XLC_XLOCALE category +XCOMM +XLC_XLOCALE + +encoding_name GB18030 +mb_cur_max 4 +state_depend_encoding False + +XCOMM cs0 class +cs0 { + side GL:Default + length 1 + ct_encoding ISO8859-1:GL +} + +XCOMM cs1 class +cs1 { + side GR:Default + length 1 + ct_encoding ISO8859-1:GR +} + +XCOMM cs2 class +cs2 { + side GR + length 2 + ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR +} + +XCOMM cs3 class +cs3 { + side none + ct_encoding ISO10646-1 +} + +END XLC_XLOCALE diff -u -r -N nls.old/XLC_LOCALE/zh_HK.UTF-8 nls/XLC_LOCALE/zh_HK.UTF-8 --- nls.old/XLC_LOCALE/zh_HK.UTF-8 1970-01-01 01:00:00.000000000 +0100 +++ nls/XLC_LOCALE/zh_HK.UTF-8 2003-10-28 11:57:04.000000000 +0100 @@ -0,0 +1,96 @@ +XCOMM XFree86 NLS for Chinese locale zh_HK.UTF-8 +XCOMM Modified from xc/nls/XLC_LOCALE/en_US.UTF-8 +XCOMM by James Su + +XCOMM +XCOMM XLC_FONTSET category +XCOMM +XLC_FONTSET + +on_demand_loading True + +object_name generic + +XCOMM We leave the legacy encodings in for the moment, because we don't +XCOMM have that many ISO10646 fonts yet. +XCOMM fs0 class (7 bit ASCII) +fs0 { + charset { + name ISO8859-1:GL + } + font { + primary ISO8859-1:GL + vertical_rotate all + } +} + +XCOMM fs1 class (ISO8859 families) +fs1 { + charset { + name ISO8859-1:GR + } + font { + primary ISO8859-1:GR + } +} + +XCOMM fs2 class +fs2 { + charset { + name BIG5HKSCS-0:GLGR + } + font { + primary BIG5HKSCS-0:GLGR + substitute BIG5-0:GLGR + } +} + +XCOMM fs3 class +fs3 { + charset { + name ISO10646-1 + } + font { + primary ISO10646-1 + } +} +END XLC_FONTSET + +XCOMM +XCOMM XLC_XLOCALE category +XCOMM +XLC_XLOCALE + +encoding_name UTF-8 +mb_cur_max 6 +state_depend_encoding False + +XCOMM cs0 class +cs0 { + side GL:Default + length 1 + ct_encoding ISO8859-1:GL +} + +XCOMM cs1 class +cs1 { + side GR:Default + length 1 + ct_encoding ISO8859-1:GR +} + +XCOMM cs2 class +cs2 { + side none + length 2 + ct_encoding BIG5HKSCS-0:GLGR +} + +XCOMM cs3 class +cs3 { + side none + ct_encoding ISO10646-1 +} + +END XLC_XLOCALE + diff -u -r -N nls.old/XLC_LOCALE/zh_HK.big5hkscs nls/XLC_LOCALE/zh_HK.big5hkscs --- nls.old/XLC_LOCALE/zh_HK.big5hkscs 2003-10-28 11:56:41.000000000 +0100 +++ nls/XLC_LOCALE/zh_HK.big5hkscs 2003-10-28 11:57:04.000000000 +0100 @@ -81,7 +81,7 @@ cs2 { side none length 2 - byte1 \xc6 + byte1 \xc6,\xc6 byte2 \x40,\x7e wc_encoding \x00008000 @@ -95,7 +95,7 @@ cs3 { side none length 2 - byte1 \xf9 + byte1 \xf9,\xf9 byte2 \x40,\xd5 wc_encoding \x00008000 @@ -124,7 +124,7 @@ cs5 { side none length 2 - byte1 \xc6 + byte1 \xc6,\xc6 byte2 \xa1,\xfe wc_encoding \x00008000 @@ -138,7 +138,7 @@ cs6 { side none length 2 - byte1 \xf9 + byte1 \xf9,\xf9 byte2 \xd6,\xfe wc_encoding \x00008000 diff -u -r -N nls.old/compose.dir nls/compose.dir --- nls.old/compose.dir 2003-10-28 11:56:41.000000000 +0100 +++ nls/compose.dir 2003-10-28 11:57:04.000000000 +0100 @@ -213,6 +213,11 @@ zh_CN/Compose: zh_CN.eucCN zh_CN/Compose: zh_CN.GB2312 zh_CN.gbk/Compose: zh_CN.GBK +zh_CN.gb18030/Compose: zh_CN.GB18030 +zh_HK.big5/Compose: zh_HK.big5 +zh_HK.big5/Compose: zh_HK.Big5 +zh_HK.big5hkscs/Compose: zh_HK.big5hkscs +zh_HK.big5hkscs/Compose: zh_HK.Big5HKSCS zh_TW.big5/Compose: zh_TW.big5 zh_TW.big5/Compose: zh_TW.Big5 zh_TW/Compose: zh_TW.eucTW --- nls/locale.alias.i18n-nls 2004-03-08 17:28:30.541264729 +0100 +++ nls/locale.alias 2004-03-08 17:36:40.873530826 +0100 @@ -826,18 +826,14 @@ zh_CN.EUC: zh_CN.eucCN zh_CN.GB2312: zh_CN.gb2312 zh_CN.GBK: zh_CN.gbk +zh_CN.GB18030: zh_CN.gb18030 zh_CN.big5: zh_TW.big5 zh_CN.euc: zh_CN.eucCN zh_CN.utf8: zh_CN.UTF-8 ZH_CN.UTF-8: zh_CN.UTF-8 zh_HK: zh_HK.big5hkscs -zh_HK.Big5hkscs: zh_HK.big5hkscs -zh_HK.Big5-hkscs: zh_HK.big5hkscs -zh_HK.Big5_hkscs: zh_HK.big5hkscs -zh_HK.Big5HKSCS: zh_HK.big5hkscs -zh_HK.BIG5-HKSCS: zh_HK.big5hkscs -zh_HK.BIG5_HKSCS: zh_HK.big5hkscs zh_HK.Big5: zh_HK.big5 +zh_HK.Big5HKSCS: zh_HK.big5hkscs zh_HK.utf8: zh_HK.UTF-8 ZH_HK.UTF-8: zh_CN.UTF-8 ZH_SG.UTF-8: zh_SG.UTF-8 --- nls/locale.dir.i18n-nls 2003-12-18 18:05:27.000000000 +0100 +++ nls/locale.dir 2003-12-22 08:35:39.243330891 +0100 @@ -220,11 +220,10 @@ zh_CN/XLC_LOCALE: zh_CN.eucCN zh_CN/XLC_LOCALE: zh_CN.gb2312 zh_CN.gbk/XLC_LOCALE: zh_CN.gbk +zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030 zh_HK.big5/XLC_LOCALE: zh_HK.big5 -zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5-hkscs -zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs -zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5HKSCS +zh_HK.UTF-8/XLC_LOCALE: zh_HK.UTF-8 zh_TW.big5/XLC_LOCALE: zh_TW.big5 zh_TW/XLC_LOCALE: zh_TW.eucTW XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress. --- nls/XI18N_OBJS/Imakefile.old 2004-02-03 23:28:02.827933978 +0000 +++ nls/XI18N_OBJS/Imakefile 2004-02-03 23:22:13.319914400 +0000 @@ -62,7 +62,9 @@ XI18NTarget(zh_CN) XI18NTarget(zh_CN.gbk) XI18NTarget(zh_CN.UTF-8) +XI18NTarget(zh_CN.gb18030) XI18NTarget(zh_HK.big5hkscs) +XI18NTarget(zh_HK.big5) XI18NTarget(zh_TW) XI18NTarget(zh_TW.big5) XI18NTarget(th_TH) diff -u -r -N ../xc.old/nls/Compose/Imakefile ./nls/Compose/Imakefile --- ../xc.old/nls/Compose/Imakefile 2004-04-04 10:45:30.286320959 +0200 +++ ./nls/Compose/Imakefile 2004-04-04 10:45:58.842036008 +0200 @@ -61,7 +61,8 @@ ComposeTarget(zh_CN) ComposeTarget(zh_CN.gbk) ComposeTarget(zh_CN.gb18030) -ComposeTarget(zh_TW) -ComposeTarget(zh_TW.big5) ComposeTarget(zh_HK.big5) ComposeTarget(zh_HK.big5hkscs) +ComposeTarget(zh_TW) +ComposeTarget(zh_TW.big5) + diff -u -r -N ../xc.old/nls/XI18N_OBJS/Imakefile ./nls/XI18N_OBJS/Imakefile --- ../xc.old/nls/XI18N_OBJS/Imakefile 2004-04-04 10:45:30.311315458 +0200 +++ ./nls/XI18N_OBJS/Imakefile 2004-04-04 10:45:58.859032267 +0200 @@ -62,10 +62,9 @@ XI18NTarget(vi_VN.viscii) XI18NTarget(zh_CN) XI18NTarget(zh_CN.gbk) -XI18NTarget(zh_CN.UTF-8) XI18NTarget(zh_CN.gb18030) +XI18NTarget(zh_HK.big5) XI18NTarget(zh_HK.big5hkscs) -XI18NTarget(zh_HK.big5) XI18NTarget(zh_TW) XI18NTarget(zh_TW.big5) XI18NTarget(th_TH) @@ -73,6 +72,8 @@ XI18NTarget(ja_JP.UTF-8) XI18NTarget(ko_KR.UTF-8) XI18NTarget(th_TH.UTF-8) +XI18NTarget(zh_CN.UTF-8) +XI18NTarget(zh_HK.UTF-8) XI18NTarget(zh_TW.UTF-8) #ifdef UXPArchitecture XI18NTarget(ja.U90) diff -u -r -N ../xc.old/nls/XLC_LOCALE/zh_CN.UTF-8 ./nls/XLC_LOCALE/zh_CN.UTF-8 --- ../xc.old/nls/XLC_LOCALE/zh_CN.UTF-8 2004-04-04 10:43:48.000000000 +0200 +++ ./nls/XLC_LOCALE/zh_CN.UTF-8 2004-04-04 10:45:58.861031827 +0200 @@ -58,39 +58,8 @@ } } -XCOMM fs4 class (Kanji) -fs4 { - charset { - name JISX0208.1983-0:GL - } - font { - primary JISX0208.1983-0:GL - } -} - -XCOMM fs5 class (Korean Character) -fs5 { - charset { - name KSC5601.1987-0:GL - } - font { - primary KSC5601.1987-0:GL - } -} - -XCOMM fs6 class (Half Kana) -fs6 { - charset { - name JISX0201.1976-0:GR - } - font { - primary JISX0201.1976-0:GR - vertical_rotate all - } -} - -XCOMM fs7 class -fs7 { +XCOMM fs4 class +fs4 { charset { name ISO10646-1 } diff -u -r -N ../xc.old/nls/XLC_LOCALE/zh_CN.gb18030 ./nls/XLC_LOCALE/zh_CN.gb18030 --- ../xc.old/nls/XLC_LOCALE/zh_CN.gb18030 2004-04-04 10:45:30.288320519 +0200 +++ ./nls/XLC_LOCALE/zh_CN.gb18030 2004-04-04 10:45:58.860032047 +0200 @@ -50,8 +50,8 @@ name GBK-0:GLGR } font { - primary GBK-0:GLGR - substitute GB13000.1993-1:GLGR + primary GBK-0:GLGR + substitute GB13000.1993-1:GLGR } } diff -u -r -N ../xc.old/nls/XLC_LOCALE/zh_CN.gbk ./nls/XLC_LOCALE/zh_CN.gbk --- ../xc.old/nls/XLC_LOCALE/zh_CN.gbk 2004-04-04 10:43:48.000000000 +0200 +++ ./nls/XLC_LOCALE/zh_CN.gbk 2004-04-04 10:45:58.861031827 +0200 @@ -62,7 +62,7 @@ byte2 \x40,\x7e;\x80,\xfe wc_encoding \x00008000 - ct_encoding GBK-0:GLGR:\x1b\x25\x2f\x32\x80\x88\x47\x42\x4b\x2d\x30\x02 + ct_encoding GBK-0:GLGR:\x1b\x25\x2f\x32 mb_conversion [\x8140,\xfefe]->\x0140 ct_conversion [\x0140,\x7efe]->\x8140 diff -u -r -N ../xc.old/nls/XLC_LOCALE/zh_HK.big5hkscs ./nls/XLC_LOCALE/zh_HK.big5hkscs --- ../xc.old/nls/XLC_LOCALE/zh_HK.big5hkscs 2004-04-04 10:45:30.289320299 +0200 +++ ./nls/XLC_LOCALE/zh_HK.big5hkscs 2004-04-04 10:45:58.861031827 +0200 @@ -19,20 +19,11 @@ vertical_rotate all } } -XCOMM fs1 class (standard Big5) + +XCOMM fs1 class (HKSCS extensions) fs1 { charset { - name BIG5-0:GLGR;BIG5-1:GLGR;BIG5-2:GLGR - } - font { - primary BIG5-0:GLGR - substitute BIG5-0:GLGR - } -} -XCOMM fs2 class (HKSCS extensions) -fs2 { - charset { - name BIG5HKSCS-0:GLGR;BIG5HKSCS-1:GLGR;BIG5HKSCS-2:GLGR + name BIG5HKSCS-0:GLGR } font { primary BIG5HKSCS-0:GLGR @@ -46,7 +37,7 @@ XCOMM XLC_XLOCALE -encoding_name zh_HK.Big5HKSCS +encoding_name zh_HK.big5hkscs mb_cur_max 2 state_depend_encoding False @@ -56,6 +47,7 @@ use_stdc_env True force_convert_to_mb True ++XCOMM cs0 class cs0 { side GL:Default length 1 @@ -63,89 +55,18 @@ ct_encoding ISO8859-1:GL } -XCOMM standard Big5, A140-C5FE + C940-F8FE +XCOMM cs1 class cs1 { side none length 2 - byte1 \xa1,\xc5;\xc9,\xf8 - byte2 \x40,\x7e;\xa1,\xfe - - wc_encoding \x00008000 - ct_encoding BIG5-0:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x30\x02 - - mb_conversion [\x8140,\xfefe]->\x0140 - ct_conversion [\x0140,\x7efe]->\x8140 -} - -XCOMM standard Big5, C640-C67E -cs2 { - side none - length 2 - byte1 \xc6,\xc6 - byte2 \x40,\x7e - - wc_encoding \x00008000 - ct_encoding BIG5-1:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x31\x02 - - mb_conversion [\x8140,\xfefe]->\x0140 - ct_conversion [\x0140,\x7efe]->\x8140 -} - -XCOMM standard Big5, F940-F9D5 -cs3 { - side none - length 2 - byte1 \xf9,\xf9 - byte2 \x40,\xd5 - - wc_encoding \x00008000 - ct_encoding BIG5-2:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x32\x02 - - mb_conversion [\x8140,\xfefe]->\x0140 - ct_conversion [\x0140,\x7efe]->\x8140 -} - - -XCOMM HKSCS extensions, 8540-A0FE + C740-C8FE + FA40-FEFE -cs4 { - side none - length 2 - byte1 \x85,\xa0;\xc7,\xc8;\xfa,\xfe + byte1 \x85,\xfe byte2 \x40,\x7e;\xa1,\xfe wc_encoding \x00008000 - ct_encoding BIG5HKSCS-0:GLGR:\x1b\x25\x2f\x32\x80\x8c\x42\x49\x47\x35\x48\x4b\x53\x43\x53\x2d\x30\x02 - - mb_conversion [\x8140,\xfefe]->\0x0140 - ct_conversion [\x0140,\x7efe]->\0x8140 -} - -XCOMM HKSCS extensions, C6A1-C6FE -cs5 { - side none - length 2 - byte1 \xc6,\xc6 - byte2 \xa1,\xfe - - wc_encoding \x00008000 - ct_encoding BIG5HKSCS-1:GLGR:\x1b\x25\x2f\x32\x80\x8c\x42\x49\x47\x35\x48\x4b\x53\x43\x53\x2d\x31\x02 - - mb_conversion [\x8140,\xfefe]->\0x0140 - ct_conversion [\x0140,\x7efe]->\0x8140 -} - -XCOMM HKSCS extensions, F9D6-F9FE -cs6 { - side none - length 2 - byte1 \xf9,\xf9 - byte2 \xd6,\xfe - - wc_encoding \x00008000 - ct_encoding BIG5HKSCS-2:GLGR:\x1b\x25\x2f\x32\x80\x8c\x42\x49\x47\x35\x48\x4b\x53\x43\x53\x2d\x32\x02 + ct_encoding BIG5HKSCS-0:GLGR:\x1b\x25\x2f\x32 - mb_conversion [\x8140,\xfefe]->\0x0140 - ct_conversion [\x0140,\x7efe]->\0x8140 + mb_conversion [\x8540,\xfefe]->\x0540 + ct_conversion [\x0540,\x7efe]->\x8540 } END XLC_XLOCALE diff -u -r -N ../xc.old/nls/XLC_LOCALE/zh_TW.UTF-8 ./nls/XLC_LOCALE/zh_TW.UTF-8 --- ../xc.old/nls/XLC_LOCALE/zh_TW.UTF-8 2004-04-04 10:43:48.000000000 +0200 +++ ./nls/XLC_LOCALE/zh_TW.UTF-8 2004-04-04 10:45:58.862031607 +0200 @@ -42,46 +42,9 @@ substitute BIG5-0:GLGR } } -XCOMM fs3 class (Kanji) +XCOMM fs3 class fs3 { charset { - name JISX0208.1983-0:GL - } - font { - primary JISX0208.1983-0:GL - } -} -XCOMM fs4 class (Korean Character) -fs4 { - charset { - name KSC5601.1987-0:GL - } - font { - primary KSC5601.1987-0:GL - } -} -XCOMM fs5 class (Chinese Han Character) -fs5 { - charset { - name GB2312.1980-0:GL - } - font { - primary GB2312.1980-0:GL - } -} -XCOMM fs6 class (Half Kana) -fs6 { - charset { - name JISX0201.1976-0:GR - } - font { - primary JISX0201.1976-0:GR - vertical_rotate all - } -} -XCOMM fs7 class -fs7 { - charset { name ISO10646-1 } font { @@ -117,47 +80,11 @@ cs2 { side none length 2 - byte1 \xa1,\xf9 - byte2 \x40,\x7e;\xa1,\xfe - - wc_encoding \x00008000 - ct_encoding BIG5-0:GLGR:\x1b\x25\x2f\x32 - - mb_conversion [\xa140,\xf9fe]->\x2140 - ct_conversion [\x2140,\x79fe]->\xa140 + ct_encoding BIG5-0:GLGR } + XCOMM cs3 class cs3 { - side GR - length 2 - ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR; JISX0208.1983-1:GL; JISX0208.1983-1:GR - -} - -XCOMM cs4 class -cs4 { - side GL - length 2 - ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR; KSC5601.1987-1:GL; KSC5601.1987-1:GR - -} - -XCOMM cs5 class -cs5 { - side GR - length 2 - ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR -} - -XCOMM cs6 class -cs6 { - side GR - length 1 - ct_encoding JISX0201.1976-0:GR -} - -XCOMM cs7 class -cs7 { side none ct_encoding ISO10646-1 } diff -u -r -N ../xc.old/nls/locale.alias ./nls/locale.alias --- ../xc.old/nls/locale.alias 2004-04-04 10:45:30.306316558 +0200 +++ ./nls/locale.alias 2004-04-04 10:45:58.844035568 +0200 @@ -66,7 +66,7 @@ az: az_AZ.ISO8859-9E az_AZ: az_AZ.ISO8859-9E az_AZ.iso88599e: az_AZ.ISO8859-9E -a3: a3_AZKOI8-C +a3: a3_AZ.KOI8-C a3_AZ: a3_AZ.KOI8-C a3_AZ.koi8c: a3_AZ.KOI8-C be: be_BY.CP1251 @@ -826,16 +826,21 @@ zh_CN.EUC: zh_CN.eucCN zh_CN.GB2312: zh_CN.gb2312 zh_CN.GBK: zh_CN.gbk -zh_CN.GB18030: zh_CN.gb18030 +zh_CN.GB18030: zh_CN.gb18030 zh_CN.big5: zh_TW.big5 zh_CN.euc: zh_CN.eucCN zh_CN.utf8: zh_CN.UTF-8 ZH_CN.UTF-8: zh_CN.UTF-8 zh_HK: zh_HK.big5hkscs +zh_HK.Big5hkscs: zh_HK.big5hkscs +zh_HK.Big5-hkscs: zh_HK.big5hkscs +zh_HK.Big5_hkscs: zh_HK.big5hkscs +zh_HK.Big5HKSCS: zh_HK.big5hkscs +zh_HK.BIG5-HKSCS: zh_HK.big5hkscs +zh_HK.BIG5_HKSCS: zh_HK.big5hkscs zh_HK.Big5: zh_HK.big5 -zh_HK.Big5HKSCS: zh_HK.big5hkscs zh_HK.utf8: zh_HK.UTF-8 -ZH_HK.UTF-8: zh_CN.UTF-8 +ZH_HK.UTF-8: zh_HK.UTF-8 ZH_SG.UTF-8: zh_SG.UTF-8 zh_TW: zh_TW.big5 zh_TW.Big5: zh_TW.big5 diff -u -r -N ../xc.old/nls/locale.dir ./nls/locale.dir --- ../xc.old/nls/locale.dir 2004-04-04 10:45:30.311315458 +0200 +++ ./nls/locale.dir 2004-04-04 10:45:58.858032487 +0200 @@ -228,10 +228,12 @@ zh_CN/XLC_LOCALE: zh_CN.eucCN zh_CN/XLC_LOCALE: zh_CN.gb2312 zh_CN.gbk/XLC_LOCALE: zh_CN.gbk -zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030 +zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030 zh_HK.big5/XLC_LOCALE: zh_HK.big5 +zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5-hkscs +zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs -zh_HK.UTF-8/XLC_LOCALE: zh_HK.UTF-8 +zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5HKSCS zh_TW.big5/XLC_LOCALE: zh_TW.big5 zh_TW/XLC_LOCALE: zh_TW.eucTW XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress. @@ -382,8 +384,8 @@ en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8 en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8 zh_CN.UTF-8/XLC_LOCALE: zh_CN.UTF-8 -zh_CN.UTF-8/XLC_LOCALE: zh_HK.UTF-8 -zh_CN.UTF-8/XLC_LOCALE: zh_SG.UTF-8 +zh_HK.UTF-8/XLC_LOCALE: zh_HK.UTF-8 +zh_CN.UTF-8/XLC_LOCALE: zh_SG.UTF-8 zh_TW.UTF-8/XLC_LOCALE: zh_TW.UTF-8 #ifdef __uxp__ ja.U90/XLC_LOCALE: ja_JP.U90