X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=utf8.h;h=6885859a3f727cf29d898b572bb699fb10047876;hb=484fdf61e8653b10160ba1e8011888f52ab6825a;hp=0b745172189758e2feddaa14225c96bff2662857;hpb=37361303e31c2073b3e9c4c5bce1a4cc42832f83;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/utf8.h b/utf8.h
index 0b74517..6885859 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)