Progress: wrap up emoji UTF-8.

diff --git a/level_0/f_utf/c/private-utf.c b/level_0/f_utf/c/private-utf.c
index cb5aa0469c208a6948688dc8cc65e2a043028877..20a26843b8a81c29351c2732bd37898f9c05f1a6 100644 (file)
--- a/level_0/f_utf/c/private-utf.c
+++ b/level_0/f_utf/c/private-utf.c
@@ -269,6 +269,7 @@ extern "C" {
     const uint8_t byte_first = f_macro_utf_character_to_char_1(character);
 
     if (width == 2) {
+
       // Latin-1 Supplement: U+00A9, U+00AE.
       if (character == 0xc2a90000 || character == 0xc2ae0000) {
         return F_true;
@@ -278,6 +279,7 @@ extern "C" {
     }
 
     if (width == 3) {
+
       // General Punctuation: U+203C, U+2049.
       if (character == 0xe280bc00 || character == 0xe2818900) {
         return F_true;
@@ -303,59 +305,58 @@ extern "C" {
         return F_true;
       }
 
-  /*
       // U+2328, U+23CF.
-      if (character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe28ca800 || character == 0xe28f8f00) {
         return F_true;
       }
 
       // U+23E9 to U+23F3.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe28fa900 && character <= 0xe28fb300) {
         return F_true;
       }
 
       // U+23F8 to U+23FA.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe28fb800 && character <= 0xe28fba00) {
         return F_true;
       }
 
       // U+24C2, U+25AA, U+25AB, U+25B6.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe2938200 || character == 0xe296aa00 || character == 0xe296ab00 || character == 0xe296b600) {
         return F_true;
       }
 
       // U+25C0.
-      if (character == 0x00000000) {
+      if (character == 0xe2978000) {
         return F_true;
       }
 
       // U+25FB to U+25FE.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe297bb00 && character <= 0xe297be00) {
         return F_true;
       }
 
       // U+2600 to U+2604.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe2988000 && character <= 0xe2988400) {
         return F_true;
       }
 
       // U+260E, U+2611, U+2614, U+2615.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe2988e00 || character == 0xe2989100 || character == 0xe2989400 || character == 0xe2989500) {
         return F_true;
       }
 
       // U+2618, U+261D, U+2620, U+2622.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe2989800 || character == 0xe2989d00 || character == 0xe298a000 || character == 0xe298a200) {
         return F_true;
       }
 
       // U+2623, U+2626, U+262A, U+262E.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe298a300 || character == 0xe298a600 || character == 0xe298aa00 || character == 0xe298ae00) {
         return F_true;
       }
 
       // U+262F.
-      if (character == 0x00000000) {
+      if (character == 0xe298af00) {
         return F_true;
       }
 
@@ -365,42 +366,42 @@ extern "C" {
       }
 
       // U+2640, U+2642.
-      if (character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe2998000 || character == 0xe2998200) {
         return F_true;
       }
 
       // U+2648 to U+2653.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe2998800 && character <= 0xe2999300) {
         return F_true;
       }
 
       // U+265F, U+2660, U+2663, U+2665.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe2999f00 || character == 0xe299a000 || character == 0xe299a300 || character == 0xe299a500) {
         return F_true;
       }
 
       // U+2666, U+2668, U+267B, U+267E.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe299a600 || character == 0xe299a800 || character == 0xe299bb00 || character == 0xe299be00) {
         return F_true;
       }
 
       // U+267F.
-      if (character == 0x00000000) {
+      if (character == 0xe299bf00) {
         return F_true;
       }
 
       // U+2692 to U+2697.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe29a9200 && character <= 0xe29a9700) {
         return F_true;
       }
 
       // U+2699, U+269B, U+269C, U+26A0.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29a9900 || character == 0xe29a9b00 || character == 0xe29a9c00 || character == 0xe29aa000) {
         return F_true;
       }
 
       // U+26A1, U+26A7, U+26AA, U+26AB.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29aa100 || character == 0xe29aa700 || character == 0xe29aaa00 || character == 0xe29aab00) {
         return F_true;
       }
 
@@ -420,330 +421,334 @@ extern "C" {
       }
 
       // U+26E9, U+26EA.
-      if (character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29ba900 || character == 0xe29baa00) {
         return F_true;
       }
 
       // U+26F0 to U+26F5.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe29bb000 && character <= 0xe29bb500) {
         return F_true;
       }
 
       // U+26F7 to U+26FA.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe29bb700 && character <= 0xe29bba00) {
         return F_true;
       }
 
       // U+26FD, U+2702, U+2705.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29bbd00 || character == 0xe29c8200 || character == 0xe29c8500) {
         return F_true;
       }
 
       // U+2708 to U+270D.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe29c8800 && character <= 0xe29c8d00) {
         return F_true;
       }
 
       // U+270F, U+2712, U+2714, U+2716.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29c8f00 || character == 0xe29c9200 || character == 0xe29c9400 || character == 0xe29c9600) {
         return F_true;
       }
 
       // U+271D, U+2721, U+2728, U+2733.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29c9d00 || character == 0xe29ca100 || character == 0xe29ca800 || character == 0xe29cb300) {
         return F_true;
       }
 
       // U+2734, U+2744, U+2747, U+274C.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29cb400 || character == 0xe29d8400 || character == 0xe29d8700 || character == 0xe29d8c00) {
         return F_true;
       }
 
       // U+274E.
-      if (character == 0x00000000) {
+      if (character == 0xe29d8e00) {
         return F_true;
       }
 
       // U+2753 to U+2755.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe29d9300 && character <= 0xe29d9500) {
         return F_true;
       }
 
       // U+2757, U+2763, U+2764.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29d9700 || character == 0xe29da300 || character == 0xe29da400) {
         return F_true;
       }
 
       // U+2795 to U+2797.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe29e9500 && character <= 0xe29e9700) {
         return F_true;
       }
 
       // U+27A1, U+27B0, U+27BF, U+2934.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe29ea100 || character == 0xe29eb000 || character == 0xe29ebf00 || character == 0xe2a4b400) {
         return F_true;
       }
 
       // U+2935.
-      if (character == 0x00000000) {
+      if (character == 0xe2a4b500) {
         return F_true;
       }
 
       // U+2B05 to U+2B07.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xe2ac8500 && character <= 0xe2ac8700) {
         return F_true;
       }
 
       // U+2B1B, U+2B1C, U+2B50, U+2B55.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xe2ac9b00 || character == 0xe2ac9c00 || character == 0xe2ad9000 || character == 0xe2ad9500) {
         return F_true;
       }
 
-      // U+3030, U+303D, U+303D, U+3297.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      // U+3030, U+303D, U+3297, U+3299.
+      if (character == 0xe380b000 || character == 0xe380bd00 || character == 0xe38a9700 || character == 0xe38a9900) {
         return F_true;
       }
 
-      // U+3299, U+1F004.
-      if (character == 0x00000000 || character == 0x00000000) {
+      // U+1F004.
+      if (character == 0x00000000) {
         return F_true;
       }
 
+      return F_false;
+    }
+
+    if (width == 4) {
+
       // U+1F0CF to U+1F171.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f8084 && character <= 0xf09f85b1) {
         return F_true;
       }
 
       // U+1F17E, U+1F17F, U+1F18E.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f85be || character == 0xf09f85bf || character == 0xf09f868e) {
         return F_true;
       }
 
       // U+1F191 to U+1F19A.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f8691 && character <= 0xf09f869a) {
         return F_true;
       }
 
       // U+1F201, U+1F202, U+1F21A, U+1F22F.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f8881 || character == 0xf09f8882 || character == 0xf09f889a || character == 0xf09f88af) {
         return F_true;
       }
 
       // U+1F232 to U+1F23A.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f88b2 && character <= 0xf09f88ba) {
         return F_true;
       }
 
       // U+1F250, U+1F251.
-      if (character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f8990 || character == 0xf09f8991) {
         return F_true;
       }
 
       // U+1F300 to U+1F321.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f8c80 && character <= 0xf09f8ca1) {
         return F_true;
       }
 
       // U+1F324 to U+1F393.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f8ca4 && character <= 0xf09f8e93) {
         return F_true;
       }
 
       // U+1F396, U+1F397.
-      if (character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f8e96 || character == 0xf09f8e97) {
         return F_true;
       }
 
       // U+1F399 to U+1F39B.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f8e99 && character <= 0xf09f8e9b) {
         return F_true;
       }
 
       // U+1F39E to U+1F3F0.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f8e9e && character <= 0xf09f8fb0) {
         return F_true;
       }
 
       // U+1F3F3 to U+1F3F5.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f8fb3 && character <= 0xf09f8fb5) {
         return F_true;
       }
 
       // U+1F3F7 to U+1F4FD.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f8fb7 && character <= 0xf09f93bd) {
         return F_true;
       }
 
       // U+1F4FF to U+1F53D.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f93bf && character <= 0xf09f94bd) {
         return F_true;
       }
 
       // U+1F549 to U+1F54E.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9589 && character <= 0xf09f958e) {
         return F_true;
       }
 
       // U+1F550 to U+1F567.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9590 && character <= 0xf09f95a7) {
         return F_true;
       }
 
       // U+1F56F, U+1F570.
-      if (character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f95af || character == 0xf09f95b0) {
         return F_true;
       }
 
       // U+1F573 to U+1F57A.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f95b3 && character <= 0xf09f95ba) {
         return F_true;
       }
 
       // U+1F587.
-      if (character == 0x00000000) {
+      if (character == 0xf09f9687) {
         return F_true;
       }
 
       // U+1F58A to U+1F58D.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f968a && character <= 0xf09f968d) {
         return F_true;
       }
 
       // U+1F590, U+1F595, U+1F596, U+1F5A4.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f9690 || character == 0xf09f9695 || character == 0xf09f9696 || character == 0xf09f96a4) {
         return F_true;
       }
 
       // U+1F5A5, U+1F5A8, U+1F5B1, U+1F5B2.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f96a5 || character == 0xf09f96a8 || character == 0xf09f96b1 || character == 0xf09f96b2) {
         return F_true;
       }
 
       // U+1F5BC.
-      if (character == 0x00000000) {
+      if (character == 0xf09f96bc) {
         return F_true;
       }
 
       // U+1F5C2 to U+1F5C4.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9782 && character <= 0xf09f9784) {
         return F_true;
       }
 
       // U+1F5D1 to U+1F5D3.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9791 && character <= 0xf09f9793) {
         return F_true;
       }
 
       // U+1F5DC to U+1F5DE.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f979c && character <= 0xf09f979e) {
         return F_true;
       }
 
       // U+1F5E1, U+1F5E3, U+1F5E8, U+1F5EF.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f97a1 || character == 0xf09f97a3 || character == 0xf09f97a8 || character == 0xf09f97af) {
         return F_true;
       }
 
       // U+1F5F3.
-      if (character == 0x00000000) {
+      if (character == 0xf09f97b3) {
         return F_true;
       }
 
       // U+1F5FA to U+1F6C5.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f97ba && character <= 0xf09f9b85) {
         return F_true;
       }
 
       // U+1F6CB to U+1F6D2.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9b8b && character <= 0xf09f9b92) {
         return F_true;
       }
 
       // U+1F6D5 to U+1F6D7.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9b95 && character <= 0xf09f9b97) {
         return F_true;
       }
 
       // U+1F6E0 to U+1F6E5.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9ba0 && character <= 0xf09f9ba5) {
         return F_true;
       }
 
       // U+1F6E9, U+1F6EB, U+1F6EC, U+1F6F0.
-      if (character == 0x00000000 || character == 0x00000000 || character == 0x00000000 || character == 0x00000000) {
+      if (character == 0xf09f9ba9 || character == 0xf09f9bab || character == 0xf09f9bac || character == 0xf09f9bb0) {
         return F_true;
       }
 
       // U+1F6F3 to U+1F6FC.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9bb3 && character <= 0xf09f9bbc) {
         return F_true;
       }
 
       // U+1F7E0 to U+1F7EB.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09f9fa0 && character <= 0xf09f9fab) {
         return F_true;
       }
 
       // U+1F90C to U+1F93A.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fa48c && character <= 0xf09fa4ba) {
         return F_true;
       }
 
       // U+1F93C to U+1F945.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fa4bc && character <= 0xf09fa585) {
         return F_true;
       }
 
       // U+1F947 to U+1F978.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fa587 && character <= 0xf09fa5b8) {
         return F_true;
       }
 
       // U+1F97A to U+1F9CB.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fa5ba && character <= 0xf09fa78b) {
         return F_true;
       }
 
       // U+1F9CD to U+1FA74.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fa78d && character <= 0xf09fa9b4) {
         return F_true;
       }
 
       // U+1FA70 to U+1FA74.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fa9b0 && character <= 0xf09fa9b4) {
         return F_true;
       }
 
       // U+1FA78 to U+1FA7A.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fa9b8 && character <= 0xf09fa9ba) {
         return F_true;
       }
 
       // U+1FA80 to U+1FA86.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09faa80 && character <= 0xf09faa86) {
         return F_true;
       }
 
       // U+1FA90 to U+1FAA8.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09faa90 && character <= 0xf09faaa8) {
         return F_true;
       }
 
       // U+1FAB0 to U+1FAB6.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09faab0 && character <= 0xf09faab6) {
         return F_true;
       }
 
       // U+1FAC0 to U+1FAC2.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fab80 && character <= 0xf09fab82) {
         return F_true;
       }
 
       // U+1FAD0 to U+1FAD6.
-      if (character >= 0x00000000 && character <= 0x00000000) {
+      if (character >= 0xf09fab90 && character <= 0xf09fab96) {
         return F_true;
       }
-  */
     }
 
     return F_false;
@@ -2685,17 +2690,15 @@ extern "C" {
       }
       else if (byte_first == 0xee) {
 
-        // @todo update this range to only 0xee.
-        // consider all private use codes as valid, U+E000 to U+F8FF.
-        if (character >= 0xee808000 && character <= 0xefa3bf00) {
+        // consider all private use codes as valid, U+E000 to U+EFFF (U+F8FF).
+        if (bytes >= 0x8080 && bytes <= 0xbfbf) {
           return F_true;
         }
       }
       else if (byte_first == 0xef) {
 
-        // @todo update this range to only 0xef
-        // consider all private use codes as valid, U+E000 to U+F8FF.
-        if (character >= 0xee808000 && character <= 0xefa3bf00) {
+        // consider all private use codes as valid, U+F000 (U+E000) to U+F8FF.
+        if (bytes >= 0x8080 && bytes <= 0xa3bf) {
           return F_true;
         }
 
@@ -3849,6 +3852,7 @@ extern "C" {
       }
     }
     else if (width == 3) {
+
       // reduce the number of checks by grouping checks by first byte.
       const uint8_t byte_first = f_macro_utf_character_to_char_1(character);
 
@@ -3912,6 +3916,7 @@ extern "C" {
     }
 
     if (width == 3) {
+
       // reduce the number of checks by grouping checks by first byte.
       const uint8_t byte_first = f_macro_utf_character_to_char_1(character);