Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
825:eb3bc15a6e0f | 826:6728e641994e |
---|---|
38 /* used when MULE is not defined, so that Charset-type stuff can still | 38 /* used when MULE is not defined, so that Charset-type stuff can still |
39 be done */ | 39 be done */ |
40 | 40 |
41 #define Vcharset_ascii Qnil | 41 #define Vcharset_ascii Qnil |
42 | 42 |
43 #define CHAR_CHARSET(ch) Vcharset_ascii | 43 #define emchar_charset(ch) Vcharset_ascii |
44 #define CHAR_LEADING_BYTE(ch) LEADING_BYTE_ASCII | 44 #define emchar_leading_byte(ch) LEADING_BYTE_ASCII |
45 #define emchar_len(ch) 1 | |
46 #define emchar_len_fmt(ch, fmt) 1 | |
45 #define LEADING_BYTE_ASCII 0x80 | 47 #define LEADING_BYTE_ASCII 0x80 |
46 #define NUM_LEADING_BYTES 1 | 48 #define NUM_LEADING_BYTES 1 |
47 #define MIN_LEADING_BYTE 0x80 | 49 #define MIN_LEADING_BYTE 0x80 |
48 #define CHARSETP(cs) 1 | 50 #define CHARSETP(cs) 1 |
49 #define CHARSET_BY_LEADING_BYTE(lb) Vcharset_ascii | 51 #define charset_by_leading_byte(lb) Vcharset_ascii |
50 #define XCHARSET_LEADING_BYTE(cs) LEADING_BYTE_ASCII | 52 #define XCHARSET_LEADING_BYTE(cs) LEADING_BYTE_ASCII |
51 #define XCHARSET_GRAPHIC(cs) -1 | 53 #define XCHARSET_GRAPHIC(cs) -1 |
52 #define XCHARSET_COLUMNS(cs) 1 | 54 #define XCHARSET_COLUMNS(cs) 1 |
53 #define XCHARSET_DIMENSION(cs) 1 | 55 #define XCHARSET_DIMENSION(cs) 1 |
54 #define BREAKUP_CHAR(ch, charset, byte1, byte2) do { \ | 56 #define BREAKUP_EMCHAR(ch, charset, byte1, byte2) do { \ |
55 (charset) = Vcharset_ascii; \ | 57 (charset) = Vcharset_ascii; \ |
56 (byte1) = (ch); \ | 58 (byte1) = (ch); \ |
57 (byte2) = 0; \ | 59 (byte2) = 0; \ |
58 } while (0) | 60 } while (0) |
59 | 61 |
149 /* Operations on leading bytes */ | 151 /* Operations on leading bytes */ |
150 /************************************************************************/ | 152 /************************************************************************/ |
151 | 153 |
152 /* Is this leading byte for a private charset? */ | 154 /* Is this leading byte for a private charset? */ |
153 | 155 |
154 #define LEADING_BYTE_PRIVATE_P(lb) ((lb) >= MIN_LEADING_BYTE_PRIVATE_1) | 156 #define leading_byte_private_p(lb) ((lb) >= MIN_LEADING_BYTE_PRIVATE_1) |
155 | 157 |
156 /* Is this a prefix for a private leading byte? */ | 158 /* Is this a prefix for a private leading byte? */ |
157 | 159 |
158 INLINE_HEADER int LEADING_BYTE_PREFIX_P (Intbyte lb); | 160 DECLARE_INLINE_HEADER ( |
159 INLINE_HEADER int | 161 int |
160 LEADING_BYTE_PREFIX_P (Intbyte lb) | 162 leading_byte_prefix_p (Intbyte lb) |
163 ) | |
161 { | 164 { |
162 return (lb == PRE_LEADING_BYTE_PRIVATE_1 || | 165 return (lb == PRE_LEADING_BYTE_PRIVATE_1 || |
163 lb == PRE_LEADING_BYTE_PRIVATE_2); | 166 lb == PRE_LEADING_BYTE_PRIVATE_2); |
164 } | 167 } |
165 | 168 |
166 /* Given a private leading byte, return the leading byte prefix stored | 169 /* Given a private leading byte, return the leading byte prefix stored |
167 in a string. */ | 170 in a string. */ |
168 | 171 |
169 #define PRIVATE_LEADING_BYTE_PREFIX(lb) \ | 172 #define private_leading_byte_prefix(lb) \ |
170 ((unsigned int) (lb) < MIN_LEADING_BYTE_PRIVATE_2 ? \ | 173 ((unsigned int) (lb) < MIN_LEADING_BYTE_PRIVATE_2 ? \ |
171 PRE_LEADING_BYTE_PRIVATE_1 : \ | 174 PRE_LEADING_BYTE_PRIVATE_1 : \ |
172 PRE_LEADING_BYTE_PRIVATE_2) | 175 PRE_LEADING_BYTE_PRIVATE_2) |
173 | 176 |
174 | 177 |
295 #define CHARSET_TO_UNICODE_TABLE(cs) ((cs)->to_unicode_table) | 298 #define CHARSET_TO_UNICODE_TABLE(cs) ((cs)->to_unicode_table) |
296 #define CHARSET_FROM_UNICODE_TABLE(cs) ((cs)->from_unicode_table) | 299 #define CHARSET_FROM_UNICODE_TABLE(cs) ((cs)->from_unicode_table) |
297 #define CHARSET_FROM_UNICODE_LEVELS(cs) ((cs)->from_unicode_levels) | 300 #define CHARSET_FROM_UNICODE_LEVELS(cs) ((cs)->from_unicode_levels) |
298 | 301 |
299 | 302 |
300 #define CHARSET_PRIVATE_P(cs) LEADING_BYTE_PRIVATE_P (CHARSET_LEADING_BYTE (cs)) | 303 #define CHARSET_PRIVATE_P(cs) leading_byte_private_p (CHARSET_LEADING_BYTE (cs)) |
301 | 304 |
302 #define XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs)) | 305 #define XCHARSET_ID(cs) CHARSET_ID (XCHARSET (cs)) |
303 #define XCHARSET_NAME(cs) CHARSET_NAME (XCHARSET (cs)) | 306 #define XCHARSET_NAME(cs) CHARSET_NAME (XCHARSET (cs)) |
304 #define XCHARSET_SHORT_NAME(cs) CHARSET_SHORT_NAME (XCHARSET (cs)) | 307 #define XCHARSET_SHORT_NAME(cs) CHARSET_SHORT_NAME (XCHARSET (cs)) |
305 #define XCHARSET_LONG_NAME(cs) CHARSET_LONG_NAME (XCHARSET (cs)) | 308 #define XCHARSET_LONG_NAME(cs) CHARSET_LONG_NAME (XCHARSET (cs)) |
334 Lisp_Object charset_by_attributes[4][128][2]; | 337 Lisp_Object charset_by_attributes[4][128][2]; |
335 Intbyte next_allocated_1_byte_leading_byte; | 338 Intbyte next_allocated_1_byte_leading_byte; |
336 Intbyte next_allocated_2_byte_leading_byte; | 339 Intbyte next_allocated_2_byte_leading_byte; |
337 }; | 340 }; |
338 | 341 |
339 INLINE_HEADER Lisp_Object CHARSET_BY_LEADING_BYTE (int lb); | 342 DECLARE_INLINE_HEADER ( |
340 INLINE_HEADER Lisp_Object | 343 Lisp_Object |
341 CHARSET_BY_LEADING_BYTE (int lb) | 344 charset_by_leading_byte (int lb) |
345 ) | |
342 { | 346 { |
343 extern struct charset_lookup *chlook; | 347 extern struct charset_lookup *chlook; |
344 | 348 |
345 #ifdef ERROR_CHECK_TEXT | 349 #ifdef ERROR_CHECK_TEXT |
346 /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the | 350 /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the |
349 text_checking_assert (tem >= MIN_LEADING_BYTE && tem <= 0xFF); | 353 text_checking_assert (tem >= MIN_LEADING_BYTE && tem <= 0xFF); |
350 #endif | 354 #endif |
351 return chlook->charset_by_leading_byte[lb - MIN_LEADING_BYTE]; | 355 return chlook->charset_by_leading_byte[lb - MIN_LEADING_BYTE]; |
352 } | 356 } |
353 | 357 |
354 INLINE_HEADER Lisp_Object | 358 DECLARE_INLINE_HEADER ( |
355 CHARSET_BY_ATTRIBUTES (int type, int final, int dir); | 359 Lisp_Object |
356 INLINE_HEADER Lisp_Object | 360 charset_by_attributes (int type, int final, int dir) |
357 CHARSET_BY_ATTRIBUTES (int type, int final, int dir) | 361 ) |
358 { | 362 { |
359 extern struct charset_lookup *chlook; | 363 extern struct charset_lookup *chlook; |
360 | 364 |
361 type_checking_assert (type < countof (chlook->charset_by_attributes) && | 365 type_checking_assert (type < countof (chlook->charset_by_attributes) && |
362 final < countof (chlook->charset_by_attributes[0]) && | 366 final < countof (chlook->charset_by_attributes[0]) && |
370 /************************************************************************/ | 374 /************************************************************************/ |
371 | 375 |
372 /* The bit fields of character are divided into 3 parts: | 376 /* The bit fields of character are divided into 3 parts: |
373 FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */ | 377 FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */ |
374 | 378 |
375 #define CHAR_FIELD1_MASK (0x1F << 14) | 379 #define EMCHAR_FIELD1_MASK (0x1F << 14) |
376 #define CHAR_FIELD2_MASK (0x7F << 7) | 380 #define EMCHAR_FIELD2_MASK (0x7F << 7) |
377 #define CHAR_FIELD3_MASK 0x7F | 381 #define EMCHAR_FIELD3_MASK 0x7F |
378 | 382 |
379 /* Macros to access each field of a character code of C. */ | 383 /* Macros to access each field of a character code of C. */ |
380 | 384 |
381 #define CHAR_FIELD1(c) (((c) & CHAR_FIELD1_MASK) >> 14) | 385 #define emchar_field1(c) (((c) & EMCHAR_FIELD1_MASK) >> 14) |
382 #define CHAR_FIELD2(c) (((c) & CHAR_FIELD2_MASK) >> 7) | 386 #define emchar_field2(c) (((c) & EMCHAR_FIELD2_MASK) >> 7) |
383 #define CHAR_FIELD3(c) ((c) & CHAR_FIELD3_MASK) | 387 #define emchar_field3(c) ((c) & EMCHAR_FIELD3_MASK) |
384 | 388 |
385 /* Field 1, if non-zero, usually holds a leading byte for a | 389 /* Field 1, if non-zero, usually holds a leading byte for a |
386 dimension-2 charset. Field 2, if non-zero, usually holds a leading | 390 dimension-2 charset. Field 2, if non-zero, usually holds a leading |
387 byte for a dimension-1 charset. */ | 391 byte for a dimension-1 charset. */ |
388 | 392 |
394 #define FIELD1_TO_OFFICIAL_LEADING_BYTE (MIN_LEADING_BYTE_OFFICIAL_2 - 1) | 398 #define FIELD1_TO_OFFICIAL_LEADING_BYTE (MIN_LEADING_BYTE_OFFICIAL_2 - 1) |
395 #define FIELD1_TO_PRIVATE_LEADING_BYTE 0xE1 | 399 #define FIELD1_TO_PRIVATE_LEADING_BYTE 0xE1 |
396 | 400 |
397 /* Minimum and maximum allowed values for the fields. */ | 401 /* Minimum and maximum allowed values for the fields. */ |
398 | 402 |
399 #define MIN_CHAR_FIELD2_OFFICIAL \ | 403 #define MIN_EMCHAR_FIELD2_OFFICIAL \ |
400 (MIN_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) | 404 (MIN_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) |
401 #define MAX_CHAR_FIELD2_OFFICIAL \ | 405 #define MAX_EMCHAR_FIELD2_OFFICIAL \ |
402 (MAX_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) | 406 (MAX_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) |
403 | 407 |
404 #define MIN_CHAR_FIELD1_OFFICIAL \ | 408 #define MIN_EMCHAR_FIELD1_OFFICIAL \ |
405 (MIN_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) | 409 (MIN_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) |
406 #define MAX_CHAR_FIELD1_OFFICIAL \ | 410 #define MAX_EMCHAR_FIELD1_OFFICIAL \ |
407 (MAX_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) | 411 (MAX_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) |
408 | 412 |
409 #define MIN_CHAR_FIELD2_PRIVATE \ | 413 #define MIN_EMCHAR_FIELD2_PRIVATE \ |
410 (MIN_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) | 414 (MIN_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) |
411 #define MAX_CHAR_FIELD2_PRIVATE \ | 415 #define MAX_EMCHAR_FIELD2_PRIVATE \ |
412 (MAX_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) | 416 (MAX_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) |
413 | 417 |
414 #define MIN_CHAR_FIELD1_PRIVATE \ | 418 #define MIN_EMCHAR_FIELD1_PRIVATE \ |
415 (MIN_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) | 419 (MIN_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) |
416 #define MAX_CHAR_FIELD1_PRIVATE \ | 420 #define MAX_EMCHAR_FIELD1_PRIVATE \ |
417 (MAX_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) | 421 (MAX_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) |
418 | 422 |
419 /* Minimum character code of each <type> character. */ | 423 /* Minimum character code of each <type> character. */ |
420 | 424 |
421 #define MIN_CHAR_OFFICIAL_TYPE9N (MIN_CHAR_FIELD2_OFFICIAL << 7) | 425 #define MIN_CHAR_OFFICIAL_TYPE9N (MIN_EMCHAR_FIELD2_OFFICIAL << 7) |
422 #define MIN_CHAR_PRIVATE_TYPE9N (MIN_CHAR_FIELD2_PRIVATE << 7) | 426 #define MIN_CHAR_PRIVATE_TYPE9N (MIN_EMCHAR_FIELD2_PRIVATE << 7) |
423 #define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_CHAR_FIELD1_OFFICIAL << 14) | 427 #define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_EMCHAR_FIELD1_OFFICIAL << 14) |
424 #define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_CHAR_FIELD1_PRIVATE << 14) | 428 #define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_EMCHAR_FIELD1_PRIVATE << 14) |
425 #define MIN_CHAR_COMPOSITION (0x1F << 14) | 429 #define MIN_CHAR_COMPOSITION (0x1F << 14) |
426 | 430 |
427 /* Leading byte of a character. | 431 /* Leading byte of a character. |
428 | 432 |
429 NOTE: This takes advantage of the fact that | 433 NOTE: This takes advantage of the fact that |
430 FIELD2_TO_OFFICIAL_LEADING_BYTE and | 434 FIELD2_TO_OFFICIAL_LEADING_BYTE and |
431 FIELD2_TO_PRIVATE_LEADING_BYTE are the same. | 435 FIELD2_TO_PRIVATE_LEADING_BYTE are the same. |
432 */ | 436 */ |
433 | 437 |
434 INLINE_HEADER Intbyte CHAR_LEADING_BYTE (Emchar c); | 438 DECLARE_INLINE_HEADER ( |
435 INLINE_HEADER Intbyte | 439 Intbyte |
436 CHAR_LEADING_BYTE (Emchar c) | 440 emchar_leading_byte (Emchar c) |
437 { | 441 ) |
438 if (CHAR_ASCII_P (c)) | 442 { |
443 if (emchar_ascii_p (c)) | |
439 return LEADING_BYTE_ASCII; | 444 return LEADING_BYTE_ASCII; |
440 else if (c < 0xA0) | 445 else if (c < 0xA0) |
441 return LEADING_BYTE_CONTROL_1; | 446 return LEADING_BYTE_CONTROL_1; |
442 else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) | 447 else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) |
443 return CHAR_FIELD2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE; | 448 return emchar_field2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE; |
444 else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N) | 449 else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N) |
445 return CHAR_FIELD1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE; | 450 return emchar_field1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE; |
446 else if (c < MIN_CHAR_COMPOSITION) | 451 else if (c < MIN_CHAR_COMPOSITION) |
447 return CHAR_FIELD1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE; | 452 return emchar_field1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE; |
448 else | 453 else |
449 { | 454 { |
450 #ifdef ENABLE_COMPOSITE_CHARS | 455 #ifdef ENABLE_COMPOSITE_CHARS |
451 return LEADING_BYTE_COMPOSITE; | 456 return LEADING_BYTE_COMPOSITE; |
452 #else | 457 #else |
454 return 0; | 459 return 0; |
455 #endif /* ENABLE_COMPOSITE_CHARS */ | 460 #endif /* ENABLE_COMPOSITE_CHARS */ |
456 } | 461 } |
457 } | 462 } |
458 | 463 |
459 #define CHAR_CHARSET(c) CHARSET_BY_LEADING_BYTE (CHAR_LEADING_BYTE (c)) | 464 DECLARE_INLINE_HEADER ( |
465 Bytecount | |
466 emchar_len (Emchar c) | |
467 ) | |
468 { | |
469 if (emchar_ascii_p (c)) | |
470 return 1; | |
471 else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) | |
472 return 2; | |
473 else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N) | |
474 return 3; /* dimension-2 official or dimension-1 private */ | |
475 else if (c < MIN_CHAR_COMPOSITION) | |
476 return 4; | |
477 else | |
478 { | |
479 #ifdef ENABLE_COMPOSITE_CHARS | |
480 #error Not yet implemented | |
481 #else | |
482 abort(); | |
483 return 0; | |
484 #endif /* ENABLE_COMPOSITE_CHARS */ | |
485 } | |
486 } | |
487 | |
488 DECLARE_INLINE_HEADER ( | |
489 Bytecount | |
490 emchar_len_fmt (Emchar c, Internal_Format fmt) | |
491 ) | |
492 { | |
493 switch (fmt) | |
494 { | |
495 case FORMAT_DEFAULT: | |
496 return emchar_len (c); | |
497 case FORMAT_16_BIT_FIXED: | |
498 return 2; | |
499 case FORMAT_32_BIT_FIXED: | |
500 return 4; | |
501 default: | |
502 text_checking_assert (fmt == FORMAT_8_BIT_FIXED); | |
503 return 1; | |
504 } | |
505 } | |
506 | |
507 #define emchar_charset(c) charset_by_leading_byte (emchar_leading_byte (c)) | |
460 | 508 |
461 /* Return a character whose charset is CHARSET and position-codes are C1 | 509 /* Return a character whose charset is CHARSET and position-codes are C1 |
462 and C2. TYPE9N character ignores C2. (For typical charsets, i.e. not | 510 and C2. TYPE9N character ignores C2. (For typical charsets, i.e. not |
463 ASCII, Control-1 or Composite, C1 and C2 will be in the range of 32 to | 511 ASCII, Control-1 or Composite, C1 and C2 will be in the range of 32 to |
464 127 or 33 to 126. See `make-char'.) | 512 127 or 33 to 126. See `make-char'.) |
466 NOTE: This takes advantage of the fact that | 514 NOTE: This takes advantage of the fact that |
467 FIELD2_TO_OFFICIAL_LEADING_BYTE and | 515 FIELD2_TO_OFFICIAL_LEADING_BYTE and |
468 FIELD2_TO_PRIVATE_LEADING_BYTE are the same. | 516 FIELD2_TO_PRIVATE_LEADING_BYTE are the same. |
469 */ | 517 */ |
470 | 518 |
471 INLINE_HEADER Emchar MAKE_CHAR_1 (Lisp_Object charset, int c1, int c2); | 519 DECLARE_INLINE_HEADER ( |
472 INLINE_HEADER Emchar | 520 Emchar |
473 MAKE_CHAR_1 (Lisp_Object charset, int c1, int c2) | 521 make_emchar (Lisp_Object charset, int c1, int c2) |
474 { | 522 ) |
523 { | |
524 Emchar retval; | |
475 if (EQ (charset, Vcharset_ascii)) | 525 if (EQ (charset, Vcharset_ascii)) |
476 return c1; | 526 retval = c1; |
477 else if (EQ (charset, Vcharset_control_1)) | 527 else if (EQ (charset, Vcharset_control_1)) |
478 return c1 | 0x80; | 528 retval = c1 | 0x80; |
479 #ifdef ENABLE_COMPOSITE_CHARS | 529 #ifdef ENABLE_COMPOSITE_CHARS |
480 else if (EQ (charset, Vcharset_composite)) | 530 else if (EQ (charset, Vcharset_composite)) |
481 return (0x1F << 14) | ((c1) << 7) | (c2); | 531 retval = (0x1F << 14) | ((c1) << 7) | (c2); |
482 #endif | 532 #endif |
483 else if (XCHARSET_DIMENSION (charset) == 1) | 533 else if (XCHARSET_DIMENSION (charset) == 1) |
484 return ((XCHARSET_LEADING_BYTE (charset) - | 534 retval = ((XCHARSET_LEADING_BYTE (charset) - |
485 FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) | (c1); | 535 FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) | (c1); |
486 else if (!XCHARSET_PRIVATE_P (charset)) | 536 else if (!XCHARSET_PRIVATE_P (charset)) |
487 return ((XCHARSET_LEADING_BYTE (charset) - | 537 retval = ((XCHARSET_LEADING_BYTE (charset) - |
488 FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); | 538 FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); |
489 else | 539 else |
490 return ((XCHARSET_LEADING_BYTE (charset) - | 540 retval = ((XCHARSET_LEADING_BYTE (charset) - |
491 FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); | 541 FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); |
492 } | 542 text_checking_assert (valid_emchar_p (retval)); |
493 | |
494 #ifdef ERROR_CHECK_TEXT | |
495 INLINE_HEADER Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2); | |
496 INLINE_HEADER Emchar | |
497 MAKE_CHAR (Lisp_Object charset, int c1, int c2) | |
498 { | |
499 Emchar retval = MAKE_CHAR_1 (charset, c1, c2); | |
500 assert (valid_char_p (retval)); | |
501 return retval; | 543 return retval; |
502 } | 544 } |
503 #else | 545 |
504 #define MAKE_CHAR(charset, c1, c2) MAKE_CHAR_1 (charset, c1, c2) | 546 /* BREAKUP_EMCHAR_1_UNSAFE assumes that the charset has already been |
505 #endif | |
506 | |
507 /* BREAKUP_CHAR_1_UNSAFE assumes that the charset has already been | |
508 calculated, and just computes c1 and c2. | 547 calculated, and just computes c1 and c2. |
509 | 548 |
510 BREAKUP_CHAR also computes and stores the charset. */ | 549 BREAKUP_EMCHAR also computes and stores the charset. */ |
511 | 550 |
512 #define BREAKUP_CHAR_1_UNSAFE(c, charset, c1, c2) \ | 551 #define BREAKUP_EMCHAR_1_UNSAFE(c, charset, c1, c2) \ |
513 XCHARSET_DIMENSION (charset) == 1 \ | 552 XCHARSET_DIMENSION (charset) == 1 \ |
514 ? ((c1) = CHAR_FIELD3 (c), (c2) = 0) \ | 553 ? ((c1) = emchar_field3 (c), (c2) = 0) \ |
515 : ((c1) = CHAR_FIELD2 (c), \ | 554 : ((c1) = emchar_field2 (c), \ |
516 (c2) = CHAR_FIELD3 (c)) | 555 (c2) = emchar_field3 (c)) |
517 | 556 |
518 INLINE_HEADER void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, | 557 DECLARE_INLINE_HEADER ( |
519 int *c2); | 558 void |
520 INLINE_HEADER void | 559 breakup_emchar_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) |
521 breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) | 560 ) |
522 { | 561 { |
523 text_checking_assert (valid_char_p (c)); | 562 text_checking_assert (valid_emchar_p (c)); |
524 *charset = CHAR_CHARSET (c); | 563 *charset = emchar_charset (c); |
525 BREAKUP_CHAR_1_UNSAFE (c, *charset, *c1, *c2); | 564 BREAKUP_EMCHAR_1_UNSAFE (c, *charset, *c1, *c2); |
526 } | 565 } |
527 | 566 |
528 /* BREAKUP_CHAR separates an Emchar into its components. The charset of | 567 /* BREAKUP_EMCHAR separates an Emchar into its components. The charset of |
529 character C is set to CHARSET, and the position-codes of C are set to C1 | 568 character C is set to CHARSET, and the position-codes of C are set to C1 |
530 and C2. C2 of TYPE9N character is 0. */ | 569 and C2. C2 of TYPE9N character is 0. */ |
531 | 570 |
532 #define BREAKUP_CHAR(c, charset, c1, c2) \ | 571 #define BREAKUP_EMCHAR(c, charset, c1, c2) \ |
533 breakup_char_1 (c, &(charset), &(c1), &(c2)) | 572 breakup_emchar_1 (c, &(charset), &(c1), &(c2)) |
534 | 573 |
535 void get_charset_limits (Lisp_Object charset, int *low, int *high); | 574 void get_charset_limits (Lisp_Object charset, int *low, int *high); |
536 int char_to_unicode (Emchar chr); | 575 int emchar_to_unicode (Emchar chr); |
537 | 576 |
538 #endif /* MULE */ | 577 #endif /* MULE */ |
539 | 578 |
540 #endif /* INCLUDED_charset_h_ */ | 579 #endif /* INCLUDED_charset_h_ */ |