/* 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, 2010, 2013
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2010, 2013, 2016
MORIOKA Tomohiko
This file is part of XEmacs.
# 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);
#ifdef HAVE_CHISE
Lisp_Object load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch);
-#ifdef HAVE_LIBCHISE
+#ifdef USE_CONCORD_OBJECT_SYSTEM
COS_object load_char_attribute_maybe_cos (Lisp_Char_Table* cit, Emchar ch);
#endif
return val;
}
-#ifdef HAVE_LIBCHISE
+#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)
{
-#if 1
Lisp_Object val = get_char_id_table_0 (cit, ch);
if (EQ (val, Qunloaded))
{
+#if 0
val = load_char_attribute_maybe (cit, ch);
- /* put_char_id_table_0 (cit, ch, val); */
- }
- if (UNBOUNDP (val))
- return cit->default_value;
- else
- return val;
#else
- Lisp_Object val = get_char_id_table_0 (cit, ch);
-
- if (EQ (val, Qunloaded))
- {
-#if 0
- val = load_char_attribute_maybe_cos (cit, ch);
- if ( val == NULL )
+ COS_object ret = load_char_attribute_maybe_cos (cit, ch);
+ if ( ret == NULL )
return cit->default_value;
else
- return val;
-#else
- val = load_char_attribute_maybe (cit, ch);
+ return ret;
#endif
}
- if ( UNBOUNDP (val) )
+ if (UNBOUNDP (val))
return cit->default_value;
else
return val;
-#endif
}
#else
#define get_char_id_table_ce(cit, ch) get_char_id_table(cit, ch)