From c867b36081026b7a72e449b72b5b9916973f9bf1 Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Sat, 6 Apr 2002 16:41:06 +0000 Subject: As noted by Philip Newton: nothing wrong with BOM, but 0xFFFE quite wrong. p4raw-id: //depot/perl@15762 --- utf8.h | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'utf8.h') diff --git a/utf8.h b/utf8.h index 0b74517218..6885859a3f 100644 --- a/utf8.h +++ b/utf8.h @@ -180,20 +180,19 @@ encoded character. #define UTF8_ALLOW_FE_FF 0x0008 #define UTF8_ALLOW_SHORT 0x0010 #define UTF8_ALLOW_SURROGATE 0x0020 -#define UTF8_ALLOW_BOM 0x0040 -#define UTF8_ALLOW_FFFF 0x0080 -#define UTF8_ALLOW_LONG 0x0100 +#define UTF8_ALLOW_FFFF 0x0040 /* Allows also FFFE. */ +#define UTF8_ALLOW_LONG 0x0080 #define UTF8_ALLOW_ANYUV (UTF8_ALLOW_EMPTY|UTF8_ALLOW_FE_FF|\ - UTF8_ALLOW_SURROGATE|UTF8_ALLOW_BOM|\ + UTF8_ALLOW_SURROGATE|\ UTF8_ALLOW_FFFF|UTF8_ALLOW_LONG) -#define UTF8_ALLOW_ANY 0x00ff +#define UTF8_ALLOW_ANY 0x00FF #define UTF8_CHECK_ONLY 0x0200 -#define UNICODE_SURROGATE_FIRST 0xd800 -#define UNICODE_SURROGATE_LAST 0xdfff -#define UNICODE_REPLACEMENT 0xfffd -#define UNICODE_BYTE_ORDER_MARK 0xfeff -#define UNICODE_ILLEGAL 0xffff +#define UNICODE_SURROGATE_FIRST 0xD800 +#define UNICODE_SURROGATE_LAST 0xDFFF +#define UNICODE_REPLACEMENT 0xFFFD +#define UNICODE_BYTE_ORDER_MARK 0xFEFF +#define UNICODE_ILLEGAL 0xFFFF /* Though our UTF-8 encoding can go beyond this, * let's be conservative and do as Unicode 3.2 says. */ @@ -201,10 +200,9 @@ encoded character. #define UNICODE_ALLOW_SURROGATE 0x0001 /* Allow UTF-16 surrogates (EVIL) */ #define UNICODE_ALLOW_FDD0 0x0002 /* Allow the U+FDD0...U+FDEF */ -#define UNICODE_ALLOW_BOM 0x0004 /* Allow 0xFEFF */ -#define UNICODE_ALLOW_FFFF 0x0008 /* Allow 0xFFFF, 0x1FFFF, ... */ -#define UNICODE_ALLOW_SUPER 0x0010 /* Allow past 10xFFFF */ -#define UNICODE_ALLOW_ANY 0xFFFF +#define UNICODE_ALLOW_FFFF 0x0004 /* Allow 0xFFF[EF], 0x1FFF[EF], ... */ +#define UNICODE_ALLOW_SUPER 0x0008 /* Allow past 10xFFFF */ +#define UNICODE_ALLOW_ANY 0x000F #define UNICODE_IS_SURROGATE(c) ((c) >= UNICODE_SURROGATE_FIRST && \ (c) <= UNICODE_SURROGATE_LAST) -- cgit v1.2.1