open-src/lib/libX11/lc-ksc5601.1992-3.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 02 Aug 2011 13:30:29 -0700
changeset 1179 4ad971e180c3
parent 1064 3395ca7a91bf
permissions -rw-r--r--
7073739 Mass minor bugfix update to X.Org upstream release [July 2011 edition]

###############################################################################
# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#

diff --git a/src/xlibi18n/lcCT.c b/src/xlibi18n/lcCT.c
index 2fbe8aa..ac07cb1 100644
--- a/src/xlibi18n/lcCT.c
+++ b/src/xlibi18n/lcCT.c
@@ -51,7 +51,7 @@
  * Static representation of a character set that can be used in Compound Text.
  */
 typedef struct _CTDataRec {
-    const char name[19];
+    const char name[20];
     const char ct_sequence[5];	/* Compound Text encoding, ESC sequence */
 } CTDataRec, *CTData;
 
@@ -95,6 +95,7 @@ static const CTDataRec default_ct_data[] =
     { "JISX0212.1990-0:GR", /* JIS_X0212-1990      159   */ "\033$)D" },
     { "KSC5601.1987-0:GL",  /* KS_C_5601-1987      149   */ "\033$(C" },
     { "KSC5601.1987-0:GR",  /* KS_C_5601-1987      149   */ "\033$)C" },
+    { "KSC5601.1992-3:GLGR",  /* KS_C_5601-1992    149   */ "\033%/2" },
     { "CNS11643.1986-1:GL", /* CNS 11643-1992 pl.1 171   */ "\033$(G" },
     { "CNS11643.1986-1:GR", /* CNS 11643-1992 pl.1 171   */ "\033$)G" },
     { "CNS11643.1986-2:GL", /* CNS 11643-1992 pl.2 172   */ "\033$(H" },
diff --git a/src/xlibi18n/lcGeneric.c b/src/xlibi18n/lcGeneric.c
index 619cb47..3f6ebe7 100644
--- a/src/xlibi18n/lcGeneric.c
+++ b/src/xlibi18n/lcGeneric.c
@@ -745,6 +745,8 @@ load_generic(
             /* 3.4.1 side */
             if (!_XlcNCompareISOLatin1(value[0], "none", 4)) {
                 codeset->side =  XlcNONE;
+            } else if (!_XlcNCompareISOLatin1(value[0], "GLGR", 4)) {
+                codeset->side =  XlcGLGR;
             } else if (!_XlcNCompareISOLatin1(value[0], "GL", 2)) {
                 codeset->side =  XlcGL;
             } else {
diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c
index 3e934b7..59dfe1a 100644
--- a/src/xlibi18n/lcUTF8.c
+++ b/src/xlibi18n/lcUTF8.c
@@ -208,6 +208,7 @@ typedef struct {
 #include "lcUniConv/jisx0208.h"
 #include "lcUniConv/jisx0212.h"
 #include "lcUniConv/ksc5601.h"
+#include "lcUniConv/ksc5601_1992.h"
 #include "lcUniConv/big5.h"
 #include "lcUniConv/big5_emacs.h"
 #include "lcUniConv/big5hkscs.h"
@@ -286,6 +287,9 @@ static Utf8ConvRec all_charsets[] = {
     { "KSC5601.1987-0", NULLQUARK,
 	ksc5601_mbtowc, ksc5601_wctomb
     },
+    { "KSC5601.1992-3", NULLQUARK,
+	ksc5601_1992_mbtowc, ksc5601_1992_wctomb
+    },
     { "KOI8-R", NULLQUARK,
 	koi8_r_mbtowc, koi8_r_wctomb
     },