X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.h;h=a0c5bd6eb86a27e98a418b55c94bdab6c0836d38;hb=8ccf542c980645ba3c02074a8bc67cd4fc8e7a1f;hp=db90d47779bf924de39e6ed1e6c22794cc1f8cc6;hpb=0fd2b52c4ee15c3e23d4ef3195c5cfcf6a8d200f;p=chise%2Fxemacs-chise.git.1

diff --git a/src/chartab.h b/src/chartab.h
index db90d47..a0c5bd6 100644
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -1,7 +1,8 @@
 /* Declarations having to do with Mule char tables.
    Copyright (C) 1992 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 1999,2000,2001,2002,2003,2004,2006 MORIOKA Tomohiko
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2010, 2013, 2016
+     MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -37,6 +38,8 @@ Boston, MA 02111-1307, USA.  */
 #  else /* HAVE_LIBCHISE */
 #    include "database.h"
 #  endif /* not HAVE_LIBCHISE */
+#  define USE_CONCORD_OBJECT_SYSTEM 1
+#  define USE_CONCORD_OBJECT_SYSTEM_TO_COMPOSE 1
 #endif
 
 EXFUN (Fmake_char, 3);
@@ -63,6 +66,10 @@ extern Lisp_Object Q_subsumptive;
 extern Lisp_Object Q_subsumptive_from;
 #endif
 
+#ifdef HAVE_CONCORD
+extern Lisp_Object Vchise_system_db_directory;
+#endif
+
 /************************************************************************/
 /*			    Char-ID Tables                              */
 /************************************************************************/
@@ -372,6 +379,10 @@ put_char_id_table_0 (Lisp_Char_Table* cit, Emchar code, Lisp_Object value)
 #ifdef HAVE_CHISE
 Lisp_Object load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch);
 
+#ifdef USE_CONCORD_OBJECT_SYSTEM
+COS_object load_char_attribute_maybe_cos (Lisp_Char_Table* cit, Emchar ch);
+#endif
+
 #ifndef HAVE_LIBCHISE
 extern Lisp_Object Qsystem_char_id;
 
@@ -416,6 +427,35 @@ get_char_id_table (Lisp_Char_Table* cit, Emchar ch)
     return val;
 }
 
+#ifdef USE_CONCORD_OBJECT_SYSTEM
+INLINE_HEADER Lisp_Object
+get_char_id_table_ce (Lisp_Char_Table* cit, Emchar ch);
+INLINE_HEADER Lisp_Object
+get_char_id_table_ce (Lisp_Char_Table* cit, Emchar ch)
+{
+  Lisp_Object val = get_char_id_table_0 (cit, ch);
+
+  if (EQ (val, Qunloaded))
+    {
+#if 0
+      val = load_char_attribute_maybe (cit, ch);
+#else
+      COS_object ret = load_char_attribute_maybe_cos (cit, ch);
+      if ( ret == NULL )
+	return cit->default_value;
+      else
+	return ret;
+#endif
+    }
+  if (UNBOUNDP (val))
+    return cit->default_value;
+  else
+    return val;
+}
+#else
+#define get_char_id_table_ce(cit, ch) get_char_id_table(cit, ch)
+#endif
+
 void
 decode_char_table_range (Lisp_Object range, struct chartab_range *outrange);