X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.h;h=9bda38695427420212654cd51fab8052809ab985;hb=57db4f8770d5f0524dd68ace23683bf91a0f9528;hp=788810fa4144073924bb6fccb4c08c4af61ba22c;hpb=4bd5ac727bd010fa78817703a905329f9221e863;p=chise%2Fxemacs-chise.git

diff --git a/src/chartab.h b/src/chartab.h
index 788810f..9bda386 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 MORIOKA Tomohiko
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2010, 2013
+     MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -56,6 +57,17 @@ extern CHISE_DS *default_chise_data_source;
 int open_chise_data_source_maybe (void);
 #endif
 
+#if defined(UTF2000) || defined(HAVE_CONCORD)
+extern Lisp_Object Q_denotational;
+extern Lisp_Object Q_denotational_from;
+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                              */
 /************************************************************************/
@@ -365,6 +377,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 HAVE_LIBCHISE
+COS_object load_char_attribute_maybe_cos (Lisp_Char_Table* cit, Emchar ch);
+#endif
+
 #ifndef HAVE_LIBCHISE
 extern Lisp_Object Qsystem_char_id;
 
@@ -409,6 +425,35 @@ get_char_id_table (Lisp_Char_Table* cit, Emchar ch)
     return val;
 }
 
+#ifdef HAVE_LIBCHISE
+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);