diff options
| -rw-r--r-- | src/character.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/character.h b/src/character.h index 9448d8bbfa9..98bb555b18d 100644 --- a/src/character.h +++ b/src/character.h | |||
| @@ -52,10 +52,6 @@ Boston, MA 02111-1307, USA. */ | |||
| 52 | #define MAX_4_BYTE_CHAR 0x1FFFFF | 52 | #define MAX_4_BYTE_CHAR 0x1FFFFF |
| 53 | #define MAX_5_BYTE_CHAR 0x3FFF7F | 53 | #define MAX_5_BYTE_CHAR 0x3FFF7F |
| 54 | 54 | ||
| 55 | /* Leading code range of Latin-1 chars. */ | ||
| 56 | #define LEADING_CODE_LATIN_1_MIN 0xC2 | ||
| 57 | #define LEADING_CODE_LATIN_1_MAX 0xC3 | ||
| 58 | |||
| 59 | /* Nonzero iff C is a character that corresponds to a raw 8-bit | 55 | /* Nonzero iff C is a character that corresponds to a raw 8-bit |
| 60 | byte. */ | 56 | byte. */ |
| 61 | #define CHAR_BYTE8_P(c) ((c) > MAX_5_BYTE_CHAR) | 57 | #define CHAR_BYTE8_P(c) ((c) > MAX_5_BYTE_CHAR) |
| @@ -95,7 +91,8 @@ extern int unibyte_to_multibyte_table[256]; | |||
| 95 | /* This is the maximum byte length of multibyte form. */ | 91 | /* This is the maximum byte length of multibyte form. */ |
| 96 | #define MAX_MULTIBYTE_LENGTH 5 | 92 | #define MAX_MULTIBYTE_LENGTH 5 |
| 97 | 93 | ||
| 98 | /* Return a Lisp character whose character code is C. */ | 94 | /* Return a Lisp character whose character code is C. It assumes C is |
| 95 | a valid character code. */ | ||
| 99 | #define make_char(c) make_number (c) | 96 | #define make_char(c) make_number (c) |
| 100 | 97 | ||
| 101 | /* Nonzero iff C is an ASCII byte. */ | 98 | /* Nonzero iff C is an ASCII byte. */ |
| @@ -348,7 +345,7 @@ extern int unibyte_to_multibyte_table[256]; | |||
| 348 | : string_char ((p), NULL, &actual_len)) | 345 | : string_char ((p), NULL, &actual_len)) |
| 349 | 346 | ||
| 350 | 347 | ||
| 351 | /* Like STRING_CHAR but advacen P to the end of multibyte form. */ | 348 | /* Like STRING_CHAR but advance P to the end of multibyte form. */ |
| 352 | 349 | ||
| 353 | #define STRING_CHAR_ADVANCE(p) \ | 350 | #define STRING_CHAR_ADVANCE(p) \ |
| 354 | (!((p)[0] & 0x80) \ | 351 | (!((p)[0] & 0x80) \ |
| @@ -390,7 +387,8 @@ extern int unibyte_to_multibyte_table[256]; | |||
| 390 | } \ | 387 | } \ |
| 391 | else | 388 | else |
| 392 | 389 | ||
| 393 | /* Like FETCH_STRING_CHAR_ADVANCE */ | 390 | /* Like FETCH_STRING_CHAR_ADVANCE but return a multibyte character eve |
| 391 | if STRING is unibyte. */ | ||
| 394 | 392 | ||
| 395 | #define FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX) \ | 393 | #define FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE(OUTPUT, STRING, CHARIDX, BYTEIDX) \ |
| 396 | if (1) \ | 394 | if (1) \ |
| @@ -452,7 +450,7 @@ extern int unibyte_to_multibyte_table[256]; | |||
| 452 | else | 450 | else |
| 453 | 451 | ||
| 454 | 452 | ||
| 455 | /* Like FETCH_CHAR_ADVANCE but assumes STRING is multibyte. */ | 453 | /* Like FETCH_CHAR_ADVANCE but assumes the current buffer is multibyte. */ |
| 456 | 454 | ||
| 457 | #define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX) \ | 455 | #define FETCH_CHAR_ADVANCE_NO_CHECK(OUTPUT, CHARIDX, BYTEIDX) \ |
| 458 | if (1) \ | 456 | if (1) \ |
| @@ -555,6 +553,9 @@ extern int unibyte_to_multibyte_table[256]; | |||
| 555 | } while (0) | 553 | } while (0) |
| 556 | 554 | ||
| 557 | 555 | ||
| 556 | /* If C is a character to be unified with a Unicode character, return | ||
| 557 | the unified Unicode character. */ | ||
| 558 | |||
| 558 | #define MAYBE_UNIFY_CHAR(c) \ | 559 | #define MAYBE_UNIFY_CHAR(c) \ |
| 559 | if (c > MAX_UNICODE_CHAR \ | 560 | if (c > MAX_UNICODE_CHAR \ |
| 560 | && CHAR_TABLE_P (Vchar_unify_table)) \ | 561 | && CHAR_TABLE_P (Vchar_unify_table)) \ |