(Fmake_coding_system): Accept property `charset-g3' for CODESYS_UTF8.

[chise/xemacs-chise.git-] / src / text-coding.c

diff --git a/src/text-coding.c b/src/text-coding.c
index c1cc513..0b6ccfd 100644 (file)
--- a/src/text-coding.c
+++ b/src/text-coding.c
@@ -2,7 +2,7 @@
    Copyright (C) 1991, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2011,
-     2012, 2013 MORIOKA Tomohiko
+     2012, 2013, 2016 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -1079,6 +1079,8 @@ if TYPE is 'ccl:
              CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 1) = value;
            else if (EQ (key, Qcharset_g2))
              CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 2) = value;
+           else if (EQ (key, Qcharset_g3))
+             CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 3) = value;
            else
              signal_simple_error ("Unrecognized property", key);
          }
@@ -3554,7 +3556,7 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
 
       /* concord_setup_env_maybe (); */
       open_chise_data_source_maybe ();
-      ret = concord_object_get_feature_value (cos_make_char (character),
+      ret = concord_object_get_attribute (cos_make_char (character),
                                              COS_COMPOSITION);
 
       if (!cos_cons_p (ret))
@@ -3579,7 +3581,7 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
 
          /* concord_setup_env_maybe (); */
          open_chise_data_source_maybe ();
-         ret2 = concord_object_get_feature_value (ret, COS_COMPOSITION);
+         ret2 = concord_object_get_attribute (ret, COS_COMPOSITION);
 
          if (!cos_cons_p (ret2))
            {
@@ -3598,7 +3600,7 @@ COMPOSE_ADD_CHAR (struct decoding_stream *str,
        {
          /* concord_setup_env_maybe (); */
          open_chise_data_source_maybe ();
-         ret = concord_object_get_feature_value (cos_make_char (character),
+         ret = concord_object_get_attribute (cos_make_char (character),
                                                  COS_COMPOSITION);
 
          COMPOSE_FLUSH_CHARS (str, dst);
@@ -4825,6 +4827,13 @@ char_encode_utf8 (struct encoding_stream *str, Emchar ch,
                                                  map, Qnil,
                                                  Qnil, Qnil)) )
            code_point = XINT (ret);
+         else if ( !NILP (map =
+                          CODING_SYSTEM_ISO2022_INITIAL_CHARSET
+                          (str->codesys, 3))
+                   && INTP (ret = Fchar_feature (make_char (ch),
+                                                 map, Qnil,
+                                                 Qnil, Qnil)) )
+           code_point = XINT (ret);
          else if (CODING_SYSTEM_USE_ENTITY_REFERENCE (str->codesys))
            {
              char buf[18];