--- xorg-x11-6.7.0/xc/lib/X11/lcUniConv/koi8_c.h 2004-03-04 18:46:48.000000000 +0100 +++ /dev/null 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -/* $XFree86: xc/lib/X11/lcUniConv/koi8_c.h,v 1.1 2000/10/27 20:26:08 dawes Exp $ */ - -/* - * KOI8-C - */ - -static const unsigned short koi8_c_2uni[128] = { - /* 0x80 */ - 0x0493, 0x0497, 0x049b, 0x049d, 0x04a3, 0x04af, 0x04b1, 0x04b3, - 0x04b7, 0x04b9, 0x04bb, 0x2580, 0x04d9, 0x04e3, 0x04e9, 0x04ef, - /* 0x90 */ - 0x0492, 0x0496, 0x049a, 0x049c, 0x04a2, 0x04ae, 0x04b0, 0x04b2, - 0x04b6, 0x04b8, 0x04ba, 0x2321, 0x04d8, 0x04e2, 0x04e8, 0x04ee, - /* 0xa0 */ - 0x00a0, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, - 0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0491, 0x045e, 0x045f, - /* 0xb0 */ - 0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, - 0x0486, 0x0409, 0x040a, 0x040b, 0x040c, 0x0490, 0x040e, 0x040f, - /* 0xc0 */ - 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, - 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, - /* 0xd0 */ - 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, - 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, - /* 0xe0 */ - 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, - 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, - /* 0xf0 */ - 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, - 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a, -}; - -static int -koi8_c_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) -{ - unsigned char c = *s; - if (c < 0x80) - *pwc = (ucs4_t) c; - else - *pwc = (ucs4_t) koi8_c_2uni[c-0x80]; - return 1; -} - -static const unsigned char koi8_c_page00[1] = { - 0xa0, /* 0xa0-0xa7 */ -}; -static const unsigned char koi8_c_page04[240] = { - 0x00, 0xb3, 0xb1, 0xb2, 0xb4, 0xb5, 0xb6, 0xb7, /* 0x00-0x07 */ - 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0x00, 0xbe, 0xbf, /* 0x08-0x0f */ - 0xe1, 0xe2, 0xf7, 0xe7, 0xe4, 0xe5, 0xf6, 0xfa, /* 0x10-0x17 */ - 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, /* 0x18-0x1f */ - 0xf2, 0xf3, 0xf4, 0xf5, 0xe6, 0xe8, 0xe3, 0xfe, /* 0x20-0x27 */ - 0xfb, 0xfd, 0xff, 0xf9, 0xf8, 0xfc, 0xe0, 0xf1, /* 0x28-0x2f */ - 0xc1, 0xc2, 0xd7, 0xc7, 0xc4, 0xc5, 0xd6, 0xda, /* 0x30-0x37 */ - 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, /* 0x38-0x3f */ - 0xd2, 0xd3, 0xd4, 0xd5, 0xc6, 0xc8, 0xc3, 0xde, /* 0x40-0x47 */ - 0xdb, 0xdd, 0xdf, 0xd9, 0xd8, 0xdc, 0xc0, 0xd1, /* 0x48-0x4f */ - 0x00, 0xa3, 0xa1, 0xa2, 0xa4, 0xa5, 0xa6, 0xa7, /* 0x50-0x57 */ - 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0x00, 0xae, 0xaf, /* 0x58-0x5f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */ - 0xbd, 0xad, 0x90, 0x80, 0x00, 0x00, 0x91, 0x81, /* 0x90-0x97 */ - 0x00, 0x00, 0x92, 0x82, 0x93, 0x83, 0x00, 0x00, /* 0x98-0x9f */ - 0x00, 0x00, 0x94, 0x84, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x95, 0x85, /* 0xa8-0xaf */ - 0x96, 0x86, 0x97, 0x87, 0x00, 0x00, 0x98, 0x88, /* 0xb0-0xb7 */ - 0x99, 0x89, 0x9a, 0x8a, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */ - 0x9c, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */ - 0x00, 0x00, 0x9d, 0x8d, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */ - 0x9e, 0x8e, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x8f, /* 0xe8-0xef */ -}; -static const unsigned char koi8_c_page22[1] = { - 0xb0, /* 0x16-0x16 */ -}; - -static int -koi8_c_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) -{ - unsigned char c = 0; - if (wc < 0x0080) { - *r = wc; - return 1; - } - else if (wc >= 0x00a0 && wc < 0x00a1) - c = koi8_c_page00[wc-0x00a0]; - else if (wc >= 0x0400 && wc < 0x04ef) - c = koi8_c_page04[wc-0x0400]; - else if (wc >= 0x2216 && wc < 0x2217) - c = koi8_c_page22[wc-0x2216]; - if (c != 0) { - *r = c; - return 1; - } - return RET_ILSEQ; -} --- xorg-x11-6.7.0/xc/lib/X11/lcUniConv/koi8_k.h._i18n 2004-08-10 14:10:49.000000000 +0200 +++ xorg-x11-6.7.0/xc/lib/X11/lcUniConv/koi8_k.h 2004-08-10 14:10:49.000000000 +0200 @@ -0,0 +1,103 @@ +/* $XFree86: xc/lib/X11/lcUniConv/koi8_k.h,v 1.2 2000/11/28 16:10:29 dawes Exp $ */ + +/* + * KOI8-K + */ + +static const unsigned short koi8_k_2uni[128] = { + /* 0x80 */ + 0x0493, 0x0497, 0x049b, 0x049d, 0x04a3, 0x04af, 0x04b1, 0x04b3, + 0x04b7, 0x04b9, 0x04bb, 0x2580, 0x04d9, 0x04e3, 0x04e9, 0x04ef, + /* 0x90 */ + 0x0492, 0x0496, 0x049a, 0x049c, 0x04a2, 0x04ae, 0x04b0, 0x04b2, + 0x04b6, 0x04b8, 0x04ba, 0x2321, 0x04d8, 0x04e2, 0x04e8, 0x04ee, + /* 0xa0 */ + 0x00a0, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, + 0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0491, 0x045e, 0x045f, + /* 0xb0 */ + 0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, + 0x0486, 0x0409, 0x040a, 0x040b, 0x040c, 0x0490, 0x040e, 0x040f, + /* 0xc0 */ + 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, + 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, + /* 0xd0 */ + 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, + 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, + /* 0xe0 */ + 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, + 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, + /* 0xf0 */ + 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, + 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a, +}; + +static int +koi8_k_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) +{ + unsigned char c = *s; + if (c < 0x80) + *pwc = (ucs4_t) c; + else + *pwc = (ucs4_t) koi8_k_2uni[c-0x80]; + return 1; +} + +static const unsigned char koi8_k_page00[1] = { + 0xa0, /* 0xa0-0xa7 */ +}; +static const unsigned char koi8_k_page04[240] = { + 0x00, 0xb3, 0xb1, 0xb2, 0xb4, 0xb5, 0xb6, 0xb7, /* 0x00-0x07 */ + 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0x00, 0xbe, 0xbf, /* 0x08-0x0f */ + 0xe1, 0xe2, 0xf7, 0xe7, 0xe4, 0xe5, 0xf6, 0xfa, /* 0x10-0x17 */ + 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, /* 0x18-0x1f */ + 0xf2, 0xf3, 0xf4, 0xf5, 0xe6, 0xe8, 0xe3, 0xfe, /* 0x20-0x27 */ + 0xfb, 0xfd, 0xff, 0xf9, 0xf8, 0xfc, 0xe0, 0xf1, /* 0x28-0x2f */ + 0xc1, 0xc2, 0xd7, 0xc7, 0xc4, 0xc5, 0xd6, 0xda, /* 0x30-0x37 */ + 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, /* 0x38-0x3f */ + 0xd2, 0xd3, 0xd4, 0xd5, 0xc6, 0xc8, 0xc3, 0xde, /* 0x40-0x47 */ + 0xdb, 0xdd, 0xdf, 0xd9, 0xd8, 0xdc, 0xc0, 0xd1, /* 0x48-0x4f */ + 0x00, 0xa3, 0xa1, 0xa2, 0xa4, 0xa5, 0xa6, 0xa7, /* 0x50-0x57 */ + 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0x00, 0xae, 0xaf, /* 0x58-0x5f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */ + 0xbd, 0xad, 0x90, 0x80, 0x00, 0x00, 0x91, 0x81, /* 0x90-0x97 */ + 0x00, 0x00, 0x92, 0x82, 0x93, 0x83, 0x00, 0x00, /* 0x98-0x9f */ + 0x00, 0x00, 0x94, 0x84, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x95, 0x85, /* 0xa8-0xaf */ + 0x96, 0x86, 0x97, 0x87, 0x00, 0x00, 0x98, 0x88, /* 0xb0-0xb7 */ + 0x99, 0x89, 0x9a, 0x8a, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0-0xc7 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0-0xd7 */ + 0x9c, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd8-0xdf */ + 0x00, 0x00, 0x9d, 0x8d, 0x00, 0x00, 0x00, 0x00, /* 0xe0-0xe7 */ + 0x9e, 0x8e, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x8f, /* 0xe8-0xef */ +}; +static const unsigned char koi8_k_page22[1] = { + 0xb0, /* 0x16-0x16 */ +}; + +static int +koi8_k_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) +{ + unsigned char c = 0; + if (wc < 0x0080) { + *r = wc; + return 1; + } + else if (wc >= 0x00a0 && wc < 0x00a1) + c = koi8_k_page00[wc-0x00a0]; + else if (wc >= 0x0400 && wc < 0x04ef) + c = koi8_k_page04[wc-0x0400]; + else if (wc >= 0x2216 && wc < 0x2217) + c = koi8_k_page22[wc-0x2216]; + if (c != 0) { + *r = c; + return 1; + } + return RET_ILSEQ; +} --- xorg-x11-6.7.0/xc/lib/X11/lcUTF8.c._i18n 2004-03-04 18:46:39.000000000 +0100 +++ xorg-x11-6.7.0/xc/lib/X11/lcUTF8.c 2004-08-10 14:10:49.000000000 +0200 @@ -185,7 +185,7 @@ #include "lcUniConv/tis620.h" #include "lcUniConv/koi8_r.h" #include "lcUniConv/koi8_u.h" -#include "lcUniConv/koi8_c.h" +#include "lcUniConv/koi8_k.h" #include "lcUniConv/armscii_8.h" #include "lcUniConv/cp1133.h" #include "lcUniConv/mulelao.h" @@ -289,8 +289,8 @@ { "KOI8-U", NULLQUARK, koi8_u_mbtowc, koi8_u_wctomb }, - { "KOI8-C", NULLQUARK, - koi8_c_mbtowc, koi8_c_wctomb + { "KOI8-K", NULLQUARK, + koi8_k_mbtowc, koi8_k_wctomb }, { "TATAR-CYR", NULLQUARK, tatar_cyr_mbtowc, tatar_cyr_wctomb --- xorg-x11-6.7.0/xc/nls/Compose/koi8-k._i18n 2004-08-10 14:10:49.000000000 +0200 +++ xorg-x11-6.7.0/xc/nls/Compose/koi8-k 2004-08-10 14:10:49.000000000 +0200 @@ -0,0 +1,123 @@ +XCOMM +XCOMM koi8-k Compose Sequence +XCOMM +XCOMM Sequence Definition +XCOMM +XCOMM $XFree86: xc/nls/Compose/koi8-k,v 1.1 2000/10/27 18:30:52 dawes Exp $ +XCOMM + +XCOMM Means +XCOMM Special Character + : "#" numbersign + : "'" apostrophe + : "'" apostrophe + : "@" at + : "[" bracketleft + : "\\" backslash + : "\\" backslash + : "\\" backslash + : "]" bracketright + : "^" asciicircum + : "^" asciicircum + : "^" asciicircum + : "^" asciicircum + : "`" grave + : "`" grave + : "{" braceleft + : "{" braceleft + : "|" bar + : "|" bar + : "|" bar + : "|" bar + : "|" bar + : "|" bar + : "}" braceright + : "}" braceright + : "~" asciitilde + : "~" asciitilde + : "~" asciitilde + : "~" asciitilde + + : "\240" nobreakspace + + : "\200" Cyrillic_ghe_bar + : "\220" Cyrillic_GHE_bar + : "\201" Cyrillic_zhe_descender + : "\221" Cyrillic_ZHE_descender + : "\202" Cyrillic_ka_descender + : "\222" Cyrillic_KA_descender + : "\203" Cyrillic_ka_vertstroke + : "\223" Cyrillic_KA_vertstroke + : "\203" Cyrillic_ka_vertstroke + : "\223" Cyrillic_KA_vertstroke + : "\204" Cyrillic_en_descender + : "\224" Cyrillic_EN_descender + : "\205" Cyrillic_u_straight + : "\225" Cyrillic_U_straight + : "\205" Cyrillic_u_straight + : "\225" Cyrillic_U_straight + : "\206" Cyrillic_u_straight_bar + : "\226" Cyrillic_U_straight_bat + : "\206" Cyrillic_u_straight_bar + : "\226" Cyrillic_U_straight_bat + : "\207" Cyrillic_ha_descender + : "\227" Cyrillic_HA_descender + : "\210" Cyrillic_che_descender + : "\230" Cyrillic_CHE_descender + : "\211" Cyrillic_che_vertstroke + : "\231" Cyrillic_CHE_vertstroke + : "\211" Cyrillic_che_vertstroke + : "\231" Cyrillic_CHE_vertstroke + : "\212" Cyrillic_shha + : "\232" Cyrillic_SHHA + : "\212" Cyrillic_shha + : "\232" Cyrillic_SHHA + : "\212" Cyrillic_shha + : "\232" Cyrillic_SHHA + : "\213" Cyrillic_schwa + : "\233" Cyrillic_SCHWA + : "\213" Cyrillic_schwa + : "\233" Cyrillic_SCHWA + : "\214" Cyrillic_i_macron + : "\234" Cyrillic_I_macron + : "\215" Cyrillic_o_bar + : "\235" Cyrillic_O_bar + : "\216" Cyrillic_u_macron + : "\236" Cyrillic_U_macron + + : "\241" Serbian_dje + : "\261" Serbian_DJE + : "\242" Macedonia_gje + : "\262" Macedonia_GJE + : "\243" Cyrillic_io + : "\263" Cyrillic_IO + : "\243" Cyrillic_io + : "\263" Cyrillic_IO + : "\243" Cyrillic_io + : "\263" Cyrillic_IO + + : "\251" Cyrillic_lje + : "\271" Cyrillic_LJE + : "\252" Cyrillic_nje + : "\272" Cyrillic_NJE + + : "\300" Cyrillic_yu + : "\340" Cyrillic_YU + : "\300" Cyrillic_yu + : "\340" Cyrillic_YU + + : "\303" Cyrillic_tse + : "\343" Cyrillic_TSE + + : "\321" Cyrillic_ya + : "\361" Cyrillic_YA + : "\321" Cyrillic_ya + : "\361" Cyrillic_YA + + + : "\335" Cyrillic_shcha + : "\375" Cyrillic_SHCHA + + + +XCOMM End of Sequence Definition --- xorg-x11-6.7.0/xc/nls/Compose/koi8-c._i18n 2004-03-04 18:47:15.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/Compose/koi8-c 2004-08-10 14:13:26.000000000 +0200 @@ -1,123 +0,0 @@ -XCOMM -XCOMM koi8-c Compose Sequence -XCOMM -XCOMM Sequence Definition -XCOMM -XCOMM $XFree86: xc/nls/Compose/koi8-c,v 1.1 2000/10/27 18:30:52 dawes Exp $ -XCOMM - -XCOMM Means -XCOMM Special Character - : "#" numbersign - : "'" apostrophe - : "'" apostrophe - : "@" at - : "[" bracketleft - : "\\" backslash - : "\\" backslash - : "\\" backslash - : "]" bracketright - : "^" asciicircum - : "^" asciicircum - : "^" asciicircum - : "^" asciicircum - : "`" grave - : "`" grave - : "{" braceleft - : "{" braceleft - : "|" bar - : "|" bar - : "|" bar - : "|" bar - : "|" bar - : "|" bar - : "}" braceright - : "}" braceright - : "~" asciitilde - : "~" asciitilde - : "~" asciitilde - : "~" asciitilde - - : "\240" nobreakspace - - : "\200" Cyrillic_ghe_bar - : "\220" Cyrillic_GHE_bar - : "\201" Cyrillic_zhe_descender - : "\221" Cyrillic_ZHE_descender - : "\202" Cyrillic_ka_descender - : "\222" Cyrillic_KA_descender - : "\203" Cyrillic_ka_vertstroke - : "\223" Cyrillic_KA_vertstroke - : "\203" Cyrillic_ka_vertstroke - : "\223" Cyrillic_KA_vertstroke - : "\204" Cyrillic_en_descender - : "\224" Cyrillic_EN_descender - : "\205" Cyrillic_u_straight - : "\225" Cyrillic_U_straight - : "\205" Cyrillic_u_straight - : "\225" Cyrillic_U_straight - : "\206" Cyrillic_u_straight_bar - : "\226" Cyrillic_U_straight_bat - : "\206" Cyrillic_u_straight_bar - : "\226" Cyrillic_U_straight_bat - : "\207" Cyrillic_ha_descender - : "\227" Cyrillic_HA_descender - : "\210" Cyrillic_che_descender - : "\230" Cyrillic_CHE_descender - : "\211" Cyrillic_che_vertstroke - : "\231" Cyrillic_CHE_vertstroke - : "\211" Cyrillic_che_vertstroke - : "\231" Cyrillic_CHE_vertstroke - : "\212" Cyrillic_shha - : "\232" Cyrillic_SHHA - : "\212" Cyrillic_shha - : "\232" Cyrillic_SHHA - : "\212" Cyrillic_shha - : "\232" Cyrillic_SHHA - : "\213" Cyrillic_schwa - : "\233" Cyrillic_SCHWA - : "\213" Cyrillic_schwa - : "\233" Cyrillic_SCHWA - : "\214" Cyrillic_i_macron - : "\234" Cyrillic_I_macron - : "\215" Cyrillic_o_bar - : "\235" Cyrillic_O_bar - : "\216" Cyrillic_u_macron - : "\236" Cyrillic_U_macron - - : "\241" Serbian_dje - : "\261" Serbian_DJE - : "\242" Macedonia_gje - : "\262" Macedonia_GJE - : "\243" Cyrillic_io - : "\263" Cyrillic_IO - : "\243" Cyrillic_io - : "\263" Cyrillic_IO - : "\243" Cyrillic_io - : "\263" Cyrillic_IO - - : "\251" Cyrillic_lje - : "\271" Cyrillic_LJE - : "\252" Cyrillic_nje - : "\272" Cyrillic_NJE - - : "\300" Cyrillic_yu - : "\340" Cyrillic_YU - : "\300" Cyrillic_yu - : "\340" Cyrillic_YU - - : "\303" Cyrillic_tse - : "\343" Cyrillic_TSE - - : "\321" Cyrillic_ya - : "\361" Cyrillic_YA - : "\321" Cyrillic_ya - : "\361" Cyrillic_YA - - - : "\335" Cyrillic_shcha - : "\375" Cyrillic_SHCHA - - - -XCOMM End of Sequence Definition --- xorg-x11-6.7.0/xc/nls/Compose/Imakefile._i18n 2004-03-04 18:47:15.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/Compose/Imakefile 2004-08-10 14:11:10.000000000 +0200 @@ -54,7 +54,7 @@ ComposeTarget(ko) ComposeTarget(koi8-r) ComposeTarget(koi8-u) -ComposeTarget(koi8-c) +ComposeTarget(koi8-k) ComposeTarget(mulelao-1) ComposeTarget(pt_BR.UTF-8) ComposeTarget(vi_VN.tcvn) --- xorg-x11-6.7.0/xc/nls/XI18N_OBJS/Imakefile._i18n 2004-03-04 18:47:15.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/XI18N_OBJS/Imakefile 2004-08-10 14:11:10.000000000 +0200 @@ -28,7 +28,6 @@ XI18NTarget(georgian-ps) XI18NTarget(ibm-cp1133) XI18NTarget(iscii-dev) -XI18NTarget(isiri-3342) XI18NTarget(iso8859-1) XI18NTarget(iso8859-2) XI18NTarget(iso8859-3) @@ -55,7 +54,6 @@ XI18NTarget(microsoft-cp1255) XI18NTarget(microsoft-cp1256) XI18NTarget(mulelao-1) -XI18NTarget(nokhchi-1) XI18NTarget(tatar-cyr) XI18NTarget(tscii-0) XI18NTarget(vi_VN.tcvn) --- xorg-x11-6.7.0/xc/nls/XI18N_OBJS/nokhchi-1._i18n 2003-11-14 17:48:51.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/XI18N_OBJS/nokhchi-1 2004-08-10 14:11:10.000000000 +0200 @@ -1,7 +0,0 @@ -# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME -# -# XI18N objects table for nokhchi-1 locale -# -XLC common/xlcDef _XlcDefaultLoader # XLC_open -XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister -XOM common/xomGeneric _XomGenericOpenOM # XOM_open --- xorg-x11-6.7.0/xc/nls/XI18N_OBJS/isiri-3342._i18n 2003-11-14 17:48:51.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/XI18N_OBJS/isiri-3342 2004-08-10 14:11:10.000000000 +0200 @@ -1,7 +0,0 @@ -# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME -# -# XI18N objects table for isiri-3342 locale -# -XLC common/xlcDef _XlcDefaultLoader # XLC_open -XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister -XOM common/xomGeneric _XomGenericOpenOM # XOM_open --- xorg-x11-6.7.0/xc/nls/XLC_LOCALE/koi8-c._i18n 2004-03-04 18:47:16.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/XLC_LOCALE/koi8-c 2004-08-10 14:24:01.876555659 +0200 @@ -1,80 +0,0 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-c,v 1.1 2000/10/27 18:30:56 dawes Exp $ -XCOMM XLocale Database Sample for koi8-c. -XCOMM - -XCOMM -XCOMM XLC_FONTSET category -XCOMM -XLC_FONTSET -XCOMM fs0 class (7 bit ASCII) -fs0 { - charset { - name ISO8859-1:GL - } - font { - primary KOI8-C:GL - substitute ISO8859-1:GL - } -} -XCOMM fs1 class -fs1 { - charset KOI8-C:GR - font KOI8-C:GR -} -END XLC_FONTSET - -XCOMM -XCOMM XLC_CHARSET_DEFINE category -XCOMM -XLC_CHARSET_DEFINE -csd0 { - charset_name KOI8-C - side GR - length 1 - string_encoding False - sequence \x1b%/1 -} -END XLC_CHARSET_DEFINE - -XCOMM -XCOMM XLC_XLOCALE category -XCOMM -XLC_XLOCALE - -encoding_name KOI8-C -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 -#endif - -XCOMM cs0 class -cs0 { - side GL:Default - length 1 - wc_encoding \x00000000 - ct_encoding KOI8-C:GL; ISO8859-1:GL -} - - -XCOMM cs1 class -cs1 { - side GR:Default - length 1 -#if WCHAR32 - wc_encoding \x30000000 -#else - wc_encoding \x00008080 -#endif - ct_encoding KOI8-C:GR -} - -END XLC_XLOCALE --- xorg-x11-6.7.0/xc/nls/XLC_LOCALE/koi8-k._i18n 2004-08-10 14:11:17.000000000 +0200 +++ xorg-x11-6.7.0/xc/nls/XLC_LOCALE/koi8-k 2004-08-10 14:11:17.000000000 +0200 @@ -0,0 +1,80 @@ +XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-k,v 1.1 2000/10/27 18:30:56 dawes Exp $ +XCOMM XLocale Database Sample for koi8-k. +XCOMM + +XCOMM +XCOMM XLC_FONTSET category +XCOMM +XLC_FONTSET +XCOMM fs0 class (7 bit ASCII) +fs0 { + charset { + name ISO8859-1:GL + } + font { + primary KOI8-K:GL + substitute ISO8859-1:GL + } +} +XCOMM fs1 class +fs1 { + charset KOI8-K:GR + font KOI8-K:GR +} +END XLC_FONTSET + +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name KOI8-K + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + +XCOMM +XCOMM XLC_XLOCALE category +XCOMM +XLC_XLOCALE + +encoding_name KOI8-K +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 +#endif + +XCOMM cs0 class +cs0 { + side GL:Default + length 1 + wc_encoding \x00000000 + ct_encoding KOI8-K:GL; ISO8859-1:GL +} + + +XCOMM cs1 class +cs1 { + side GR:Default + length 1 +#if WCHAR32 + wc_encoding \x30000000 +#else + wc_encoding \x00008080 +#endif + ct_encoding KOI8-K:GR +} + +END XLC_XLOCALE --- xorg-x11-6.7.0/xc/nls/XLC_LOCALE/Imakefile._i18n 2004-03-04 18:47:16.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/XLC_LOCALE/Imakefile 2004-08-10 14:23:10.478710928 +0200 @@ -40,7 +40,6 @@ LTarget(georgian-ps) LTarget(ibm-cp1133) LTarget(iscii-dev) -LTarget(isiri-3342) LTarget(iso8859-1) LTarget(iso8859-2) LTarget(iso8859-3) @@ -64,12 +63,11 @@ LTarget(ko_KR.UTF-8) LTarget(koi8-r) LTarget(koi8-u) -LTarget(koi8-c) +LTarget(koi8-k) LTarget(microsoft-cp1251) LTarget(microsoft-cp1255) LTarget(microsoft-cp1256) LTarget(mulelao-1) -LTarget(nokhchi-1) LTarget(pt_BR.UTF-8) LTarget(tatar-cyr) LTarget(th_TH) --- xorg-x11-6.7.0/xc/nls/XLC_LOCALE/isiri-3342._i18n 2004-03-04 18:47:16.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/XLC_LOCALE/isiri-3342 2004-08-10 14:23:43.896910337 +0200 @@ -1,80 +0,0 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/isiri-3342,v 1.1 2000/10/27 18:30:55 dawes Exp $ -XCOMM XLocale Database Sample for mulelao-1. -XCOMM - -XCOMM -XCOMM XLC_FONTSET category -XCOMM -XLC_FONTSET -XCOMM fs0 class (7 bit ASCII) -fs0 { - charset { - name ISO8859-1:GL - } - font { - primary ISIRI-3342:GL - substitute ISO8859-1:GL - } -} -XCOMM fs1 class -fs1 { - charset ISIRI-3342:GR - font ISIRI-3342:GR -} -END XLC_FONTSET - -XCOMM -XCOMM XLC_CHARSET_DEFINE category -XCOMM -XLC_CHARSET_DEFINE -csd0 { - charset_name ISIRI-3342 - side GR - length 1 - string_encoding False - sequence \x1b%/1 -} -END XLC_CHARSET_DEFINE - -XCOMM -XCOMM XLC_XLOCALE category -XCOMM -XLC_XLOCALE - -encoding_name ISIRI-3342 -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 -#endif - -XCOMM cs0 class -cs0 { - side GL:Default - length 1 - wc_encoding \x00000000 - ct_encoding ISIRI-3342:GL; ISO8859-1:GL -} - - -XCOMM cs1 class -cs1 { - side GR:Default - length 1 -#if WCHAR32 - wc_encoding \x30000000 -#else - wc_encoding \x00008080 -#endif - ct_encoding ISIRI-3342:GR -} - -END XLC_XLOCALE --- xorg-x11-6.7.0/xc/nls/XLC_LOCALE/nokhchi-1._i18n 2004-03-04 18:47:16.000000000 +0100 +++ xorg-x11-6.7.0/xc/nls/XLC_LOCALE/nokhchi-1 2004-08-10 14:22:20.505917440 +0200 @@ -1,80 +0,0 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/nokhchi-1,v 1.1 2000/10/27 18:30:57 dawes Exp $ -XCOMM XLocale Database Sample for mulelao-1. -XCOMM - -XCOMM -XCOMM XLC_FONTSET category -XCOMM -XLC_FONTSET -XCOMM fs0 class (7 bit ASCII) -fs0 { - charset { - name ISO8859-1:GL - } - font { - primary NOKHCHI-1:GL - substitute ISO8859-1:GL - } -} -XCOMM fs1 class -fs1 { - charset NOKHCHI-1:GR - font NOKHCHI-1:GR -} -END XLC_FONTSET - -XCOMM -XCOMM XLC_CHARSET_DEFINE category -XCOMM -XLC_CHARSET_DEFINE -csd0 { - charset_name NOKHCHI-1 - side GR - length 1 - string_encoding False - sequence \x1b%/1 -} -END XLC_CHARSET_DEFINE - -XCOMM -XCOMM XLC_XLOCALE category -XCOMM -XLC_XLOCALE - -encoding_name NOKHCHI-1 -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 -#endif - -XCOMM cs0 class -cs0 { - side GL:Default - length 1 - wc_encoding \x00000000 - ct_encoding NOKHCHI-1:GL; ISO8859-1:GL -} - - -XCOMM cs1 class -cs1 { - side GR:Default - length 1 -#if WCHAR32 - wc_encoding \x30000000 -#else - wc_encoding \x00008080 -#endif - ct_encoding NOKHCHI-1:GR -} - -END XLC_XLOCALE --- xorg-x11-6.8.2/xc/nls/XLC_LOCALE/en_US.UTF-8._i18n 2005-02-24 12:03:27.000000000 +0100 +++ xorg-x11-6.8.2/xc/nls/XLC_LOCALE/en_US.UTF-8 2005-02-25 16:13:00.186956201 +0100 @@ -30,17 +30,143 @@ primary ISO8859-1:GR } } -XCOMM fs2 class (Kanji) +XCOMM fs2 class (ISO8859 families) fs2 { charset { + name ISO8859-2:GR + } + font { + primary ISO8859-2:GR + } +} +XCOMM fs3 class (ISO8859 families) +fs3 { + charset { + name ISO8859-3:GR + } + font { + primary ISO8859-3:GR + } +} +XCOMM fs4 class (ISO8859 families) +fs4 { + charset { + name ISO8859-4:GR + } + font { + primary ISO8859-4:GR + } +} +XCOMM fs5 class (ISO8859 families) +fs5 { + charset { + name ISO8859-5:GR + } + font { + primary ISO8859-5:GR + } +} +XCOMM fs6 class (koi8-r) +fs6 { + charset { + name KOI8-R:GR + } + font { + primary KOI8-R:GR + } +} +XCOMM fs7 class (ISO8859 families) +fs7 { + charset { + name ISO8859-7:GR + } + font { + primary ISO8859-7:GR + } +} +XCOMM fs8 class (koi8-u) +fs8 { + charset { + name KOI8-U:GR + } + font { + primary KOI8-U:GR + } +} +XCOMM fs9 class (ISO8859 families) +fs9 { + charset { + name ISO8859-9:GR + } + font { + primary ISO8859-9:GR + } +} +XCOMM fs10 class (armscii-8) +fs10 { + charset { + name ARMSCII-8:GR + } + font { + primary ARMSCII-8:GR + } +} +XCOMM fs11 class (tis-620) +fs11 { + charset { + name TIS620-0:GR + } + font { + primary TIS620-0:GR + } +} +XCOMM fs12 class (tcvn) +fs12 { + charset { + name TCVN-5712:GR + } + font { + primary TCVN-5712:GR + } +} +XCOMM fs13 class (ISO8859 families) +fs13 { + charset { + name ISO8859-13:GR + } + font { + primary ISO8859-13:GR + } +} +XCOMM fs14 class (ISO8859 families) +fs14 { + charset { + name ISO8859-14:GR + } + font { + primary ISO8859-14:GR + } +} +XCOMM fs15 class (ISO8859 families) +fs15 { + charset { + name ISO8859-15:GR + } + font { + primary ISO8859-15:GR + } +} +XCOMM fs16 class (Kanji) +fs16 { + charset { name JISX0208.1983-0:GL } font { primary JISX0208.1983-0:GL } } -XCOMM fs3 class (Korean Character) -fs3 { +XCOMM fs17 class (Korean Character) +fs17 { charset { name KSC5601.1987-0:GL } @@ -48,8 +174,8 @@ primary KSC5601.1987-0:GL } } -XCOMM fs4 class (Chinese Han Character) -fs4 { +XCOMM fs18 class (Chinese Han Character) +fs18 { charset { name GB2312.1980-0:GL } @@ -57,8 +183,18 @@ primary GB2312.1980-0:GL } } -XCOMM fs5 class (Half Kana) -fs5 { +XCOMM fs19 class (Chinese Han Character) +fs19 { + charset { + name GBK-0:GLGR + } + font { + primary GBK-0:GLGR + substitute GB13000.1993-1:GLGR + } +} +XCOMM fs20 class (Half Kana) +fs20 { charset { name JISX0201.1976-0:GR } @@ -67,9 +203,37 @@ vertical_rotate all } } +XCOMM fs21 class (Chinese Han Character (Traditional)) +fs21 { + charset { + name BIG5-0:GLGR + } + font { + primary BIG5-0:GLGR + substitute GB13000.1993-1:GLGR + } +} +XCOMM fs22 class (georgian) +fs22 { + charset { + name GEORGIAN-PS:GR + } + font { + primary GEORGIAN-PS:GR + } +} +XCOMM fs23 class (laotian) +fs23 { + charset { + name MULELAO-1:GR + } + font { + primary MULELAO-1:GR + } +} XCOMM ISO10646 should come last so the fonts above will actually be used -XCOMM fs6 class -fs6 { +XCOMM fs24 class +fs24 { charset { name ISO10646-1 } @@ -103,37 +267,177 @@ } XCOMM cs2 class -cs2 { +cs2 { + side GR + length 1 + ct_encoding ISO8859-2:GR +} + +XCOMM cs3 class +cs3 { + side GR + length 1 + ct_encoding ISO8859-3:GR +} + +XCOMM cs4 class +cs4 { + side GR + length 1 + ct_encoding ISO8859-4:GR +} + +XCOMM cs5 class +cs5 { + side GR + length 1 + ct_encoding ISO8859-5:GR +} + +XCOMM cs6 class +cs6 { + side GR + length 1 + ct_encoding KOI8-R:GR +} + +XCOMM cs7 class +cs7 { + side GR + length 1 + ct_encoding ISO8859-7:GR +} + +XCOMM cs8 class +cs8 { + side GR + length 1 + ct_encoding KOI8-U:GR +} + +XCOMM cs9 class +cs9 { + side GR + length 1 + ct_encoding ISO8859-9:GR +} + +XCOMM cs10 class +cs10 { + side GR + length 1 + ct_encoding ARMSCII-8:GR +} + +XCOMM cs11 class +cs11 { + side GR + length 1 + ct_encoding TIS620-0:GR +} + +XCOMM cs12 class +cs12 { + side GR + length 1 + ct_encoding TCVN-5712:GR +} + +XCOMM cs13 class +cs13 { + side GR + length 1 + ct_encoding ISO8859-13:GR +} + +XCOMM cs14 class +cs14 { + side GR + length 1 + ct_encoding ISO8859-14:GR +} + +XCOMM cs15 class +cs15 { + side GR + length 1 + ct_encoding ISO8859-15:GR +} + +XCOMM cs16 class +cs16 { side GR length 2 ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;\ JISX0208.1983-1:GL; JISX0208.1983-1:GR } -XCOMM cs3 class -cs3 { +XCOMM cs17 class +cs17 { side GL length 2 ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR;\ KSC5601.1987-1:GL; KSC5601.1987-1:GR } -XCOMM cs4 class -cs4 { +XCOMM cs18 class +cs18 { side GR length 2 ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR } -XCOMM cs5 class -cs5 { +XCOMM cs19 class +cs19 { + side none + length 2 + byte1 \x81,\xfe + 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 + + mb_conversion [\x8140,\xfefe]->\x0140 + ct_conversion [\x0140,\x7efe]->\x8140 +} + +XCOMM cs20 class +cs20 { side GR length 1 ct_encoding JISX0201.1976-0:GR } -XCOMM cs6 class -cs6 { +XCOMM cs21 class +cs21 { + 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 +} + +XCOMM cs22 class +cs22 { + side GR + length 1 + ct_encoding GEORGIAN-PS:GR +} + +XCOMM cs23 class +cs23 { + side GR + length 1 + ct_encoding MULELAO-1:GR +} + +XCOMM cs24 class +cs24 { side none ct_encoding ISO10646-1 }