X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.c;h=33f1ee2d043b0a116f60efdcb7b5a7c22f23202e;hb=4e2f94633e8386b64eaaf86fbc0010d950ed2d75;hp=65000a0cb62707c5c1201747cb0d6562271a6a7f;hpb=87dd8ecaf0fa83fc731d01f5bea6c29cc4fddb9b;p=chise%2Fxemacs-chise.git

diff --git a/src/chartab.c b/src/chartab.c
index 65000a0..33f1ee2 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -76,7 +76,6 @@ EXFUN (Fchar_refs_simplify_char_specs, 1);
 extern Lisp_Object Qideographic_structure;
 
 Lisp_Object Vnext_defined_char_id;
-EXFUN (Fdefine_char, 1);
 
 EXFUN (Fmap_char_attribute, 3);
 
@@ -1236,15 +1235,16 @@ Return variants of CHARACTER.
 */
        (character))
 {
-  Lisp_Object ret;
-
   CHECK_CHAR (character);
-  ret = Fchar_feature (character, Q_ucs_unified, Qnil,
-		       Qnil, Qnil);
-  if (CONSP (ret))
-    return Fcopy_list (ret);
-  else
-    return Qnil;
+  return
+    nconc2
+    (Fcopy_list (Fget_char_attribute (character, Q_subsumptive, Qnil)),
+     (nconc2
+      (Fcopy_list (Fget_char_attribute (character, Q_denotational, Qnil)),
+       (nconc2
+	(Fcopy_list (Fget_char_attribute (character, Q_identical, Qnil)),
+	 Fcopy_list (Fchar_feature (character, Q_ucs_unified, Qnil,
+				    Qnil, Qnil)))))));
 }
 
 #endif
@@ -3426,7 +3426,7 @@ put_char_composition (Lisp_Object character, Lisp_Object value)
 
       if (INTP (v))
 	{
-	  Emchar c = XINT (v);
+	  Emchar c = DECODE_CHAR (Vcharset_ucs, XINT (v), 0);
 	  Lisp_Object ret
 	    = Fchar_feature (make_char (c), Q_ucs_unified, Qnil,
 			     Qnil, Qnil);
@@ -3489,7 +3489,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
       if (!INTP (value))
 	signal_simple_error ("Invalid value for =>ucs", value);
 
-      c = XINT (value);
+      c = DECODE_CHAR (Vcharset_ucs, XINT (value), 0);
 
       ret = Fchar_feature (make_char (c), Q_ucs_unified, Qnil,
 			   Qnil, Qnil);
@@ -3509,9 +3509,10 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 	    EQ (attribute, Q_component) ||
 	    EQ (attribute, Q_component_of) ||
 	    !NILP (Fstring_match
-		   (build_string ("^\\(<-\\|->\\)\\(simplified"
-				  "\\|same\\|vulgar\\|wrong"
-				  "\\|original\\|ancient"
+		   (build_string ("^\\(<-\\|->\\)\\("
+				  "fullwidth\\|halfwidth"
+				  "\\|simplified\\|vulgar\\|wrong"
+				  "\\|same\\|original\\|ancient"
 				  "\\)[^*]*$"),
 		    Fsymbol_name (attribute),
 		    Qnil, Qnil)) )
@@ -3635,11 +3636,11 @@ open_chise_data_source_maybe ()
 {
   if (default_chise_data_source == NULL)
     {
-      Lisp_Object db_dir = Vexec_directory;
+      Lisp_Object db_dir = Vdata_directory;
       int modemask = 0755;		/* rwxr-xr-x */
 
       if (NILP (db_dir))
-	db_dir = build_string ("../lib-src");
+	db_dir = build_string ("../etc");
       db_dir = Fexpand_file_name (build_string ("chise-db"), db_dir);
 
       default_chise_data_source
@@ -3743,10 +3744,10 @@ Lisp_Object
 char_attribute_system_db_file (Lisp_Object key_type, Lisp_Object attribute,
 			       int writing_mode)
 {
-  Lisp_Object db_dir = Vexec_directory;
+  Lisp_Object db_dir = Vdata_directory;
 
   if (NILP (db_dir))
-    db_dir = build_string ("../lib-src");
+    db_dir = build_string ("../etc");
 
   db_dir = Fexpand_file_name (build_string ("chise-db"), db_dir);
   if (writing_mode && NILP (Ffile_exists_p (db_dir)))
@@ -3829,7 +3830,9 @@ Save values of ATTRIBUTE into database file.
     {
       Lisp_Object (*filter)(Lisp_Object value);
 
-      if ( EQ (attribute, Qideographic_structure)
+      if ( !NILP (Ffind_charset (attribute)) )
+	filter = NULL;
+      else if ( EQ (attribute, Qideographic_structure)
 	   || EQ (attribute, Q_identical)
 	   || EQ (attribute, Q_identical_from)
 	   || !NILP (Fstring_match