(Fsave_char_attribute_table): Use `save_charset_properties' for CCS

[chise/xemacs-chise.git.1] / src / chartab.c

diff --git a/src/chartab.c b/src/chartab.c
index 82b3f21..d22b611 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1130,10 +1130,6 @@ make_char_id_table (Lisp_Object initval)
 }
 
 
-#if defined(HAVE_CHISE) && !defined(HAVE_LIBCHISE_LIBCHISE)
-Lisp_Object Qsystem_char_id;
-#endif
-
 Lisp_Object Qcomposition;
 Lisp_Object Q_decomposition;
 Lisp_Object Q_identical;
@@ -3279,6 +3275,41 @@ Return DEFAULT-VALUE if the value is not exist.
   return default_value;
 }
 
+static Lisp_Object
+find_char_feature_in_family (Lisp_Object character,
+                            Lisp_Object con_feature,
+                            Lisp_Object feature,
+                            Lisp_Object feature_rel_max)
+{
+  Lisp_Object ancestors
+    = Fget_char_attribute (character, con_feature, Qnil);
+
+  while (!NILP (ancestors))
+    {
+      Lisp_Object ancestor = XCAR (ancestors);
+      Lisp_Object ret;
+
+      if (EQ (ancestor, character))
+       return Qunbound;
+
+      ret = Fchar_feature (ancestor, feature, Qunbound,
+                          Qnil, make_int (0));
+      if (!UNBOUNDP (ret))
+       return ret;
+
+      ancestors = XCDR (ancestors);
+
+      ret = Fget_char_attribute (ancestor, Q_subsumptive_from, Qnil);
+      if (!NILP (ret))
+       ancestors = nconc2 (Fcopy_sequence (ancestors), ret);
+
+      ret = Fget_char_attribute (ancestor, Q_denotational_from, Qnil);
+      if (!NILP (ret))
+       ancestors = nconc2 (Fcopy_sequence (ancestors), ret);
+    }
+  return Qunbound;
+}
+
 DEFUN ("char-feature", Fchar_feature, 2, 5, 0, /*
 Return the value of CHARACTER's FEATURE.
 Return DEFAULT-VALUE if the value is not exist.
@@ -3329,38 +3360,20 @@ Return DEFAULT-VALUE if the value is not exist.
 
       if ( (name_str[0] != '=') || (name_str[1] == '>') )
        {
-         Lisp_Object ancestors
-           = Fget_char_attribute (character, Q_identical, Qnil);
-
-         if (NILP (ancestors))
-           ancestors
-             = Fget_char_attribute (character, Q_subsumptive_from, Qnil);
-
-         if (NILP (ancestors))
-           ancestors
-             = Fget_char_attribute (character, Q_denotational_from, Qnil);
+         ret = find_char_feature_in_family (character, Q_identical,
+                                            attribute, feature_rel_max);
+         if (!UNBOUNDP (ret))
+           return ret;
 
-         while (!NILP (ancestors))
-           {
-             Lisp_Object ancestor = XCAR (ancestors);
+         ret = find_char_feature_in_family (character, Q_subsumptive_from,
+                                            attribute, feature_rel_max);
+         if (!UNBOUNDP (ret))
+           return ret;
 
-             if (!EQ (ancestor, character))
-               {
-                 ret = Fchar_feature (ancestor, attribute, Qunbound,
-                                      Qnil, make_int (0));
-                 if (!UNBOUNDP (ret))
-                   return ret;
-
-                 ancestors = XCDR (ancestors);
-                 ret = Fget_char_attribute (ancestor,
-                                            Q_subsumptive_from, Qnil);
-                 if (!NILP (ret))
-                   ancestors = nconc2 (Fcopy_sequence (ancestors), ret);
-               }
-             else
-               return default_value;
-             /* ancestors = XCDR (ancestors); */
-           }
+         ret = find_char_feature_in_family (character, Q_denotational_from,
+                                            attribute, feature_rel_max);
+         if (!UNBOUNDP (ret))
+           return ret;
        }
     }
   return default_value;
@@ -3495,9 +3508,13 @@ Store CHARACTER's ATTRIBUTE with VALUE.
            EQ (attribute, Q_identical_from) ||
            EQ (attribute, Q_component) ||
            EQ (attribute, Q_component_of) ||
-           !NILP (Fstring_match (build_string ("^<-simplified[^*]*$"),
-                                 Fsymbol_name (attribute),
-                                 Qnil, Qnil)) )
+           !NILP (Fstring_match
+                  (build_string ("^\\(<-\\|->\\)\\(simplified"
+                                 "\\|same\\|vulgar\\|wrong"
+                                 "\\|original\\|ancient"
+                                 "\\)[^*]*$"),
+                   Fsymbol_name (attribute),
+                   Qnil, Qnil)) )
     {
       Lisp_Object rest = value;
       Lisp_Object ret;
@@ -3526,14 +3543,23 @@ Store CHARACTER's ATTRIBUTE with VALUE.
          Lisp_String* name = symbol_name (XSYMBOL (attribute));
          Bufbyte *name_str = string_data (name);
 
-         if (name_str[0] == '<' && name_str[1] == '-')
+         if ( (name_str[0] == '<' && name_str[1] == '-') || 
+              (name_str[0] == '-' && name_str[1] == '>') )
            {
              Bytecount length = string_length (name);
              Bufbyte *rev_name_str = alloca (length + 1);
 
              memcpy (rev_name_str + 2, name_str + 2, length - 2);
-             rev_name_str[0] = '-';
-             rev_name_str[1] = '>';
+             if (name_str[0] == '<')
+               {
+                 rev_name_str[0] = '-';
+                 rev_name_str[1] = '>';
+               }
+             else
+               {
+                 rev_name_str[0] = '<';
+                 rev_name_str[1] = '-';
+               }
              rev_name_str[length] = 0;
              rev_feature = intern (rev_name_str);
            }
@@ -3554,8 +3580,9 @@ Store CHARACTER's ATTRIBUTE with VALUE.
              if (!CONSP (ffv))
                put_char_attribute (ret, rev_feature, list1 (character));
              else if (NILP (Fmemq (character, ffv)))
-               put_char_attribute (ret, rev_feature,
-                                   Fcons (character, ffv));
+               put_char_attribute
+                 (ret, rev_feature,
+                  nconc2 (Fcopy_sequence (ffv), list1 (character)));
              Fsetcar (rest, ret);
            }
          rest = XCDR (rest);
@@ -3762,6 +3789,10 @@ char_attribute_system_db_file (Lisp_Object key_type, Lisp_Object attribute,
 }
 #endif /* not HAVE_LIBCHISE */
 
+#ifdef HAVE_LIBCHISE
+Lisp_Object save_charset_properties (Lisp_Object charset);
+#endif /* HAVE_LIBCHISE */
+
 DEFUN ("save-char-attribute-table", Fsave_char_attribute_table, 1, 1, 0, /*
 Save values of ATTRIBUTE into database file.
 */
@@ -3802,11 +3833,21 @@ Save values of ATTRIBUTE into database file.
     {
       Lisp_Object (*filter)(Lisp_Object value);
 
-      if ( EQ (attribute, Qideographic_structure)
+      if ( !NILP (Ffind_charset (attribute)) )
+       {
+#ifdef HAVE_LIBCHISE
+         save_charset_properties (attribute);
+#endif /* HAVE_LIBCHISE */
+         filter = NULL;
+       }
+      else if ( EQ (attribute, Qideographic_structure)
           || EQ (attribute, Q_identical)
           || EQ (attribute, Q_identical_from)
           || !NILP (Fstring_match
-                    (build_string ("^\\(<-\\|->\\)simplified[^*]*$"),
+                    (build_string ("^\\(<-\\|->\\)\\(simplified"
+                                   "\\|same\\|vulgar\\|wrong"
+                                   "\\|original\\|ancient"
+                                   "\\)[^*]*$"),
                      Fsymbol_name (attribute),
                      Qnil, Qnil)) )
        filter = &Fchar_refs_simplify_char_specs;
@@ -4572,10 +4613,6 @@ syms_of_chartab (void)
   INIT_LRECORD_IMPLEMENTATION (uint16_byte_table);
   INIT_LRECORD_IMPLEMENTATION (byte_table);
 
-#if defined(HAVE_CHISE) && !defined(HAVE_LIBCHISE_LIBCHISE)
-  defsymbol (&Qsystem_char_id,         "system-char-id");
-#endif
-
   defsymbol (&Qto_ucs,                 "=>ucs");
   defsymbol (&Q_ucs_unified,           "->ucs-unified");
   defsymbol (&Q_subsumptive,           "->subsumptive");