688N/A###############################################################################
1064N/A# Copyright (c) 2009, 2011, 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
1370N/Adiff --git a/nls/ja/XI18N_OBJS b/nls/ja/XI18N_OBJS
1370N/Aindex 50b51fe..f682a19 100644
1370N/A--- a/nls/ja/XI18N_OBJS
1370N/A+++ b/nls/ja/XI18N_OBJS
688N/A@@ -4,8 +4,5 @@
688N/A #
688N/A XLC ja/xlibi18n_ja _XlcGenericLoader # XLC_open
688N/A XLC common/xlibi18n _XlcGenericLoader # XLC_open
688N/A-#XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_regiser XIM_unregister
688N/A-XIM common/ximp40 _Ximp_OpenIM # XIM_open
688N/A-XIM common/ximlocal _XimpLocalOpenIM # XIM_open
688N/A XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_regiser XIM_unregister
688N/A XOM common/xomGeneric _XomGenericOpenOM # XOM_open
1370N/Adiff --git a/nls/ja/XLC_LOCALE.pre b/nls/ja/XLC_LOCALE.pre
1370N/Aindex 99decf0..69af5a6 100644
1370N/A--- a/nls/ja/XLC_LOCALE.pre
1370N/A+++ b/nls/ja/XLC_LOCALE.pre
1064N/A@@ -39,16 +39,18 @@ fs2 {
688N/A vertical_rotate all
688N/A }
688N/A }
688N/A+
688N/A XCOMM fs3 class (Supplementary Kanji)
688N/A-XCOMM fs3 {
688N/A-XCOMM charset {
688N/A-XCOMM name JISX0212.1990-0:GL
688N/A-XCOMM udc_area \x7521,\x7e7e
688N/A-XCOMM }
688N/A-XCOMM font {
688N/A-XCOMM primary JISX0212.1990-0:GL
688N/A-XCOMM }
688N/A-XCOMM }
688N/A+fs3 {
688N/A+ charset {
688N/A+ name JISX0212.1990-0:GL
688N/A+ udc_area \x7521,\x7e7e
688N/A+ }
688N/A+ font {
688N/A+ primary JISX0212.1990-0:GL
688N/A+ }
688N/A+}
688N/A+
688N/A END XLC_FONTSET
688N/A
688N/A XCOMM
1370N/A@@ -107,18 +109,17 @@ cs2 {
688N/A }
688N/A
688N/A XCOMM cs3 class
688N/A-XCOMM cs3 {
688N/A-XCOMM side GL
688N/A-XCOMM length 2
688N/A-XCOMM mb_encoding <SS> \x8f
688N/A-XCOMM #if WCHAR32
688N/A-XCOMM wc_encoding \x20000000
688N/A-XCOMM #else
688N/A-XCOMM wc_encoding \x00008000
688N/A-XCOMM #endif
688N/A-XCOMM ct_encoding JISX0212.1990-0:GL; JISX0212.1990-0:GR
688N/A-XCOMM }
688N/A-
688N/A+cs3 {
688N/A+ side GL
688N/A+ length 2
688N/A+ mb_encoding <SS> \x8f
688N/A+#if WCHAR32
688N/A+ wc_encoding \x20000000
688N/A+#else
688N/A+ wc_encoding \x00008000
688N/A+#endif
688N/A+ ct_encoding JISX0212.1990-0:GL; JISX0212.1990-0:GR
688N/A+}
688N/A
688N/A END XLC_XLOCALE
1370N/A