diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 12:46:32 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 12:46:32 -0700 |
| commit | 492d93245bc8eea2a405ceadd4e336f5393a970f (patch) | |
| tree | 9ec9184a6b1678ec6385eaa70ee97d727fe4688a /src/composite.h | |
| parent | b55ccb71aa544accbeac70d9ddf5855c11956706 (diff) | |
| download | emacs-492d93245bc8eea2a405ceadd4e336f5393a970f.tar.gz | |
* composite.h (COMPOSITION_DECODE_REFS): New macro,
breaking out part of COMPOSITION_DECODE_RULE.
(COMPOSITION_DECODE_RULE): Use it.
* composite.c (get_composition_id): Remove unused local vars,
by using the new macro.
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/composite.h b/src/composite.h index b8943fbfdc3..fa8e1164e4a 100644 --- a/src/composite.h +++ b/src/composite.h @@ -126,21 +126,28 @@ extern Lisp_Object composition_temp; ->contents[(n) * 2 - 1]) /* Decode encoded composition rule RULE_CODE into GREF (global - reference point code), NREF (new reference point code), XOFF - (horizontal offset) YOFF (vertical offset). Don't check RULE_CODE, + reference point code), NREF (new ref. point code). Don't check RULE_CODE; always set GREF and NREF to valid values. By side effect, RULE_CODE is modified. */ -#define COMPOSITION_DECODE_RULE(rule_code, gref, nref, xoff, yoff) \ +#define COMPOSITION_DECODE_REFS(rule_code, gref, nref) \ do { \ - xoff = (rule_code) >> 16; \ - yoff = ((rule_code) >> 8) & 0xFF; \ rule_code &= 0xFF; \ gref = (rule_code) / 12; \ if (gref > 12) gref = 11; \ nref = (rule_code) % 12; \ } while (0) +/* Like COMPOSITION_DECODE_REFS (RULE_CODE, GREF, NREF), but also + decode RULE_CODE into XOFF and YOFF (vertical offset). */ + +#define COMPOSITION_DECODE_RULE(rule_code, gref, nref, xoff, yoff) \ + do { \ + xoff = (rule_code) >> 16; \ + yoff = ((rule_code) >> 8) & 0xFF; \ + COMPOSITION_DECODE_REFS (rule_code, gref, nref); \ + } while (0) + /* Return encoded composition rule for the pair of global reference point GREF and new reference point NREF. If arguments are invalid, return -1. */ @@ -281,7 +288,7 @@ enum lglyph_indices else \ ASET ((g), LGLYPH_IX_CODE, make_number (val)); \ } while (0) - + #define LGLYPH_SET_WIDTH(g, val) ASET ((g), LGLYPH_IX_WIDTH, make_number (val)) #define LGLYPH_SET_LBEARING(g, val) ASET ((g), LGLYPH_IX_LBEARING, make_number (val)) #define LGLYPH_SET_RBEARING(g, val) ASET ((g), LGLYPH_IX_RBEARING, make_number (val)) @@ -321,4 +328,3 @@ extern EMACS_INT composition_adjust_point (EMACS_INT, EMACS_INT); EXFUN (Fcomposition_get_gstring, 4); #endif /* not EMACS_COMPOSITE_H */ - |