Resorted; add missing Morohashi's Daikanwa characters; add missing

[chise/xemacs-chise.git] / src / mule-charset.h

diff --git a/src/mule-charset.h b/src/mule-charset.h
index 30bc569..9bc8264 100644 (file)
--- a/src/mule-charset.h
+++ b/src/mule-charset.h
@@ -568,7 +568,7 @@ extern struct charset_lookup *chlook;
 
 #ifdef ERROR_CHECK_TYPECHECK
 /* int not Bufbyte even though that is the actual type of a leading byte.
-   This way, out-ot-range values will get caught rather than automatically
+   This way, out-of-range values will get caught rather than automatically
    truncated. */
 INLINE_HEADER Lisp_Object CHARSET_BY_LEADING_BYTE (int lb);
 INLINE_HEADER Lisp_Object
@@ -586,9 +586,14 @@ CHARSET_BY_LEADING_BYTE (int lb)
 
 #endif
 
-#define CHARSET_BY_ATTRIBUTES(type, final, dir) \
-  (chlook->charset_by_attributes[type][final][dir])
-
+INLINE_HEADER Lisp_Object
+CHARSET_BY_ATTRIBUTES (int chars, int multi, int final, int dir);
+INLINE_HEADER Lisp_Object
+CHARSET_BY_ATTRIBUTES (int chars, int dimension, int final, int dir)
+{
+  return chlook->charset_by_attributes[(dimension == 1 ? 0 : 2)
+                                     + (chars == 94 ? 0 : 1)][final][dir];
+}
 
 /* Table of number of bytes in the string representation of a character
    indexed by the first byte of that representation.