projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(U-00027215): Apply new conventions for glyph granularity.
[chise/xemacs-chise.git.1]
/
src
/
chartab.h
diff --git
a/src/chartab.h
b/src/chartab.h
index
5800283
..
a0c5bd6
100644
(file)
--- a/
src/chartab.h
+++ b/
src/chartab.h
@@
-1,7
+1,7
@@
/* Declarations having to do with Mule char tables.
Copyright (C) 1992 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
/* 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.
MORIOKA Tomohiko
This file is part of XEmacs.
@@
-38,6
+38,8
@@
Boston, MA 02111-1307, USA. */
# else /* HAVE_LIBCHISE */
# include "database.h"
# endif /* not HAVE_LIBCHISE */
# 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);
#endif
EXFUN (Fmake_char, 3);
@@
-377,7
+379,7
@@
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_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
COS_object load_char_attribute_maybe_cos (Lisp_Char_Table* cit, Emchar ch);
#endif
@@
-425,44
+427,30
@@
get_char_id_table (Lisp_Char_Table* cit, Emchar ch)
return val;
}
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)
{
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))
{
Lisp_Object val = get_char_id_table_0 (cit, ch);
if (EQ (val, Qunloaded))
{
+#if 0
val = load_char_attribute_maybe (cit, ch);
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
#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 cit->default_value;
else
- return val;
-#else
- val = load_char_attribute_maybe (cit, ch);
+ return ret;
#endif
}
#endif
}
- if ( UNBOUNDP (val) )
+ if (UNBOUNDP (val))
return cit->default_value;
else
return val;
return cit->default_value;
else
return val;
-#endif
}
#else
#define get_char_id_table_ce(cit, ch) get_char_id_table(cit, ch)
}
#else
#define get_char_id_table_ce(cit, ch) get_char_id_table(cit, ch)