Mercurial > emacs

comparison src/composite.h @ 91173:d073992bc6f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(COMPOSITION_METHOD): Handle COMPOSITION_WITH_GLYPH_STRING.
author Kenichi Handa <handa@m17n.org>
date Mon, 03 Dec 2007 14:39:51 +0000
parents 424b655804ca
children bef5150c5492
comparison
equal deleted inserted replaced
91172:32461c53ccb4 91173:d073992bc6f3
90 (COMPOSITION_REGISTERD_P (prop) \ 90 (COMPOSITION_REGISTERD_P (prop) \
91 ? composition_table[COMPOSITION_ID (prop)]->method \ 91 ? composition_table[COMPOSITION_ID (prop)]->method \
92 : (composition_temp = XCDR (XCAR (prop)), \ 92 : (composition_temp = XCDR (XCAR (prop)), \
93 (NILP (composition_temp) \ 93 (NILP (composition_temp) \
94 ? COMPOSITION_RELATIVE \ 94 ? COMPOSITION_RELATIVE \
95 : ((INTEGERP (composition_temp) || STRINGP (composition_temp)) \ 95 : (INTEGERP (composition_temp) || STRINGP (composition_temp)) \
96 ? COMPOSITION_WITH_ALTCHARS \ 96 ? COMPOSITION_WITH_ALTCHARS \
97 : COMPOSITION_WITH_RULE_ALTCHARS)))) 97 : (VECTORP (composition_temp) \
98 && ASIZE (composition_temp) >= 2 \
99 && VECTORP (AREF (composition_temp, 0))) \
100 ? COMPOSITION_WITH_GLYPH_STRING \
101 : COMPOSITION_WITH_RULE_ALTCHARS)))
98 102
99 /* Return 1 if the composition is valid. It is valid if length of 103 /* Return 1 if the composition is valid. It is valid if length of
100 the composition equals to (END - START). */ 104 the composition equals to (END - START). */
101 #define COMPOSITION_VALID_P(start, end, prop) \ 105 #define COMPOSITION_VALID_P(start, end, prop) \
102 (CONSP (prop) \ 106 (CONSP (prop) \