From fc2f548f04f7675ff1f9a61a0f8e8114bba2debf Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 18:32:39 +0000 Subject: [PATCH 01/33] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0010400..f08056e 100644 --- a/README.md +++ b/README.md @@ -225,3 +225,6 @@ Feedstock Maintainers * [@ocefpaf](https://github.com/ocefpaf/) * [@scopatz](https://github.com/scopatz/) + + + From 8b1d04a1173ae1a08cb7e1519f8b5322a5a56d2c Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 14 Dec 2023 12:33:22 -0600 Subject: [PATCH 02/33] Create utf_8_mac.patch --- recipe/utf_8_mac.patch | 1636 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1636 insertions(+) create mode 100644 recipe/utf_8_mac.patch diff --git a/recipe/utf_8_mac.patch b/recipe/utf_8_mac.patch new file mode 100644 index 0000000..d58c1a1 --- /dev/null +++ b/recipe/utf_8_mac.patch @@ -0,0 +1,1636 @@ +--- a/lib/converters.h 2009-06-21 06:17:33.000000000 -0500 ++++ b/lib/converters.h 2010-01-20 19:54:37.000000000 -0600 +@@ -119,6 +119,7 @@ + /* General multi-byte encodings */ + #include "utf8.h" + #include "ucs2.h" ++#include "utf8mac.h" + #include "ucs2be.h" + #include "ucs2le.h" + #include "ucs4.h" +--- a/lib/encodings.def 2009-06-12 01:19:03.000000000 +0200 ++++ b/lib/encodings.def 2009-06-12 01:20:39.000000000 +0200 +@@ -69,6 +69,12 @@ + utf8) + #endif + ++DEFENCODING(( "UTF-8-MAC", /* utf8-nfd */ ++ "UTF8-MAC", /* label from samba 2.2jp */ ++ ), ++ utf8mac, ++ { utf8mac_mbtowc, NULL }, { utf8mac_wctomb, NULL }) ++ + DEFENCODING(( "UCS-2", /* glibc */ + "ISO-10646-UCS-2", /* IANA */ + "csUnicode", /* IANA */ +--- a/lib/utf8mac.h 1970-01-01 09:00:00.000000000 +0900 ++++ b/lib/utf8mac.h 2007-11-13 17:42:39.000000000 +0900 +@@ -0,0 +1,1608 @@ ++/* ++ * Copyright (C) 2003 Apple Computer, Inc. All rights reserved. ++ * ++ * This file is part of the GNU LIBICONV Library. ++ * ++ * The GNU LIBICONV Library is free software; you can redistribute it ++ * and/or modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * The GNU LIBICONV Library is distributed in the hope that it will be ++ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with the GNU LIBICONV Library; see the file COPYING.LIB. ++ * If not, write to the Free Software Foundation, Inc., 59 Temple Place - ++ * Suite 330, Boston, MA 02111-1307, USA. ++ */ ++ ++/* ++ * UTF-8-MAC ++ */ ++ ++ /* ++ Includes Unicode 3.2 decomposition code derived from Core Foundation ++ */ ++ ++#include ++#include ++#include /* bzero() */ ++ ++#define UTF_REVERSE_ENDIAN 0x01 /* reverse UCS-2 byte order */ ++#define UTF_NO_NULL_TERM 0x02 /* do not add null termination */ ++#define UTF_DECOMPOSED 0x04 /* generate fully decomposed UCS-2 */ ++#define UTF_PRECOMPOSED 0x08 /* generate precomposed UCS-2 */ ++ ++int utf8_encodestr (const u_int16_t *, size_t, u_int8_t *, size_t *, ++ size_t, u_int16_t, int); ++ ++int utf8_decodestr (const u_int8_t *, size_t, u_int16_t *,size_t *, ++ size_t, u_int16_t, int, size_t *); ++ ++/* ++ Derived from Core Foundation headers: ++ ++ CFUniCharDecompData.h ++ CFUniCharPrecompData.h ++ CFUniCharNonBaseData.h ++*/ ++ ++static const u_int16_t ++__CFUniCharDecompositionTable[] = { ++ 0x00C0, 0x2000, 0x00C1, 0x2002, 0x00C2, 0x2004, 0x00C3, 0x2006, ++ 0x00C4, 0x2008, 0x00C5, 0x200A, 0x00C7, 0x200C, 0x00C8, 0x200E, ++ 0x00C9, 0x2010, 0x00CA, 0x2012, 0x00CB, 0x2014, 0x00CC, 0x2016, ++ 0x00CD, 0x2018, 0x00CE, 0x201A, 0x00CF, 0x201C, 0x00D1, 0x201E, ++ 0x00D2, 0x2020, 0x00D3, 0x2022, 0x00D4, 0x2024, 0x00D5, 0x2026, ++ 0x00D6, 0x2028, 0x00D9, 0x202A, 0x00DA, 0x202C, 0x00DB, 0x202E, ++ 0x00DC, 0x2030, 0x00DD, 0x2032, 0x00E0, 0x2034, 0x00E1, 0x2036, ++ 0x00E2, 0x2038, 0x00E3, 0x203A, 0x00E4, 0x203C, 0x00E5, 0x203E, ++ 0x00E7, 0x2040, 0x00E8, 0x2042, 0x00E9, 0x2044, 0x00EA, 0x2046, ++ 0x00EB, 0x2048, 0x00EC, 0x204A, 0x00ED, 0x204C, 0x00EE, 0x204E, ++ 0x00EF, 0x2050, 0x00F1, 0x2052, 0x00F2, 0x2054, 0x00F3, 0x2056, ++ 0x00F4, 0x2058, 0x00F5, 0x205A, 0x00F6, 0x205C, 0x00F9, 0x205E, ++ 0x00FA, 0x2060, 0x00FB, 0x2062, 0x00FC, 0x2064, 0x00FD, 0x2066, ++ 0x00FF, 0x2068, 0x0100, 0x206A, 0x0101, 0x206C, 0x0102, 0x206E, ++ 0x0103, 0x2070, 0x0104, 0x2072, 0x0105, 0x2074, 0x0106, 0x2076, ++ 0x0107, 0x2078, 0x0108, 0x207A, 0x0109, 0x207C, 0x010A, 0x207E, ++ 0x010B, 0x2080, 0x010C, 0x2082, 0x010D, 0x2084, 0x010E, 0x2086, ++ 0x010F, 0x2088, 0x0112, 0x208A, 0x0113, 0x208C, 0x0114, 0x208E, ++ 0x0115, 0x2090, 0x0116, 0x2092, 0x0117, 0x2094, 0x0118, 0x2096, ++ 0x0119, 0x2098, 0x011A, 0x209A, 0x011B, 0x209C, 0x011C, 0x209E, ++ 0x011D, 0x20A0, 0x011E, 0x20A2, 0x011F, 0x20A4, 0x0120, 0x20A6, ++ 0x0121, 0x20A8, 0x0122, 0x20AA, 0x0123, 0x20AC, 0x0124, 0x20AE, ++ 0x0125, 0x20B0, 0x0128, 0x20B2, 0x0129, 0x20B4, 0x012A, 0x20B6, ++ 0x012B, 0x20B8, 0x012C, 0x20BA, 0x012D, 0x20BC, 0x012E, 0x20BE, ++ 0x012F, 0x20C0, 0x0130, 0x20C2, 0x0134, 0x20C4, 0x0135, 0x20C6, ++ 0x0136, 0x20C8, 0x0137, 0x20CA, 0x0139, 0x20CC, 0x013A, 0x20CE, ++ 0x013B, 0x20D0, 0x013C, 0x20D2, 0x013D, 0x20D4, 0x013E, 0x20D6, ++ 0x0143, 0x20D8, 0x0144, 0x20DA, 0x0145, 0x20DC, 0x0146, 0x20DE, ++ 0x0147, 0x20E0, 0x0148, 0x20E2, 0x014C, 0x20E4, 0x014D, 0x20E6, ++ 0x014E, 0x20E8, 0x014F, 0x20EA, 0x0150, 0x20EC, 0x0151, 0x20EE, ++ 0x0154, 0x20F0, 0x0155, 0x20F2, 0x0156, 0x20F4, 0x0157, 0x20F6, ++ 0x0158, 0x20F8, 0x0159, 0x20FA, 0x015A, 0x20FC, 0x015B, 0x20FE, ++ 0x015C, 0x2100, 0x015D, 0x2102, 0x015E, 0x2104, 0x015F, 0x2106, ++ 0x0160, 0x2108, 0x0161, 0x210A, 0x0162, 0x210C, 0x0163, 0x210E, ++ 0x0164, 0x2110, 0x0165, 0x2112, 0x0168, 0x2114, 0x0169, 0x2116, ++ 0x016A, 0x2118, 0x016B, 0x211A, 0x016C, 0x211C, 0x016D, 0x211E, ++ 0x016E, 0x2120, 0x016F, 0x2122, 0x0170, 0x2124, 0x0171, 0x2126, ++ 0x0172, 0x2128, 0x0173, 0x212A, 0x0174, 0x212C, 0x0175, 0x212E, ++ 0x0176, 0x2130, 0x0177, 0x2132, 0x0178, 0x2134, 0x0179, 0x2136, ++ 0x017A, 0x2138, 0x017B, 0x213A, 0x017C, 0x213C, 0x017D, 0x213E, ++ 0x017E, 0x2140, 0x01A0, 0x2142, 0x01A1, 0x2144, 0x01AF, 0x2146, ++ 0x01B0, 0x2148, 0x01CD, 0x214A, 0x01CE, 0x214C, 0x01CF, 0x214E, ++ 0x01D0, 0x2150, 0x01D1, 0x2152, 0x01D2, 0x2154, 0x01D3, 0x2156, ++ 0x01D4, 0x2158, 0x01D5, 0xA15A, 0x01D6, 0xA15C, 0x01D7, 0xA15E, ++ 0x01D8, 0xA160, 0x01D9, 0xA162, 0x01DA, 0xA164, 0x01DB, 0xA166, ++ 0x01DC, 0xA168, 0x01DE, 0xA16A, 0x01DF, 0xA16C, 0x01E0, 0xA16E, ++ 0x01E1, 0xA170, 0x01E2, 0x2172, 0x01E3, 0x2174, 0x01E6, 0x2176, ++ 0x01E7, 0x2178, 0x01E8, 0x217A, 0x01E9, 0x217C, 0x01EA, 0x217E, ++ 0x01EB, 0x2180, 0x01EC, 0xA182, 0x01ED, 0xA184, 0x01EE, 0x2186, ++ 0x01EF, 0x2188, 0x01F0, 0x218A, 0x01F4, 0x218C, 0x01F5, 0x218E, ++ 0x01F8, 0x2190, 0x01F9, 0x2192, 0x01FA, 0xA194, 0x01FB, 0xA196, ++ 0x01FC, 0x2198, 0x01FD, 0x219A, 0x01FE, 0x219C, 0x01FF, 0x219E, ++ 0x0200, 0x21A0, 0x0201, 0x21A2, 0x0202, 0x21A4, 0x0203, 0x21A6, ++ 0x0204, 0x21A8, 0x0205, 0x21AA, 0x0206, 0x21AC, 0x0207, 0x21AE, ++ 0x0208, 0x21B0, 0x0209, 0x21B2, 0x020A, 0x21B4, 0x020B, 0x21B6, ++ 0x020C, 0x21B8, 0x020D, 0x21BA, 0x020E, 0x21BC, 0x020F, 0x21BE, ++ 0x0210, 0x21C0, 0x0211, 0x21C2, 0x0212, 0x21C4, 0x0213, 0x21C6, ++ 0x0214, 0x21C8, 0x0215, 0x21CA, 0x0216, 0x21CC, 0x0217, 0x21CE, ++ 0x0218, 0x21D0, 0x0219, 0x21D2, 0x021A, 0x21D4, 0x021B, 0x21D6, ++ 0x021E, 0x21D8, 0x021F, 0x21DA, 0x0226, 0x21DC, 0x0227, 0x21DE, ++ 0x0228, 0x21E0, 0x0229, 0x21E2, 0x022A, 0xA1E4, 0x022B, 0xA1E6, ++ 0x022C, 0xA1E8, 0x022D, 0xA1EA, 0x022E, 0x21EC, 0x022F, 0x21EE, ++ 0x0230, 0xA1F0, 0x0231, 0xA1F2, 0x0232, 0x21F4, 0x0233, 0x21F6, ++ 0x0340, 0x1300, 0x0341, 0x1301, 0x0343, 0x1313, 0x0344, 0x21F8, ++ 0x0374, 0x12B9, 0x037E, 0x103B, 0x0385, 0x21FA, 0x0386, 0x21FC, ++ 0x0387, 0x10B7, 0x0388, 0x21FE, 0x0389, 0x2200, 0x038A, 0x2202, ++ 0x038C, 0x2204, 0x038E, 0x2206, 0x038F, 0x2208, 0x0390, 0xA20A, ++ 0x03AA, 0x220C, 0x03AB, 0x220E, 0x03AC, 0x2210, 0x03AD, 0x2212, ++ 0x03AE, 0x2214, 0x03AF, 0x2216, 0x03B0, 0xA218, 0x03CA, 0x221A, ++ 0x03CB, 0x221C, 0x03CC, 0x221E, 0x03CD, 0x2220, 0x03CE, 0x2222, ++ 0x03D3, 0x2224, 0x03D4, 0x2226, 0x0400, 0x2228, 0x0401, 0x222A, ++ 0x0403, 0x222C, 0x0407, 0x222E, 0x040C, 0x2230, 0x040D, 0x2232, ++ 0x040E, 0x2234, 0x0419, 0x2236, 0x0439, 0x2238, 0x0450, 0x223A, ++ 0x0451, 0x223C, 0x0453, 0x223E, 0x0457, 0x2240, 0x045C, 0x2242, ++ 0x045D, 0x2244, 0x045E, 0x2246, 0x0476, 0x2248, 0x0477, 0x224A, ++ 0x04C1, 0x224C, 0x04C2, 0x224E, 0x04D0, 0x2250, 0x04D1, 0x2252, ++ 0x04D2, 0x2254, 0x04D3, 0x2256, 0x04D6, 0x2258, 0x04D7, 0x225A, ++ 0x04DA, 0x225C, 0x04DB, 0x225E, 0x04DC, 0x2260, 0x04DD, 0x2262, ++ 0x04DE, 0x2264, 0x04DF, 0x2266, 0x04E2, 0x2268, 0x04E3, 0x226A, ++ 0x04E4, 0x226C, 0x04E5, 0x226E, 0x04E6, 0x2270, 0x04E7, 0x2272, ++ 0x04EA, 0x2274, 0x04EB, 0x2276, 0x04EC, 0x2278, 0x04ED, 0x227A, ++ 0x04EE, 0x227C, 0x04EF, 0x227E, 0x04F0, 0x2280, 0x04F1, 0x2282, ++ 0x04F2, 0x2284, 0x04F3, 0x2286, 0x04F4, 0x2288, 0x04F5, 0x228A, ++ 0x04F8, 0x228C, 0x04F9, 0x228E, 0x0622, 0x2290, 0x0623, 0x2292, ++ 0x0624, 0x2294, 0x0625, 0x2296, 0x0626, 0x2298, 0x06C0, 0x229A, ++ 0x06C2, 0x229C, 0x06D3, 0x229E, 0x0929, 0x22A0, 0x0931, 0x22A2, ++ 0x0934, 0x22A4, 0x0958, 0x22A6, 0x0959, 0x22A8, 0x095A, 0x22AA, ++ 0x095B, 0x22AC, 0x095C, 0x22AE, 0x095D, 0x22B0, 0x095E, 0x22B2, ++ 0x095F, 0x22B4, 0x09CB, 0x22B6, 0x09CC, 0x22B8, 0x09DC, 0x22BA, ++ 0x09DD, 0x22BC, 0x09DF, 0x22BE, 0x0A33, 0x22C0, 0x0A36, 0x22C2, ++ 0x0A59, 0x22C4, 0x0A5A, 0x22C6, 0x0A5B, 0x22C8, 0x0A5E, 0x22CA, ++ 0x0B48, 0x22CC, 0x0B4B, 0x22CE, 0x0B4C, 0x22D0, 0x0B5C, 0x22D2, ++ 0x0B5D, 0x22D4, 0x0B94, 0x22D6, 0x0BCA, 0x22D8, 0x0BCB, 0x22DA, ++ 0x0BCC, 0x22DC, 0x0C48, 0x22DE, 0x0CC0, 0x22E0, 0x0CC7, 0x22E2, ++ 0x0CC8, 0x22E4, 0x0CCA, 0x22E6, 0x0CCB, 0xA2E8, 0x0D4A, 0x22EA, ++ 0x0D4B, 0x22EC, 0x0D4C, 0x22EE, 0x0DDA, 0x22F0, 0x0DDC, 0x22F2, ++ 0x0DDD, 0xA2F4, 0x0DDE, 0x22F6, 0x0F43, 0x22F8, 0x0F4D, 0x22FA, ++ 0x0F52, 0x22FC, 0x0F57, 0x22FE, 0x0F5C, 0x2300, 0x0F69, 0x2302, ++ 0x0F73, 0x2304, 0x0F75, 0x2306, 0x0F76, 0x2308, 0x0F78, 0x230A, ++ 0x0F81, 0x230C, 0x0F93, 0x230E, 0x0F9D, 0x2310, 0x0FA2, 0x2312, ++ 0x0FA7, 0x2314, 0x0FAC, 0x2316, 0x0FB9, 0x2318, 0x1026, 0x231A, ++ 0x1E00, 0x231C, 0x1E01, 0x231E, 0x1E02, 0x2320, 0x1E03, 0x2322, ++ 0x1E04, 0x2324, 0x1E05, 0x2326, 0x1E06, 0x2328, 0x1E07, 0x232A, ++ 0x1E08, 0xA32C, 0x1E09, 0xA32E, 0x1E0A, 0x2330, 0x1E0B, 0x2332, ++ 0x1E0C, 0x2334, 0x1E0D, 0x2336, 0x1E0E, 0x2338, 0x1E0F, 0x233A, ++ 0x1E10, 0x233C, 0x1E11, 0x233E, 0x1E12, 0x2340, 0x1E13, 0x2342, ++ 0x1E14, 0xA344, 0x1E15, 0xA346, 0x1E16, 0xA348, 0x1E17, 0xA34A, ++ 0x1E18, 0x234C, 0x1E19, 0x234E, 0x1E1A, 0x2350, 0x1E1B, 0x2352, ++ 0x1E1C, 0xA354, 0x1E1D, 0xA356, 0x1E1E, 0x2358, 0x1E1F, 0x235A, ++ 0x1E20, 0x235C, 0x1E21, 0x235E, 0x1E22, 0x2360, 0x1E23, 0x2362, ++ 0x1E24, 0x2364, 0x1E25, 0x2366, 0x1E26, 0x2368, 0x1E27, 0x236A, ++ 0x1E28, 0x236C, 0x1E29, 0x236E, 0x1E2A, 0x2370, 0x1E2B, 0x2372, ++ 0x1E2C, 0x2374, 0x1E2D, 0x2376, 0x1E2E, 0xA378, 0x1E2F, 0xA37A, ++ 0x1E30, 0x237C, 0x1E31, 0x237E, 0x1E32, 0x2380, 0x1E33, 0x2382, ++ 0x1E34, 0x2384, 0x1E35, 0x2386, 0x1E36, 0x2388, 0x1E37, 0x238A, ++ 0x1E38, 0xA38C, 0x1E39, 0xA38E, 0x1E3A, 0x2390, 0x1E3B, 0x2392, ++ 0x1E3C, 0x2394, 0x1E3D, 0x2396, 0x1E3E, 0x2398, 0x1E3F, 0x239A, ++ 0x1E40, 0x239C, 0x1E41, 0x239E, 0x1E42, 0x23A0, 0x1E43, 0x23A2, ++ 0x1E44, 0x23A4, 0x1E45, 0x23A6, 0x1E46, 0x23A8, 0x1E47, 0x23AA, ++ 0x1E48, 0x23AC, 0x1E49, 0x23AE, 0x1E4A, 0x23B0, 0x1E4B, 0x23B2, ++ 0x1E4C, 0xA3B4, 0x1E4D, 0xA3B6, 0x1E4E, 0xA3B8, 0x1E4F, 0xA3BA, ++ 0x1E50, 0xA3BC, 0x1E51, 0xA3BE, 0x1E52, 0xA3C0, 0x1E53, 0xA3C2, ++ 0x1E54, 0x23C4, 0x1E55, 0x23C6, 0x1E56, 0x23C8, 0x1E57, 0x23CA, ++ 0x1E58, 0x23CC, 0x1E59, 0x23CE, 0x1E5A, 0x23D0, 0x1E5B, 0x23D2, ++ 0x1E5C, 0xA3D4, 0x1E5D, 0xA3D6, 0x1E5E, 0x23D8, 0x1E5F, 0x23DA, ++ 0x1E60, 0x23DC, 0x1E61, 0x23DE, 0x1E62, 0x23E0, 0x1E63, 0x23E2, ++ 0x1E64, 0xA3E4, 0x1E65, 0xA3E6, 0x1E66, 0xA3E8, 0x1E67, 0xA3EA, ++ 0x1E68, 0xA3EC, 0x1E69, 0xA3EE, 0x1E6A, 0x23F0, 0x1E6B, 0x23F2, ++ 0x1E6C, 0x23F4, 0x1E6D, 0x23F6, 0x1E6E, 0x23F8, 0x1E6F, 0x23FA, ++ 0x1E70, 0x23FC, 0x1E71, 0x23FE, 0x1E72, 0x2400, 0x1E73, 0x2402, ++ 0x1E74, 0x2404, 0x1E75, 0x2406, 0x1E76, 0x2408, 0x1E77, 0x240A, ++ 0x1E78, 0xA40C, 0x1E79, 0xA40E, 0x1E7A, 0xA410, 0x1E7B, 0xA412, ++ 0x1E7C, 0x2414, 0x1E7D, 0x2416, 0x1E7E, 0x2418, 0x1E7F, 0x241A, ++ 0x1E80, 0x241C, 0x1E81, 0x241E, 0x1E82, 0x2420, 0x1E83, 0x2422, ++ 0x1E84, 0x2424, 0x1E85, 0x2426, 0x1E86, 0x2428, 0x1E87, 0x242A, ++ 0x1E88, 0x242C, 0x1E89, 0x242E, 0x1E8A, 0x2430, 0x1E8B, 0x2432, ++ 0x1E8C, 0x2434, 0x1E8D, 0x2436, 0x1E8E, 0x2438, 0x1E8F, 0x243A, ++ 0x1E90, 0x243C, 0x1E91, 0x243E, 0x1E92, 0x2440, 0x1E93, 0x2442, ++ 0x1E94, 0x2444, 0x1E95, 0x2446, 0x1E96, 0x2448, 0x1E97, 0x244A, ++ 0x1E98, 0x244C, 0x1E99, 0x244E, 0x1E9B, 0x2450, 0x1EA0, 0x2452, ++ 0x1EA1, 0x2454, 0x1EA2, 0x2456, 0x1EA3, 0x2458, 0x1EA4, 0xA45A, ++ 0x1EA5, 0xA45C, 0x1EA6, 0xA45E, 0x1EA7, 0xA460, 0x1EA8, 0xA462, ++ 0x1EA9, 0xA464, 0x1EAA, 0xA466, 0x1EAB, 0xA468, 0x1EAC, 0xA46A, ++ 0x1EAD, 0xA46C, 0x1EAE, 0xA46E, 0x1EAF, 0xA470, 0x1EB0, 0xA472, ++ 0x1EB1, 0xA474, 0x1EB2, 0xA476, 0x1EB3, 0xA478, 0x1EB4, 0xA47A, ++ 0x1EB5, 0xA47C, 0x1EB6, 0xA47E, 0x1EB7, 0xA480, 0x1EB8, 0x2482, ++ 0x1EB9, 0x2484, 0x1EBA, 0x2486, 0x1EBB, 0x2488, 0x1EBC, 0x248A, ++ 0x1EBD, 0x248C, 0x1EBE, 0xA48E, 0x1EBF, 0xA490, 0x1EC0, 0xA492, ++ 0x1EC1, 0xA494, 0x1EC2, 0xA496, 0x1EC3, 0xA498, 0x1EC4, 0xA49A, ++ 0x1EC5, 0xA49C, 0x1EC6, 0xA49E, 0x1EC7, 0xA4A0, 0x1EC8, 0x24A2, ++ 0x1EC9, 0x24A4, 0x1ECA, 0x24A6, 0x1ECB, 0x24A8, 0x1ECC, 0x24AA, ++ 0x1ECD, 0x24AC, 0x1ECE, 0x24AE, 0x1ECF, 0x24B0, 0x1ED0, 0xA4B2, ++ 0x1ED1, 0xA4B4, 0x1ED2, 0xA4B6, 0x1ED3, 0xA4B8, 0x1ED4, 0xA4BA, ++ 0x1ED5, 0xA4BC, 0x1ED6, 0xA4BE, 0x1ED7, 0xA4C0, 0x1ED8, 0xA4C2, ++ 0x1ED9, 0xA4C4, 0x1EDA, 0xA4C6, 0x1EDB, 0xA4C8, 0x1EDC, 0xA4CA, ++ 0x1EDD, 0xA4CC, 0x1EDE, 0xA4CE, 0x1EDF, 0xA4D0, 0x1EE0, 0xA4D2, ++ 0x1EE1, 0xA4D4, 0x1EE2, 0xA4D6, 0x1EE3, 0xA4D8, 0x1EE4, 0x24DA, ++ 0x1EE5, 0x24DC, 0x1EE6, 0x24DE, 0x1EE7, 0x24E0, 0x1EE8, 0xA4E2, ++ 0x1EE9, 0xA4E4, 0x1EEA, 0xA4E6, 0x1EEB, 0xA4E8, 0x1EEC, 0xA4EA, ++ 0x1EED, 0xA4EC, 0x1EEE, 0xA4EE, 0x1EEF, 0xA4F0, 0x1EF0, 0xA4F2, ++ 0x1EF1, 0xA4F4, 0x1EF2, 0x24F6, 0x1EF3, 0x24F8, 0x1EF4, 0x24FA, ++ 0x1EF5, 0x24FC, 0x1EF6, 0x24FE, 0x1EF7, 0x2500, 0x1EF8, 0x2502, ++ 0x1EF9, 0x2504, 0x1F00, 0x2506, 0x1F01, 0x2508, 0x1F02, 0xA50A, ++ 0x1F03, 0xA50C, 0x1F04, 0xA50E, 0x1F05, 0xA510, 0x1F06, 0xA512, ++ 0x1F07, 0xA514, 0x1F08, 0x2516, 0x1F09, 0x2518, 0x1F0A, 0xA51A, ++ 0x1F0B, 0xA51C, 0x1F0C, 0xA51E, 0x1F0D, 0xA520, 0x1F0E, 0xA522, ++ 0x1F0F, 0xA524, 0x1F10, 0x2526, 0x1F11, 0x2528, 0x1F12, 0xA52A, ++ 0x1F13, 0xA52C, 0x1F14, 0xA52E, 0x1F15, 0xA530, 0x1F18, 0x2532, ++ 0x1F19, 0x2534, 0x1F1A, 0xA536, 0x1F1B, 0xA538, 0x1F1C, 0xA53A, ++ 0x1F1D, 0xA53C, 0x1F20, 0x253E, 0x1F21, 0x2540, 0x1F22, 0xA542, ++ 0x1F23, 0xA544, 0x1F24, 0xA546, 0x1F25, 0xA548, 0x1F26, 0xA54A, ++ 0x1F27, 0xA54C, 0x1F28, 0x254E, 0x1F29, 0x2550, 0x1F2A, 0xA552, ++ 0x1F2B, 0xA554, 0x1F2C, 0xA556, 0x1F2D, 0xA558, 0x1F2E, 0xA55A, ++ 0x1F2F, 0xA55C, 0x1F30, 0x255E, 0x1F31, 0x2560, 0x1F32, 0xA562, ++ 0x1F33, 0xA564, 0x1F34, 0xA566, 0x1F35, 0xA568, 0x1F36, 0xA56A, ++ 0x1F37, 0xA56C, 0x1F38, 0x256E, 0x1F39, 0x2570, 0x1F3A, 0xA572, ++ 0x1F3B, 0xA574, 0x1F3C, 0xA576, 0x1F3D, 0xA578, 0x1F3E, 0xA57A, ++ 0x1F3F, 0xA57C, 0x1F40, 0x257E, 0x1F41, 0x2580, 0x1F42, 0xA582, ++ 0x1F43, 0xA584, 0x1F44, 0xA586, 0x1F45, 0xA588, 0x1F48, 0x258A, ++ 0x1F49, 0x258C, 0x1F4A, 0xA58E, 0x1F4B, 0xA590, 0x1F4C, 0xA592, ++ 0x1F4D, 0xA594, 0x1F50, 0x2596, 0x1F51, 0x2598, 0x1F52, 0xA59A, ++ 0x1F53, 0xA59C, 0x1F54, 0xA59E, 0x1F55, 0xA5A0, 0x1F56, 0xA5A2, ++ 0x1F57, 0xA5A4, 0x1F59, 0x25A6, 0x1F5B, 0xA5A8, 0x1F5D, 0xA5AA, ++ 0x1F5F, 0xA5AC, 0x1F60, 0x25AE, 0x1F61, 0x25B0, 0x1F62, 0xA5B2, ++ 0x1F63, 0xA5B4, 0x1F64, 0xA5B6, 0x1F65, 0xA5B8, 0x1F66, 0xA5BA, ++ 0x1F67, 0xA5BC, 0x1F68, 0x25BE, 0x1F69, 0x25C0, 0x1F6A, 0xA5C2, ++ 0x1F6B, 0xA5C4, 0x1F6C, 0xA5C6, 0x1F6D, 0xA5C8, 0x1F6E, 0xA5CA, ++ 0x1F6F, 0xA5CC, 0x1F70, 0x25CE, 0x1F71, 0x93AC, 0x1F72, 0x25D0, ++ 0x1F73, 0x93AD, 0x1F74, 0x25D2, 0x1F75, 0x93AE, 0x1F76, 0x25D4, ++ 0x1F77, 0x93AF, 0x1F78, 0x25D6, 0x1F79, 0x93CC, 0x1F7A, 0x25D8, ++ 0x1F7B, 0x93CD, 0x1F7C, 0x25DA, 0x1F7D, 0x93CE, 0x1F80, 0xA5DC, ++ 0x1F81, 0xA5DE, 0x1F82, 0xA5E0, 0x1F83, 0xA5E2, 0x1F84, 0xA5E4, ++ 0x1F85, 0xA5E6, 0x1F86, 0xA5E8, 0x1F87, 0xA5EA, 0x1F88, 0xA5EC, ++ 0x1F89, 0xA5EE, 0x1F8A, 0xA5F0, 0x1F8B, 0xA5F2, 0x1F8C, 0xA5F4, ++ 0x1F8D, 0xA5F6, 0x1F8E, 0xA5F8, 0x1F8F, 0xA5FA, 0x1F90, 0xA5FC, ++ 0x1F91, 0xA5FE, 0x1F92, 0xA600, 0x1F93, 0xA602, 0x1F94, 0xA604, ++ 0x1F95, 0xA606, 0x1F96, 0xA608, 0x1F97, 0xA60A, 0x1F98, 0xA60C, ++ 0x1F99, 0xA60E, 0x1F9A, 0xA610, 0x1F9B, 0xA612, 0x1F9C, 0xA614, ++ 0x1F9D, 0xA616, 0x1F9E, 0xA618, 0x1F9F, 0xA61A, 0x1FA0, 0xA61C, ++ 0x1FA1, 0xA61E, 0x1FA2, 0xA620, 0x1FA3, 0xA622, 0x1FA4, 0xA624, ++ 0x1FA5, 0xA626, 0x1FA6, 0xA628, 0x1FA7, 0xA62A, 0x1FA8, 0xA62C, ++ 0x1FA9, 0xA62E, 0x1FAA, 0xA630, 0x1FAB, 0xA632, 0x1FAC, 0xA634, ++ 0x1FAD, 0xA636, 0x1FAE, 0xA638, 0x1FAF, 0xA63A, 0x1FB0, 0x263C, ++ 0x1FB1, 0x263E, 0x1FB2, 0xA640, 0x1FB3, 0x2642, 0x1FB4, 0xA644, ++ 0x1FB6, 0x2646, 0x1FB7, 0xA648, 0x1FB8, 0x264A, 0x1FB9, 0x264C, ++ 0x1FBA, 0x264E, 0x1FBB, 0x9386, 0x1FBC, 0x2650, 0x1FBE, 0x13B9, ++ 0x1FC1, 0x2652, 0x1FC2, 0xA654, 0x1FC3, 0x2656, 0x1FC4, 0xA658, ++ 0x1FC6, 0x265A, 0x1FC7, 0xA65C, 0x1FC8, 0x265E, 0x1FC9, 0x9388, ++ 0x1FCA, 0x2660, 0x1FCB, 0x9389, 0x1FCC, 0x2662, 0x1FCD, 0x2664, ++ 0x1FCE, 0x2666, 0x1FCF, 0x2668, 0x1FD0, 0x266A, 0x1FD1, 0x266C, ++ 0x1FD2, 0xA66E, 0x1FD3, 0x9390, 0x1FD6, 0x2670, 0x1FD7, 0xA672, ++ 0x1FD8, 0x2674, 0x1FD9, 0x2676, 0x1FDA, 0x2678, 0x1FDB, 0x938A, ++ 0x1FDD, 0x267A, 0x1FDE, 0x267C, 0x1FDF, 0x267E, 0x1FE0, 0x2680, ++ 0x1FE1, 0x2682, 0x1FE2, 0xA684, 0x1FE3, 0x93B0, 0x1FE4, 0x2686, ++ 0x1FE5, 0x2688, 0x1FE6, 0x268A, 0x1FE7, 0xA68C, 0x1FE8, 0x268E, ++ 0x1FE9, 0x2690, 0x1FEA, 0x2692, 0x1FEB, 0x938E, 0x1FEC, 0x2694, ++ 0x1FED, 0x2696, 0x1FEE, 0x9385, 0x1FEF, 0x1060, 0x1FF2, 0xA698, ++ 0x1FF3, 0x269A, 0x1FF4, 0xA69C, 0x1FF6, 0x269E, 0x1FF7, 0xA6A0, ++ 0x1FF8, 0x26A2, 0x1FF9, 0x938C, 0x1FFA, 0x26A4, 0x1FFB, 0x938F, ++ 0x1FFC, 0x26A6, 0x1FFD, 0x10B4, 0x304C, 0x26A8, 0x304E, 0x26AA, ++ 0x3050, 0x26AC, 0x3052, 0x26AE, 0x3054, 0x26B0, 0x3056, 0x26B2, ++ 0x3058, 0x26B4, 0x305A, 0x26B6, 0x305C, 0x26B8, 0x305E, 0x26BA, ++ 0x3060, 0x26BC, 0x3062, 0x26BE, 0x3065, 0x26C0, 0x3067, 0x26C2, ++ 0x3069, 0x26C4, 0x3070, 0x26C6, 0x3071, 0x26C8, 0x3073, 0x26CA, ++ 0x3074, 0x26CC, 0x3076, 0x26CE, 0x3077, 0x26D0, 0x3079, 0x26D2, ++ 0x307A, 0x26D4, 0x307C, 0x26D6, 0x307D, 0x26D8, 0x3094, 0x26DA, ++ 0x309E, 0x26DC, 0x30AC, 0x26DE, 0x30AE, 0x26E0, 0x30B0, 0x26E2, ++ 0x30B2, 0x26E4, 0x30B4, 0x26E6, 0x30B6, 0x26E8, 0x30B8, 0x26EA, ++ 0x30BA, 0x26EC, 0x30BC, 0x26EE, 0x30BE, 0x26F0, 0x30C0, 0x26F2, ++ 0x30C2, 0x26F4, 0x30C5, 0x26F6, 0x30C7, 0x26F8, 0x30C9, 0x26FA, ++ 0x30D0, 0x26FC, 0x30D1, 0x26FE, 0x30D3, 0x2700, 0x30D4, 0x2702, ++ 0x30D6, 0x2704, 0x30D7, 0x2706, 0x30D9, 0x2708, 0x30DA, 0x270A, ++ 0x30DC, 0x270C, 0x30DD, 0x270E, 0x30F4, 0x2710, 0x30F7, 0x2712, ++ 0x30F8, 0x2714, 0x30F9, 0x2716, 0x30FA, 0x2718, 0x30FE, 0x271A, ++ 0xFB1D, 0x271C, 0xFB1F, 0x271E, 0xFB2A, 0x2720, 0xFB2B, 0x2722, ++ 0xFB2C, 0xA724, 0xFB2D, 0xA726, 0xFB2E, 0x2728, 0xFB2F, 0x272A, ++ 0xFB30, 0x272C, 0xFB31, 0x272E, 0xFB32, 0x2730, 0xFB33, 0x2732, ++ 0xFB34, 0x2734, 0xFB35, 0x2736, 0xFB36, 0x2738, 0xFB38, 0x273A, ++ 0xFB39, 0x273C, 0xFB3A, 0x273E, 0xFB3B, 0x2740, 0xFB3C, 0x2742, ++ 0xFB3E, 0x2744, 0xFB40, 0x2746, 0xFB41, 0x2748, 0xFB43, 0x274A, ++ 0xFB44, 0x274C, 0xFB46, 0x274E, 0xFB47, 0x2750, 0xFB48, 0x2752, ++ 0xFB49, 0x2754, 0xFB4A, 0x2756, 0xFB4B, 0x2758, 0xFB4C, 0x275A, ++ 0xFB4D, 0x275C, 0xFB4E, 0x275E ++}; ++ ++static const u_int32_t __UniCharDecompositionTableLength = ++ (sizeof(__CFUniCharDecompositionTable) / (sizeof(u_int16_t) * 2)); ++ ++ ++static const u_int16_t ++__CFUniCharMultipleDecompositionTable[] = { ++ 0x0041, 0x0300, 0x0041, 0x0301, 0x0041, 0x0302, 0x0041, 0x0303, ++ 0x0041, 0x0308, 0x0041, 0x030A, 0x0043, 0x0327, 0x0045, 0x0300, ++ 0x0045, 0x0301, 0x0045, 0x0302, 0x0045, 0x0308, 0x0049, 0x0300, ++ 0x0049, 0x0301, 0x0049, 0x0302, 0x0049, 0x0308, 0x004E, 0x0303, ++ 0x004F, 0x0300, 0x004F, 0x0301, 0x004F, 0x0302, 0x004F, 0x0303, ++ 0x004F, 0x0308, 0x0055, 0x0300, 0x0055, 0x0301, 0x0055, 0x0302, ++ 0x0055, 0x0308, 0x0059, 0x0301, 0x0061, 0x0300, 0x0061, 0x0301, ++ 0x0061, 0x0302, 0x0061, 0x0303, 0x0061, 0x0308, 0x0061, 0x030A, ++ 0x0063, 0x0327, 0x0065, 0x0300, 0x0065, 0x0301, 0x0065, 0x0302, ++ 0x0065, 0x0308, 0x0069, 0x0300, 0x0069, 0x0301, 0x0069, 0x0302, ++ 0x0069, 0x0308, 0x006E, 0x0303, 0x006F, 0x0300, 0x006F, 0x0301, ++ 0x006F, 0x0302, 0x006F, 0x0303, 0x006F, 0x0308, 0x0075, 0x0300, ++ 0x0075, 0x0301, 0x0075, 0x0302, 0x0075, 0x0308, 0x0079, 0x0301, ++ 0x0079, 0x0308, 0x0041, 0x0304, 0x0061, 0x0304, 0x0041, 0x0306, ++ 0x0061, 0x0306, 0x0041, 0x0328, 0x0061, 0x0328, 0x0043, 0x0301, ++ 0x0063, 0x0301, 0x0043, 0x0302, 0x0063, 0x0302, 0x0043, 0x0307, ++ 0x0063, 0x0307, 0x0043, 0x030C, 0x0063, 0x030C, 0x0044, 0x030C, ++ 0x0064, 0x030C, 0x0045, 0x0304, 0x0065, 0x0304, 0x0045, 0x0306, ++ 0x0065, 0x0306, 0x0045, 0x0307, 0x0065, 0x0307, 0x0045, 0x0328, ++ 0x0065, 0x0328, 0x0045, 0x030C, 0x0065, 0x030C, 0x0047, 0x0302, ++ 0x0067, 0x0302, 0x0047, 0x0306, 0x0067, 0x0306, 0x0047, 0x0307, ++ 0x0067, 0x0307, 0x0047, 0x0327, 0x0067, 0x0327, 0x0048, 0x0302, ++ 0x0068, 0x0302, 0x0049, 0x0303, 0x0069, 0x0303, 0x0049, 0x0304, ++ 0x0069, 0x0304, 0x0049, 0x0306, 0x0069, 0x0306, 0x0049, 0x0328, ++ 0x0069, 0x0328, 0x0049, 0x0307, 0x004A, 0x0302, 0x006A, 0x0302, ++ 0x004B, 0x0327, 0x006B, 0x0327, 0x004C, 0x0301, 0x006C, 0x0301, ++ 0x004C, 0x0327, 0x006C, 0x0327, 0x004C, 0x030C, 0x006C, 0x030C, ++ 0x004E, 0x0301, 0x006E, 0x0301, 0x004E, 0x0327, 0x006E, 0x0327, ++ 0x004E, 0x030C, 0x006E, 0x030C, 0x004F, 0x0304, 0x006F, 0x0304, ++ 0x004F, 0x0306, 0x006F, 0x0306, 0x004F, 0x030B, 0x006F, 0x030B, ++ 0x0052, 0x0301, 0x0072, 0x0301, 0x0052, 0x0327, 0x0072, 0x0327, ++ 0x0052, 0x030C, 0x0072, 0x030C, 0x0053, 0x0301, 0x0073, 0x0301, ++ 0x0053, 0x0302, 0x0073, 0x0302, 0x0053, 0x0327, 0x0073, 0x0327, ++ 0x0053, 0x030C, 0x0073, 0x030C, 0x0054, 0x0327, 0x0074, 0x0327, ++ 0x0054, 0x030C, 0x0074, 0x030C, 0x0055, 0x0303, 0x0075, 0x0303, ++ 0x0055, 0x0304, 0x0075, 0x0304, 0x0055, 0x0306, 0x0075, 0x0306, ++ 0x0055, 0x030A, 0x0075, 0x030A, 0x0055, 0x030B, 0x0075, 0x030B, ++ 0x0055, 0x0328, 0x0075, 0x0328, 0x0057, 0x0302, 0x0077, 0x0302, ++ 0x0059, 0x0302, 0x0079, 0x0302, 0x0059, 0x0308, 0x005A, 0x0301, ++ 0x007A, 0x0301, 0x005A, 0x0307, 0x007A, 0x0307, 0x005A, 0x030C, ++ 0x007A, 0x030C, 0x004F, 0x031B, 0x006F, 0x031B, 0x0055, 0x031B, ++ 0x0075, 0x031B, 0x0041, 0x030C, 0x0061, 0x030C, 0x0049, 0x030C, ++ 0x0069, 0x030C, 0x004F, 0x030C, 0x006F, 0x030C, 0x0055, 0x030C, ++ 0x0075, 0x030C, 0x00DC, 0x0304, 0x00FC, 0x0304, 0x00DC, 0x0301, ++ 0x00FC, 0x0301, 0x00DC, 0x030C, 0x00FC, 0x030C, 0x00DC, 0x0300, ++ 0x00FC, 0x0300, 0x00C4, 0x0304, 0x00E4, 0x0304, 0x0226, 0x0304, ++ 0x0227, 0x0304, 0x00C6, 0x0304, 0x00E6, 0x0304, 0x0047, 0x030C, ++ 0x0067, 0x030C, 0x004B, 0x030C, 0x006B, 0x030C, 0x004F, 0x0328, ++ 0x006F, 0x0328, 0x01EA, 0x0304, 0x01EB, 0x0304, 0x01B7, 0x030C, ++ 0x0292, 0x030C, 0x006A, 0x030C, 0x0047, 0x0301, 0x0067, 0x0301, ++ 0x004E, 0x0300, 0x006E, 0x0300, 0x00C5, 0x0301, 0x00E5, 0x0301, ++ 0x00C6, 0x0301, 0x00E6, 0x0301, 0x00D8, 0x0301, 0x00F8, 0x0301, ++ 0x0041, 0x030F, 0x0061, 0x030F, 0x0041, 0x0311, 0x0061, 0x0311, ++ 0x0045, 0x030F, 0x0065, 0x030F, 0x0045, 0x0311, 0x0065, 0x0311, ++ 0x0049, 0x030F, 0x0069, 0x030F, 0x0049, 0x0311, 0x0069, 0x0311, ++ 0x004F, 0x030F, 0x006F, 0x030F, 0x004F, 0x0311, 0x006F, 0x0311, ++ 0x0052, 0x030F, 0x0072, 0x030F, 0x0052, 0x0311, 0x0072, 0x0311, ++ 0x0055, 0x030F, 0x0075, 0x030F, 0x0055, 0x0311, 0x0075, 0x0311, ++ 0x0053, 0x0326, 0x0073, 0x0326, 0x0054, 0x0326, 0x0074, 0x0326, ++ 0x0048, 0x030C, 0x0068, 0x030C, 0x0041, 0x0307, 0x0061, 0x0307, ++ 0x0045, 0x0327, 0x0065, 0x0327, 0x00D6, 0x0304, 0x00F6, 0x0304, ++ 0x00D5, 0x0304, 0x00F5, 0x0304, 0x004F, 0x0307, 0x006F, 0x0307, ++ 0x022E, 0x0304, 0x022F, 0x0304, 0x0059, 0x0304, 0x0079, 0x0304, ++ 0x0308, 0x0301, 0x00A8, 0x0301, 0x0391, 0x0301, 0x0395, 0x0301, ++ 0x0397, 0x0301, 0x0399, 0x0301, 0x039F, 0x0301, 0x03A5, 0x0301, ++ 0x03A9, 0x0301, 0x03CA, 0x0301, 0x0399, 0x0308, 0x03A5, 0x0308, ++ 0x03B1, 0x0301, 0x03B5, 0x0301, 0x03B7, 0x0301, 0x03B9, 0x0301, ++ 0x03CB, 0x0301, 0x03B9, 0x0308, 0x03C5, 0x0308, 0x03BF, 0x0301, ++ 0x03C5, 0x0301, 0x03C9, 0x0301, 0x03D2, 0x0301, 0x03D2, 0x0308, ++ 0x0415, 0x0300, 0x0415, 0x0308, 0x0413, 0x0301, 0x0406, 0x0308, ++ 0x041A, 0x0301, 0x0418, 0x0300, 0x0423, 0x0306, 0x0418, 0x0306, ++ 0x0438, 0x0306, 0x0435, 0x0300, 0x0435, 0x0308, 0x0433, 0x0301, ++ 0x0456, 0x0308, 0x043A, 0x0301, 0x0438, 0x0300, 0x0443, 0x0306, ++ 0x0474, 0x030F, 0x0475, 0x030F, 0x0416, 0x0306, 0x0436, 0x0306, ++ 0x0410, 0x0306, 0x0430, 0x0306, 0x0410, 0x0308, 0x0430, 0x0308, ++ 0x0415, 0x0306, 0x0435, 0x0306, 0x04D8, 0x0308, 0x04D9, 0x0308, ++ 0x0416, 0x0308, 0x0436, 0x0308, 0x0417, 0x0308, 0x0437, 0x0308, ++ 0x0418, 0x0304, 0x0438, 0x0304, 0x0418, 0x0308, 0x0438, 0x0308, ++ 0x041E, 0x0308, 0x043E, 0x0308, 0x04E8, 0x0308, 0x04E9, 0x0308, ++ 0x042D, 0x0308, 0x044D, 0x0308, 0x0423, 0x0304, 0x0443, 0x0304, ++ 0x0423, 0x0308, 0x0443, 0x0308, 0x0423, 0x030B, 0x0443, 0x030B, ++ 0x0427, 0x0308, 0x0447, 0x0308, 0x042B, 0x0308, 0x044B, 0x0308, ++ 0x0627, 0x0653, 0x0627, 0x0654, 0x0648, 0x0654, 0x0627, 0x0655, ++ 0x064A, 0x0654, 0x06D5, 0x0654, 0x06C1, 0x0654, 0x06D2, 0x0654, ++ 0x0928, 0x093C, 0x0930, 0x093C, 0x0933, 0x093C, 0x0915, 0x093C, ++ 0x0916, 0x093C, 0x0917, 0x093C, 0x091C, 0x093C, 0x0921, 0x093C, ++ 0x0922, 0x093C, 0x092B, 0x093C, 0x092F, 0x093C, 0x09C7, 0x09BE, ++ 0x09C7, 0x09D7, 0x09A1, 0x09BC, 0x09A2, 0x09BC, 0x09AF, 0x09BC, ++ 0x0A32, 0x0A3C, 0x0A38, 0x0A3C, 0x0A16, 0x0A3C, 0x0A17, 0x0A3C, ++ 0x0A1C, 0x0A3C, 0x0A2B, 0x0A3C, 0x0B47, 0x0B56, 0x0B47, 0x0B3E, ++ 0x0B47, 0x0B57, 0x0B21, 0x0B3C, 0x0B22, 0x0B3C, 0x0B92, 0x0BD7, ++ 0x0BC6, 0x0BBE, 0x0BC7, 0x0BBE, 0x0BC6, 0x0BD7, 0x0C46, 0x0C56, ++ 0x0CBF, 0x0CD5, 0x0CC6, 0x0CD5, 0x0CC6, 0x0CD6, 0x0CC6, 0x0CC2, ++ 0x0CCA, 0x0CD5, 0x0D46, 0x0D3E, 0x0D47, 0x0D3E, 0x0D46, 0x0D57, ++ 0x0DD9, 0x0DCA, 0x0DD9, 0x0DCF, 0x0DDC, 0x0DCA, 0x0DD9, 0x0DDF, ++ 0x0F42, 0x0FB7, 0x0F4C, 0x0FB7, 0x0F51, 0x0FB7, 0x0F56, 0x0FB7, ++ 0x0F5B, 0x0FB7, 0x0F40, 0x0FB5, 0x0F71, 0x0F72, 0x0F71, 0x0F74, ++ 0x0FB2, 0x0F80, 0x0FB3, 0x0F80, 0x0F71, 0x0F80, 0x0F92, 0x0FB7, ++ 0x0F9C, 0x0FB7, 0x0FA1, 0x0FB7, 0x0FA6, 0x0FB7, 0x0FAB, 0x0FB7, ++ 0x0F90, 0x0FB5, 0x1025, 0x102E, 0x0041, 0x0325, 0x0061, 0x0325, ++ 0x0042, 0x0307, 0x0062, 0x0307, 0x0042, 0x0323, 0x0062, 0x0323, ++ 0x0042, 0x0331, 0x0062, 0x0331, 0x00C7, 0x0301, 0x00E7, 0x0301, ++ 0x0044, 0x0307, 0x0064, 0x0307, 0x0044, 0x0323, 0x0064, 0x0323, ++ 0x0044, 0x0331, 0x0064, 0x0331, 0x0044, 0x0327, 0x0064, 0x0327, ++ 0x0044, 0x032D, 0x0064, 0x032D, 0x0112, 0x0300, 0x0113, 0x0300, ++ 0x0112, 0x0301, 0x0113, 0x0301, 0x0045, 0x032D, 0x0065, 0x032D, ++ 0x0045, 0x0330, 0x0065, 0x0330, 0x0228, 0x0306, 0x0229, 0x0306, ++ 0x0046, 0x0307, 0x0066, 0x0307, 0x0047, 0x0304, 0x0067, 0x0304, ++ 0x0048, 0x0307, 0x0068, 0x0307, 0x0048, 0x0323, 0x0068, 0x0323, ++ 0x0048, 0x0308, 0x0068, 0x0308, 0x0048, 0x0327, 0x0068, 0x0327, ++ 0x0048, 0x032E, 0x0068, 0x032E, 0x0049, 0x0330, 0x0069, 0x0330, ++ 0x00CF, 0x0301, 0x00EF, 0x0301, 0x004B, 0x0301, 0x006B, 0x0301, ++ 0x004B, 0x0323, 0x006B, 0x0323, 0x004B, 0x0331, 0x006B, 0x0331, ++ 0x004C, 0x0323, 0x006C, 0x0323, 0x1E36, 0x0304, 0x1E37, 0x0304, ++ 0x004C, 0x0331, 0x006C, 0x0331, 0x004C, 0x032D, 0x006C, 0x032D, ++ 0x004D, 0x0301, 0x006D, 0x0301, 0x004D, 0x0307, 0x006D, 0x0307, ++ 0x004D, 0x0323, 0x006D, 0x0323, 0x004E, 0x0307, 0x006E, 0x0307, ++ 0x004E, 0x0323, 0x006E, 0x0323, 0x004E, 0x0331, 0x006E, 0x0331, ++ 0x004E, 0x032D, 0x006E, 0x032D, 0x00D5, 0x0301, 0x00F5, 0x0301, ++ 0x00D5, 0x0308, 0x00F5, 0x0308, 0x014C, 0x0300, 0x014D, 0x0300, ++ 0x014C, 0x0301, 0x014D, 0x0301, 0x0050, 0x0301, 0x0070, 0x0301, ++ 0x0050, 0x0307, 0x0070, 0x0307, 0x0052, 0x0307, 0x0072, 0x0307, ++ 0x0052, 0x0323, 0x0072, 0x0323, 0x1E5A, 0x0304, 0x1E5B, 0x0304, ++ 0x0052, 0x0331, 0x0072, 0x0331, 0x0053, 0x0307, 0x0073, 0x0307, ++ 0x0053, 0x0323, 0x0073, 0x0323, 0x015A, 0x0307, 0x015B, 0x0307, ++ 0x0160, 0x0307, 0x0161, 0x0307, 0x1E62, 0x0307, 0x1E63, 0x0307, ++ 0x0054, 0x0307, 0x0074, 0x0307, 0x0054, 0x0323, 0x0074, 0x0323, ++ 0x0054, 0x0331, 0x0074, 0x0331, 0x0054, 0x032D, 0x0074, 0x032D, ++ 0x0055, 0x0324, 0x0075, 0x0324, 0x0055, 0x0330, 0x0075, 0x0330, ++ 0x0055, 0x032D, 0x0075, 0x032D, 0x0168, 0x0301, 0x0169, 0x0301, ++ 0x016A, 0x0308, 0x016B, 0x0308, 0x0056, 0x0303, 0x0076, 0x0303, ++ 0x0056, 0x0323, 0x0076, 0x0323, 0x0057, 0x0300, 0x0077, 0x0300, ++ 0x0057, 0x0301, 0x0077, 0x0301, 0x0057, 0x0308, 0x0077, 0x0308, ++ 0x0057, 0x0307, 0x0077, 0x0307, 0x0057, 0x0323, 0x0077, 0x0323, ++ 0x0058, 0x0307, 0x0078, 0x0307, 0x0058, 0x0308, 0x0078, 0x0308, ++ 0x0059, 0x0307, 0x0079, 0x0307, 0x005A, 0x0302, 0x007A, 0x0302, ++ 0x005A, 0x0323, 0x007A, 0x0323, 0x005A, 0x0331, 0x007A, 0x0331, ++ 0x0068, 0x0331, 0x0074, 0x0308, 0x0077, 0x030A, 0x0079, 0x030A, ++ 0x017F, 0x0307, 0x0041, 0x0323, 0x0061, 0x0323, 0x0041, 0x0309, ++ 0x0061, 0x0309, 0x00C2, 0x0301, 0x00E2, 0x0301, 0x00C2, 0x0300, ++ 0x00E2, 0x0300, 0x00C2, 0x0309, 0x00E2, 0x0309, 0x00C2, 0x0303, ++ 0x00E2, 0x0303, 0x1EA0, 0x0302, 0x1EA1, 0x0302, 0x0102, 0x0301, ++ 0x0103, 0x0301, 0x0102, 0x0300, 0x0103, 0x0300, 0x0102, 0x0309, ++ 0x0103, 0x0309, 0x0102, 0x0303, 0x0103, 0x0303, 0x1EA0, 0x0306, ++ 0x1EA1, 0x0306, 0x0045, 0x0323, 0x0065, 0x0323, 0x0045, 0x0309, ++ 0x0065, 0x0309, 0x0045, 0x0303, 0x0065, 0x0303, 0x00CA, 0x0301, ++ 0x00EA, 0x0301, 0x00CA, 0x0300, 0x00EA, 0x0300, 0x00CA, 0x0309, ++ 0x00EA, 0x0309, 0x00CA, 0x0303, 0x00EA, 0x0303, 0x1EB8, 0x0302, ++ 0x1EB9, 0x0302, 0x0049, 0x0309, 0x0069, 0x0309, 0x0049, 0x0323, ++ 0x0069, 0x0323, 0x004F, 0x0323, 0x006F, 0x0323, 0x004F, 0x0309, ++ 0x006F, 0x0309, 0x00D4, 0x0301, 0x00F4, 0x0301, 0x00D4, 0x0300, ++ 0x00F4, 0x0300, 0x00D4, 0x0309, 0x00F4, 0x0309, 0x00D4, 0x0303, ++ 0x00F4, 0x0303, 0x1ECC, 0x0302, 0x1ECD, 0x0302, 0x01A0, 0x0301, ++ 0x01A1, 0x0301, 0x01A0, 0x0300, 0x01A1, 0x0300, 0x01A0, 0x0309, ++ 0x01A1, 0x0309, 0x01A0, 0x0303, 0x01A1, 0x0303, 0x01A0, 0x0323, ++ 0x01A1, 0x0323, 0x0055, 0x0323, 0x0075, 0x0323, 0x0055, 0x0309, ++ 0x0075, 0x0309, 0x01AF, 0x0301, 0x01B0, 0x0301, 0x01AF, 0x0300, ++ 0x01B0, 0x0300, 0x01AF, 0x0309, 0x01B0, 0x0309, 0x01AF, 0x0303, ++ 0x01B0, 0x0303, 0x01AF, 0x0323, 0x01B0, 0x0323, 0x0059, 0x0300, ++ 0x0079, 0x0300, 0x0059, 0x0323, 0x0079, 0x0323, 0x0059, 0x0309, ++ 0x0079, 0x0309, 0x0059, 0x0303, 0x0079, 0x0303, 0x03B1, 0x0313, ++ 0x03B1, 0x0314, 0x1F00, 0x0300, 0x1F01, 0x0300, 0x1F00, 0x0301, ++ 0x1F01, 0x0301, 0x1F00, 0x0342, 0x1F01, 0x0342, 0x0391, 0x0313, ++ 0x0391, 0x0314, 0x1F08, 0x0300, 0x1F09, 0x0300, 0x1F08, 0x0301, ++ 0x1F09, 0x0301, 0x1F08, 0x0342, 0x1F09, 0x0342, 0x03B5, 0x0313, ++ 0x03B5, 0x0314, 0x1F10, 0x0300, 0x1F11, 0x0300, 0x1F10, 0x0301, ++ 0x1F11, 0x0301, 0x0395, 0x0313, 0x0395, 0x0314, 0x1F18, 0x0300, ++ 0x1F19, 0x0300, 0x1F18, 0x0301, 0x1F19, 0x0301, 0x03B7, 0x0313, ++ 0x03B7, 0x0314, 0x1F20, 0x0300, 0x1F21, 0x0300, 0x1F20, 0x0301, ++ 0x1F21, 0x0301, 0x1F20, 0x0342, 0x1F21, 0x0342, 0x0397, 0x0313, ++ 0x0397, 0x0314, 0x1F28, 0x0300, 0x1F29, 0x0300, 0x1F28, 0x0301, ++ 0x1F29, 0x0301, 0x1F28, 0x0342, 0x1F29, 0x0342, 0x03B9, 0x0313, ++ 0x03B9, 0x0314, 0x1F30, 0x0300, 0x1F31, 0x0300, 0x1F30, 0x0301, ++ 0x1F31, 0x0301, 0x1F30, 0x0342, 0x1F31, 0x0342, 0x0399, 0x0313, ++ 0x0399, 0x0314, 0x1F38, 0x0300, 0x1F39, 0x0300, 0x1F38, 0x0301, ++ 0x1F39, 0x0301, 0x1F38, 0x0342, 0x1F39, 0x0342, 0x03BF, 0x0313, ++ 0x03BF, 0x0314, 0x1F40, 0x0300, 0x1F41, 0x0300, 0x1F40, 0x0301, ++ 0x1F41, 0x0301, 0x039F, 0x0313, 0x039F, 0x0314, 0x1F48, 0x0300, ++ 0x1F49, 0x0300, 0x1F48, 0x0301, 0x1F49, 0x0301, 0x03C5, 0x0313, ++ 0x03C5, 0x0314, 0x1F50, 0x0300, 0x1F51, 0x0300, 0x1F50, 0x0301, ++ 0x1F51, 0x0301, 0x1F50, 0x0342, 0x1F51, 0x0342, 0x03A5, 0x0314, ++ 0x1F59, 0x0300, 0x1F59, 0x0301, 0x1F59, 0x0342, 0x03C9, 0x0313, ++ 0x03C9, 0x0314, 0x1F60, 0x0300, 0x1F61, 0x0300, 0x1F60, 0x0301, ++ 0x1F61, 0x0301, 0x1F60, 0x0342, 0x1F61, 0x0342, 0x03A9, 0x0313, ++ 0x03A9, 0x0314, 0x1F68, 0x0300, 0x1F69, 0x0300, 0x1F68, 0x0301, ++ 0x1F69, 0x0301, 0x1F68, 0x0342, 0x1F69, 0x0342, 0x03B1, 0x0300, ++ 0x03B5, 0x0300, 0x03B7, 0x0300, 0x03B9, 0x0300, 0x03BF, 0x0300, ++ 0x03C5, 0x0300, 0x03C9, 0x0300, 0x1F00, 0x0345, 0x1F01, 0x0345, ++ 0x1F02, 0x0345, 0x1F03, 0x0345, 0x1F04, 0x0345, 0x1F05, 0x0345, ++ 0x1F06, 0x0345, 0x1F07, 0x0345, 0x1F08, 0x0345, 0x1F09, 0x0345, ++ 0x1F0A, 0x0345, 0x1F0B, 0x0345, 0x1F0C, 0x0345, 0x1F0D, 0x0345, ++ 0x1F0E, 0x0345, 0x1F0F, 0x0345, 0x1F20, 0x0345, 0x1F21, 0x0345, ++ 0x1F22, 0x0345, 0x1F23, 0x0345, 0x1F24, 0x0345, 0x1F25, 0x0345, ++ 0x1F26, 0x0345, 0x1F27, 0x0345, 0x1F28, 0x0345, 0x1F29, 0x0345, ++ 0x1F2A, 0x0345, 0x1F2B, 0x0345, 0x1F2C, 0x0345, 0x1F2D, 0x0345, ++ 0x1F2E, 0x0345, 0x1F2F, 0x0345, 0x1F60, 0x0345, 0x1F61, 0x0345, ++ 0x1F62, 0x0345, 0x1F63, 0x0345, 0x1F64, 0x0345, 0x1F65, 0x0345, ++ 0x1F66, 0x0345, 0x1F67, 0x0345, 0x1F68, 0x0345, 0x1F69, 0x0345, ++ 0x1F6A, 0x0345, 0x1F6B, 0x0345, 0x1F6C, 0x0345, 0x1F6D, 0x0345, ++ 0x1F6E, 0x0345, 0x1F6F, 0x0345, 0x03B1, 0x0306, 0x03B1, 0x0304, ++ 0x1F70, 0x0345, 0x03B1, 0x0345, 0x03AC, 0x0345, 0x03B1, 0x0342, ++ 0x1FB6, 0x0345, 0x0391, 0x0306, 0x0391, 0x0304, 0x0391, 0x0300, ++ 0x0391, 0x0345, 0x00A8, 0x0342, 0x1F74, 0x0345, 0x03B7, 0x0345, ++ 0x03AE, 0x0345, 0x03B7, 0x0342, 0x1FC6, 0x0345, 0x0395, 0x0300, ++ 0x0397, 0x0300, 0x0397, 0x0345, 0x1FBF, 0x0300, 0x1FBF, 0x0301, ++ 0x1FBF, 0x0342, 0x03B9, 0x0306, 0x03B9, 0x0304, 0x03CA, 0x0300, ++ 0x03B9, 0x0342, 0x03CA, 0x0342, 0x0399, 0x0306, 0x0399, 0x0304, ++ 0x0399, 0x0300, 0x1FFE, 0x0300, 0x1FFE, 0x0301, 0x1FFE, 0x0342, ++ 0x03C5, 0x0306, 0x03C5, 0x0304, 0x03CB, 0x0300, 0x03C1, 0x0313, ++ 0x03C1, 0x0314, 0x03C5, 0x0342, 0x03CB, 0x0342, 0x03A5, 0x0306, ++ 0x03A5, 0x0304, 0x03A5, 0x0300, 0x03A1, 0x0314, 0x00A8, 0x0300, ++ 0x1F7C, 0x0345, 0x03C9, 0x0345, 0x03CE, 0x0345, 0x03C9, 0x0342, ++ 0x1FF6, 0x0345, 0x039F, 0x0300, 0x03A9, 0x0300, 0x03A9, 0x0345, ++ 0x304B, 0x3099, 0x304D, 0x3099, 0x304F, 0x3099, 0x3051, 0x3099, ++ 0x3053, 0x3099, 0x3055, 0x3099, 0x3057, 0x3099, 0x3059, 0x3099, ++ 0x305B, 0x3099, 0x305D, 0x3099, 0x305F, 0x3099, 0x3061, 0x3099, ++ 0x3064, 0x3099, 0x3066, 0x3099, 0x3068, 0x3099, 0x306F, 0x3099, ++ 0x306F, 0x309A, 0x3072, 0x3099, 0x3072, 0x309A, 0x3075, 0x3099, ++ 0x3075, 0x309A, 0x3078, 0x3099, 0x3078, 0x309A, 0x307B, 0x3099, ++ 0x307B, 0x309A, 0x3046, 0x3099, 0x309D, 0x3099, 0x30AB, 0x3099, ++ 0x30AD, 0x3099, 0x30AF, 0x3099, 0x30B1, 0x3099, 0x30B3, 0x3099, ++ 0x30B5, 0x3099, 0x30B7, 0x3099, 0x30B9, 0x3099, 0x30BB, 0x3099, ++ 0x30BD, 0x3099, 0x30BF, 0x3099, 0x30C1, 0x3099, 0x30C4, 0x3099, ++ 0x30C6, 0x3099, 0x30C8, 0x3099, 0x30CF, 0x3099, 0x30CF, 0x309A, ++ 0x30D2, 0x3099, 0x30D2, 0x309A, 0x30D5, 0x3099, 0x30D5, 0x309A, ++ 0x30D8, 0x3099, 0x30D8, 0x309A, 0x30DB, 0x3099, 0x30DB, 0x309A, ++ 0x30A6, 0x3099, 0x30EF, 0x3099, 0x30F0, 0x3099, 0x30F1, 0x3099, ++ 0x30F2, 0x3099, 0x30FD, 0x3099, 0x05D9, 0x05B4, 0x05F2, 0x05B7, ++ 0x05E9, 0x05C1, 0x05E9, 0x05C2, 0xFB49, 0x05C1, 0xFB49, 0x05C2, ++ 0x05D0, 0x05B7, 0x05D0, 0x05B8, 0x05D0, 0x05BC, 0x05D1, 0x05BC, ++ 0x05D2, 0x05BC, 0x05D3, 0x05BC, 0x05D4, 0x05BC, 0x05D5, 0x05BC, ++ 0x05D6, 0x05BC, 0x05D8, 0x05BC, 0x05D9, 0x05BC, 0x05DA, 0x05BC, ++ 0x05DB, 0x05BC, 0x05DC, 0x05BC, 0x05DE, 0x05BC, 0x05E0, 0x05BC, ++ 0x05E1, 0x05BC, 0x05E3, 0x05BC, 0x05E4, 0x05BC, 0x05E6, 0x05BC, ++ 0x05E7, 0x05BC, 0x05E8, 0x05BC, 0x05E9, 0x05BC, 0x05EA, 0x05BC, ++ 0x05D5, 0x05B9, 0x05D1, 0x05BF, 0x05DB, 0x05BF, 0x05E4, 0x05BF ++}; ++ ++static const u_int8_t ++__CFUniCharDecomposableBitmap[] = { ++ 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x06, 0x00, ++ 0x00, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x00, 0x0C, ++ 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x0F, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x11, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, ++ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0xBF, 0xFF, 0x7E, 0x3E, 0xBF, 0xFF, 0x7E, 0xBE, ++ 0xFF, 0xFF, 0xFC, 0xFF, 0x3F, 0xFF, 0xF1, 0x7E, ++ 0xF8, 0xF1, 0xF3, 0xFF, 0x3F, 0xFF, 0xFF, 0x7F, ++ 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x01, 0x00, ++ 0x00, 0xE0, 0xFF, 0xDF, 0xCF, 0xFF, 0x31, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xCF, 0xC0, 0xFF, 0x0F, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, ++ 0xE0, 0xD7, 0x01, 0x00, 0x00, 0xFC, 0x01, 0x00, ++ 0x00, 0x7C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x8B, 0x70, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, ++ 0x00, 0x00, 0x8B, 0x70, 0x00, 0x00, 0xC0, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x06, 0x00, 0xCF, 0xFC, 0xFC, 0xFC, 0x3F, 0x03, ++ 0x00, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x05, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x12, 0x00, ++ 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x18, 0x00, 0xB0, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, ++ 0x00, 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x19, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x81, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x08, 0x20, 0x84, 0x10, 0x00, 0x02, 0x68, 0x01, ++ 0x02, 0x00, 0x08, 0x20, 0x84, 0x10, 0x00, 0x02, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, ++ 0xFF, 0xFF, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0x3F, 0x3F, 0xFF, 0xAA, 0xFF, 0xFF, 0xFF, 0x3F, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x5F, ++ 0xDE, 0xFF, 0xCF, 0xEF, 0xFF, 0xFF, 0xDC, 0x3F, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x50, 0x55, 0x55, 0xA5, 0x02, 0xDB, 0x36, ++ 0x00, 0x00, 0x10, 0x40, 0x00, 0x50, 0x55, 0x55, ++ 0xA5, 0x02, 0xDB, 0x36, 0x00, 0x00, 0x90, 0x47, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0xA0, 0x00, 0xFC, 0x7F, 0x5F, ++ 0xDB, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ++}; ++ ++static const u_int32_t ++__CFUniCharPrecompSourceTable[] = { ++ 0x00000300, 0x00540000, 0x00000301, 0x00750054, ++ 0x00000302, 0x002000C9, 0x00000303, 0x001C00E9, ++ 0x00000304, 0x002C0105, 0x00000306, 0x00200131, ++ 0x00000307, 0x002E0151, 0x00000308, 0x0036017F, ++ 0x00000309, 0x001801B5, 0x0000030A, 0x000601CD, ++ 0x0000030B, 0x000601D3, 0x0000030C, 0x002501D9, ++ 0x0000030F, 0x000E01FE, 0x00000311, 0x000C020C, ++ 0x00000313, 0x000E0218, 0x00000314, 0x00100226, ++ 0x0000031B, 0x00040236, 0x00000323, 0x002A023A, ++ 0x00000324, 0x00020264, 0x00000325, 0x00020266, ++ 0x00000326, 0x00040268, 0x00000327, 0x0016026C, ++ 0x00000328, 0x000A0282, 0x0000032D, 0x000C028C, ++ 0x0000032E, 0x00020298, 0x00000330, 0x0006029A, ++ 0x00000331, 0x001102A0, 0x00000338, 0x002C02B1, ++ 0x00000342, 0x001D02DD, 0x00000345, 0x003F02FA, ++ 0x00000653, 0x00010339, 0x00000654, 0x0006033A, ++ 0x00000655, 0x00010340, 0x0000093C, 0x00030341, ++ 0x000009BE, 0x00010344, 0x000009D7, 0x00010345, ++ 0x00000B3E, 0x00010346, 0x00000B56, 0x00010347, ++ 0x00000B57, 0x00010348, 0x00000BBE, 0x00020349, ++ 0x00000BD7, 0x0002034B, 0x00000C56, 0x0001034D, ++ 0x00000CC2, 0x0001034E, 0x00000CD5, 0x0003034F, ++ 0x00000CD6, 0x00010352, 0x00000D3E, 0x00020353, ++ 0x00000D57, 0x00010355, 0x00000DCA, 0x00020356, ++ 0x00000DCF, 0x00010358, 0x00000DDF, 0x00010359, ++ 0x0000102E, 0x0001035A, 0x00003099, 0x0030035B, ++ 0x0000309A, 0x000A038B ++}; ++ ++static const u_int32_t __CFUniCharPrecompositionTableLength = ++ (sizeof(__CFUniCharPrecompSourceTable) / (sizeof(u_int32_t) * 2)); ++ ++ ++static const u_int16_t ++__CFUniCharBMPPrecompDestinationTable[] = { ++ 0x0041, 0x00C0, 0x0045, 0x00C8, 0x0049, 0x00CC, 0x004E, 0x01F8, ++ 0x004F, 0x00D2, 0x0055, 0x00D9, 0x0057, 0x1E80, 0x0059, 0x1EF2, ++ 0x0061, 0x00E0, 0x0065, 0x00E8, 0x0069, 0x00EC, 0x006E, 0x01F9, ++ 0x006F, 0x00F2, 0x0075, 0x00F9, 0x0077, 0x1E81, 0x0079, 0x1EF3, ++ 0x00A8, 0x1FED, 0x00C2, 0x1EA6, 0x00CA, 0x1EC0, 0x00D4, 0x1ED2, ++ 0x00DC, 0x01DB, 0x00E2, 0x1EA7, 0x00EA, 0x1EC1, 0x00F4, 0x1ED3, ++ 0x00FC, 0x01DC, 0x0102, 0x1EB0, 0x0103, 0x1EB1, 0x0112, 0x1E14, ++ 0x0113, 0x1E15, 0x014C, 0x1E50, 0x014D, 0x1E51, 0x01A0, 0x1EDC, ++ 0x01A1, 0x1EDD, 0x01AF, 0x1EEA, 0x01B0, 0x1EEB, 0x0391, 0x1FBA, ++ 0x0395, 0x1FC8, 0x0397, 0x1FCA, 0x0399, 0x1FDA, 0x039F, 0x1FF8, ++ 0x03A5, 0x1FEA, 0x03A9, 0x1FFA, 0x03B1, 0x1F70, 0x03B5, 0x1F72, ++ 0x03B7, 0x1F74, 0x03B9, 0x1F76, 0x03BF, 0x1F78, 0x03C5, 0x1F7A, ++ 0x03C9, 0x1F7C, 0x03CA, 0x1FD2, 0x03CB, 0x1FE2, 0x0415, 0x0400, ++ 0x0418, 0x040D, 0x0435, 0x0450, 0x0438, 0x045D, 0x1F00, 0x1F02, ++ 0x1F01, 0x1F03, 0x1F08, 0x1F0A, 0x1F09, 0x1F0B, 0x1F10, 0x1F12, ++ 0x1F11, 0x1F13, 0x1F18, 0x1F1A, 0x1F19, 0x1F1B, 0x1F20, 0x1F22, ++ 0x1F21, 0x1F23, 0x1F28, 0x1F2A, 0x1F29, 0x1F2B, 0x1F30, 0x1F32, ++ 0x1F31, 0x1F33, 0x1F38, 0x1F3A, 0x1F39, 0x1F3B, 0x1F40, 0x1F42, ++ 0x1F41, 0x1F43, 0x1F48, 0x1F4A, 0x1F49, 0x1F4B, 0x1F50, 0x1F52, ++ 0x1F51, 0x1F53, 0x1F59, 0x1F5B, 0x1F60, 0x1F62, 0x1F61, 0x1F63, ++ 0x1F68, 0x1F6A, 0x1F69, 0x1F6B, 0x1FBF, 0x1FCD, 0x1FFE, 0x1FDD, ++ 0x0041, 0x00C1, 0x0043, 0x0106, 0x0045, 0x00C9, 0x0047, 0x01F4, ++ 0x0049, 0x00CD, 0x004B, 0x1E30, 0x004C, 0x0139, 0x004D, 0x1E3E, ++ 0x004E, 0x0143, 0x004F, 0x00D3, 0x0050, 0x1E54, 0x0052, 0x0154, ++ 0x0053, 0x015A, 0x0055, 0x00DA, 0x0057, 0x1E82, 0x0059, 0x00DD, ++ 0x005A, 0x0179, 0x0061, 0x00E1, 0x0063, 0x0107, 0x0065, 0x00E9, ++ 0x0067, 0x01F5, 0x0069, 0x00ED, 0x006B, 0x1E31, 0x006C, 0x013A, ++ 0x006D, 0x1E3F, 0x006E, 0x0144, 0x006F, 0x00F3, 0x0070, 0x1E55, ++ 0x0072, 0x0155, 0x0073, 0x015B, 0x0075, 0x00FA, 0x0077, 0x1E83, ++ 0x0079, 0x00FD, 0x007A, 0x017A, 0x00A8, 0x0385, 0x00C2, 0x1EA4, ++ 0x00C5, 0x01FA, 0x00C6, 0x01FC, 0x00C7, 0x1E08, 0x00CA, 0x1EBE, ++ 0x00CF, 0x1E2E, 0x00D4, 0x1ED0, 0x00D5, 0x1E4C, 0x00D8, 0x01FE, ++ 0x00DC, 0x01D7, 0x00E2, 0x1EA5, 0x00E5, 0x01FB, 0x00E6, 0x01FD, ++ 0x00E7, 0x1E09, 0x00EA, 0x1EBF, 0x00EF, 0x1E2F, 0x00F4, 0x1ED1, ++ 0x00F5, 0x1E4D, 0x00F8, 0x01FF, 0x00FC, 0x01D8, 0x0102, 0x1EAE, ++ 0x0103, 0x1EAF, 0x0112, 0x1E16, 0x0113, 0x1E17, 0x014C, 0x1E52, ++ 0x014D, 0x1E53, 0x0168, 0x1E78, 0x0169, 0x1E79, 0x01A0, 0x1EDA, ++ 0x01A1, 0x1EDB, 0x01AF, 0x1EE8, 0x01B0, 0x1EE9, 0x0391, 0x0386, ++ 0x0395, 0x0388, 0x0397, 0x0389, 0x0399, 0x038A, 0x039F, 0x038C, ++ 0x03A5, 0x038E, 0x03A9, 0x038F, 0x03B1, 0x03AC, 0x03B5, 0x03AD, ++ 0x03B7, 0x03AE, 0x03B9, 0x03AF, 0x03BF, 0x03CC, 0x03C5, 0x03CD, ++ 0x03C9, 0x03CE, 0x03CA, 0x0390, 0x03CB, 0x03B0, 0x03D2, 0x03D3, ++ 0x0413, 0x0403, 0x041A, 0x040C, 0x0433, 0x0453, 0x043A, 0x045C, ++ 0x1F00, 0x1F04, 0x1F01, 0x1F05, 0x1F08, 0x1F0C, 0x1F09, 0x1F0D, ++ 0x1F10, 0x1F14, 0x1F11, 0x1F15, 0x1F18, 0x1F1C, 0x1F19, 0x1F1D, ++ 0x1F20, 0x1F24, 0x1F21, 0x1F25, 0x1F28, 0x1F2C, 0x1F29, 0x1F2D, ++ 0x1F30, 0x1F34, 0x1F31, 0x1F35, 0x1F38, 0x1F3C, 0x1F39, 0x1F3D, ++ 0x1F40, 0x1F44, 0x1F41, 0x1F45, 0x1F48, 0x1F4C, 0x1F49, 0x1F4D, ++ 0x1F50, 0x1F54, 0x1F51, 0x1F55, 0x1F59, 0x1F5D, 0x1F60, 0x1F64, ++ 0x1F61, 0x1F65, 0x1F68, 0x1F6C, 0x1F69, 0x1F6D, 0x1FBF, 0x1FCE, ++ 0x1FFE, 0x1FDE, 0x0041, 0x00C2, 0x0043, 0x0108, 0x0045, 0x00CA, ++ 0x0047, 0x011C, 0x0048, 0x0124, 0x0049, 0x00CE, 0x004A, 0x0134, ++ 0x004F, 0x00D4, 0x0053, 0x015C, 0x0055, 0x00DB, 0x0057, 0x0174, ++ 0x0059, 0x0176, 0x005A, 0x1E90, 0x0061, 0x00E2, 0x0063, 0x0109, ++ 0x0065, 0x00EA, 0x0067, 0x011D, 0x0068, 0x0125, 0x0069, 0x00EE, ++ 0x006A, 0x0135, 0x006F, 0x00F4, 0x0073, 0x015D, 0x0075, 0x00FB, ++ 0x0077, 0x0175, 0x0079, 0x0177, 0x007A, 0x1E91, 0x1EA0, 0x1EAC, ++ 0x1EA1, 0x1EAD, 0x1EB8, 0x1EC6, 0x1EB9, 0x1EC7, 0x1ECC, 0x1ED8, ++ 0x1ECD, 0x1ED9, 0x0041, 0x00C3, 0x0045, 0x1EBC, 0x0049, 0x0128, ++ 0x004E, 0x00D1, 0x004F, 0x00D5, 0x0055, 0x0168, 0x0056, 0x1E7C, ++ 0x0059, 0x1EF8, 0x0061, 0x00E3, 0x0065, 0x1EBD, 0x0069, 0x0129, ++ 0x006E, 0x00F1, 0x006F, 0x00F5, 0x0075, 0x0169, 0x0076, 0x1E7D, ++ 0x0079, 0x1EF9, 0x00C2, 0x1EAA, 0x00CA, 0x1EC4, 0x00D4, 0x1ED6, ++ 0x00E2, 0x1EAB, 0x00EA, 0x1EC5, 0x00F4, 0x1ED7, 0x0102, 0x1EB4, ++ 0x0103, 0x1EB5, 0x01A0, 0x1EE0, 0x01A1, 0x1EE1, 0x01AF, 0x1EEE, ++ 0x01B0, 0x1EEF, 0x0041, 0x0100, 0x0045, 0x0112, 0x0047, 0x1E20, ++ 0x0049, 0x012A, 0x004F, 0x014C, 0x0055, 0x016A, 0x0059, 0x0232, ++ 0x0061, 0x0101, 0x0065, 0x0113, 0x0067, 0x1E21, 0x0069, 0x012B, ++ 0x006F, 0x014D, 0x0075, 0x016B, 0x0079, 0x0233, 0x00C4, 0x01DE, ++ 0x00C6, 0x01E2, 0x00D5, 0x022C, 0x00D6, 0x022A, 0x00DC, 0x01D5, ++ 0x00E4, 0x01DF, 0x00E6, 0x01E3, 0x00F5, 0x022D, 0x00F6, 0x022B, ++ 0x00FC, 0x01D6, 0x01EA, 0x01EC, 0x01EB, 0x01ED, 0x0226, 0x01E0, ++ 0x0227, 0x01E1, 0x022E, 0x0230, 0x022F, 0x0231, 0x0391, 0x1FB9, ++ 0x0399, 0x1FD9, 0x03A5, 0x1FE9, 0x03B1, 0x1FB1, 0x03B9, 0x1FD1, ++ 0x03C5, 0x1FE1, 0x0418, 0x04E2, 0x0423, 0x04EE, 0x0438, 0x04E3, ++ 0x0443, 0x04EF, 0x1E36, 0x1E38, 0x1E37, 0x1E39, 0x1E5A, 0x1E5C, ++ 0x1E5B, 0x1E5D, 0x0041, 0x0102, 0x0045, 0x0114, 0x0047, 0x011E, ++ 0x0049, 0x012C, 0x004F, 0x014E, 0x0055, 0x016C, 0x0061, 0x0103, ++ 0x0065, 0x0115, 0x0067, 0x011F, 0x0069, 0x012D, 0x006F, 0x014F, ++ 0x0075, 0x016D, 0x0228, 0x1E1C, 0x0229, 0x1E1D, 0x0391, 0x1FB8, ++ 0x0399, 0x1FD8, 0x03A5, 0x1FE8, 0x03B1, 0x1FB0, 0x03B9, 0x1FD0, ++ 0x03C5, 0x1FE0, 0x0410, 0x04D0, 0x0415, 0x04D6, 0x0416, 0x04C1, ++ 0x0418, 0x0419, 0x0423, 0x040E, 0x0430, 0x04D1, 0x0435, 0x04D7, ++ 0x0436, 0x04C2, 0x0438, 0x0439, 0x0443, 0x045E, 0x1EA0, 0x1EB6, ++ 0x1EA1, 0x1EB7, 0x0041, 0x0226, 0x0042, 0x1E02, 0x0043, 0x010A, ++ 0x0044, 0x1E0A, 0x0045, 0x0116, 0x0046, 0x1E1E, 0x0047, 0x0120, ++ 0x0048, 0x1E22, 0x0049, 0x0130, 0x004D, 0x1E40, 0x004E, 0x1E44, ++ 0x004F, 0x022E, 0x0050, 0x1E56, 0x0052, 0x1E58, 0x0053, 0x1E60, ++ 0x0054, 0x1E6A, 0x0057, 0x1E86, 0x0058, 0x1E8A, 0x0059, 0x1E8E, ++ 0x005A, 0x017B, 0x0061, 0x0227, 0x0062, 0x1E03, 0x0063, 0x010B, ++ 0x0064, 0x1E0B, 0x0065, 0x0117, 0x0066, 0x1E1F, 0x0067, 0x0121, ++ 0x0068, 0x1E23, 0x006D, 0x1E41, 0x006E, 0x1E45, 0x006F, 0x022F, ++ 0x0070, 0x1E57, 0x0072, 0x1E59, 0x0073, 0x1E61, 0x0074, 0x1E6B, ++ 0x0077, 0x1E87, 0x0078, 0x1E8B, 0x0079, 0x1E8F, 0x007A, 0x017C, ++ 0x015A, 0x1E64, 0x015B, 0x1E65, 0x0160, 0x1E66, 0x0161, 0x1E67, ++ 0x017F, 0x1E9B, 0x1E62, 0x1E68, 0x1E63, 0x1E69, 0x0041, 0x00C4, ++ 0x0045, 0x00CB, 0x0048, 0x1E26, 0x0049, 0x00CF, 0x004F, 0x00D6, ++ 0x0055, 0x00DC, 0x0057, 0x1E84, 0x0058, 0x1E8C, 0x0059, 0x0178, ++ 0x0061, 0x00E4, 0x0065, 0x00EB, 0x0068, 0x1E27, 0x0069, 0x00EF, ++ 0x006F, 0x00F6, 0x0074, 0x1E97, 0x0075, 0x00FC, 0x0077, 0x1E85, ++ 0x0078, 0x1E8D, 0x0079, 0x00FF, 0x00D5, 0x1E4E, 0x00F5, 0x1E4F, ++ 0x016A, 0x1E7A, 0x016B, 0x1E7B, 0x0399, 0x03AA, 0x03A5, 0x03AB, ++ 0x03B9, 0x03CA, 0x03C5, 0x03CB, 0x03D2, 0x03D4, 0x0406, 0x0407, ++ 0x0410, 0x04D2, 0x0415, 0x0401, 0x0416, 0x04DC, 0x0417, 0x04DE, ++ 0x0418, 0x04E4, 0x041E, 0x04E6, 0x0423, 0x04F0, 0x0427, 0x04F4, ++ 0x042B, 0x04F8, 0x042D, 0x04EC, 0x0430, 0x04D3, 0x0435, 0x0451, ++ 0x0436, 0x04DD, 0x0437, 0x04DF, 0x0438, 0x04E5, 0x043E, 0x04E7, ++ 0x0443, 0x04F1, 0x0447, 0x04F5, 0x044B, 0x04F9, 0x044D, 0x04ED, ++ 0x0456, 0x0457, 0x04D8, 0x04DA, 0x04D9, 0x04DB, 0x04E8, 0x04EA, ++ 0x04E9, 0x04EB, 0x0041, 0x1EA2, 0x0045, 0x1EBA, 0x0049, 0x1EC8, ++ 0x004F, 0x1ECE, 0x0055, 0x1EE6, 0x0059, 0x1EF6, 0x0061, 0x1EA3, ++ 0x0065, 0x1EBB, 0x0069, 0x1EC9, 0x006F, 0x1ECF, 0x0075, 0x1EE7, ++ 0x0079, 0x1EF7, 0x00C2, 0x1EA8, 0x00CA, 0x1EC2, 0x00D4, 0x1ED4, ++ 0x00E2, 0x1EA9, 0x00EA, 0x1EC3, 0x00F4, 0x1ED5, 0x0102, 0x1EB2, ++ 0x0103, 0x1EB3, 0x01A0, 0x1EDE, 0x01A1, 0x1EDF, 0x01AF, 0x1EEC, ++ 0x01B0, 0x1EED, 0x0041, 0x00C5, 0x0055, 0x016E, 0x0061, 0x00E5, ++ 0x0075, 0x016F, 0x0077, 0x1E98, 0x0079, 0x1E99, 0x004F, 0x0150, ++ 0x0055, 0x0170, 0x006F, 0x0151, 0x0075, 0x0171, 0x0423, 0x04F2, ++ 0x0443, 0x04F3, 0x0041, 0x01CD, 0x0043, 0x010C, 0x0044, 0x010E, ++ 0x0045, 0x011A, 0x0047, 0x01E6, 0x0048, 0x021E, 0x0049, 0x01CF, ++ 0x004B, 0x01E8, 0x004C, 0x013D, 0x004E, 0x0147, 0x004F, 0x01D1, ++ 0x0052, 0x0158, 0x0053, 0x0160, 0x0054, 0x0164, 0x0055, 0x01D3, ++ 0x005A, 0x017D, 0x0061, 0x01CE, 0x0063, 0x010D, 0x0064, 0x010F, ++ 0x0065, 0x011B, 0x0067, 0x01E7, 0x0068, 0x021F, 0x0069, 0x01D0, ++ 0x006A, 0x01F0, 0x006B, 0x01E9, 0x006C, 0x013E, 0x006E, 0x0148, ++ 0x006F, 0x01D2, 0x0072, 0x0159, 0x0073, 0x0161, 0x0074, 0x0165, ++ 0x0075, 0x01D4, 0x007A, 0x017E, 0x00DC, 0x01D9, 0x00FC, 0x01DA, ++ 0x01B7, 0x01EE, 0x0292, 0x01EF, 0x0041, 0x0200, 0x0045, 0x0204, ++ 0x0049, 0x0208, 0x004F, 0x020C, 0x0052, 0x0210, 0x0055, 0x0214, ++ 0x0061, 0x0201, 0x0065, 0x0205, 0x0069, 0x0209, 0x006F, 0x020D, ++ 0x0072, 0x0211, 0x0075, 0x0215, 0x0474, 0x0476, 0x0475, 0x0477, ++ 0x0041, 0x0202, 0x0045, 0x0206, 0x0049, 0x020A, 0x004F, 0x020E, ++ 0x0052, 0x0212, 0x0055, 0x0216, 0x0061, 0x0203, 0x0065, 0x0207, ++ 0x0069, 0x020B, 0x006F, 0x020F, 0x0072, 0x0213, 0x0075, 0x0217, ++ 0x0391, 0x1F08, 0x0395, 0x1F18, 0x0397, 0x1F28, 0x0399, 0x1F38, ++ 0x039F, 0x1F48, 0x03A9, 0x1F68, 0x03B1, 0x1F00, 0x03B5, 0x1F10, ++ 0x03B7, 0x1F20, 0x03B9, 0x1F30, 0x03BF, 0x1F40, 0x03C1, 0x1FE4, ++ 0x03C5, 0x1F50, 0x03C9, 0x1F60, 0x0391, 0x1F09, 0x0395, 0x1F19, ++ 0x0397, 0x1F29, 0x0399, 0x1F39, 0x039F, 0x1F49, 0x03A1, 0x1FEC, ++ 0x03A5, 0x1F59, 0x03A9, 0x1F69, 0x03B1, 0x1F01, 0x03B5, 0x1F11, ++ 0x03B7, 0x1F21, 0x03B9, 0x1F31, 0x03BF, 0x1F41, 0x03C1, 0x1FE5, ++ 0x03C5, 0x1F51, 0x03C9, 0x1F61, 0x004F, 0x01A0, 0x0055, 0x01AF, ++ 0x006F, 0x01A1, 0x0075, 0x01B0, 0x0041, 0x1EA0, 0x0042, 0x1E04, ++ 0x0044, 0x1E0C, 0x0045, 0x1EB8, 0x0048, 0x1E24, 0x0049, 0x1ECA, ++ 0x004B, 0x1E32, 0x004C, 0x1E36, 0x004D, 0x1E42, 0x004E, 0x1E46, ++ 0x004F, 0x1ECC, 0x0052, 0x1E5A, 0x0053, 0x1E62, 0x0054, 0x1E6C, ++ 0x0055, 0x1EE4, 0x0056, 0x1E7E, 0x0057, 0x1E88, 0x0059, 0x1EF4, ++ 0x005A, 0x1E92, 0x0061, 0x1EA1, 0x0062, 0x1E05, 0x0064, 0x1E0D, ++ 0x0065, 0x1EB9, 0x0068, 0x1E25, 0x0069, 0x1ECB, 0x006B, 0x1E33, ++ 0x006C, 0x1E37, 0x006D, 0x1E43, 0x006E, 0x1E47, 0x006F, 0x1ECD, ++ 0x0072, 0x1E5B, 0x0073, 0x1E63, 0x0074, 0x1E6D, 0x0075, 0x1EE5, ++ 0x0076, 0x1E7F, 0x0077, 0x1E89, 0x0079, 0x1EF5, 0x007A, 0x1E93, ++ 0x01A0, 0x1EE2, 0x01A1, 0x1EE3, 0x01AF, 0x1EF0, 0x01B0, 0x1EF1, ++ 0x0055, 0x1E72, 0x0075, 0x1E73, 0x0041, 0x1E00, 0x0061, 0x1E01, ++ 0x0053, 0x0218, 0x0054, 0x021A, 0x0073, 0x0219, 0x0074, 0x021B, ++ 0x0043, 0x00C7, 0x0044, 0x1E10, 0x0045, 0x0228, 0x0047, 0x0122, ++ 0x0048, 0x1E28, 0x004B, 0x0136, 0x004C, 0x013B, 0x004E, 0x0145, ++ 0x0052, 0x0156, 0x0053, 0x015E, 0x0054, 0x0162, 0x0063, 0x00E7, ++ 0x0064, 0x1E11, 0x0065, 0x0229, 0x0067, 0x0123, 0x0068, 0x1E29, ++ 0x006B, 0x0137, 0x006C, 0x013C, 0x006E, 0x0146, 0x0072, 0x0157, ++ 0x0073, 0x015F, 0x0074, 0x0163, 0x0041, 0x0104, 0x0045, 0x0118, ++ 0x0049, 0x012E, 0x004F, 0x01EA, 0x0055, 0x0172, 0x0061, 0x0105, ++ 0x0065, 0x0119, 0x0069, 0x012F, 0x006F, 0x01EB, 0x0075, 0x0173, ++ 0x0044, 0x1E12, 0x0045, 0x1E18, 0x004C, 0x1E3C, 0x004E, 0x1E4A, ++ 0x0054, 0x1E70, 0x0055, 0x1E76, 0x0064, 0x1E13, 0x0065, 0x1E19, ++ 0x006C, 0x1E3D, 0x006E, 0x1E4B, 0x0074, 0x1E71, 0x0075, 0x1E77, ++ 0x0048, 0x1E2A, 0x0068, 0x1E2B, 0x0045, 0x1E1A, 0x0049, 0x1E2C, ++ 0x0055, 0x1E74, 0x0065, 0x1E1B, 0x0069, 0x1E2D, 0x0075, 0x1E75, ++ 0x0042, 0x1E06, 0x0044, 0x1E0E, 0x004B, 0x1E34, 0x004C, 0x1E3A, ++ 0x004E, 0x1E48, 0x0052, 0x1E5E, 0x0054, 0x1E6E, 0x005A, 0x1E94, ++ 0x0062, 0x1E07, 0x0064, 0x1E0F, 0x0068, 0x1E96, 0x006B, 0x1E35, ++ 0x006C, 0x1E3B, 0x006E, 0x1E49, 0x0072, 0x1E5F, 0x0074, 0x1E6F, ++ 0x007A, 0x1E95, 0x003C, 0x226E, 0x003D, 0x2260, 0x003E, 0x226F, ++ 0x2190, 0x219A, 0x2192, 0x219B, 0x2194, 0x21AE, 0x21D0, 0x21CD, ++ 0x21D2, 0x21CF, 0x21D4, 0x21CE, 0x2203, 0x2204, 0x2208, 0x2209, ++ 0x220B, 0x220C, 0x2223, 0x2224, 0x2225, 0x2226, 0x223C, 0x2241, ++ 0x2243, 0x2244, 0x2245, 0x2247, 0x2248, 0x2249, 0x224D, 0x226D, ++ 0x2261, 0x2262, 0x2264, 0x2270, 0x2265, 0x2271, 0x2272, 0x2274, ++ 0x2273, 0x2275, 0x2276, 0x2278, 0x2277, 0x2279, 0x227A, 0x2280, ++ 0x227B, 0x2281, 0x227C, 0x22E0, 0x227D, 0x22E1, 0x2282, 0x2284, ++ 0x2283, 0x2285, 0x2286, 0x2288, 0x2287, 0x2289, 0x2291, 0x22E2, ++ 0x2292, 0x22E3, 0x22A2, 0x22AC, 0x22A8, 0x22AD, 0x22A9, 0x22AE, ++ 0x22AB, 0x22AF, 0x22B2, 0x22EA, 0x22B3, 0x22EB, 0x22B4, 0x22EC, ++ 0x22B5, 0x22ED, 0x00A8, 0x1FC1, 0x03B1, 0x1FB6, 0x03B7, 0x1FC6, ++ 0x03B9, 0x1FD6, 0x03C5, 0x1FE6, 0x03C9, 0x1FF6, 0x03CA, 0x1FD7, ++ 0x03CB, 0x1FE7, 0x1F00, 0x1F06, 0x1F01, 0x1F07, 0x1F08, 0x1F0E, ++ 0x1F09, 0x1F0F, 0x1F20, 0x1F26, 0x1F21, 0x1F27, 0x1F28, 0x1F2E, ++ 0x1F29, 0x1F2F, 0x1F30, 0x1F36, 0x1F31, 0x1F37, 0x1F38, 0x1F3E, ++ 0x1F39, 0x1F3F, 0x1F50, 0x1F56, 0x1F51, 0x1F57, 0x1F59, 0x1F5F, ++ 0x1F60, 0x1F66, 0x1F61, 0x1F67, 0x1F68, 0x1F6E, 0x1F69, 0x1F6F, ++ 0x1FBF, 0x1FCF, 0x1FFE, 0x1FDF, 0x0391, 0x1FBC, 0x0397, 0x1FCC, ++ 0x03A9, 0x1FFC, 0x03AC, 0x1FB4, 0x03AE, 0x1FC4, 0x03B1, 0x1FB3, ++ 0x03B7, 0x1FC3, 0x03C9, 0x1FF3, 0x03CE, 0x1FF4, 0x1F00, 0x1F80, ++ 0x1F01, 0x1F81, 0x1F02, 0x1F82, 0x1F03, 0x1F83, 0x1F04, 0x1F84, ++ 0x1F05, 0x1F85, 0x1F06, 0x1F86, 0x1F07, 0x1F87, 0x1F08, 0x1F88, ++ 0x1F09, 0x1F89, 0x1F0A, 0x1F8A, 0x1F0B, 0x1F8B, 0x1F0C, 0x1F8C, ++ 0x1F0D, 0x1F8D, 0x1F0E, 0x1F8E, 0x1F0F, 0x1F8F, 0x1F20, 0x1F90, ++ 0x1F21, 0x1F91, 0x1F22, 0x1F92, 0x1F23, 0x1F93, 0x1F24, 0x1F94, ++ 0x1F25, 0x1F95, 0x1F26, 0x1F96, 0x1F27, 0x1F97, 0x1F28, 0x1F98, ++ 0x1F29, 0x1F99, 0x1F2A, 0x1F9A, 0x1F2B, 0x1F9B, 0x1F2C, 0x1F9C, ++ 0x1F2D, 0x1F9D, 0x1F2E, 0x1F9E, 0x1F2F, 0x1F9F, 0x1F60, 0x1FA0, ++ 0x1F61, 0x1FA1, 0x1F62, 0x1FA2, 0x1F63, 0x1FA3, 0x1F64, 0x1FA4, ++ 0x1F65, 0x1FA5, 0x1F66, 0x1FA6, 0x1F67, 0x1FA7, 0x1F68, 0x1FA8, ++ 0x1F69, 0x1FA9, 0x1F6A, 0x1FAA, 0x1F6B, 0x1FAB, 0x1F6C, 0x1FAC, ++ 0x1F6D, 0x1FAD, 0x1F6E, 0x1FAE, 0x1F6F, 0x1FAF, 0x1F70, 0x1FB2, ++ 0x1F74, 0x1FC2, 0x1F7C, 0x1FF2, 0x1FB6, 0x1FB7, 0x1FC6, 0x1FC7, ++ 0x1FF6, 0x1FF7, 0x0627, 0x0622, 0x0627, 0x0623, 0x0648, 0x0624, ++ 0x064A, 0x0626, 0x06C1, 0x06C2, 0x06D2, 0x06D3, 0x06D5, 0x06C0, ++ 0x0627, 0x0625, 0x0928, 0x0929, 0x0930, 0x0931, 0x0933, 0x0934, ++ 0x09C7, 0x09CB, 0x09C7, 0x09CC, 0x0B47, 0x0B4B, 0x0B47, 0x0B48, ++ 0x0B47, 0x0B4C, 0x0BC6, 0x0BCA, 0x0BC7, 0x0BCB, 0x0B92, 0x0B94, ++ 0x0BC6, 0x0BCC, 0x0C46, 0x0C48, 0x0CC6, 0x0CCA, 0x0CBF, 0x0CC0, ++ 0x0CC6, 0x0CC7, 0x0CCA, 0x0CCB, 0x0CC6, 0x0CC8, 0x0D46, 0x0D4A, ++ 0x0D47, 0x0D4B, 0x0D46, 0x0D4C, 0x0DD9, 0x0DDA, 0x0DDC, 0x0DDD, ++ 0x0DD9, 0x0DDC, 0x0DD9, 0x0DDE, 0x1025, 0x1026, 0x3046, 0x3094, ++ 0x304B, 0x304C, 0x304D, 0x304E, 0x304F, 0x3050, 0x3051, 0x3052, ++ 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305A, ++ 0x305B, 0x305C, 0x305D, 0x305E, 0x305F, 0x3060, 0x3061, 0x3062, ++ 0x3064, 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306F, 0x3070, ++ 0x3072, 0x3073, 0x3075, 0x3076, 0x3078, 0x3079, 0x307B, 0x307C, ++ 0x309D, 0x309E, 0x30A6, 0x30F4, 0x30AB, 0x30AC, 0x30AD, 0x30AE, ++ 0x30AF, 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, ++ 0x30B7, 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, ++ 0x30BF, 0x30C0, 0x30C1, 0x30C2, 0x30C4, 0x30C5, 0x30C6, 0x30C7, ++ 0x30C8, 0x30C9, 0x30CF, 0x30D0, 0x30D2, 0x30D3, 0x30D5, 0x30D6, ++ 0x30D8, 0x30D9, 0x30DB, 0x30DC, 0x30EF, 0x30F7, 0x30F0, 0x30F8, ++ 0x30F1, 0x30F9, 0x30F2, 0x30FA, 0x30FD, 0x30FE, 0x306F, 0x3071, ++ 0x3072, 0x3074, 0x3075, 0x3077, 0x3078, 0x307A, 0x307B, 0x307D, ++ 0x30CF, 0x30D1, 0x30D2, 0x30D4, 0x30D5, 0x30D7, 0x30D8, 0x30DA, ++ 0x30DB, 0x30DD ++}; ++ ++static const u_int8_t ++__CFUniCharCombiningBitmap[] = { ++ 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, ++ 0x00, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, ++ 0x0D, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, ++ 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x13, 0x00, ++ ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x78, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0xFE, 0xFF, 0xFB, 0xFF, 0xFF, 0xBB, ++ 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0xF8, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0xC0, 0xFF, 0x9F, 0x3D, 0x00, 0x00, ++ 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xFF, 0xFF, ++ 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFF, 0x01, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0xFF, 0x3F, 0x1E, 0x00, 0x0C, 0x00, 0x00, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0x9F, 0x39, 0x80, 0x00, 0x0C, 0x00, 0x00, 0x00, ++ 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0x87, 0x39, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0xBF, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0x8F, 0x39, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, ++ 0xC7, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, ++ 0xDF, 0x3D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, ++ 0xDF, 0x3D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, ++ 0xCF, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x84, 0x5F, 0xFF, 0x00, 0x00, 0x0C, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0x07, ++ 0x80, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0x1B, ++ 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xA0, 0xC2, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, ++ 0xDF, 0x00, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0x1F, ++ 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xC7, 0x03, ++ 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x1C, 0x00, ++ 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xFF, ++ 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0xFF, 0xFF, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0x3F, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, ++ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ++}; ++ ++/* Surrogate Pair Constants */ ++#define SP_HALF_SHIFT 10 ++#define SP_HALF_BASE 0x0010000UL ++#define SP_HALF_MASK 0x3FFUL ++ ++#define SP_HIGH_FIRST 0xD800UL ++#define SP_HIGH_LAST 0xDBFFUL ++#define SP_LOW_FIRST 0xDC00UL ++#define SP_LOW_LAST 0xDFFFUL ++ ++/* ++ * Test for a combining character. ++ * ++ * Similar to __CFUniCharIsNonBaseCharacter except that ++ * unicode_combinable also includes Hangul Jamo characters. ++ */ ++static inline int ++unicode_combinable(u_int16_t character) ++{ ++ const u_int8_t *bitmap = __CFUniCharCombiningBitmap; ++ u_int8_t value; ++ ++ if (character < 0x0300) ++ return (0); ++ ++ value = bitmap[(character >> 8) & 0xFF]; ++ ++ if (value == 0xFF) { ++ return (1); ++ } else if (value) { ++ bitmap = bitmap + ((value - 1) * 32) + 256; ++ return (bitmap[(character & 0xFF) / 8] & (1 << (character % 8)) ? 1 : 0); ++ } ++ return (0); ++} ++ ++/* ++ * Test for a precomposed character. ++ * ++ * Similar to __CFUniCharIsDecomposableCharacter. ++ */ ++static inline int ++unicode_decomposeable(u_int16_t character) { ++ const u_int8_t *bitmap = __CFUniCharDecomposableBitmap; ++ u_int8_t value; ++ ++ if (character < 0x00C0) ++ return (0); ++ ++ value = bitmap[(character >> 8) & 0xFF]; ++ ++ if (value == 0xFF) { ++ return (1); ++ } else if (value) { ++ bitmap = bitmap + ((value - 1) * 32) + 256; ++ return (bitmap[(character & 0xFF) / 8] & (1 << (character % 8)) ? 1 : 0); ++ } ++ return (0); ++} ++ ++static int unicode_decompose(u_int16_t character, u_int16_t *convertedChars); ++static u_int16_t unicode_combine(u_int16_t base, u_int16_t combining); ++ ++char utf_extrabytes[32] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 2, 2, 3, -1 ++}; ++ ++/* ++ * utf8_encodestr - Encodes a Unicode string to UTF-8 ++ * ++ * NOTES: ++ * The resulting UTF-8 string is NULL terminated. ++ * ++ * If '/' chars are not allowed on disk then an alternate ++ * (replacement) char must be provided in altslash. ++ * ++ * input flags: ++ * UTF_REVERSE_ENDIAN: Unicode byteorder is opposite current runtime ++ * UTF_NO_NULL_TERM: don't add NULL termination to UTF-8 output ++ * ++ * result: ++ * ENAMETOOLONG: Name didn't fit; only buflen bytes were encoded ++ * EINVAL: Illegal char found; char was replaced by an '_'. ++ */ ++int ++utf8_encodestr(const u_int16_t * ucsp, size_t ucslen, u_int8_t * utf8p, ++ size_t * utf8len, size_t buflen, u_int16_t altslash, int flags) ++{ ++ u_int8_t * bufstart; ++ u_int8_t * bufend; ++ u_int16_t ucs_ch; ++ u_int16_t * chp = NULL; ++ u_int16_t sequence[8]; ++ int extra = 0; ++ int charcnt; ++ int swapbytes = (flags & UTF_REVERSE_ENDIAN); ++ int nullterm = ((flags & UTF_NO_NULL_TERM) == 0); ++ int decompose = (flags & UTF_DECOMPOSED); ++ int result = 0; ++ ++ bufstart = utf8p; ++ bufend = bufstart + buflen; ++ if (nullterm) ++ --bufend; ++ charcnt = ucslen / 2; ++ ++ while (charcnt-- > 0) { ++ if (extra > 0) { ++ --extra; ++ ucs_ch = *chp++; ++ } else { ++ ucs_ch = swapbytes ? OSSwapInt16(*ucsp++) : *ucsp++; ++ ++ if (decompose && unicode_decomposeable(ucs_ch)) { ++ extra = unicode_decompose(ucs_ch, sequence) - 1; ++ charcnt += extra; ++ ucs_ch = sequence[0]; ++ chp = &sequence[1]; ++ } ++ } ++ ++ if (ucs_ch < 0x0080) { ++ if (utf8p >= bufend) { ++ result = ENAMETOOLONG; ++ break; ++ } ++ *utf8p++ = ucs_ch; ++ ++ } else if (ucs_ch < 0x800) { ++ if ((utf8p + 1) >= bufend) { ++ result = ENAMETOOLONG; ++ break; ++ } ++ *utf8p++ = 0xc0 | (ucs_ch >> 6); ++ *utf8p++ = 0x80 | (0x3f & ucs_ch); ++ ++ } else { ++ /* Combine valid surrogate pairs */ ++ if (ucs_ch >= SP_HIGH_FIRST && ucs_ch <= SP_HIGH_LAST ++ && charcnt > 0) { ++ u_int16_t ch2; ++ u_int32_t pair; ++ ++ ch2 = swapbytes ? OSSwapInt16(*ucsp) : *ucsp; ++ if (ch2 >= SP_LOW_FIRST && ch2 <= SP_LOW_LAST) { ++ pair = ((ucs_ch - SP_HIGH_FIRST) << SP_HALF_SHIFT) ++ + (ch2 - SP_LOW_FIRST) + SP_HALF_BASE; ++ if ((utf8p + 3) >= bufend) { ++ result = ENAMETOOLONG; ++ break; ++ } ++ --charcnt; ++ ++ucsp; ++ *utf8p++ = 0xf0 | (pair >> 18); ++ *utf8p++ = 0x80 | (0x3f & (pair >> 12)); ++ *utf8p++ = 0x80 | (0x3f & (pair >> 6)); ++ *utf8p++ = 0x80 | (0x3f & pair); ++ continue; ++ } ++ } ++ if ((utf8p + 2) >= bufend) { ++ result = ENAMETOOLONG; ++ break; ++ } ++ *utf8p++ = 0xe0 | (ucs_ch >> 12); ++ *utf8p++ = 0x80 | (0x3f & (ucs_ch >> 6)); ++ *utf8p++ = 0x80 | (0x3f & ucs_ch); ++ } ++ } ++ ++ *utf8len = utf8p - bufstart; ++ if (nullterm) ++ *utf8p++ = '\0'; ++ ++ return (result); ++} ++ ++ ++/* ++ * utf8_decodestr - Decodes a UTF-8 string back to Unicode ++ * ++ * NOTES: ++ * The input UTF-8 string does not need to be null terminated ++ * if utf8len is set. ++ * ++ * If '/' chars are not allowed on disk then an alternate ++ * (replacement) char must be provided in altslash. ++ * ++ * input flags: ++ * UTF_REV_ENDIAN: Unicode byteorder is oposite current runtime ++ * UTF_DECOMPOSED: Unicode output string must be fully decompsed ++ * ++ * result: ++ * ENAMETOOLONG: Name didn't fit; only ucslen chars were decoded. ++ * EINVAL: Illegal UTF-8 sequence found. ++ */ ++int ++utf8_decodestr(const u_int8_t* utf8p, size_t utf8len, u_int16_t* ucsp, ++ size_t *ucslen, size_t buflen, u_int16_t altslash, int flags, size_t *consumed) ++{ ++ u_int16_t* bufstart; ++ u_int16_t* bufend; ++ unsigned int ucs_ch; ++ unsigned int byte; ++ int result = 0; ++ int decompose, precompose, swapbytes; ++ const u_int8_t *utf8start, *utf8lastpass; ++ ++ decompose = (flags & UTF_DECOMPOSED); ++ precompose = (flags & UTF_PRECOMPOSED); ++ swapbytes = (flags & UTF_REVERSE_ENDIAN); ++ ++ bufstart = ucsp; ++ bufend = (u_int16_t *)((u_int8_t *)ucsp + buflen); ++ utf8start = utf8p; ++ ++ while (utf8len-- > 0) { ++ byte = *utf8p++; ++ ++ if (ucsp >= bufend) ++ goto toolong; ++ ++ /* check for ascii */ ++ if (byte < 0x80) { ++ ucs_ch = byte; /* 1st byte */ ++ } else { ++ u_int32_t ch; ++ int extrabytes = utf_extrabytes[byte >> 3]; ++ ++ if (utf8len < extrabytes) ++ goto invalid; ++ utf8len -= extrabytes; ++ ++ switch (extrabytes) { ++ case 1: ++ ch = byte; ch <<= 6; /* 1st byte */ ++ byte = *utf8p++; /* 2nd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ++ ch -= 0x00003080UL; ++ if (ch < 0x0080) ++ goto invalid; ++ ucs_ch = ch; ++ break; ++ case 2: ++ ch = byte; ch <<= 6; /* 1st byte */ ++ byte = *utf8p++; /* 2nd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ch <<= 6; ++ byte = *utf8p++; /* 3rd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ++ ch -= 0x000E2080UL; ++ if (ch < 0x0800) ++ goto invalid; ++ if (ch >= 0xD800) { ++ if (ch <= 0xDFFF) ++ goto invalid; ++ if (ch == 0xFFFE || ch == 0xFFFF) ++ goto invalid; ++ } ++ ucs_ch = ch; ++ break; ++ case 3: ++ ch = byte; ch <<= 6; /* 1st byte */ ++ byte = *utf8p++; /* 2nd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ch <<= 6; ++ byte = *utf8p++; /* 3rd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ch <<= 6; ++ byte = *utf8p++; /* 4th byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ++ ch -= 0x03C82080UL + SP_HALF_BASE; ++ ucs_ch = (ch >> SP_HALF_SHIFT) + SP_HIGH_FIRST; ++ if (ucs_ch < SP_HIGH_FIRST || ucs_ch > SP_HIGH_LAST) ++ goto invalid; ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ if (ucsp >= bufend) ++ goto toolong; ++ ucs_ch = (ch & SP_HALF_MASK) + SP_LOW_FIRST; ++ if (ucs_ch < SP_LOW_FIRST || ucs_ch > SP_LOW_LAST) ++ goto invalid; ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ continue; ++ default: ++ goto invalid; ++ } ++ } ++ if (precompose && (ucsp != bufstart)) { ++ u_int16_t composite, base; ++ ++ if (unicode_combinable(ucs_ch)) { ++ base = swapbytes ? OSSwapInt16(*(ucsp - 1)) : *(ucsp - 1); ++ composite = unicode_combine(base, ucs_ch); ++ if (composite) { ++ --ucsp; ++ ucs_ch = composite; ++ } else { ++ goto exit; ++ } ++ } else { ++ goto exit; ++ } ++ } ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ utf8lastpass = utf8p; ++ } ++ ++exit: ++ *ucslen = (u_int8_t*)ucsp - (u_int8_t*)bufstart; ++ *consumed = utf8lastpass - utf8start; ++ return (result); ++ ++invalid: ++ result = EINVAL; ++ goto exit; ++ ++toolong: ++ result = ENAMETOOLONG; ++ goto exit; ++} ++ ++ /* ++ * Unicode 3.2 decomposition code (derived from Core Foundation) ++ */ ++ ++typedef struct { ++ u_int32_t _key; ++ u_int32_t _value; ++} unicode_mappings32; ++ ++static inline u_int32_t ++getmappedvalue32(const unicode_mappings32 *theTable, u_int32_t numElem, ++ u_int16_t character) ++{ ++ const unicode_mappings32 *p, *q, *divider; ++ ++ if ((character < theTable[0]._key) || (character > theTable[numElem-1]._key)) ++ return (0); ++ ++ p = theTable; ++ q = p + (numElem-1); ++ while (p <= q) { ++ divider = p + ((q - p) >> 1); /* divide by 2 */ ++ if (character < divider->_key) { q = divider - 1; } ++ else if (character > divider->_key) { p = divider + 1; } ++ else { return (divider->_value); } ++ } ++ return (0); ++} ++ ++#define RECURSIVE_DECOMPOSITION (1 << 15) ++#define EXTRACT_COUNT(value) (((value) >> 12) & 0x0007) ++ ++typedef struct { ++ u_int16_t _key; ++ u_int16_t _value; ++} unicode_mappings16; ++ ++static inline u_int16_t ++getmappedvalue16(const unicode_mappings16 *theTable, u_int32_t numElem, ++ u_int16_t character) ++{ ++ const unicode_mappings16 *p, *q, *divider; ++ ++ if ((character < theTable[0]._key) || (character > theTable[numElem-1]._key)) ++ return (0); ++ ++ p = theTable; ++ q = p + (numElem-1); ++ while (p <= q) { ++ divider = p + ((q - p) >> 1); /* divide by 2 */ ++ if (character < divider->_key) ++ q = divider - 1; ++ else if (character > divider->_key) ++ p = divider + 1; ++ else ++ return (divider->_value); ++ } ++ return (0); ++} ++ ++ ++static u_int32_t ++unicode_recursive_decompose(u_int16_t character, u_int16_t *convertedChars) ++{ ++ u_int16_t value; ++ u_int32_t length; ++ u_int16_t firstChar; ++ u_int16_t theChar; ++ const u_int16_t *bmpMappings; ++ u_int32_t usedLength; ++ ++ value = getmappedvalue16( ++ (const unicode_mappings16 *)__CFUniCharDecompositionTable, ++ __UniCharDecompositionTableLength, character); ++ length = EXTRACT_COUNT(value); ++ firstChar = value & 0x0FFF; ++ theChar = firstChar; ++ bmpMappings = (length == 1 ? &theChar : __CFUniCharMultipleDecompositionTable + firstChar); ++ usedLength = 0; ++ ++ if (value & RECURSIVE_DECOMPOSITION) { ++ usedLength = unicode_recursive_decompose((u_int16_t)*bmpMappings, convertedChars); ++ ++ --length; /* Decrement for the first char */ ++ if (!usedLength) ++ return 0; ++ ++bmpMappings; ++ convertedChars += usedLength; ++ } ++ ++ usedLength += length; ++ ++ while (length--) ++ *(convertedChars++) = *(bmpMappings++); ++ ++ return (usedLength); ++} ++ ++#define HANGUL_SBASE 0xAC00 ++#define HANGUL_LBASE 0x1100 ++#define HANGUL_VBASE 0x1161 ++#define HANGUL_TBASE 0x11A7 ++ ++#define HANGUL_SCOUNT 11172 ++#define HANGUL_LCOUNT 19 ++#define HANGUL_VCOUNT 21 ++#define HANGUL_TCOUNT 28 ++#define HANGUL_NCOUNT (HANGUL_VCOUNT * HANGUL_TCOUNT) ++ ++/* ++ * unicode_decompose - decompose a composed Unicode char ++ * ++ * Composed Unicode characters are forbidden on ++ * HFS Plus volumes. ucs_decompose will convert a ++ * composed character into its correct decomposed ++ * sequence. ++ * ++ * Similar to CFUniCharDecomposeCharacter ++ */ ++static int ++unicode_decompose(u_int16_t character, u_int16_t *convertedChars) ++{ ++ if ((character >= HANGUL_SBASE) && ++ (character <= (HANGUL_SBASE + HANGUL_SCOUNT))) { ++ u_int32_t length; ++ ++ character -= HANGUL_SBASE; ++ length = (character % HANGUL_TCOUNT ? 3 : 2); ++ ++ *(convertedChars++) = ++ character / HANGUL_NCOUNT + HANGUL_LBASE; ++ *(convertedChars++) = ++ (character % HANGUL_NCOUNT) / HANGUL_TCOUNT + HANGUL_VBASE; ++ if (length > 2) ++ *convertedChars = (character % HANGUL_TCOUNT) + HANGUL_TBASE; ++ return (length); ++ } else { ++ return (unicode_recursive_decompose(character, convertedChars)); ++ } ++} ++ ++/* ++ * unicode_combine - generate a precomposed Unicode char ++ * ++ * Precomposed Unicode characters are required for some volume ++ * formats and network protocols. unicode_combine will combine ++ * a decomposed character sequence into a single precomposed ++ * (composite) character. ++ * ++ * Similar toCFUniCharPrecomposeCharacter but unicode_combine ++ * also handles Hangul Jamo characters. ++ */ ++static u_int16_t ++unicode_combine(u_int16_t base, u_int16_t combining) ++{ ++ u_int32_t value; ++ ++ /* Check HANGUL */ ++ if ((combining >= HANGUL_VBASE) && (combining < (HANGUL_TBASE + HANGUL_TCOUNT))) { ++ /* 2 char Hangul sequences */ ++ if ((combining < (HANGUL_VBASE + HANGUL_VCOUNT)) && ++ (base >= HANGUL_LBASE && base < (HANGUL_LBASE + HANGUL_LCOUNT))) { ++ return (HANGUL_SBASE + ++ ((base - HANGUL_LBASE)*(HANGUL_VCOUNT*HANGUL_TCOUNT)) + ++ ((combining - HANGUL_VBASE)*HANGUL_TCOUNT)); ++ } ++ ++ /* 3 char Hangul sequences */ ++ if ((combining > HANGUL_TBASE) && ++ (base >= HANGUL_SBASE && base < (HANGUL_SBASE + HANGUL_SCOUNT))) { ++ if ((base - HANGUL_SBASE) % HANGUL_TCOUNT) ++ return (0); ++ else ++ return (base + (combining - HANGUL_TBASE)); ++ } ++ } ++ ++ value = getmappedvalue32( ++ (const unicode_mappings32 *)__CFUniCharPrecompSourceTable, ++ __CFUniCharPrecompositionTableLength, combining); ++ ++ if (value) { ++ value = getmappedvalue16( ++ (const unicode_mappings16 *) ++ ((u_int32_t *)__CFUniCharBMPPrecompDestinationTable + (value & 0xFFFF)), ++ (value >> 16), base); ++ } ++ return (value); ++} ++ ++static int ++utf8mac_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) ++{ ++ u_int16_t ucsp[13]; ++ size_t ucslen = 0, consumed = 0; ++ int ret; ++ int flags; ++ ++ bzero(&ucsp, sizeof(ucsp)); ++ *pwc = 0; ++ flags = UTF_PRECOMPOSED; ++ ++#ifdef __LITTLE_ENDIAN__ ++ flags |= UTF_REVERSE_ENDIAN; ++#endif ++ ++ ret = utf8_decodestr(s, n, ucsp, &ucslen, sizeof(ucsp), 0, flags, &consumed); ++ ++ if (ret == ENAMETOOLONG) /* Name didn't fit; only ucslen chars were decoded */ ++ return RET_TOOFEW(0); ++ ++ if ( ret == EINVAL) /* Illegal UTF-8 sequence found */ ++ return RET_ILSEQ; ++ ++ if((ret = ucs2_mbtowc(conv, pwc, (const unsigned char *) ucsp, ucslen)) < 0) ++ return ret; ++ ++ return consumed; ++} ++ ++static int ++utf8mac_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) /* n == 0 is acceptable */ ++{ ++ int ret; ++ size_t len; ++ u_int16_t ucs_string[13]; ++ int flags; ++ ++ if((ret = ucs2_wctomb(conv, (unsigned char *) ucs_string, wc, sizeof(ucs_string))) < 0) ++ return ret; ++ ++ flags = UTF_NO_NULL_TERM | UTF_DECOMPOSED; ++#ifdef __LITTLE_ENDIAN__ ++ flags |= UTF_REVERSE_ENDIAN; ++#endif ++ utf8_encodestr(ucs_string, ret, r, &len, n, 0, flags); ++ ++ return len; ++} From 0970e1a498842a36d8ddfb8c061f72490cd9e447 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 14 Dec 2023 12:33:49 -0600 Subject: [PATCH 03/33] Update meta.yaml --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fe6b21d..8201e02 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,9 +12,10 @@ source: - CMakeLists.txt.patch # [win] - config.h.patch # [win] - configure.cmake.patch # [win] + - utf_8_mac.patch # [osx] build: - number: 1 + number: 2 requirements: From e39a9b4447c1512ed242e744293855a59a2c9e99 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 18:34:18 +0000 Subject: [PATCH 04/33] MNT: Re-rendered with conda-build 3.28.1, conda-smithy 3.30.1, and conda-forge-pinning 2023.12.14.13.22.08 --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index f08056e..0010400 100644 --- a/README.md +++ b/README.md @@ -225,6 +225,3 @@ Feedstock Maintainers * [@ocefpaf](https://github.com/ocefpaf/) * [@scopatz](https://github.com/scopatz/) - - - From 96798805120fd721ffc330f708c7ee11d42dd58c Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 14 Dec 2023 12:49:40 -0600 Subject: [PATCH 05/33] Update build.sh --- recipe/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 7a045ec..fc11ea9 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -4,6 +4,8 @@ cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./build-aux cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux set -ex +ls -lah lib/*.h + ./configure --prefix=${PREFIX} \ --host=${HOST} \ --build=${BUILD} \ From 2e3ee762dca050e68c04d4b2f5023155746a6a35 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 14 Dec 2023 14:05:34 -0600 Subject: [PATCH 06/33] Update utf_8_mac.patch --- recipe/utf_8_mac.patch | 215 ++++++++++++++++++++++++++++++----------- 1 file changed, 158 insertions(+), 57 deletions(-) diff --git a/recipe/utf_8_mac.patch b/recipe/utf_8_mac.patch index d58c1a1..8106ba9 100644 --- a/recipe/utf_8_mac.patch +++ b/recipe/utf_8_mac.patch @@ -1,6 +1,16 @@ ---- a/lib/converters.h 2009-06-21 06:17:33.000000000 -0500 -+++ b/lib/converters.h 2010-01-20 19:54:37.000000000 -0600 -@@ -119,6 +119,7 @@ +--- a/lib/Makefile.in 2022-02-12 07:13:33 ++++ b/lib/Makefile.in 2022-05-31 03:37:07 +@@ -159,6 +159,7 @@ + converters.h \ + ascii.h \ + utf8.h \ ++ utf8mac.h \ + ucs2.h \ + ucs2be.h \ + ucs2le.h \ +--- a/lib/converters.h 2022-01-23 17:47:43 ++++ b/lib/converters.h 2022-05-31 03:37:07 +@@ -122,6 +122,7 @@ /* General multi-byte encodings */ #include "utf8.h" #include "ucs2.h" @@ -8,9 +18,9 @@ #include "ucs2be.h" #include "ucs2le.h" #include "ucs4.h" ---- a/lib/encodings.def 2009-06-12 01:19:03.000000000 +0200 -+++ b/lib/encodings.def 2009-06-12 01:20:39.000000000 +0200 -@@ -69,6 +69,12 @@ +--- a/lib/encodings.def 2021-06-06 04:50:48 ++++ b/lib/encodings.def 2022-05-31 03:37:07 +@@ -68,6 +68,12 @@ utf8) #endif @@ -23,11 +33,11 @@ DEFENCODING(( "UCS-2", /* glibc */ "ISO-10646-UCS-2", /* IANA */ "csUnicode", /* IANA */ ---- a/lib/utf8mac.h 1970-01-01 09:00:00.000000000 +0900 -+++ b/lib/utf8mac.h 2007-11-13 17:42:39.000000000 +0900 -@@ -0,0 +1,1608 @@ +--- a/lib/utf8mac.h 1969-12-31 18:00:00 ++++ b/lib/utf8mac.h 2022-05-31 03:37:07 +@@ -0,0 +1,1699 @@ +/* -+ * Copyright (C) 2003 Apple Computer, Inc. All rights reserved. ++ * Copyright (C) 2003, 2013 Apple Computer, Inc. All rights reserved. + * + * This file is part of the GNU LIBICONV Library. + * @@ -55,9 +65,33 @@ + Includes Unicode 3.2 decomposition code derived from Core Foundation + */ + ++#include ++typedef uint8_t u_int8_t; ++typedef uint16_t u_int16_t; ++typedef uint32_t u_int32_t; ++typedef uint64_t u_int64_t; ++ ++#if defined(__APPLE__) +#include ++#elif defined(__sun) ++# include ++# ifdef BSWAP_16 ++# define OSSwapInt16(x) BSWAP_16(x) ++# else ++# define OSSwapInt16(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) ++# endif ++#elif defined(_AIX) ++# define OSSwapInt16(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) ++#else ++# include ++# define OSSwapInt16(x) bswap_16(x) ++#endif /* __sun */ ++ ++#ifdef WORDS_LITTLEENDIAN ++# define __LITTLE_ENDIAN__ ++#endif ++ +#include -+#include /* bzero() */ + +#define UTF_REVERSE_ENDIAN 0x01 /* reverse UCS-2 byte order */ +#define UTF_NO_NULL_TERM 0x02 /* do not add null termination */ @@ -70,6 +104,63 @@ +int utf8_decodestr (const u_int8_t *, size_t, u_int16_t *,size_t *, + size_t, u_int16_t, int, size_t *); + ++/* Port from utf16be.h and remove the `conv_t conv` argument */ ++static int ++_utf16be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n) ++{ ++ int count = 0; ++ if (n >= 2) { ++ ucs4_t wc = (s[0] << 8) + s[1]; ++ if (wc >= 0xd800 && wc < 0xdc00) { ++ if (n >= 4) { ++ ucs4_t wc2 = (s[2] << 8) + s[3]; ++ if (!(wc2 >= 0xdc00 && wc2 < 0xe000)) ++ goto ilseq; ++ *pwc = 0x10000 + ((wc - 0xd800) << 10) + (wc2 - 0xdc00); ++ return count+4; ++ } ++ } else if (wc >= 0xdc00 && wc < 0xe000) { ++ goto ilseq; ++ } else { ++ *pwc = wc; ++ return count+2; ++ } ++ } ++ return RET_TOOFEW(count); ++ ++ilseq: ++ return RET_SHIFT_ILSEQ(count); ++} ++ ++/* Port from utf16be.h and remove the `conv_t conv` argument */ ++static int ++_utf16be_wctomb (unsigned char *r, ucs4_t wc, size_t n) ++{ ++ if (!(wc >= 0xd800 && wc < 0xe000)) { ++ if (wc < 0x10000) { ++ if (n >= 2) { ++ r[0] = (unsigned char) (wc >> 8); ++ r[1] = (unsigned char) wc; ++ return 2; ++ } else ++ return RET_TOOSMALL; ++ } ++ else if (wc < 0x110000) { ++ if (n >= 4) { ++ ucs4_t wc1 = 0xd800 + ((wc - 0x10000) >> 10); ++ ucs4_t wc2 = 0xdc00 + ((wc - 0x10000) & 0x3ff); ++ r[0] = (unsigned char) (wc1 >> 8); ++ r[1] = (unsigned char) wc1; ++ r[2] = (unsigned char) (wc2 >> 8); ++ r[3] = (unsigned char) wc2; ++ return 4; ++ } else ++ return RET_TOOSMALL; ++ } ++ } ++ return RET_ILUNI; ++} ++ +/* + Derived from Core Foundation headers: + @@ -1066,13 +1157,13 @@ + +/* Surrogate Pair Constants */ +#define SP_HALF_SHIFT 10 -+#define SP_HALF_BASE 0x0010000UL -+#define SP_HALF_MASK 0x3FFUL ++#define SP_HALF_BASE 0x0010000U ++#define SP_HALF_MASK 0x3FFU + -+#define SP_HIGH_FIRST 0xD800UL -+#define SP_HIGH_LAST 0xDBFFUL -+#define SP_LOW_FIRST 0xDC00UL -+#define SP_LOW_LAST 0xDFFFUL ++#define SP_HIGH_FIRST 0xD800U ++#define SP_HIGH_LAST 0xDBFFU ++#define SP_LOW_FIRST 0xDC00U ++#define SP_LOW_LAST 0xDFFFU + +/* + * Test for a combining character. @@ -1159,7 +1250,7 @@ + u_int16_t * chp = NULL; + u_int16_t sequence[8]; + int extra = 0; -+ int charcnt; ++ size_t charcnt; + int swapbytes = (flags & UTF_REVERSE_ENDIAN); + int nullterm = ((flags & UTF_NO_NULL_TERM) == 0); + int decompose = (flags & UTF_DECOMPOSED); @@ -1176,7 +1267,7 @@ + --extra; + ucs_ch = *chp++; + } else { -+ ucs_ch = swapbytes ? OSSwapInt16(*ucsp++) : *ucsp++; ++ ucs_ch = swapbytes ? OSSwapInt16(*ucsp++) : *ucsp++; + + if (decompose && unicode_decomposeable(ucs_ch)) { + extra = unicode_decompose(ucs_ch, sequence) - 1; @@ -1208,7 +1299,7 @@ + u_int16_t ch2; + u_int32_t pair; + -+ ch2 = swapbytes ? OSSwapInt16(*ucsp) : *ucsp; ++ ch2 = swapbytes ? OSSwapInt16(*ucsp) : *ucsp; + if (ch2 >= SP_LOW_FIRST && ch2 <= SP_LOW_LAST) { + pair = ((ucs_ch - SP_HIGH_FIRST) << SP_HALF_SHIFT) + + (ch2 - SP_LOW_FIRST) + SP_HALF_BASE; @@ -1267,7 +1358,7 @@ +{ + u_int16_t* bufstart; + u_int16_t* bufend; -+ unsigned int ucs_ch; ++ unsigned int ucs_ch, ucs_ch2; + unsigned int byte; + int result = 0; + int decompose, precompose, swapbytes; @@ -1290,12 +1381,13 @@ + /* check for ascii */ + if (byte < 0x80) { + ucs_ch = byte; /* 1st byte */ ++ ucs_ch2 = 0; + } else { + u_int32_t ch; + int extrabytes = utf_extrabytes[byte >> 3]; + + if (utf8len < extrabytes) -+ goto invalid; ++ goto toolong; + utf8len -= extrabytes; + + switch (extrabytes) { @@ -1305,11 +1397,12 @@ + if ((byte >> 6) != 2) + goto invalid; + ch += byte; -+ ch -= 0x00003080UL; ++ ch -= 0x00003080U; + if (ch < 0x0080) + goto invalid; + ucs_ch = ch; -+ break; ++ ucs_ch2 = 0; ++ break; + case 2: + ch = byte; ch <<= 6; /* 1st byte */ + byte = *utf8p++; /* 2nd byte */ @@ -1320,7 +1413,7 @@ + if ((byte >> 6) != 2) + goto invalid; + ch += byte; -+ ch -= 0x000E2080UL; ++ ch -= 0x000E2080U; + if (ch < 0x0800) + goto invalid; + if (ch >= 0xD800) { @@ -1330,6 +1423,7 @@ + goto invalid; + } + ucs_ch = ch; ++ ucs_ch2 = 0; + break; + case 3: + ch = byte; ch <<= 6; /* 1st byte */ @@ -1344,41 +1438,42 @@ + byte = *utf8p++; /* 4th byte */ + if ((byte >> 6) != 2) + goto invalid; -+ ch += byte; -+ ch -= 0x03C82080UL + SP_HALF_BASE; ++ ch += byte; ++ ch -= 0x03C82080U + SP_HALF_BASE; + ucs_ch = (ch >> SP_HALF_SHIFT) + SP_HIGH_FIRST; + if (ucs_ch < SP_HIGH_FIRST || ucs_ch > SP_HIGH_LAST) + goto invalid; -+ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; -+ if (ucsp >= bufend) -+ goto toolong; -+ ucs_ch = (ch & SP_HALF_MASK) + SP_LOW_FIRST; -+ if (ucs_ch < SP_LOW_FIRST || ucs_ch > SP_LOW_LAST) ++ ucs_ch2 = (ch & SP_HALF_MASK) + SP_LOW_FIRST; ++ if (ucs_ch2 < SP_LOW_FIRST || ucs_ch2 > SP_LOW_LAST) + goto invalid; -+ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; -+ continue; ++ break; + default: + goto invalid; + } + } -+ if (precompose && (ucsp != bufstart)) { -+ u_int16_t composite, base; -+ -+ if (unicode_combinable(ucs_ch)) { -+ base = swapbytes ? OSSwapInt16(*(ucsp - 1)) : *(ucsp - 1); -+ composite = unicode_combine(base, ucs_ch); -+ if (composite) { -+ --ucsp; -+ ucs_ch = composite; ++ if (precompose && (ucsp != bufstart)) { ++ u_int16_t composite, base; ++ ++ if (!ucs_ch2 && unicode_combinable(ucs_ch)) { ++ base = swapbytes ? OSSwapInt16(*(ucsp - 1)) : *(ucsp - 1); ++ composite = unicode_combine(base, ucs_ch); ++ if (composite) { ++ --ucsp; ++ ucs_ch = composite; ++ } else { ++ goto exit; ++ } + } else { + goto exit; + } -+ } else { -+ goto exit; + } -+ } -+ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; -+ utf8lastpass = utf8p; ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ if (ucs_ch2) { ++ if (ucsp >= bufend) ++ goto toolong; ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch2) : ucs_ch2; ++ } ++ utf8lastpass = utf8p; + } + +exit: @@ -1586,7 +1681,7 @@ +} + +static int -+utf8mac_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) ++utf8mac_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n) +{ + u_int16_t ucsp[13]; + size_t ucslen = 0, consumed = 0; @@ -1609,28 +1704,34 @@ + if ( ret == EINVAL) /* Illegal UTF-8 sequence found */ + return RET_ILSEQ; + -+ if((ret = ucs2_mbtowc(conv, pwc, (const unsigned char *) ucsp, ucslen)) < 0) -+ return ret; ++ if((ret = _utf16be_mbtowc(pwc, (const unsigned char *) ucsp, ucslen)) < 0) ++ return ret; + -+ return consumed; ++ return (int)consumed; +} + +static int -+utf8mac_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) /* n == 0 is acceptable */ ++utf8mac_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, size_t n) /* n == 0 is acceptable */ +{ + int ret; + size_t len; + u_int16_t ucs_string[13]; + int flags; + -+ if((ret = ucs2_wctomb(conv, (unsigned char *) ucs_string, wc, sizeof(ucs_string))) < 0) -+ return ret; ++ if((ret = _utf16be_wctomb((unsigned char *) ucs_string, wc, sizeof(ucs_string))) < 0) ++ return ret; + + flags = UTF_NO_NULL_TERM | UTF_DECOMPOSED; +#ifdef __LITTLE_ENDIAN__ + flags |= UTF_REVERSE_ENDIAN; +#endif -+ utf8_encodestr(ucs_string, ret, r, &len, n, 0, flags); ++ ret = utf8_encodestr(ucs_string, ret, r, &len, n, 0, flags); ++ if (ret == EINVAL) ++ return RET_ILUNI; ++ if (ret == ENAMETOOLONG) ++ return RET_TOOSMALL; + -+ return len; ++ return (int)len; +} ++ ++/* vim:set tabstop=8 shiftwidth=4: */ From aff9eebc915147d1f8a31c67d8a61bc941cc9286 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 14 Dec 2023 15:56:32 -0600 Subject: [PATCH 07/33] Update utf_8_mac.patch From 818b5fd740565815a32e4ec4ffbbadd8d7dadd92 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 14 Dec 2023 16:14:13 -0600 Subject: [PATCH 08/33] Update build.sh --- recipe/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index fc11ea9..f52bc44 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -4,7 +4,14 @@ cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./build-aux cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux set -ex -ls -lah lib/*.h +# refresh the flags +if [[ "$OSTYPE" == "darwin"* ]]; then + mv lib/flags.h lib/flags.h.bak + $(CC) $(CFLAGS) lib/genflags.c -o genflags + ./genflags > lib/flags.h + rm -f genflags + diff -u lib/flags.h.bak lib/flags.h +fi ./configure --prefix=${PREFIX} \ --host=${HOST} \ From 09e8b6adb98315ab878409073ee5556465fbb39a Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 14 Dec 2023 20:15:27 -0600 Subject: [PATCH 09/33] Update build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index f52bc44..3f973b2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,7 +7,7 @@ set -ex # refresh the flags if [[ "$OSTYPE" == "darwin"* ]]; then mv lib/flags.h lib/flags.h.bak - $(CC) $(CFLAGS) lib/genflags.c -o genflags + ${CC} ${CFLAGS} lib/genflags.c -o genflags ./genflags > lib/flags.h rm -f genflags diff -u lib/flags.h.bak lib/flags.h From 92c12a91c1efa7254654cddfe5a83284bf40ca02 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Dec 2023 09:03:45 +0100 Subject: [PATCH 10/33] Clean up bash script --- recipe/build.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 3f973b2..5e9c562 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,16 +1,21 @@ #!/usr/bin/env sh + +set -euxo pipefail + # Get an updated config.sub and config.guess cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./build-aux cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux -set -ex # refresh the flags -if [[ "$OSTYPE" == "darwin"* ]]; then +if [[ "${target_platform}" == osx-* ]]; then mv lib/flags.h lib/flags.h.bak ${CC} ${CFLAGS} lib/genflags.c -o genflags ./genflags > lib/flags.h rm -f genflags - diff -u lib/flags.h.bak lib/flags.h + # Debugging: Show generated diff + diff -u lib/flags.h.bak lib/flags.h || true + # Check that UTF-8.MAC is included + grep utf8mac lib/flags.h fi ./configure --prefix=${PREFIX} \ @@ -19,7 +24,7 @@ fi --enable-static \ --disable-rpath -make -j${CPU_COUNT} ${VERBOSE_AT} -if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "1" ]]; then +make -j${CPU_COUNT} +if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" != "1" ]]; then make check fi From 935a378e66356c27365a5c406c7eacdc40f8863e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Dec 2023 09:20:16 +0100 Subject: [PATCH 11/33] Use CC_FOR_BUILD --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 5e9c562..8090fb6 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -9,7 +9,7 @@ cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux # refresh the flags if [[ "${target_platform}" == osx-* ]]; then mv lib/flags.h lib/flags.h.bak - ${CC} ${CFLAGS} lib/genflags.c -o genflags + ${CC_FOR_BUILD} ${CFLAGS} lib/genflags.c -o genflags ./genflags > lib/flags.h rm -f genflags # Debugging: Show generated diff From f3d7d97b08f9d5b1b0250f6db8a6f435e8914175 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 08:09:19 -0600 Subject: [PATCH 12/33] ENH hard code the patch for flags.h --- recipe/utf_8_mac.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/recipe/utf_8_mac.patch b/recipe/utf_8_mac.patch index 8106ba9..e32246c 100644 --- a/recipe/utf_8_mac.patch +++ b/recipe/utf_8_mac.patch @@ -8,6 +8,16 @@ ucs2.h \ ucs2be.h \ ucs2le.h \ +--- lib/flags.h.bak 2022-05-15 12:59:06.000000000 +0000 ++++ lib/flags.h 2023-12-15 08:27:14.000000000 +0000 +@@ -14,6 +14,7 @@ + + #define ei_ascii_oflags (0) + #define ei_utf8_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) ++#define ei_utf8mac_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) + #define ei_ucs2_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) + #define ei_ucs2be_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) + #define ei_ucs2le_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) --- a/lib/converters.h 2022-01-23 17:47:43 +++ b/lib/converters.h 2022-05-31 03:37:07 @@ -122,6 +122,7 @@ From 0b7e8a558f70fcac7659f6583dd2dc91ee7e702e Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 08:10:00 -0600 Subject: [PATCH 13/33] Update build.sh --- recipe/build.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 8090fb6..57a0941 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,17 +6,18 @@ set -euxo pipefail cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./build-aux cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux -# refresh the flags -if [[ "${target_platform}" == osx-* ]]; then - mv lib/flags.h lib/flags.h.bak - ${CC_FOR_BUILD} ${CFLAGS} lib/genflags.c -o genflags - ./genflags > lib/flags.h - rm -f genflags - # Debugging: Show generated diff - diff -u lib/flags.h.bak lib/flags.h || true - # Check that UTF-8.MAC is included - grep utf8mac lib/flags.h -fi +# this bit of code will refresh the flags.h header +# for now we have hard coded the changes as a patch. +# if [[ "${target_platform}" == osx-* ]]; then +# mv lib/flags.h lib/flags.h.bak +# ${CC_FOR_BUILD} ${CFLAGS} lib/genflags.c -o genflags +# ./genflags > lib/flags.h +# rm -f genflags +# # Debugging: Show generated diff +# diff -u lib/flags.h.bak lib/flags.h || true +# # Check that UTF-8.MAC is included +# grep utf8mac lib/flags.h +# fi ./configure --prefix=${PREFIX} \ --host=${HOST} \ From 7a003e8cf7dc20f738f10e3c76142dfd31fbd743 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 08:11:54 -0600 Subject: [PATCH 14/33] Update meta.yaml --- recipe/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8201e02..fff6303 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,6 @@ source: build: number: 2 - requirements: build: - libtool # [unix] @@ -73,6 +72,7 @@ outputs: license: LGPL-2.1-only license_file: COPYING.LIB summary: Provides iconv for systems which don't have one (or that cannot convert from/to Unicode.) + - name: iconv script: install.sh # there is no executable available on windows, see @@ -91,11 +91,16 @@ outputs: test: commands: - iconv --help + # Ensure we run the built iconv and not the one from the base system. + - test "$(command -v iconv)" = "${PREFIX}/bin/iconv" # [unix] + # Test working patched-in UTF-8-MAC encoding. + - test "$(printf %s 'ä' | iconv --from-code=UTF-8 --to-code=UTF-8-MAC)" = "$(printf '\x61\xcc\x88')" # [osx] about: home: https://www.gnu.org/software/libiconv/ license: GPL-3.0-only license_file: COPYING summary: Provides iconv for systems which don't have one (or that cannot convert from/to Unicode.) + about: home: https://www.gnu.org/software/libiconv/ license: GPL-3.0-only AND LGPL-2.1-only From 5b73c97052098b5e5b04e00b85638253b00c6a31 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 08:28:16 -0600 Subject: [PATCH 15/33] Update utf_8_mac.patch --- recipe/utf_8_mac.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/utf_8_mac.patch b/recipe/utf_8_mac.patch index e32246c..21538f0 100644 --- a/recipe/utf_8_mac.patch +++ b/recipe/utf_8_mac.patch @@ -8,8 +8,8 @@ ucs2.h \ ucs2be.h \ ucs2le.h \ ---- lib/flags.h.bak 2022-05-15 12:59:06.000000000 +0000 -+++ lib/flags.h 2023-12-15 08:27:14.000000000 +0000 +--- a/lib/flags.h 2022-05-15 12:59:06.000000000 +0000 ++++ b/lib/flags.h 2023-12-15 08:27:14.000000000 +0000 @@ -14,6 +14,7 @@ #define ei_ascii_oflags (0) From fb81f57db04a61827544eeac4f5f1112330c7959 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 08:46:27 -0600 Subject: [PATCH 16/33] Update meta.yaml --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fff6303..d6778ed 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -91,6 +91,8 @@ outputs: test: commands: - iconv --help + # print all supported encodings + - iconv -l # Ensure we run the built iconv and not the one from the base system. - test "$(command -v iconv)" = "${PREFIX}/bin/iconv" # [unix] # Test working patched-in UTF-8-MAC encoding. From b7021928d210897cb5f63aeeaa7ba057cc03c5af Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 09:31:46 -0600 Subject: [PATCH 17/33] Update build.sh --- recipe/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 57a0941..687366f 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -25,6 +25,10 @@ cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux --enable-static \ --disable-rpath +if [[ "${target_platform}" == osx-* ]]; then + make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" +fi + make -j${CPU_COUNT} if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" != "1" ]]; then make check From 58641f923ddbf32ed858b5a434258d60bad20ea0 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 09:40:05 -0600 Subject: [PATCH 18/33] Update meta.yaml --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d6778ed..e1546a4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,6 +19,9 @@ build: requirements: build: + - automake # [osx] + - autoconf # [osx] + - groff # [osx] - libtool # [unix] - {{ compiler('c') }} - cmake # [win] From aa2b80d0550131f2e8c87e2032646f37381bfa51 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 09:40:56 -0600 Subject: [PATCH 19/33] Update build.sh --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index 687366f..4996735 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -26,6 +26,7 @@ cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux --disable-rpath if [[ "${target_platform}" == osx-* ]]; then + make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" totally-clean make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" fi From fc74df7ec24a5e401ed6bef0cd6638a24fde90f3 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 09:42:30 -0600 Subject: [PATCH 20/33] Update recipe/meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e1546a4..37a22ce 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ requirements: - automake # [osx] - autoconf # [osx] - groff # [osx] + - gperf # [osx] - libtool # [unix] - {{ compiler('c') }} - cmake # [win] From d2ada51141e510171592de7f312b0d1bad981cba Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 09:44:35 -0600 Subject: [PATCH 21/33] Update recipe/utf_8_mac.patch --- recipe/utf_8_mac.patch | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/recipe/utf_8_mac.patch b/recipe/utf_8_mac.patch index 21538f0..8106ba9 100644 --- a/recipe/utf_8_mac.patch +++ b/recipe/utf_8_mac.patch @@ -8,16 +8,6 @@ ucs2.h \ ucs2be.h \ ucs2le.h \ ---- a/lib/flags.h 2022-05-15 12:59:06.000000000 +0000 -+++ b/lib/flags.h 2023-12-15 08:27:14.000000000 +0000 -@@ -14,6 +14,7 @@ - - #define ei_ascii_oflags (0) - #define ei_utf8_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) -+#define ei_utf8mac_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) - #define ei_ucs2_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) - #define ei_ucs2be_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) - #define ei_ucs2le_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) --- a/lib/converters.h 2022-01-23 17:47:43 +++ b/lib/converters.h 2022-05-31 03:37:07 @@ -122,6 +122,7 @@ From 0f3107a4d45563b9758927d1b2f9697e8215d394 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 09:45:30 -0600 Subject: [PATCH 22/33] Update recipe/build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 4996735..fe6035a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -26,7 +26,7 @@ cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux --disable-rpath if [[ "${target_platform}" == osx-* ]]; then - make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" totally-clean + # make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" totally-clean make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" fi From a2072d0bd2401bc0393b78c24bcb8aa4328f080c Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 09:46:00 -0600 Subject: [PATCH 23/33] Update recipe/build.sh --- recipe/build.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index fe6035a..97efab9 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,19 +6,6 @@ set -euxo pipefail cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./build-aux cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux -# this bit of code will refresh the flags.h header -# for now we have hard coded the changes as a patch. -# if [[ "${target_platform}" == osx-* ]]; then -# mv lib/flags.h lib/flags.h.bak -# ${CC_FOR_BUILD} ${CFLAGS} lib/genflags.c -o genflags -# ./genflags > lib/flags.h -# rm -f genflags -# # Debugging: Show generated diff -# diff -u lib/flags.h.bak lib/flags.h || true -# # Check that UTF-8.MAC is included -# grep utf8mac lib/flags.h -# fi - ./configure --prefix=${PREFIX} \ --host=${HOST} \ --build=${BUILD} \ From c0eba26621e676f8dce8b3aedb8b4c7c0d22143e Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 10:02:55 -0600 Subject: [PATCH 24/33] Update recipe/build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 97efab9..d683d1b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -14,7 +14,7 @@ cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux if [[ "${target_platform}" == osx-* ]]; then # make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" totally-clean - make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" + make -f Makefile.devel CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS}" fi make -j${CPU_COUNT} From a509bbf1dd9800d28e202994101f62f98b0ac4d5 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 10:04:07 -0600 Subject: [PATCH 25/33] Update recipe/build.sh --- recipe/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index d683d1b..fcaa6da 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,7 +13,6 @@ cp $BUILD_PREFIX/share/libtool/build-aux/config.* ./libcharset/build-aux --disable-rpath if [[ "${target_platform}" == osx-* ]]; then - # make -f Makefile.devel CC="${CC}" CFLAGS="${CFLAGS}" totally-clean make -f Makefile.devel CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS}" fi From 768b641009a921aa75329bc30417e7f8f59b7327 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 10:19:18 -0600 Subject: [PATCH 26/33] Update recipe/meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 37a22ce..0422fc7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -100,7 +100,7 @@ outputs: # Ensure we run the built iconv and not the one from the base system. - test "$(command -v iconv)" = "${PREFIX}/bin/iconv" # [unix] # Test working patched-in UTF-8-MAC encoding. - - test "$(printf %s 'ä' | iconv --from-code=UTF-8 --to-code=UTF-8-MAC)" = "$(printf '\x61\xcc\x88')" # [osx] + - test "$(printf '\xc3\xa4' | iconv --from-code=UTF-8 --to-code=UTF-8-MAC)" = "$(printf '\x61\xcc\x88')" # [osx] about: home: https://www.gnu.org/software/libiconv/ license: GPL-3.0-only From f4b13cf8a493d9f33abfbe26e700faf055649985 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 10:20:22 -0600 Subject: [PATCH 27/33] Update recipe/meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0422fc7..5e614ef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -96,7 +96,7 @@ outputs: commands: - iconv --help # print all supported encodings - - iconv -l + - iconv -l | grep "UTF-8-MAC" # Ensure we run the built iconv and not the one from the base system. - test "$(command -v iconv)" = "${PREFIX}/bin/iconv" # [unix] # Test working patched-in UTF-8-MAC encoding. From 08be23530d4559cced911da7ece6ba67f1d3e1b3 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 10:27:38 -0600 Subject: [PATCH 28/33] Update recipe/meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5e614ef..323e3e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -96,7 +96,7 @@ outputs: commands: - iconv --help # print all supported encodings - - iconv -l | grep "UTF-8-MAC" + - iconv -l | grep "UTF-8-MAC" # [osx] # Ensure we run the built iconv and not the one from the base system. - test "$(command -v iconv)" = "${PREFIX}/bin/iconv" # [unix] # Test working patched-in UTF-8-MAC encoding. From bb2454e672350e22cf348bd3e26c2b5d114c7b7b Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 11:44:28 -0600 Subject: [PATCH 29/33] Update recipe/utf_8_mac.patch Co-authored-by: Marcel Bargull --- recipe/utf_8_mac.patch | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/recipe/utf_8_mac.patch b/recipe/utf_8_mac.patch index 8106ba9..9a05fd2 100644 --- a/recipe/utf_8_mac.patch +++ b/recipe/utf_8_mac.patch @@ -1,13 +1,3 @@ ---- a/lib/Makefile.in 2022-02-12 07:13:33 -+++ b/lib/Makefile.in 2022-05-31 03:37:07 -@@ -159,6 +159,7 @@ - converters.h \ - ascii.h \ - utf8.h \ -+ utf8mac.h \ - ucs2.h \ - ucs2be.h \ - ucs2le.h \ --- a/lib/converters.h 2022-01-23 17:47:43 +++ b/lib/converters.h 2022-05-31 03:37:07 @@ -122,6 +122,7 @@ From 308eb403d2101a0b8542664f2011d6450b3b07b9 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 11:57:37 -0600 Subject: [PATCH 30/33] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 323e3e0..d3e8364 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -122,3 +122,4 @@ extra: - jakirkham - jhamman - scopatz + - mbargull From 98d7257197c33b0e82b4207b87530a9d942b2317 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 18:01:29 +0000 Subject: [PATCH 31/33] MNT: Re-rendered with conda-build 3.28.1, conda-smithy 3.30.1, and conda-forge-pinning 2023.12.15.17.00.18 --- .github/CODEOWNERS | 2 +- README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e0c7a29..c5ab4ce 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @jakirkham @jhamman @ocefpaf @scopatz \ No newline at end of file +* @jakirkham @jhamman @mbargull @ocefpaf @scopatz \ No newline at end of file diff --git a/README.md b/README.md index 0010400..d8ce2f7 100644 --- a/README.md +++ b/README.md @@ -222,6 +222,7 @@ Feedstock Maintainers * [@jakirkham](https://github.com/jakirkham/) * [@jhamman](https://github.com/jhamman/) +* [@mbargull](https://github.com/mbargull/) * [@ocefpaf](https://github.com/ocefpaf/) * [@scopatz](https://github.com/scopatz/) From c8f6fbeda044df67fa3eaf86a6bc2aba91b09ff7 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 15 Dec 2023 12:41:26 -0600 Subject: [PATCH 32/33] Update recipe/meta.yaml --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d3e8364..f6d5868 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,9 @@ source: - CMakeLists.txt.patch # [win] - config.h.patch # [win] - configure.cmake.patch # [win] + # MRB: I made this patch by diffing libiconv-1.17 and the version of the code here + # https://github.com/fumiyas/libiconv-utf8mac/commit/2677394480f0d67d6f64b74045b9b4ad08097592 + # I removed a bunch of the extraneous changes to just pull in the header fixes - utf_8_mac.patch # [osx] build: From 9a6c1cd8b6b9fbcc5205bbc0739200c5e35cdab2 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Fri, 15 Dec 2023 21:36:45 +0100 Subject: [PATCH 33/33] Use utf8mac.h from upstream Apple source in patch Signed-off-by: Marcel Bargull --- recipe/meta.yaml | 3 - recipe/utf_8_mac.patch | 203 ++++++++++++++--------------------------- 2 files changed, 70 insertions(+), 136 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f6d5868..d3e8364 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,9 +12,6 @@ source: - CMakeLists.txt.patch # [win] - config.h.patch # [win] - configure.cmake.patch # [win] - # MRB: I made this patch by diffing libiconv-1.17 and the version of the code here - # https://github.com/fumiyas/libiconv-utf8mac/commit/2677394480f0d67d6f64b74045b9b4ad08097592 - # I removed a bunch of the extraneous changes to just pull in the header fixes - utf_8_mac.patch # [osx] build: diff --git a/recipe/utf_8_mac.patch b/recipe/utf_8_mac.patch index 9a05fd2..739dd4e 100644 --- a/recipe/utf_8_mac.patch +++ b/recipe/utf_8_mac.patch @@ -1,6 +1,30 @@ ---- a/lib/converters.h 2022-01-23 17:47:43 -+++ b/lib/converters.h 2022-05-31 03:37:07 -@@ -122,6 +122,7 @@ +From 153171238f2af82fec32b4c9c86e5defa747e003 Mon Sep 17 00:00:00 2001 +From: Marcel Bargull +Date: Fri, 15 Dec 2023 21:23:54 +0100 +Subject: [PATCH] Add UTF-8-MAC encoding from Apple libiconv sources + +This adds utf8mac.h from Apple's libiconv from +https://github.com/apple-oss-distributions/libiconv/blob/libiconv-64/libiconv/lib/utf8mac.h +and registers it as an encoding in lib/encodings.def and lib/converter.h +similar to the patches found at +- https://github.com/fumiyas/libiconv-utf8mac/tree/2677394480f0d67d6f64b74045b9b4ad08097592 +- https://github.com/Homebrew/homebrew-core/blob/9911c3276bcc2a8f2e8a8359370c217e43cd8104/Formula/lib/libiconv.rb#L26 +- https://github.com/macports/macports-ports/blob/f3ba1cfbdb791cd35fdfafb98c06868952451980/textproc/libiconv/files/patch-utf8mac.diff + +Co-authored-by: Matthew R. Becker +Signed-off-by: Marcel Bargull +--- + lib/converters.h | 1 + + lib/encodings.def | 6 + + lib/utf8mac.h | 1607 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 1614 insertions(+) + create mode 100644 lib/utf8mac.h + +diff --git a/lib/converters.h b/lib/converters.h +index e2e2227..76a6267 100644 +--- a/lib/converters.h ++++ b/lib/converters.h +@@ -122,6 +122,7 @@ struct conv_struct { /* General multi-byte encodings */ #include "utf8.h" #include "ucs2.h" @@ -8,9 +32,11 @@ #include "ucs2be.h" #include "ucs2le.h" #include "ucs4.h" ---- a/lib/encodings.def 2021-06-06 04:50:48 -+++ b/lib/encodings.def 2022-05-31 03:37:07 -@@ -68,6 +68,12 @@ +diff --git a/lib/encodings.def b/lib/encodings.def +index 41d8063..e573945 100644 +--- a/lib/encodings.def ++++ b/lib/encodings.def +@@ -68,6 +68,12 @@ DEFALIAS( "UTF8", /* HP-UX */ utf8) #endif @@ -23,9 +49,12 @@ DEFENCODING(( "UCS-2", /* glibc */ "ISO-10646-UCS-2", /* IANA */ "csUnicode", /* IANA */ ---- a/lib/utf8mac.h 1969-12-31 18:00:00 -+++ b/lib/utf8mac.h 2022-05-31 03:37:07 -@@ -0,0 +1,1699 @@ +diff --git a/lib/utf8mac.h b/lib/utf8mac.h +new file mode 100644 +index 0000000..c5d0f76 +--- /dev/null ++++ b/lib/utf8mac.h +@@ -0,0 +1,1607 @@ +/* + * Copyright (C) 2003, 2013 Apple Computer, Inc. All rights reserved. + * @@ -55,32 +84,7 @@ + Includes Unicode 3.2 decomposition code derived from Core Foundation + */ + -+#include -+typedef uint8_t u_int8_t; -+typedef uint16_t u_int16_t; -+typedef uint32_t u_int32_t; -+typedef uint64_t u_int64_t; -+ -+#if defined(__APPLE__) +#include -+#elif defined(__sun) -+# include -+# ifdef BSWAP_16 -+# define OSSwapInt16(x) BSWAP_16(x) -+# else -+# define OSSwapInt16(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) -+# endif -+#elif defined(_AIX) -+# define OSSwapInt16(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) -+#else -+# include -+# define OSSwapInt16(x) bswap_16(x) -+#endif /* __sun */ -+ -+#ifdef WORDS_LITTLEENDIAN -+# define __LITTLE_ENDIAN__ -+#endif -+ +#include + +#define UTF_REVERSE_ENDIAN 0x01 /* reverse UCS-2 byte order */ @@ -94,63 +98,6 @@ +int utf8_decodestr (const u_int8_t *, size_t, u_int16_t *,size_t *, + size_t, u_int16_t, int, size_t *); + -+/* Port from utf16be.h and remove the `conv_t conv` argument */ -+static int -+_utf16be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n) -+{ -+ int count = 0; -+ if (n >= 2) { -+ ucs4_t wc = (s[0] << 8) + s[1]; -+ if (wc >= 0xd800 && wc < 0xdc00) { -+ if (n >= 4) { -+ ucs4_t wc2 = (s[2] << 8) + s[3]; -+ if (!(wc2 >= 0xdc00 && wc2 < 0xe000)) -+ goto ilseq; -+ *pwc = 0x10000 + ((wc - 0xd800) << 10) + (wc2 - 0xdc00); -+ return count+4; -+ } -+ } else if (wc >= 0xdc00 && wc < 0xe000) { -+ goto ilseq; -+ } else { -+ *pwc = wc; -+ return count+2; -+ } -+ } -+ return RET_TOOFEW(count); -+ -+ilseq: -+ return RET_SHIFT_ILSEQ(count); -+} -+ -+/* Port from utf16be.h and remove the `conv_t conv` argument */ -+static int -+_utf16be_wctomb (unsigned char *r, ucs4_t wc, size_t n) -+{ -+ if (!(wc >= 0xd800 && wc < 0xe000)) { -+ if (wc < 0x10000) { -+ if (n >= 2) { -+ r[0] = (unsigned char) (wc >> 8); -+ r[1] = (unsigned char) wc; -+ return 2; -+ } else -+ return RET_TOOSMALL; -+ } -+ else if (wc < 0x110000) { -+ if (n >= 4) { -+ ucs4_t wc1 = 0xd800 + ((wc - 0x10000) >> 10); -+ ucs4_t wc2 = 0xdc00 + ((wc - 0x10000) & 0x3ff); -+ r[0] = (unsigned char) (wc1 >> 8); -+ r[1] = (unsigned char) wc1; -+ r[2] = (unsigned char) (wc2 >> 8); -+ r[3] = (unsigned char) wc2; -+ return 4; -+ } else -+ return RET_TOOSMALL; -+ } -+ } -+ return RET_ILUNI; -+} -+ +/* + Derived from Core Foundation headers: + @@ -1257,7 +1204,7 @@ + --extra; + ucs_ch = *chp++; + } else { -+ ucs_ch = swapbytes ? OSSwapInt16(*ucsp++) : *ucsp++; ++ ucs_ch = swapbytes ? OSSwapInt16(*ucsp++) : *ucsp++; + + if (decompose && unicode_decomposeable(ucs_ch)) { + extra = unicode_decompose(ucs_ch, sequence) - 1; @@ -1289,7 +1236,7 @@ + u_int16_t ch2; + u_int32_t pair; + -+ ch2 = swapbytes ? OSSwapInt16(*ucsp) : *ucsp; ++ ch2 = swapbytes ? OSSwapInt16(*ucsp) : *ucsp; + if (ch2 >= SP_LOW_FIRST && ch2 <= SP_LOW_LAST) { + pair = ((ucs_ch - SP_HIGH_FIRST) << SP_HALF_SHIFT) + + (ch2 - SP_LOW_FIRST) + SP_HALF_BASE; @@ -1348,7 +1295,7 @@ +{ + u_int16_t* bufstart; + u_int16_t* bufend; -+ unsigned int ucs_ch, ucs_ch2; ++ unsigned int ucs_ch; + unsigned int byte; + int result = 0; + int decompose, precompose, swapbytes; @@ -1371,13 +1318,12 @@ + /* check for ascii */ + if (byte < 0x80) { + ucs_ch = byte; /* 1st byte */ -+ ucs_ch2 = 0; + } else { + u_int32_t ch; + int extrabytes = utf_extrabytes[byte >> 3]; + + if (utf8len < extrabytes) -+ goto toolong; ++ goto invalid; + utf8len -= extrabytes; + + switch (extrabytes) { @@ -1391,8 +1337,7 @@ + if (ch < 0x0080) + goto invalid; + ucs_ch = ch; -+ ucs_ch2 = 0; -+ break; ++ break; + case 2: + ch = byte; ch <<= 6; /* 1st byte */ + byte = *utf8p++; /* 2nd byte */ @@ -1413,7 +1358,6 @@ + goto invalid; + } + ucs_ch = ch; -+ ucs_ch2 = 0; + break; + case 3: + ch = byte; ch <<= 6; /* 1st byte */ @@ -1428,42 +1372,41 @@ + byte = *utf8p++; /* 4th byte */ + if ((byte >> 6) != 2) + goto invalid; -+ ch += byte; ++ ch += byte; + ch -= 0x03C82080U + SP_HALF_BASE; + ucs_ch = (ch >> SP_HALF_SHIFT) + SP_HIGH_FIRST; + if (ucs_ch < SP_HIGH_FIRST || ucs_ch > SP_HIGH_LAST) + goto invalid; -+ ucs_ch2 = (ch & SP_HALF_MASK) + SP_LOW_FIRST; -+ if (ucs_ch2 < SP_LOW_FIRST || ucs_ch2 > SP_LOW_LAST) ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ if (ucsp >= bufend) ++ goto toolong; ++ ucs_ch = (ch & SP_HALF_MASK) + SP_LOW_FIRST; ++ if (ucs_ch < SP_LOW_FIRST || ucs_ch > SP_LOW_LAST) + goto invalid; -+ break; ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ continue; + default: + goto invalid; + } + } -+ if (precompose && (ucsp != bufstart)) { -+ u_int16_t composite, base; -+ -+ if (!ucs_ch2 && unicode_combinable(ucs_ch)) { -+ base = swapbytes ? OSSwapInt16(*(ucsp - 1)) : *(ucsp - 1); -+ composite = unicode_combine(base, ucs_ch); -+ if (composite) { -+ --ucsp; -+ ucs_ch = composite; -+ } else { -+ goto exit; -+ } ++ if (precompose && (ucsp != bufstart)) { ++ u_int16_t composite, base; ++ ++ if (unicode_combinable(ucs_ch)) { ++ base = swapbytes ? OSSwapInt16(*(ucsp - 1)) : *(ucsp - 1); ++ composite = unicode_combine(base, ucs_ch); ++ if (composite) { ++ --ucsp; ++ ucs_ch = composite; + } else { + goto exit; + } ++ } else { ++ goto exit; + } -+ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; -+ if (ucs_ch2) { -+ if (ucsp >= bufend) -+ goto toolong; -+ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch2) : ucs_ch2; -+ } -+ utf8lastpass = utf8p; ++ } ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ utf8lastpass = utf8p; + } + +exit: @@ -1694,8 +1637,8 @@ + if ( ret == EINVAL) /* Illegal UTF-8 sequence found */ + return RET_ILSEQ; + -+ if((ret = _utf16be_mbtowc(pwc, (const unsigned char *) ucsp, ucslen)) < 0) -+ return ret; ++ if((ret = ucs2_mbtowc(conv, pwc, (const unsigned char *) ucsp, ucslen)) < 0) ++ return ret; + + return (int)consumed; +} @@ -1708,20 +1651,14 @@ + u_int16_t ucs_string[13]; + int flags; + -+ if((ret = _utf16be_wctomb((unsigned char *) ucs_string, wc, sizeof(ucs_string))) < 0) -+ return ret; ++ if((ret = ucs2_wctomb(conv, (unsigned char *) ucs_string, wc, sizeof(ucs_string))) < 0) ++ return ret; + + flags = UTF_NO_NULL_TERM | UTF_DECOMPOSED; +#ifdef __LITTLE_ENDIAN__ + flags |= UTF_REVERSE_ENDIAN; +#endif -+ ret = utf8_encodestr(ucs_string, ret, r, &len, n, 0, flags); -+ if (ret == EINVAL) -+ return RET_ILUNI; -+ if (ret == ENAMETOOLONG) -+ return RET_TOOSMALL; ++ utf8_encodestr(ucs_string, ret, r, &len, n, 0, flags); + + return (int)len; +} -+ -+/* vim:set tabstop=8 shiftwidth=4: */