X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.c;h=d22b611554a13421198b7641db746ddd62091f60;hb=da6d8669637d3c52deb282a55a5d0fb58d5e4e14;hp=b8984ea70599afd1a42dc6a59bd1175c85500acc;hpb=483d3fdb6be43da350fee11caec0dbf97a75137b;p=chise%2Fxemacs-chise.git.1

diff --git a/src/chartab.c b/src/chartab.c
index b8984ea..d22b611 100644
--- 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;
@@ -1144,10 +1140,6 @@ Lisp_Object Q_subsumptive;
 Lisp_Object Q_subsumptive_from;
 Lisp_Object Q_component;
 Lisp_Object Q_component_of;
-Lisp_Object Q_same;
-Lisp_Object Q_same_of;
-Lisp_Object Q_vulgar;
-Lisp_Object Q_vulgar_of;
 Lisp_Object Qto_ucs;
 Lisp_Object Q_ucs_unified;
 Lisp_Object Qcompat;
@@ -3516,13 +3508,11 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 	    EQ (attribute, Q_identical_from) ||
 	    EQ (attribute, Q_component) ||
 	    EQ (attribute, Q_component_of) ||
-	    EQ (attribute, Q_same) ||
-	    EQ (attribute, Q_same_of) ||
-	    EQ (attribute, Q_vulgar) ||
-	    EQ (attribute, Q_vulgar_of) ||
 	    !NILP (Fstring_match
-		   (build_string ("^<-\\(simplified"
-				  "\\|wrong\\)[^*]*$"),
+		   (build_string ("^\\(<-\\|->\\)\\(simplified"
+				  "\\|same\\|vulgar\\|wrong"
+				  "\\|original\\|ancient"
+				  "\\)[^*]*$"),
 		    Fsymbol_name (attribute),
 		    Qnil, Qnil)) )
     {
@@ -3548,27 +3538,28 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 	rev_feature = Q_component_of;
       else if (EQ (attribute, Q_component_of))
 	rev_feature = Q_component;
-      else if (EQ (attribute, Q_same))
-	rev_feature = Q_same_of;
-      else if (EQ (attribute, Q_same_of))
-	rev_feature = Q_same;
-      else if (EQ (attribute, Q_vulgar))
-	rev_feature = Q_vulgar_of;
-      else if (EQ (attribute, Q_vulgar_of))
-	rev_feature = Q_vulgar;
       else
 	{
 	  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);
 	    }
@@ -3589,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);
@@ -3797,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.
 */
@@ -3837,14 +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)
-	   || EQ (attribute, Q_same)
-	   || EQ (attribute, Q_same_of)
 	   || !NILP (Fstring_match
-		     (build_string ("^\\(<-\\|->\\)\\("
-				    "simplified\\|wrong\\)[^*]*$"),
+		     (build_string ("^\\(<-\\|->\\)\\(simplified"
+				    "\\|same\\|vulgar\\|wrong"
+				    "\\|original\\|ancient"
+				    "\\)[^*]*$"),
 		      Fsymbol_name (attribute),
 		      Qnil, Qnil)) )
 	filter = &Fchar_refs_simplify_char_specs;
@@ -4620,10 +4623,6 @@ syms_of_chartab (void)
   defsymbol (&Q_identical_from,		"<-identical");
   defsymbol (&Q_component,		"->ideographic-component-forms");
   defsymbol (&Q_component_of,		"<-ideographic-component-forms");
-  defsymbol (&Q_same,			"->same");
-  defsymbol (&Q_same_of,		"<-same");
-  defsymbol (&Q_vulgar,			"->vulgar");
-  defsymbol (&Q_vulgar_of,		"<-vulgar");
   defsymbol (&Qcomposition,		"composition");
   defsymbol (&Q_decomposition,		"->decomposition");
   defsymbol (&Qcompat,			"compat");