components/x11/libX11/patches/15.lc-ksc5601.1992-3.patch

   1 ###############################################################################
   2 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
   3 #
   4 # Permission is hereby granted, free of charge, to any person obtaining a
   5 # copy of this software and associated documentation files (the "Software"),
   6 # to deal in the Software without restriction, including without limitation
   7 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   8 # and/or sell copies of the Software, and to permit persons to whom the
   9 # Software is furnished to do so, subject to the following conditions:
  10 #
  11 # The above copyright notice and this permission notice (including the next
  12 # paragraph) shall be included in all copies or substantial portions of the
  13 # Software.
  14 #
  15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  16 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  17 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  18 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  21 # DEALINGS IN THE SOFTWARE.
  22 #
  23
  24 diff --git a/src/xlibi18n/lcCT.c b/src/xlibi18n/lcCT.c
  25 index b161300..624379a 100644
  26 --- a/src/xlibi18n/lcCT.c
  27 +++ b/src/xlibi18n/lcCT.c
  28 @@ -51,7 +51,7 @@
  29   * Static representation of a character set that can be used in Compound Text.
  30   */
  31  typedef struct _CTDataRec {
  32 -    const char name[19];
  33 +    const char name[20];
  34      const char ct_sequence[5]; /* Compound Text encoding, ESC sequence */
  35  } CTDataRec, *CTData;
  36
  37 @@ -95,6 +95,7 @@ static const CTDataRec default_ct_data[] =
  38      { "JISX0212.1990-0:GR", /* JIS_X0212-1990      159   */ "\033$)D" },
  39      { "KSC5601.1987-0:GL",  /* KS_C_5601-1987      149   */ "\033$(C" },
  40      { "KSC5601.1987-0:GR",  /* KS_C_5601-1987      149   */ "\033$)C" },
  41 +    { "KSC5601.1992-3:GLGR",  /* KS_C_5601-1992    149   */ "\033%/2" },
  42      { "CNS11643.1986-1:GL", /* CNS 11643-1992 pl.1 171   */ "\033$(G" },
  43      { "CNS11643.1986-1:GR", /* CNS 11643-1992 pl.1 171   */ "\033$)G" },
  44      { "CNS11643.1986-2:GL", /* CNS 11643-1992 pl.2 172   */ "\033$(H" },
  45 diff --git a/src/xlibi18n/lcGeneric.c b/src/xlibi18n/lcGeneric.c
  46 index 20c455c..0562a71 100644
  47 --- a/src/xlibi18n/lcGeneric.c
  48 +++ b/src/xlibi18n/lcGeneric.c
  49 @@ -747,6 +747,8 @@ load_generic(
  50              /* 3.4.1 side */
  51              if (!_XlcNCompareISOLatin1(value[0], "none", 4)) {
  52                  codeset->side =  XlcNONE;
  53 +            } else if (!_XlcNCompareISOLatin1(value[0], "GLGR", 4)) {
  54 +                codeset->side =  XlcGLGR;
  55              } else if (!_XlcNCompareISOLatin1(value[0], "GL", 2)) {
  56                  codeset->side =  XlcGL;
  57              } else {
  58 diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c
  59 index 0f3d0d2..18af23d 100644
  60 --- a/src/xlibi18n/lcUTF8.c
  61 +++ b/src/xlibi18n/lcUTF8.c
  62 @@ -208,6 +208,7 @@ typedef struct {
  63  #include "lcUniConv/jisx0208.h"
  64  #include "lcUniConv/jisx0212.h"
  65  #include "lcUniConv/ksc5601.h"
  66 +#include "lcUniConv/ksc5601_1992.h"
  67  #include "lcUniConv/big5.h"
  68  #include "lcUniConv/big5_emacs.h"
  69  #include "lcUniConv/big5hkscs.h"
  70 @@ -286,6 +287,9 @@ static Utf8ConvRec all_charsets[] = {
  71      { "KSC5601.1987-0", NULLQUARK,
  72         ksc5601_mbtowc, ksc5601_wctomb
  73      },
  74 +    { "KSC5601.1992-3", NULLQUARK,
  75 +       ksc5601_1992_mbtowc, ksc5601_1992_wctomb
  76 +    },
  77      { "KOI8-R", NULLQUARK,
  78         koi8_r_mbtowc, koi8_r_wctomb
  79      },