components/x11/libX11/patches/45.locale-ja_JP.UTF-8.patch

   1 ###############################################################################
   2 # Copyright (c) 2009, 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/nls/ja_JP.UTF-8/XI18N_OBJS b/nls/ja_JP.UTF-8/XI18N_OBJS
  25 index 9159b67..13f8980 100644
  26 --- a/nls/ja_JP.UTF-8/XI18N_OBJS
  27 +++ b/nls/ja_JP.UTF-8/XI18N_OBJS
  28 @@ -4,5 +4,8 @@
  29  #
  30  #
  31  XLC    common/xlcUTF8Load      _XlcUtf8Loader  # XLC_open
  32 -XIM    common/ximcp    _XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open    XIM_register XIM_unregister
  33 +XIM    common/xiiimp   _SwitchOpenIM           # XIM_open
  34 +XIM    common/ximcp    _XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open    XIM_regiser XIM_unregister
  35 +XIM    common/ximlocal _XimpLocalOpenIM        # XIM_open
  36 +XIM    common/ximp40   _Ximp_OpenIM            # XIM_open
  37  XOM    common/xomGeneric       _XomGenericOpenOM       # XOM_open
  38 diff --git a/nls/ja_JP.UTF-8/XLC_LOCALE.pre b/nls/ja_JP.UTF-8/XLC_LOCALE.pre
  39 index 0f5ebe2..1294bdf 100644
  40 --- a/nls/ja_JP.UTF-8/XLC_LOCALE.pre
  41 +++ b/nls/ja_JP.UTF-8/XLC_LOCALE.pre
  42 @@ -17,7 +17,7 @@ fs0 {
  43      name  ISO8859-1:GL
  44    }
  45    font  {
  46 -    primary   ISO8859-1:GL
  47 +    primary  JISX0201.1976-0:GL;ISO8859-1:GL
  48      vertical_rotate all
  49    }
  50  }
  51 @@ -41,18 +41,29 @@ fs2 {
  52         }
  53  }
  54
  55 -XCOMM   fs3 class (Korean Character)
  56 +XCOMM  fs3 class (Supplementary Kanji)
  57  fs3    {
  58 +        charset {
  59 +                name            JISX0212.1990-0:GL
  60 +                udc_area        \x7521,\x7e7e
  61 +        }
  62 +        font    {
  63 +                primary         JISX0212.1990-0:GL
  64 +        }
  65 +}
  66 +
  67 +XCOMM   fs4 class (Korean Character)
  68 +fs4    {
  69         charset {
  70 -               name    KSC5601.1987-0:GL
  71 +               name    KSC5601.1992-3:GLGR
  72         }
  73         font    {
  74 -               primary KSC5601.1987-0:GL
  75 +               primary KSC5601.1992-3:GLGR
  76         }
  77  }
  78
  79 -XCOMM   fs4 class (Chinese Han Character)
  80 -fs4    {
  81 +XCOMM   fs5 class (Chinese Han Character)
  82 +fs5    {
  83         charset {
  84                 name    GB2312.1980-0:GL
  85         }
  86 @@ -60,8 +71,8 @@ fs4   {
  87                 primary GB2312.1980-0:GL
  88         }
  89  }
  90 -XCOMM  fs5 class (Half Kana)
  91 -fs5    {
  92 +XCOMM  fs6 class (Half Kana)
  93 +fs6    {
  94         charset {
  95                 name    JISX0201.1976-0:GR
  96         }
  97 @@ -75,12 +86,13 @@ XCOMM other fonts are picked up before iso10646-1 fonts.
  98  XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all
  99  XCOMM in ISO8859-X ranges.
 100
 101 -XCOMM fs6 class
 102 -fs6 {
 103 +XCOMM fs7 class
 104 +fs7 {
 105    charset {
 106      name  ISO10646-1
 107    }
 108    font  {
 109 +    load_option     delay_nocheck
 110      primary ISO10646-1
 111    }
 112  }
 113 @@ -100,7 +112,7 @@ XCOMM       cs0 class
 114  cs0    {
 115         side            GL:Default
 116         length          1
 117 -       ct_encoding     ISO8859-1:GL
 118 +       ct_encoding     ISO8859-1:GL;JISX0201.1976-0:GL
 119  }
 120
 121  XCOMM  cs1 class
 122 @@ -119,29 +131,36 @@ cs2       {
 123  }
 124
 125  XCOMM  cs3 class
 126 -cs3     {
 127 -        side            GL
 128 +cs3    {
 129 +       side            GL
 130 +       length          2
 131 +       ct_encoding     JISX0212.1990-0:GL; JISX0212.1990-0:GR
 132 +}
 133 +
 134 +XCOMM  cs4 class
 135 +cs4     {
 136 +        side            GR:Default
 137          length          2
 138 -        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;                        KSC5601.1987-1:GL; KSC5601.1987-1:GR
 139 +        ct_encoding     KSC5601.1992-3:GLGR
 140
 141  }
 142
 143 -XCOMM  cs4 class
 144 -cs4     {
 145 +XCOMM  cs5 class
 146 +cs5     {
 147          side            GR
 148          length          2
 149          ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
 150  }
 151
 152 -XCOMM  cs5 class
 153 -cs5    {
 154 +XCOMM  cs6 class
 155 +cs6    {
 156         side            GR
 157         length          1
 158         ct_encoding     JISX0201.1976-0:GR
 159  }
 160
 161 -XCOMM  cs6 class
 162 -cs6    {
 163 +XCOMM  cs7 class
 164 +cs7    {
 165         side            none
 166         ct_encoding     ISO10646-1
 167  }