Add glyph-images of HNG-KAR.

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

diff --git a/src/chartab.c b/src/chartab.c
index ea4860f..de92ddc 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -5,7 +5,7 @@
    Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008,
    Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008,

-     2010, 2011, 2012, 2013 MORIOKA Tomohiko
+     2010, 2011, 2012, 2013, 2015, 2016 MORIOKA Tomohiko

 
 This file is part of XEmacs.
 
 
 This file is part of XEmacs.
 

@@ -3413,6 +3413,7 @@ Return DEFAULT-VALUE if the value is not exist.
   if (!UNBOUNDP (ret))
     return ret;
 
   if (!UNBOUNDP (ret))
     return ret;
 

+#if 0

   if (NILP (feature_rel_max)
       || (INTP (feature_rel_max) &&
          XINT (feature_rel_max) > 0))
   if (NILP (feature_rel_max)
       || (INTP (feature_rel_max) &&
          XINT (feature_rel_max) > 0))

@@ -3437,6 +3438,7 @@ Return DEFAULT-VALUE if the value is not exist.
            return ret;
        }
     }
            return ret;
        }
     }

+#endif

 
   if ( !(EQ (attribute, Q_identical)) &&
        !(EQ (attribute, Q_subsumptive_from)) &&
 
   if ( !(EQ (attribute, Q_identical)) &&
        !(EQ (attribute, Q_subsumptive_from)) &&

@@ -3445,11 +3447,13 @@ Return DEFAULT-VALUE if the value is not exist.
          || (INTP (char_rel_max) &&
              XINT (char_rel_max) > 0)) ) )
     {
          || (INTP (char_rel_max) &&
              XINT (char_rel_max) > 0)) ) )
     {

+#if 0

       Lisp_String* name = symbol_name (XSYMBOL (attribute));
       Bufbyte *name_str = string_data (name);
 
       if ( (name_str[0] != '=') || (name_str[1] == '>') )
        {
       Lisp_String* name = symbol_name (XSYMBOL (attribute));
       Bufbyte *name_str = string_data (name);
 
       if ( (name_str[0] != '=') || (name_str[1] == '>') )
        {

+#endif

          ret = find_char_feature_in_family (character, Q_identical,
                                             attribute, feature_rel_max);
          if (!UNBOUNDP (ret))
          ret = find_char_feature_in_family (character, Q_identical,
                                             attribute, feature_rel_max);
          if (!UNBOUNDP (ret))

@@ -3464,7 +3468,9 @@ Return DEFAULT-VALUE if the value is not exist.
                                             attribute, feature_rel_max);
          if (!UNBOUNDP (ret))
            return ret;
                                             attribute, feature_rel_max);
          if (!UNBOUNDP (ret))
            return ret;

+#if 0

        }
        }

+#endif

     }
   return default_value;
 }
     }
   return default_value;
 }

@@ -3937,7 +3943,7 @@ COS_object
 char_table_get_db_cos (Lisp_Char_Table* cit, Emchar ch)
 {
   return
 char_table_get_db_cos (Lisp_Char_Table* cit, Emchar ch)
 {
   return

-    concord_object_get_feature_value
+    concord_object_get_attribute

     (cos_make_char (ch),
      cos_intern (XSTRING_DATA (Fsymbol_name (cit->name))));
 }
     (cos_make_char (ch),
      cos_intern (XSTRING_DATA (Fsymbol_name (cit->name))));
 }

@@ -4224,13 +4230,13 @@ load_char_attribute_maybe_cos (Lisp_Char_Table* cit, Emchar ch)
       COS_object val;
 
       if (char_table_open_db_maybe (cit))
       COS_object val;
 
       if (char_table_open_db_maybe (cit))

-       return Qunbound;
+       return NULL;

 
       val = char_table_get_db_cos (cit, ch);
 
       return val;
     }
 
       val = char_table_get_db_cos (cit, ch);
 
       return val;
     }

-  return Qunbound;
+  return NULL;

 }
 #endif
 
 }
 #endif