688N/A###############################################################################

943N/A# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.

688N/A#

688N/A# Permission is hereby granted, free of charge, to any person obtaining a

919N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

919N/A# and/or sell copies of the Software, and to permit persons to whom the

919N/A# Software is furnished to do so, subject to the following conditions:

919N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

919N/A#

919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

688N/A#

688N/A

688N/Adiff -urp -x '*~' -x '*.orig' src/xlibi18n/lcCT.c src/xlibi18n/lcCT.c

688N/A--- src/xlibi18n/lcCT.c 2009-01-28 21:09:42.000000000 -0800

688N/A+++ src/xlibi18n/lcCT.c 2009-04-08 00:20:25.037179000 -0700

986N/A@@ -51,7 +51,7 @@

986N/A * Static representation of a character set that can be used in Compound Text.

986N/A */

986N/A typedef struct _CTDataRec {

986N/A- const char name[19];

986N/A+ const char name[20];

986N/A const char ct_sequence[5]; /* Compound Text encoding, ESC sequence */

986N/A } CTDataRec, *CTData;

986N/A

688N/A@@ -97,6 +97,7 @@ static const CTDataRec default_ct_data[]

688N/A { "JISX0212.1990-0:GR", /* JIS_X0212-1990 159 */ "\033$)D" },

688N/A { "KSC5601.1987-0:GL", /* KS_C_5601-1987 149 */ "\033$(C" },

688N/A { "KSC5601.1987-0:GR", /* KS_C_5601-1987 149 */ "\033$)C" },

986N/A+ { "KSC5601.1992-3:GLGR", /* KS_C_5601-1992 149 */ "\033%/2" },

688N/A { "CNS11643.1986-1:GL", /* CNS 11643-1992 pl.1 171 */ "\033$(G" },

688N/A { "CNS11643.1986-1:GR", /* CNS 11643-1992 pl.1 171 */ "\033$)G" },

688N/A { "CNS11643.1986-2:GL", /* CNS 11643-1992 pl.2 172 */ "\033$(H" },

688N/Adiff -urp -x '*~' -x '*.orig' src/xlibi18n/lcGeneric.c src/xlibi18n/lcGeneric.c

688N/A--- src/xlibi18n/lcGeneric.c 2009-01-28 21:09:42.000000000 -0800

688N/A+++ src/xlibi18n/lcGeneric.c 2009-04-08 00:20:25.037898000 -0700

688N/A@@ -758,6 +758,8 @@ load_generic(

688N/A /* 3.4.1 side */

688N/A if (!_XlcNCompareISOLatin1(value[0], "none", 4)) {

688N/A codeset->side = XlcNONE;

688N/A+ } else if (!_XlcNCompareISOLatin1(value[0], "GLGR", 4)) {

688N/A+ codeset->side = XlcGLGR;

688N/A } else if (!_XlcNCompareISOLatin1(value[0], "GL", 2)) {

688N/A codeset->side = XlcGL;

688N/A } else {

688N/Adiff -urp -x '*~' -x '*.orig' src/xlibi18n/lcUTF8.c src/xlibi18n/lcUTF8.c

688N/A--- src/xlibi18n/lcUTF8.c 2009-01-28 21:09:43.000000000 -0800

688N/A+++ src/xlibi18n/lcUTF8.c 2009-04-08 00:20:25.071063000 -0700

688N/A@@ -210,6 +210,7 @@ typedef struct {

688N/A #include "lcUniConv/jisx0208.h"

688N/A #include "lcUniConv/jisx0212.h"

688N/A #include "lcUniConv/ksc5601.h"

688N/A+#include "lcUniConv/ksc5601_1992.h"

688N/A #include "lcUniConv/big5.h"

688N/A #include "lcUniConv/big5_emacs.h"

688N/A #include "lcUniConv/big5hkscs.h"

688N/A@@ -288,6 +289,9 @@ static Utf8ConvRec all_charsets[] = {

688N/A { "KSC5601.1987-0", NULLQUARK,

688N/A ksc5601_mbtowc, ksc5601_wctomb

688N/A },

688N/A+ { "KSC5601.1992-3", NULLQUARK,

688N/A+ ksc5601_1992_mbtowc, ksc5601_1992_wctomb

688N/A+ },

688N/A { "KOI8-R", NULLQUARK,

688N/A koi8_r_mbtowc, koi8_r_wctomb

688N/A },