From: tomo <tomo>
Date: Mon, 9 Feb 2004 10:58:11 +0000 (+0000)
Subject: (Fput_char_attribute): Convert char-refs in value of
X-Git-Tag: r21-4-14-chise-0_21-23^2~43
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=37613857c376f274d47037ee2215890c26cba5b6;p=chise%2Fxemacs-chise.git.1

(Fput_char_attribute): Convert char-refs in value of
`<-simplified[^*]*' to characters and put reverse links.
---

diff --git a/src/chartab.c b/src/chartab.c
index a753ac4..8b0afd8 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -3481,10 +3481,42 @@ Store CHARACTER's ATTRIBUTE with VALUE.
   else if ( EQ (attribute, Q_subsumptive) ||
 	    EQ (attribute, Q_subsumptive_from) ||
 	    EQ (attribute, Q_denotational) ||
-	    EQ (attribute, Q_denotational_from) )
+	    EQ (attribute, Q_denotational_from) ||
+	    !NILP (Fstring_match (build_string ("^<-simplified[^*]*$"),
+				  Fsymbol_name (attribute),
+				  Qnil, Qnil)) )
     {
       Lisp_Object rest = value;
       Lisp_Object ret;
+      Lisp_Object rev_feature = Qnil;
+      struct gcpro gcpro1;
+      GCPRO1 (rev_feature);
+
+      if (EQ (attribute, Q_subsumptive))
+	rev_feature = Q_subsumptive_from;
+      else if (EQ (attribute, Q_subsumptive_from))
+	rev_feature = Q_subsumptive;
+      else if (EQ (attribute, Q_denotational))
+	rev_feature = Q_denotational_from;
+      else if (EQ (attribute, Q_denotational_from))
+	rev_feature = Q_denotational;
+      else
+	{
+	  Lisp_String* name = symbol_name (XSYMBOL (attribute));
+	  Bufbyte *name_str = string_data (name);
+
+	  if (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] = '>';
+	      rev_name_str[length] = 0;
+	      rev_feature = intern (rev_name_str);
+	    }
+	}
 
       while (CONSP (rest))
 	{
@@ -3495,18 +3527,8 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 	  
 	  if ( !NILP (ret) && !EQ (ret, character) )
 	    {
-	      Lisp_Object rev_feature;
 	      Lisp_Object ffv;
 
-	      if (EQ (attribute, Q_subsumptive))
-		rev_feature = Q_subsumptive_from;
-	      else if (EQ (attribute, Q_subsumptive_from))
-		rev_feature = Q_subsumptive;
-	      else if (EQ (attribute, Q_denotational))
-		rev_feature = Q_denotational_from;
-	      else /* if (EQ (attribute, Q_denotational_from)) */
-		rev_feature = Q_denotational;
-
 	      ffv = Fget_char_attribute (ret, rev_feature, Qnil);
 	      if (!CONSP (ffv))
 		put_char_attribute (ret, rev_feature, list1 (character));
@@ -3517,6 +3539,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 	    }
 	  rest = XCDR (rest);
 	}
+      UNGCPRO;
     }
 #if 0
   else if (EQ (attribute, Qideographic_structure))