diff options
Diffstat (limited to 'xc/nls')
-rw-r--r-- | xc/nls/Imakefile | 7 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/armscii-8 | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/en_US.UTF-8 | 36 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/georgian-academy | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/georgian-ps | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/ibm-cp1133 | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/iscii-dev | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/isiri-3342 | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/iso8859-9e | 14 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/koi8-c | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/koi8-r | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/koi8-u | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/microsoft-cp1251 | 15 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/microsoft-cp1255 | 15 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/microsoft-cp1256 | 15 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/mulelao-1 | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/nokhchi-1 | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/tatar-cyr | 15 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/tscii-0 | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/vi_VN.tcvn | 30 | ||||
-rw-r--r-- | xc/nls/XLC_LOCALE/vi_VN.viscii | 30 | ||||
-rw-r--r-- | xc/nls/locale.alias | 4 | ||||
-rw-r--r-- | xc/nls/locale.dir | 8 |
23 files changed, 462 insertions, 87 deletions
diff --git a/xc/nls/Imakefile b/xc/nls/Imakefile index 341e6c96a..2b39765b6 100644 --- a/xc/nls/Imakefile +++ b/xc/nls/Imakefile @@ -3,12 +3,15 @@ XCOMM $XConsortium: Imakefile /main/5 1996/11/13 14:45:33 lehors $ -XCOMM $XFree86: xc/nls/Imakefile,v 1.4 1999/08/22 13:04:24 dawes Exp $ +XCOMM $XFree86: xc/nls/Imakefile,v 1.5 2000/12/02 01:16:04 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags SUBDIRS = XLC_LOCALE Compose - DEFINES = -DR63_COMPAT +#if defined(FreeBSDArchitecture) + RU_SU_DEFINES = -DINCLUDE_ru_SU +#endif + DEFINES = -DR63_COMPAT $(RU_SU_DEFINES) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) diff --git a/xc/nls/XLC_LOCALE/armscii-8 b/xc/nls/XLC_LOCALE/armscii-8 index 0ec1a284d..7fb19f741 100644 --- a/xc/nls/XLC_LOCALE/armscii-8 +++ b/xc/nls/XLC_LOCALE/armscii-8 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/armscii-8,v 1.1 1999/06/06 14:05:58 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/armscii-8,v 1.2 2000/12/01 17:43:02 dawes Exp $ XCOMM XLocale Database Sample for armscii-8. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font ARMSCII-8:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary ARMSCII-8:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name ARMSCII-8 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding ARMSCII-8:GR; ISO8859-1:GR + ct_encoding ARMSCII-8:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/en_US.UTF-8 b/xc/nls/XLC_LOCALE/en_US.UTF-8 index 6779498a4..9919a8d25 100644 --- a/xc/nls/XLC_LOCALE/en_US.UTF-8 +++ b/xc/nls/XLC_LOCALE/en_US.UTF-8 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/en_US.UTF-8,v 1.2 2000/02/29 03:09:07 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/en_US.UTF-8,v 1.3 2000/12/01 17:43:02 dawes Exp $ XCOMM XLocale Database Sample for en_US.UTF-8 XCOMM @@ -14,7 +14,7 @@ object_name generic XCOMM fs0 class fs0 { charset { - name ISO10646-1:none + name ISO10646-1 } font { primary ISO10646-1 @@ -85,58 +85,58 @@ XCOMM XLC_XLOCALE category XCOMM XLC_XLOCALE -encoding_name "UTF-8" +encoding_name UTF-8 mb_cur_max 6 state_depend_encoding False XCOMM cs0 class cs0 { - side none -} - -XCOMM cs1 class -cs1 { side GL:Default length 1 ct_encoding ISO8859-1:GL } -XCOMM cs2 class -cs2 { +XCOMM cs1 class +cs1 { side GR:Default length 1 ct_encoding ISO8859-1:GR } -XCOMM cs3 class -cs3 { +XCOMM cs2 class +cs2 { 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 { +XCOMM cs3 class +cs3 { 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 { +XCOMM cs4 class +cs4 { side GR length 2 ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR } -XCOMM cs6 class -cs6 { +XCOMM cs5 class +cs5 { side GR length 1 ct_encoding JISX0201.1976-0:GR } +XCOMM cs6 class +cs6 { + side none + ct_encoding ISO10646-1 +} END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/georgian-academy b/xc/nls/XLC_LOCALE/georgian-academy index 418c0700a..37adcb781 100644 --- a/xc/nls/XLC_LOCALE/georgian-academy +++ b/xc/nls/XLC_LOCALE/georgian-academy @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/georgian-academy,v 1.1 1999/06/06 14:05:58 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/georgian-academy,v 1.2 2000/12/01 17:43:02 dawes Exp $ XCOMM XLocale Database Sample for georgian-academy XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font GEORGIAN-ACADEMY:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary GEORGIAN-ACADEMY:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name GEORGIAN-ACADEMY + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding GEORGIAN-ACADEMY:GR; ISO8859-1:GR + ct_encoding GEORGIAN-ACADEMY:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/georgian-ps b/xc/nls/XLC_LOCALE/georgian-ps index 835b1638c..49f449bf6 100644 --- a/xc/nls/XLC_LOCALE/georgian-ps +++ b/xc/nls/XLC_LOCALE/georgian-ps @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/georgian-ps,v 1.1 1999/06/06 14:05:58 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/georgian-ps,v 1.2 2000/12/01 17:43:02 dawes Exp $ XCOMM XLocale Database Sample for georgian-ps XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font GEORGIAN-PS:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary GEORGIAN-PS:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name GEORGIAN-PS + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding GEORGIAN-PS:GR; ISO8859-1:GR + ct_encoding GEORGIAN-PS:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/ibm-cp1133 b/xc/nls/XLC_LOCALE/ibm-cp1133 index ecde71205..e08fbb1b8 100644 --- a/xc/nls/XLC_LOCALE/ibm-cp1133 +++ b/xc/nls/XLC_LOCALE/ibm-cp1133 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/ibm-cp1133,v 1.1 1999/06/06 14:05:59 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/ibm-cp1133,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XLocale Database Sample for ibm-cp1133. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font IBM-CP1133:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary IBM-CP1133:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name IBM-CP1133 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding IBM-CP1133:GR; ISO8859-1:GR + ct_encoding IBM-CP1133:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/iscii-dev b/xc/nls/XLC_LOCALE/iscii-dev index 06a69572e..9910e7133 100644 --- a/xc/nls/XLC_LOCALE/iscii-dev +++ b/xc/nls/XLC_LOCALE/iscii-dev @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/iscii-dev,v 1.1 2000/10/27 18:30:53 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iscii-dev,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XLocale Database Sample for mulelao-1. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font ISCII-DEV:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary ISCII-DEV:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name ISCII-DEV + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding ISCII-DEV:GR; ISO8859-1:GR + ct_encoding ISCII-DEV:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/isiri-3342 b/xc/nls/XLC_LOCALE/isiri-3342 index 5d6817afa..d76a03596 100644 --- a/xc/nls/XLC_LOCALE/isiri-3342 +++ b/xc/nls/XLC_LOCALE/isiri-3342 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/isiri-3342,v 1.1 2000/10/27 18:30:55 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/isiri-3342,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XLocale Database Sample for mulelao-1. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font ISIRI-3342:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary ISIRI-3342:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } 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 @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding ISIRI-3342:GR; ISO8859-1:GR + ct_encoding ISIRI-3342:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/iso8859-9e b/xc/nls/XLC_LOCALE/iso8859-9e index 3b0e5a8d1..8157a2f32 100644 --- a/xc/nls/XLC_LOCALE/iso8859-9e +++ b/xc/nls/XLC_LOCALE/iso8859-9e @@ -1,7 +1,7 @@ XCOMM $XConsortium: iso8859-9e /main/7 1996/09/28 16:51:50 rws $ XCOMM XLocale Database Sample for iso8859-9e. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-9e,v 1.2 2000/10/28 00:34:03 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-9e,v 1.3 2000/12/01 17:43:03 dawes Exp $ XCOMM XCOMM XLC_FONTSET category @@ -28,6 +28,18 @@ fs1 { } } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name ISO8859-9E + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE XCOMM XCOMM XLC_XLOCALE category diff --git a/xc/nls/XLC_LOCALE/koi8-c b/xc/nls/XLC_LOCALE/koi8-c index ffe2b2ec1..4941705d7 100644 --- a/xc/nls/XLC_LOCALE/koi8-c +++ b/xc/nls/XLC_LOCALE/koi8-c @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-c,v 1.1 2000/10/27 18:30:56 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-c,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XLocale Database Sample for koi8-c. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font KOI8-C:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary KOI8-C:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } 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 @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding KOI8-C:GR; ISO8859-1:GR + ct_encoding KOI8-C:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/koi8-r b/xc/nls/XLC_LOCALE/koi8-r index 0e09f6497..9b78347f3 100644 --- a/xc/nls/XLC_LOCALE/koi8-r +++ b/xc/nls/XLC_LOCALE/koi8-r @@ -2,7 +2,7 @@ XCOMM $TOG: koi8-r /main/2 1997/09/29 13:14:37 kaleb $ XCOMM XLocale Database Sample for koi8-r. XCOMM XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-r,v 3.2 1997/11/16 06:17:47 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-r,v 3.3 2000/12/01 17:43:03 dawes Exp $ XCOMM XCOMM XLC_FONTSET category @@ -10,8 +10,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font KOI8-R:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary KOI8-R:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -20,6 +25,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name KOI8-R + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -36,6 +54,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -54,7 +76,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding KOI8-R:GR; ISO8859-1:GR + ct_encoding KOI8-R:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/koi8-u b/xc/nls/XLC_LOCALE/koi8-u index a3cd7e9d3..4fb8d3217 100644 --- a/xc/nls/XLC_LOCALE/koi8-u +++ b/xc/nls/XLC_LOCALE/koi8-u @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-u,v 1.1 1999/05/30 02:28:03 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-u,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XLocale Database Sample for koi8-u. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font KOI8-U:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary KOI8-U:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name KOI8-U + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding KOI8-U:GR; ISO8859-1:GR + ct_encoding KOI8-U:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/microsoft-cp1251 b/xc/nls/XLC_LOCALE/microsoft-cp1251 index 98a3ffad2..3725553c0 100644 --- a/xc/nls/XLC_LOCALE/microsoft-cp1251 +++ b/xc/nls/XLC_LOCALE/microsoft-cp1251 @@ -1,7 +1,7 @@ XCOMM $TOG: microsoft-cp1251 /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for microsoft-cp1251. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1251,v 1.1 2000/10/27 18:30:56 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1251,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XCOMM XLC_FONTSET category @@ -29,6 +29,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name MICROSOFT-CP1251 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM diff --git a/xc/nls/XLC_LOCALE/microsoft-cp1255 b/xc/nls/XLC_LOCALE/microsoft-cp1255 index ad84b5edd..da9103069 100644 --- a/xc/nls/XLC_LOCALE/microsoft-cp1255 +++ b/xc/nls/XLC_LOCALE/microsoft-cp1255 @@ -1,7 +1,7 @@ XCOMM $TOG: microsoft-cp1255 /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for microsoft-cp1255. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1255,v 1.1 2000/10/27 18:30:56 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1255,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XCOMM XLC_FONTSET category @@ -29,6 +29,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name MICROSOFT-CP1255 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM diff --git a/xc/nls/XLC_LOCALE/microsoft-cp1256 b/xc/nls/XLC_LOCALE/microsoft-cp1256 index 661af1066..3fb6dc961 100644 --- a/xc/nls/XLC_LOCALE/microsoft-cp1256 +++ b/xc/nls/XLC_LOCALE/microsoft-cp1256 @@ -1,7 +1,7 @@ XCOMM $TOG: microsoft-cp1256 /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for microsoft-cp1256. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1256,v 1.1 2000/10/27 18:30:57 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1256,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XCOMM XLC_FONTSET category @@ -29,6 +29,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name MICROSOFT-CP1256 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM diff --git a/xc/nls/XLC_LOCALE/mulelao-1 b/xc/nls/XLC_LOCALE/mulelao-1 index 78c96900a..7b96302c9 100644 --- a/xc/nls/XLC_LOCALE/mulelao-1 +++ b/xc/nls/XLC_LOCALE/mulelao-1 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/mulelao-1,v 1.1 1999/06/06 14:05:59 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/mulelao-1,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XLocale Database Sample for mulelao-1. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font MULELAO-1:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary MULELAO-1:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name MULELAO-1 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding MULELAO-1:GR; ISO8859-1:GR + ct_encoding MULELAO-1:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/nokhchi-1 b/xc/nls/XLC_LOCALE/nokhchi-1 index 8ff4933ed..8750b3bab 100644 --- a/xc/nls/XLC_LOCALE/nokhchi-1 +++ b/xc/nls/XLC_LOCALE/nokhchi-1 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/nokhchi-1,v 1.1 2000/10/27 18:30:57 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/nokhchi-1,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XLocale Database Sample for mulelao-1. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font NOKHCHI-1:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary NOKHCHI-1:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } 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 @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding NOKHCHI-1:GR; ISO8859-1:GR + ct_encoding NOKHCHI-1:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/tatar-cyr b/xc/nls/XLC_LOCALE/tatar-cyr index b1960dee0..17f9893f2 100644 --- a/xc/nls/XLC_LOCALE/tatar-cyr +++ b/xc/nls/XLC_LOCALE/tatar-cyr @@ -1,7 +1,7 @@ XCOMM $TOG: tatar-cyr /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for tatar-cyr. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/tatar-cyr,v 1.1 2000/10/27 18:30:57 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/tatar-cyr,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XCOMM XLC_FONTSET category @@ -29,6 +29,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name TATAR-CYR + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM diff --git a/xc/nls/XLC_LOCALE/tscii-0 b/xc/nls/XLC_LOCALE/tscii-0 index 05197e899..19b610c3b 100644 --- a/xc/nls/XLC_LOCALE/tscii-0 +++ b/xc/nls/XLC_LOCALE/tscii-0 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/tscii-0,v 1.1 2000/10/27 18:30:57 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/tscii-0,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XLocale Database Sample for mulelao-1. XCOMM @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font TSCII-0:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary TSCII-0:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name TSCII-0 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding TSCII-0:GR; ISO8859-1:GR + ct_encoding TSCII-0:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/vi_VN.tcvn b/xc/nls/XLC_LOCALE/vi_VN.tcvn index af3d0ea8a..76b10547d 100644 --- a/xc/nls/XLC_LOCALE/vi_VN.tcvn +++ b/xc/nls/XLC_LOCALE/vi_VN.tcvn @@ -1,6 +1,6 @@ XCOMM XLocale Database Sample for vi_VN.TCVN XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/vi_VN.tcvn,v 1.1 1999/06/06 14:06:02 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/vi_VN.tcvn,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XCOMM XLC_FONTSET category @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font TCVN-5712:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary TCVN-5712:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name TCVN-5712 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding TCVN-5712:GR; ISO8859-1:GR + ct_encoding TCVN-5712:GR } END XLC_XLOCALE diff --git a/xc/nls/XLC_LOCALE/vi_VN.viscii b/xc/nls/XLC_LOCALE/vi_VN.viscii index 061b16bcd..9018602b0 100644 --- a/xc/nls/XLC_LOCALE/vi_VN.viscii +++ b/xc/nls/XLC_LOCALE/vi_VN.viscii @@ -1,6 +1,6 @@ XCOMM XLocale Database Sample for vi_VN.VISCII XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/vi_VN.viscii,v 1.1 1999/06/06 14:06:02 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/vi_VN.viscii,v 1.2 2000/12/01 17:43:03 dawes Exp $ XCOMM XCOMM XLC_FONTSET category @@ -8,8 +8,13 @@ XCOMM XLC_FONTSET XCOMM fs0 class (7 bit ASCII) fs0 { - charset ISO8859-1:GL - font VISCII1.1-1:GL; ISO8859-1:GL + charset { + name ISO8859-1:GL + } + font { + primary VISCII1.1-1:GL + substitute ISO8859-1:GL + } } XCOMM fs1 class fs1 { @@ -18,6 +23,19 @@ fs1 { } END XLC_FONTSET +XCOMM +XCOMM XLC_CHARSET_DEFINE category +XCOMM +XLC_CHARSET_DEFINE +csd0 { + charset_name VISCII1.1-1 + side GR + length 1 + string_encoding False + sequence \x1b%/1 +} +END XLC_CHARSET_DEFINE + XCOMM XCOMM XLC_XLOCALE category XCOMM @@ -34,6 +52,10 @@ wc_encoding_mask \x00008080 wc_shift_bits 8 #endif +#ifndef X_LOCALE +use_stdc_env True +#endif + XCOMM cs0 class cs0 { side GL:Default @@ -52,7 +74,7 @@ cs1 { #else wc_encoding \x00008080 #endif - ct_encoding VISCII1.1-1:GR; ISO8859-1:GR + ct_encoding VISCII1.1-1:GR } END XLC_XLOCALE diff --git a/xc/nls/locale.alias b/xc/nls/locale.alias index 9e43d8050..ee70a4a14 100644 --- a/xc/nls/locale.alias +++ b/xc/nls/locale.alias @@ -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.32 2000/11/28 23:43:41 dawes Exp $ +XCOMM $XFree86: xc/nls/locale.alias,v 1.33 2000/12/02 01:16:04 dawes Exp $ XCOMM #ifdef R63_COMPAT XCOMM These entries are in the old format (no ':') @@ -442,6 +442,7 @@ wa_BE.iso885915 wa_BE.ISO8859-15 zh zh_CN.eucCN zh_CN zh_CN.eucCN zh_CN.big5 zh_TW.big5 +zh_CN.Big5 zh_TW.big5 zh_CN.EUC zh_CN.eucCN zh_CN.euc zh_CN.eucCN zh_CN.gb2312 zh_CN.eucCN @@ -1031,6 +1032,7 @@ yi_US.MICROSOFT-CP1255: yi_US.CP1255 zh: zh_CN.eucCN zh_CN: zh_CN.eucCN zh_CN.big5: zh_TW.big5 +zh_CN.Big5: zh_TW.big5 zh_CN.EUC: zh_CN.eucCN zh_CN.euc: zh_CN.eucCN zh_CN.gb2312: zh_CN.eucCN diff --git a/xc/nls/locale.dir b/xc/nls/locale.dir index 87be9bbd3..5624c9bb7 100644 --- a/xc/nls/locale.dir +++ b/xc/nls/locale.dir @@ -4,7 +4,7 @@ XCOMM This file contains locale database file name XCOMM The first word is the locale database file name and XCOMM the second word is full locale name. XCOMM -XCOMM $XFree86: xc/nls/locale.dir,v 1.17 2000/11/27 17:45:54 dawes Exp $ +XCOMM $XFree86: xc/nls/locale.dir,v 1.18 2000/12/01 17:43:02 dawes Exp $ XCOMM #ifdef R63_COMPAT XCOMM These entries are in the old format (no ':') @@ -122,7 +122,6 @@ iso8859-1/XLC_LOCALE is_IS.ISO8859-1 iso8859-15/XLC_LOCALE is_IS.ISO8859-15 iso8859-1/XLC_LOCALE it_CH.ISO8859-1 iso8859-1/XLC_LOCALE it_IT.ISO8859-1 -nunacom-8/XLC_LOCALE iu_CA.NUNACOM-8 ja/XLC_LOCALE ja_JP.eucJP ja.SJIS/XLC_LOCALE ja_JP.SJIS ja.JIS/XLC_LOCALE ja_JP.JIS7 @@ -200,7 +199,7 @@ zh/XLC_LOCALE zh_CN.eucCN zh/XLC_LOCALE zh_CN.GB2312 zh_TW.big5/XLC_LOCALE zh_TW.big5 zh_TW.big5/XLC_LOCALE zh_TW.Big5 -zh_TW.cns11643/XLC_LOCALE zh_TW.eucTW +zh_TW/XLC_LOCALE zh_TW.eucTW XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress. en_US.UTF-8/XLC_LOCALE af_ZA.UTF-8 en_US.UTF-8/XLC_LOCALE ar_AA.UTF-8 @@ -457,7 +456,6 @@ iso8859-1/XLC_LOCALE: is_IS.ISO8859-1 iso8859-15/XLC_LOCALE: is_IS.ISO8859-15 iso8859-1/XLC_LOCALE: it_CH.ISO8859-1 iso8859-1/XLC_LOCALE: it_IT.ISO8859-1 -nunacom-8/XLC_LOCALE: iu_CA.NUNACOM-8 ja/XLC_LOCALE: ja_JP.eucJP ja.SJIS/XLC_LOCALE: ja_JP.SJIS ja.JIS/XLC_LOCALE: ja_JP.JIS7 @@ -534,7 +532,7 @@ zh/XLC_LOCALE: zh_CN.eucCN zh/XLC_LOCALE: zh_CN.GB2312 zh_TW.big5/XLC_LOCALE: zh_TW.big5 zh_TW.big5/XLC_LOCALE: zh_TW.Big5 -zh_TW.cns11643/XLC_LOCALE: zh_TW.eucTW +zh_TW/XLC_LOCALE: zh_TW.eucTW XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress. en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8 en_US.UTF-8/XLC_LOCALE: ar_AA.UTF-8 |