Mercurial > hg > xemacs-beta
diff src/charset.h @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
| author | ben |
|---|---|
| date | Sun, 05 May 2002 11:33:57 +0000 |
| parents | a5954632b187 |
| children | 804517e16990 |
line wrap: on
line diff
--- a/src/charset.h Thu May 02 14:35:32 2002 +0000 +++ b/src/charset.h Sun May 05 11:33:57 2002 +0000 @@ -40,18 +40,20 @@ #define Vcharset_ascii Qnil -#define CHAR_CHARSET(ch) Vcharset_ascii -#define CHAR_LEADING_BYTE(ch) LEADING_BYTE_ASCII +#define emchar_charset(ch) Vcharset_ascii +#define emchar_leading_byte(ch) LEADING_BYTE_ASCII +#define emchar_len(ch) 1 +#define emchar_len_fmt(ch, fmt) 1 #define LEADING_BYTE_ASCII 0x80 #define NUM_LEADING_BYTES 1 #define MIN_LEADING_BYTE 0x80 #define CHARSETP(cs) 1 -#define CHARSET_BY_LEADING_BYTE(lb) Vcharset_ascii +#define charset_by_leading_byte(lb) Vcharset_ascii #define XCHARSET_LEADING_BYTE(cs) LEADING_BYTE_ASCII #define XCHARSET_GRAPHIC(cs) -1 #define XCHARSET_COLUMNS(cs) 1 #define XCHARSET_DIMENSION(cs) 1 -#define BREAKUP_CHAR(ch, charset, byte1, byte2) do { \ +#define BREAKUP_EMCHAR(ch, charset, byte1, byte2) do { \ (charset) = Vcharset_ascii; \ (byte1) = (ch); \ (byte2) = 0; \ @@ -151,13 +153,14 @@ /* Is this leading byte for a private charset? */ -#define LEADING_BYTE_PRIVATE_P(lb) ((lb) >= MIN_LEADING_BYTE_PRIVATE_1) +#define leading_byte_private_p(lb) ((lb) >= MIN_LEADING_BYTE_PRIVATE_1) /* Is this a prefix for a private leading byte? */ -INLINE_HEADER int LEADING_BYTE_PREFIX_P (Intbyte lb); -INLINE_HEADER int -LEADING_BYTE_PREFIX_P (Intbyte lb) +DECLARE_INLINE_HEADER ( +int +leading_byte_prefix_p (Intbyte lb) +) { return (lb == PRE_LEADING_BYTE_PRIVATE_1 || lb == PRE_LEADING_BYTE_PRIVATE_2); @@ -166,7 +169,7 @@ /* Given a private leading byte, return the leading byte prefix stored in a string. */ -#define PRIVATE_LEADING_BYTE_PREFIX(lb) \ +#define private_leading_byte_prefix(lb) \ ((unsigned int) (lb) < MIN_LEADING_BYTE_PRIVATE_2 ? \ PRE_LEADING_BYTE_PRIVATE_1 : \ PRE_LEADING_BYTE_PRIVATE_2) @@ -297,7 +300,7 @@ #define CHARSET_FROM_UNICODE_LEVELS(cs) ((cs)->from_unicode_levels) -#define CHARSET_PRIVATE_P(cs) LEADING_BYTE_PRIVATE_P (CHARSET_LEADING_BYTE (cs)) +#define CHARSET_PRIVATE_P(cs) leading_byte_private_p (CHARSET_LEADING_BYTE (cs)) #define XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs)) #define XCHARSET_NAME(cs) CHARSET_NAME (XCHARSET (cs)) @@ -336,9 +339,10 @@ Intbyte next_allocated_2_byte_leading_byte; }; -INLINE_HEADER Lisp_Object CHARSET_BY_LEADING_BYTE (int lb); -INLINE_HEADER Lisp_Object -CHARSET_BY_LEADING_BYTE (int lb) +DECLARE_INLINE_HEADER ( +Lisp_Object +charset_by_leading_byte (int lb) +) { extern struct charset_lookup *chlook; @@ -351,10 +355,10 @@ return chlook->charset_by_leading_byte[lb - MIN_LEADING_BYTE]; } -INLINE_HEADER Lisp_Object -CHARSET_BY_ATTRIBUTES (int type, int final, int dir); -INLINE_HEADER Lisp_Object -CHARSET_BY_ATTRIBUTES (int type, int final, int dir) +DECLARE_INLINE_HEADER ( +Lisp_Object +charset_by_attributes (int type, int final, int dir) +) { extern struct charset_lookup *chlook; @@ -372,15 +376,15 @@ /* The bit fields of character are divided into 3 parts: FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */ -#define CHAR_FIELD1_MASK (0x1F << 14) -#define CHAR_FIELD2_MASK (0x7F << 7) -#define CHAR_FIELD3_MASK 0x7F +#define EMCHAR_FIELD1_MASK (0x1F << 14) +#define EMCHAR_FIELD2_MASK (0x7F << 7) +#define EMCHAR_FIELD3_MASK 0x7F /* Macros to access each field of a character code of C. */ -#define CHAR_FIELD1(c) (((c) & CHAR_FIELD1_MASK) >> 14) -#define CHAR_FIELD2(c) (((c) & CHAR_FIELD2_MASK) >> 7) -#define CHAR_FIELD3(c) ((c) & CHAR_FIELD3_MASK) +#define emchar_field1(c) (((c) & EMCHAR_FIELD1_MASK) >> 14) +#define emchar_field2(c) (((c) & EMCHAR_FIELD2_MASK) >> 7) +#define emchar_field3(c) ((c) & EMCHAR_FIELD3_MASK) /* Field 1, if non-zero, usually holds a leading byte for a dimension-2 charset. Field 2, if non-zero, usually holds a leading @@ -396,32 +400,32 @@ /* Minimum and maximum allowed values for the fields. */ -#define MIN_CHAR_FIELD2_OFFICIAL \ +#define MIN_EMCHAR_FIELD2_OFFICIAL \ (MIN_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) -#define MAX_CHAR_FIELD2_OFFICIAL \ +#define MAX_EMCHAR_FIELD2_OFFICIAL \ (MAX_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) -#define MIN_CHAR_FIELD1_OFFICIAL \ +#define MIN_EMCHAR_FIELD1_OFFICIAL \ (MIN_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) -#define MAX_CHAR_FIELD1_OFFICIAL \ +#define MAX_EMCHAR_FIELD1_OFFICIAL \ (MAX_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) -#define MIN_CHAR_FIELD2_PRIVATE \ +#define MIN_EMCHAR_FIELD2_PRIVATE \ (MIN_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) -#define MAX_CHAR_FIELD2_PRIVATE \ +#define MAX_EMCHAR_FIELD2_PRIVATE \ (MAX_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) -#define MIN_CHAR_FIELD1_PRIVATE \ +#define MIN_EMCHAR_FIELD1_PRIVATE \ (MIN_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) -#define MAX_CHAR_FIELD1_PRIVATE \ +#define MAX_EMCHAR_FIELD1_PRIVATE \ (MAX_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) /* Minimum character code of each <type> character. */ -#define MIN_CHAR_OFFICIAL_TYPE9N (MIN_CHAR_FIELD2_OFFICIAL << 7) -#define MIN_CHAR_PRIVATE_TYPE9N (MIN_CHAR_FIELD2_PRIVATE << 7) -#define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_CHAR_FIELD1_OFFICIAL << 14) -#define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_CHAR_FIELD1_PRIVATE << 14) +#define MIN_CHAR_OFFICIAL_TYPE9N (MIN_EMCHAR_FIELD2_OFFICIAL << 7) +#define MIN_CHAR_PRIVATE_TYPE9N (MIN_EMCHAR_FIELD2_PRIVATE << 7) +#define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_EMCHAR_FIELD1_OFFICIAL << 14) +#define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_EMCHAR_FIELD1_PRIVATE << 14) #define MIN_CHAR_COMPOSITION (0x1F << 14) /* Leading byte of a character. @@ -431,20 +435,21 @@ FIELD2_TO_PRIVATE_LEADING_BYTE are the same. */ -INLINE_HEADER Intbyte CHAR_LEADING_BYTE (Emchar c); -INLINE_HEADER Intbyte -CHAR_LEADING_BYTE (Emchar c) +DECLARE_INLINE_HEADER ( +Intbyte +emchar_leading_byte (Emchar c) +) { - if (CHAR_ASCII_P (c)) + if (emchar_ascii_p (c)) return LEADING_BYTE_ASCII; else if (c < 0xA0) return LEADING_BYTE_CONTROL_1; else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) - return CHAR_FIELD2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE; + return emchar_field2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE; else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N) - return CHAR_FIELD1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE; + return emchar_field1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE; else if (c < MIN_CHAR_COMPOSITION) - return CHAR_FIELD1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE; + return emchar_field1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE; else { #ifdef ENABLE_COMPOSITE_CHARS @@ -456,7 +461,50 @@ } } -#define CHAR_CHARSET(c) CHARSET_BY_LEADING_BYTE (CHAR_LEADING_BYTE (c)) +DECLARE_INLINE_HEADER ( +Bytecount +emchar_len (Emchar c) +) +{ + if (emchar_ascii_p (c)) + return 1; + else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) + return 2; + else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N) + return 3; /* dimension-2 official or dimension-1 private */ + else if (c < MIN_CHAR_COMPOSITION) + return 4; + else + { +#ifdef ENABLE_COMPOSITE_CHARS +#error Not yet implemented +#else + abort(); + return 0; +#endif /* ENABLE_COMPOSITE_CHARS */ + } +} + +DECLARE_INLINE_HEADER ( +Bytecount +emchar_len_fmt (Emchar c, Internal_Format fmt) +) +{ + switch (fmt) + { + case FORMAT_DEFAULT: + return emchar_len (c); + case FORMAT_16_BIT_FIXED: + return 2; + case FORMAT_32_BIT_FIXED: + return 4; + default: + text_checking_assert (fmt == FORMAT_8_BIT_FIXED); + return 1; + } +} + +#define emchar_charset(c) charset_by_leading_byte (emchar_leading_byte (c)) /* Return a character whose charset is CHARSET and position-codes are C1 and C2. TYPE9N character ignores C2. (For typical charsets, i.e. not @@ -468,72 +516,63 @@ FIELD2_TO_PRIVATE_LEADING_BYTE are the same. */ -INLINE_HEADER Emchar MAKE_CHAR_1 (Lisp_Object charset, int c1, int c2); -INLINE_HEADER Emchar -MAKE_CHAR_1 (Lisp_Object charset, int c1, int c2) +DECLARE_INLINE_HEADER ( +Emchar +make_emchar (Lisp_Object charset, int c1, int c2) +) { + Emchar retval; if (EQ (charset, Vcharset_ascii)) - return c1; + retval = c1; else if (EQ (charset, Vcharset_control_1)) - return c1 | 0x80; + retval = c1 | 0x80; #ifdef ENABLE_COMPOSITE_CHARS else if (EQ (charset, Vcharset_composite)) - return (0x1F << 14) | ((c1) << 7) | (c2); + retval = (0x1F << 14) | ((c1) << 7) | (c2); #endif else if (XCHARSET_DIMENSION (charset) == 1) - return ((XCHARSET_LEADING_BYTE (charset) - - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) | (c1); + retval = ((XCHARSET_LEADING_BYTE (charset) - + FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) | (c1); else if (!XCHARSET_PRIVATE_P (charset)) - return ((XCHARSET_LEADING_BYTE (charset) - - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); + retval = ((XCHARSET_LEADING_BYTE (charset) - + FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); else - return ((XCHARSET_LEADING_BYTE (charset) - - FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); + retval = ((XCHARSET_LEADING_BYTE (charset) - + FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); + text_checking_assert (valid_emchar_p (retval)); + return retval; } -#ifdef ERROR_CHECK_TEXT -INLINE_HEADER Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2); -INLINE_HEADER Emchar -MAKE_CHAR (Lisp_Object charset, int c1, int c2) -{ - Emchar retval = MAKE_CHAR_1 (charset, c1, c2); - assert (valid_char_p (retval)); - return retval; -} -#else -#define MAKE_CHAR(charset, c1, c2) MAKE_CHAR_1 (charset, c1, c2) -#endif - -/* BREAKUP_CHAR_1_UNSAFE assumes that the charset has already been +/* BREAKUP_EMCHAR_1_UNSAFE assumes that the charset has already been calculated, and just computes c1 and c2. - BREAKUP_CHAR also computes and stores the charset. */ + BREAKUP_EMCHAR also computes and stores the charset. */ -#define BREAKUP_CHAR_1_UNSAFE(c, charset, c1, c2) \ +#define BREAKUP_EMCHAR_1_UNSAFE(c, charset, c1, c2) \ XCHARSET_DIMENSION (charset) == 1 \ - ? ((c1) = CHAR_FIELD3 (c), (c2) = 0) \ - : ((c1) = CHAR_FIELD2 (c), \ - (c2) = CHAR_FIELD3 (c)) + ? ((c1) = emchar_field3 (c), (c2) = 0) \ + : ((c1) = emchar_field2 (c), \ + (c2) = emchar_field3 (c)) -INLINE_HEADER void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, - int *c2); -INLINE_HEADER void -breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) +DECLARE_INLINE_HEADER ( +void +breakup_emchar_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) +) { - text_checking_assert (valid_char_p (c)); - *charset = CHAR_CHARSET (c); - BREAKUP_CHAR_1_UNSAFE (c, *charset, *c1, *c2); + text_checking_assert (valid_emchar_p (c)); + *charset = emchar_charset (c); + BREAKUP_EMCHAR_1_UNSAFE (c, *charset, *c1, *c2); } -/* BREAKUP_CHAR separates an Emchar into its components. The charset of +/* BREAKUP_EMCHAR separates an Emchar into its components. The charset of character C is set to CHARSET, and the position-codes of C are set to C1 and C2. C2 of TYPE9N character is 0. */ -#define BREAKUP_CHAR(c, charset, c1, c2) \ - breakup_char_1 (c, &(charset), &(c1), &(c2)) +#define BREAKUP_EMCHAR(c, charset, c1, c2) \ + breakup_emchar_1 (c, &(charset), &(c1), &(c2)) void get_charset_limits (Lisp_Object charset, int *low, int *high); -int char_to_unicode (Emchar chr); +int emchar_to_unicode (Emchar chr); #endif /* MULE */