From bb139edc92f7a7e6d6d461624cb5720c8c65079f Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 13 May 2017 15:38:22 +0100 Subject: [PATCH 1/6] Simplify the library documentation in the README file. --- README.md | 66 +++++++++---------------------------------------------- 1 file changed, 10 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 8fa57b39..92843f27 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,7 @@ - [Data Files](#data-files) - [Unicode Character Database](#unicode-character-database) - [ConScript Unicode Registry](#conscript-unicode-registry) -- [C Library](#c-library) - - [Querying Properties](#querying-properties) - - [Case Conversion](#case-conversion) - - [wctype Compatibility](#wctype-compatibility) +- [Library](#library) - [Build Dependencies](#build-dependencies) - [Debian](#debian) - [Building](#building) @@ -52,61 +49,18 @@ added: This data is located in the `data/csur` directory in a form compatible with the Unicode Character Data files. -## C Library +## Library -The C library provides several different facilities that make use of the UCD -data. It provides a compact and efficient representation of the different data -tables. +The `ucd-tools` project provides a C library with a C++ binding. This library +supports querying Unicode information about the codepoints in a compact and +efficient representation of the different data tables. -Detailed documentation is provided in the `src/include/ucd/ucd.h` file in the -Doxygen documentation format. +A ctype-compatible API is also provided, allowing programs to use that API on +systems that don't provide wide-character case conversion and ctype +implementations. -### Querying Properties - -The library exposes the following properties from the UCD data files: - -| C API | C++ API | Data | Description | -|-----------------------|------------------------|-------------|-------------| -| `ucd_lookup_category` | `ucd::lookup_category` | UnicodeData | A [General Category Value](http://www.unicode.org/reports/tr44/#General_Category_Values). | -| `ucd_lookup_script` | `ucd::lookup_script` | Script | An [ISO 15924](http://www.unicode.org/iso15924/iso15924-codes.html) script code. | -| `ucd_properties` | `ucd::properties` | PropList | The code point properties from the PropList Unicode data file. | - -### Case Conversion - -The following character conversion functions are provided: - -| C API | C++ API | Description | -|---------------|----------------|-------------| -| `ucd_tolower` | `ucd::tolower` | convert letters to lower case | -| `ucd_totitle` | `ucd::totitle` | convert letters to title case (UCD extension) | -| `ucd_toupper` | `ucd::toupper` | convert letters to upper case | - -__NOTE:__ These functions use the simple case mapping algorithm. That is, they -only ever map to a single character. This is to provide a compatible signature -to the standard C `wctype.h` APIs. - -### wctype Compatibility - -To facilitate working on platforms that don't have a useable wide-character -ctypes library, or to provide a more consistent behaviour, the `ucd-tools` -C library provides a set of APIs that are compatible with `wctype.h`. - -The following character classification functions are provided: - -| C API | C++ API | -|----------------|-----------------| -| `ucd_isalnum` | `ucd::isalnum` | -| `ucd_isalpha` | `ucd::isalpha` | -| `ucd_isblank` | `ucd::isblank` | -| `ucd_iscntrl` | `ucd::iscntrl` | -| `ucd_isdigit` | `ucd::isdigit` | -| `ucd_isgraph` | `ucd::isgraph` | -| `ucd_islower` | `ucd::islower` | -| `ucd_isprint` | `ucd::isprint` | -| `ucd_ispunct` | `ucd::ispunct` | -| `ucd_isspace` | `ucd::isspace` | -| `ucd_isupper` | `ucd::isupper` | -| `ucd_isxdigit` | `ucd::isxdigit` | +Detailed documentation is provided in the [src/include/ucd/ucd.h](ucd.h) file +using the Doxygen documentation format. ## Build Dependencies From f00587a94da323f4f2c5bc15f348838cc89cb64c Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 13 May 2017 15:46:03 +0100 Subject: [PATCH 2/6] Further simplify the README file. --- README.md | 58 ++++++++----------------------------------------------- 1 file changed, 8 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 92843f27..8a758b14 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # Unicode Character Database Tools -- [Data Files](#data-files) - - [Unicode Character Database](#unicode-character-database) - - [ConScript Unicode Registry](#conscript-unicode-registry) -- [Library](#library) - [Build Dependencies](#build-dependencies) - [Debian](#debian) - [Building](#building) @@ -13,54 +9,16 @@ ---------- -The Unicode Character Database (UCD) Tools is a set of Python tools and a C -library with a C++ API binding. The Python tools are designed to support -extracting and processing data from the text-based UCD source files, while -the C library is designed to provide easy access to this information within -a C or C++ program. +The Unicode Character Database (UCD) Tools is a set of Python tools and a +[C library](src/include/ucd/ucd.h) with a C++ API binding. The Python tools +are designed to support extracting and processing data from the text-based +UCD source files, while the C library is designed to provide easy access to +this information within a C or C++ program. -## Data Files +The project uses and supports the following sources of Unicode codepoint data: -The `ucd-tools` project provides support for UCD formatted data files from -several different sources. - -### Unicode Character Database - -The following [Unicode Character Database](http://www.unicode.org/Public/9.0.0/ucd/) -files are supported: - -* Blocks -* DerivedAge -* PropList -* PropertyValueAliases -* Scripts -* UnicodeData - -### ConScript Unicode Registry - -If enabled, the following data from the -[ConScript Unicode Registry](http://www.evertype.com/standards/csur/) (CSUR) is -added: - -| Code Range | Script | -|--------------|---------| -| `F8D0-F8FF` | [Klingon](http://www.evertype.com/standards/csur/klingon.html) | - -This data is located in the `data/csur` directory in a form compatible with the -Unicode Character Data files. - -## Library - -The `ucd-tools` project provides a C library with a C++ binding. This library -supports querying Unicode information about the codepoints in a compact and -efficient representation of the different data tables. - -A ctype-compatible API is also provided, allowing programs to use that API on -systems that don't provide wide-character case conversion and ctype -implementations. - -Detailed documentation is provided in the [src/include/ucd/ucd.h](ucd.h) file -using the Doxygen documentation format. +* [Unicode Character Database](http://www.unicode.org/Public/9.0.0/ucd/) +* [ConScript Unicode Registry](http://www.evertype.com/standards/csur/) ## Build Dependencies From f93b98a69d5da5dc75c27828c811279739dce47e Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 13 May 2017 21:18:54 +0100 Subject: [PATCH 3/6] Add Emoji support from emoji-data.txt. --- .gitignore | 1 + Makefile.am | 8 +- README.md | 3 +- src/include/ucd/ucd.h | 3 + src/proplist.c | 198 ++++++++++++++++++++++++++++++++++++++---- tools/printdata.py | 12 ++- tools/ucd.py | 4 + 7 files changed, 206 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 058fa1c5..fdfc86f9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ # build output: +data/emoji data/ucd src/libucd.la diff --git a/Makefile.am b/Makefile.am index 2b208ac8..fd7f3ed0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,12 +53,17 @@ dist-hook: ChangeLog EXTRA_DIST += ChangeLog -############################# Unicode Character Database ###################### +############################# Unicode Data #################################### +EMOJI_VERSION=4.0 UCD_VERSION=@UCD_VERSION@ UCD_ROOTDIR=data/ucd UCD_SRCDIR=http://www.unicode.org/Public +data/emoji/emoji-data.txt: + mkdir -pv data/emoji + curl ${UCD_SRCDIR}/emoji/${EMOJI_VERSION}/emoji-data.txt > $@ + data/ucd/PropList.txt: mkdir -pv data/ucd curl ${UCD_SRCDIR}/${UCD_VERSION}/ucd/PropList.txt > $@ @@ -141,6 +146,7 @@ tests_printucddata_cpp_SOURCES = tests/printucddata_cpp.cpp tests_printucddata_cpp_LDADD = src/libucd.la tests/unicode-data.expected: tools/printdata.py tools/ucd.py \ + data/emoji/emoji-data.txt \ data/ucd/UnicodeData.txt \ data/ucd/PropList.txt \ data/ucd/DerivedCoreProperties.txt \ diff --git a/README.md b/README.md index 8a758b14..6a583766 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ this information within a C or C++ program. The project uses and supports the following sources of Unicode codepoint data: -* [Unicode Character Database](http://www.unicode.org/Public/9.0.0/ucd/) +* [Unicode Character Database](http://www.unicode.org/Public/9.0.0/ucd/) 9.0.0 +* [Unicode Emoji](http://www.unicode.org/Public/emoji/4.0/) 4.0 (UTR #51) * [ConScript Unicode Registry](http://www.evertype.com/standards/csur/) ## Build Dependencies diff --git a/src/include/ucd/ucd.h b/src/include/ucd/ucd.h index 82228594..486edce1 100644 --- a/src/include/ucd/ucd.h +++ b/src/include/ucd/ucd.h @@ -328,6 +328,7 @@ ucd_script ucd_lookup_script(codepoint_t c); /** @brief Properties */ typedef uint64_t ucd_property; + #define UCD_PROPERTY_WHITE_SPACE 0x0000000000000001ull /**< @brief White_Space */ #define UCD_PROPERTY_BIDI_CONTROL 0x0000000000000002ull /**< @brief Bidi_Control */ #define UCD_PROPERTY_JOIN_CONTROL 0x0000000000000004ull /**< @brief Join_Control */ @@ -361,6 +362,7 @@ typedef uint64_t ucd_property; #define UCD_PROPERTY_PATTERN_WHITE_SPACE 0x0000000040000000ull /**< @brief Pattern_White_Space */ #define UCD_PROPERTY_PATTERN_SYNTAX 0x0000000080000000ull /**< @brief Pattern_Syntax */ #define UCD_PROPERTY_PREPENDED_CONCATENATION_MARK 0x0000000100000000ull /**< @brief Prepended_Concatenation_Mark */ +#define UCD_PROPERTY_EMOJI 0x0000000200000000ull /**< @brief Emoji */ /** @brief Return the properties of the specified codepoint. * @@ -853,6 +855,7 @@ namespace ucd Pattern_White_Space = UCD_PROPERTY_PATTERN_WHITE_SPACE, /**< @brief Pattern_White_Space */ Pattern_Syntax = UCD_PROPERTY_PATTERN_SYNTAX, /**< @brief Pattern_Syntax */ Prepended_Concatenation_Mark = UCD_PROPERTY_PREPENDED_CONCATENATION_MARK, /**< @brief Prepended_Concatenation_Mark */ + Emoji = UCD_PROPERTY_EMOJI, /**< @brief Emoji */ }; /** @brief Return the properties of the specified codepoint. diff --git a/src/proplist.c b/src/proplist.c index 9cf15f83..73c4c9d4 100644 --- a/src/proplist.c +++ b/src/proplist.c @@ -163,6 +163,7 @@ static ucd_property properties_Ll(codepoint_t c) if (c >= 0x210A && c <= 0x2113) return UCD_PROPERTY_OTHER_MATH; // Ll|Lu if (c >= 0x212F && c <= 0x2131) return UCD_PROPERTY_OTHER_MATH; // Ll|Lu if (c >= 0x2133 && c <= 0x2134) return UCD_PROPERTY_OTHER_MATH; // Ll|Lu + if (c == 0x2139) return UCD_PROPERTY_EMOJI; if (c >= 0x213C && c <= 0x213F) return UCD_PROPERTY_OTHER_MATH; // Ll|Lu if (c >= 0x2145 && c <= 0x2147) return UCD_PROPERTY_OTHER_MATH; // Ll|Lu if (c >= 0x2148 && c <= 0x2149) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_SOFT_DOTTED; @@ -1157,7 +1158,7 @@ static ucd_property properties_Nd(codepoint_t c) switch (c & 0xFFFFFF00) { case 0x0000: - if (c >= 0x0030 && c <= 0x0039) return UCD_PROPERTY_HEX_DIGIT | UCD_PROPERTY_ASCII_HEX_DIGIT; + if (c >= 0x0030 && c <= 0x0039) return UCD_PROPERTY_HEX_DIGIT | UCD_PROPERTY_ASCII_HEX_DIGIT | UCD_PROPERTY_EMOJI; break; case 0xFF00: if (c >= 0xFF10 && c <= 0xFF19) return UCD_PROPERTY_HEX_DIGIT; @@ -1231,7 +1232,7 @@ static ucd_property properties_Pd(codepoint_t c) return UCD_PROPERTY_DASH | UCD_PROPERTY_PATTERN_SYNTAX; case 0x3000: if (c == 0x301C) return UCD_PROPERTY_DASH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c == 0x3030) return UCD_PROPERTY_DASH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x3030) return UCD_PROPERTY_DASH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; break; case 0xFE00: if (c == 0xFE63) return UCD_PROPERTY_DASH | UCD_PROPERTY_HYPHEN | UCD_PROPERTY_OTHER_MATH; @@ -1319,7 +1320,9 @@ static ucd_property properties_Po(codepoint_t c) case 0x0000: if (c == 0x0021) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x0022) return UCD_PROPERTY_QUOTATION_MARK | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x0023) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x0027) return UCD_PROPERTY_QUOTATION_MARK | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x002A) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x002C) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x002E) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x003A && c <= 0x003B) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_PATTERN_SYNTAX; @@ -1410,10 +1413,12 @@ static ucd_property properties_Po(codepoint_t c) if (c >= 0x2020 && c <= 0x2027) return UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x2032 && c <= 0x2034) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_OTHER_MATH; if (c >= 0x2030 && c <= 0x2038) return UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x203C && c <= 0x203D) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x203C) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x203D) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x203B && c <= 0x203E) return UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x2041 && c <= 0x2043) return UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x2047 && c <= 0x2049) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX; + if (c >= 0x2047 && c <= 0x2048) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x2049) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x204A && c <= 0x2051) return UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x2053) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_DASH; if (c >= 0x2055 && c <= 0x205E) return UCD_PROPERTY_PATTERN_SYNTAX; @@ -1427,6 +1432,7 @@ static ucd_property properties_Po(codepoint_t c) if (c == 0x3001) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x3002) return UCD_PROPERTY_TERMINAL_PUNCTUATION | UCD_PROPERTY_SENTENCE_TERMINAL | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x3003) return UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x303D) return UCD_PROPERTY_EMOJI; if (c == 0x30FB) return UCD_PROPERTY_HYPHEN; break; case 0xA400: @@ -1660,6 +1666,9 @@ static ucd_property properties_Sk(codepoint_t c) if (c == 0xFF40) return UCD_PROPERTY_DIACRITIC; if (c == 0xFFE3) return UCD_PROPERTY_DIACRITIC; break; + case 0x01F300: + if (c >= 0x01F3FB && c <= 0x01F3FF) return UCD_PROPERTY_EMOJI; + break; } return 0; } @@ -1678,16 +1687,23 @@ static ucd_property properties_Sm(codepoint_t c) break; case 0x2100: if (c == 0x2118) return UCD_PROPERTY_OTHER_ID_START; + if (c == 0x2194) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x2190) return UCD_PROPERTY_PATTERN_SYNTAX; break; case 0x2200: if (c == 0x2212) return UCD_PROPERTY_DASH | UCD_PROPERTY_PATTERN_SYNTAX; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2300: + return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2500: + if (c >= 0x25FB && c <= 0x25FE) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2600: case 0x2700: + return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2900: + if (c >= 0x2934 && c <= 0x2935) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2A00: case 0x2B00: return UCD_PROPERTY_PATTERN_SYNTAX; @@ -1700,16 +1716,18 @@ static ucd_property properties_So(codepoint_t c) switch (c & 0xFFFFFF00) { case 0x0000: + if (c == 0x00A9) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x00AE) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2100: + if (c == 0x2122) return UCD_PROPERTY_EMOJI; if (c == 0x2129) return UCD_PROPERTY_OTHER_MATH; if (c == 0x212E) return UCD_PROPERTY_OTHER_ID_START; - if (c >= 0x2195 && c <= 0x2199) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x219C && c <= 0x219F) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x21A1 && c <= 0x21A2) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x21A4 && c <= 0x21A5) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x21A8) return UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x21A7 && c <= 0x21AD) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x21A9) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x21AA) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2195 && c <= 0x2199) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x219C && c <= 0x21AD) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x21B0 && c <= 0x21B1) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x21B6 && c <= 0x21B7) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x21AF && c <= 0x21BB) return UCD_PROPERTY_PATTERN_SYNTAX; @@ -1722,28 +1740,37 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x21D5 && c <= 0x21F3) return UCD_PROPERTY_PATTERN_SYNTAX; break; case 0x2300: - if (c >= 0x2300 && c <= 0x2307) return UCD_PROPERTY_PATTERN_SYNTAX; + if (c <= 0x2307) return UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x231A) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x231B) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x230C && c <= 0x231F) return UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x2322 && c <= 0x2328) return UCD_PROPERTY_PATTERN_SYNTAX; + if (c >= 0x2322 && c <= 0x2327) return UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x2328) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x232B && c <= 0x237B) return UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x237D && c <= 0x239A) return UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x23B4 && c <= 0x23B5) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x23B7) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x23CF) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x23D0) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x23B4 && c <= 0x23DB) return UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x23E2) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c >= 0x23E9 && c <= 0x23F3) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x23F8 && c <= 0x23FA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x23E3 && c <= 0x23FE) return UCD_PROPERTY_PATTERN_SYNTAX; break; case 0x2400: - if (c >= 0x2400 && c <= 0x2426) return UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x2440 && c <= 0x244A) return UCD_PROPERTY_PATTERN_SYNTAX; + if (c >= 0x2400 && c <= 0x244A) return UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x24C2) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE | UCD_PROPERTY_EMOJI; if (c >= 0x24B6 && c <= 0x24CF) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE; if (c >= 0x24D0 && c <= 0x24E9) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_LOWERCASE; break; case 0x2500: if (c >= 0x25A0 && c <= 0x25A1) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x25AE && c <= 0x25B6) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x25BC && c <= 0x25C0) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c >= 0x25AA && c <= 0x25AB) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x25AE && c <= 0x25B5) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x25B6) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x25BC && c <= 0x25BF) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x25C0) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x25C6 && c <= 0x25C7) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x25CA && c <= 0x25CB) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x25CF && c <= 0x25D3) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; @@ -1752,22 +1779,85 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x25E7 && c <= 0x25EC) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2600: + if (c <= 0x2604) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x2605 && c <= 0x2606) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c == 0x2640) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c == 0x2642) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; - if (c >= 0x2660 && c <= 0x2663) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x260E) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2611) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2614 && c <= 0x2615) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2618) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x261D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2620) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2622 && c <= 0x2623) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2626) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x262A) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x262E && c <= 0x262F) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2638 && c <= 0x263A) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2640) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2642) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2648 && c <= 0x2653) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2660) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2661 && c <= 0x2662) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x2663) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2665 && c <= 0x2666) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2668) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x266D && c <= 0x266E) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c == 0x267B) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x267F) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2692 && c <= 0x2697) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2699) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x269B && c <= 0x269C) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26A0 && c <= 0x26A1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26AA && c <= 0x26AB) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26B0 && c <= 0x26B1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26BD && c <= 0x26BE) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26C4 && c <= 0x26C5) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26C8) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26CE && c <= 0x26CF) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26D1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26D3 && c <= 0x26D4) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26E9 && c <= 0x26EA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26F0 && c <= 0x26F5) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26F7 && c <= 0x26FA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26FD) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2700: + if (c == 0x2702) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2705) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2708 && c <= 0x270D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x270F) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2712) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2714) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2716) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x271D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2721) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2728) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2733 && c <= 0x2734) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2744) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2747) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x274C) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x274E) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2753 && c <= 0x2755) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2757) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2763 && c <= 0x2764) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2795 && c <= 0x2797) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x27A1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x27B0) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x27BF) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2800: + return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2B00: + if (c >= 0x2B05 && c <= 0x2B07) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2B1B && c <= 0x2B1C) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2B50) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2B55) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2E00: if (c >= 0x2E80 && c <= 0x2E99) return UCD_PROPERTY_RADICAL; if (c >= 0x2E9B && c <= 0x2EF3) return UCD_PROPERTY_RADICAL; break; case 0x2F00: - if (c >= 0x2F00 && c <= 0x2FD5) return UCD_PROPERTY_RADICAL; + if (c <= 0x2FD5) return UCD_PROPERTY_RADICAL; if (c >= 0x2FF0 && c <= 0x2FF1) return UCD_PROPERTY_IDS_BINARY_OPERATOR; if (c >= 0x2FF2 && c <= 0x2FF3) return UCD_PROPERTY_IDS_TRINARY_OPERATOR; if (c >= 0x2FF4 && c <= 0x2FFB) return UCD_PROPERTY_IDS_BINARY_OPERATOR; @@ -1776,11 +1866,81 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x3012 && c <= 0x3013) return UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x3020) return UCD_PROPERTY_PATTERN_SYNTAX; break; + case 0x3200: + if (c == 0x3297) return UCD_PROPERTY_EMOJI; + if (c == 0x3299) return UCD_PROPERTY_EMOJI; + break; + case 0x01F000: + if (c == 0x01F004) return UCD_PROPERTY_EMOJI; + if (c == 0x01F0CF) return UCD_PROPERTY_EMOJI; + break; case 0x01F100: if (c >= 0x01F130 && c <= 0x01F149) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE; if (c >= 0x01F150 && c <= 0x01F169) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE; + if (c >= 0x01F170 && c <= 0x01F171) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE | UCD_PROPERTY_EMOJI; + if (c >= 0x01F17E && c <= 0x01F17F) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE | UCD_PROPERTY_EMOJI; if (c >= 0x01F170 && c <= 0x01F189) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE; + if (c == 0x01F18E) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F191 && c <= 0x01F19A) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F1E6) return UCD_PROPERTY_EMOJI; break; + case 0x01F200: + if (c >= 0x01F201 && c <= 0x01F202) return UCD_PROPERTY_EMOJI; + if (c == 0x01F21A) return UCD_PROPERTY_EMOJI; + if (c == 0x01F22F) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F232 && c <= 0x01F23A) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F250 && c <= 0x01F251) return UCD_PROPERTY_EMOJI; + break; + case 0x01F300: + if (c <= 0x01F321) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F324 && c <= 0x01F393) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F396 && c <= 0x01F397) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F399 && c <= 0x01F39B) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F39E && c <= 0x01F3F0) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F3F3 && c <= 0x01F3F5) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F3F7 && c <= 0x01F3FA) return UCD_PROPERTY_EMOJI; + break; + case 0x01F400: + if (c != 0x01F4FE) return UCD_PROPERTY_EMOJI; + break; + case 0x01F500: + if (c <= 0x01F53D) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F549 && c <= 0x01F54E) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F550 && c <= 0x01F567) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F56F && c <= 0x01F570) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F573 && c <= 0x01F57A) return UCD_PROPERTY_EMOJI; + if (c == 0x01F587) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F58A && c <= 0x01F58D) return UCD_PROPERTY_EMOJI; + if (c == 0x01F590) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F595 && c <= 0x01F596) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F5A4 && c <= 0x01F5A5) return UCD_PROPERTY_EMOJI; + if (c == 0x01F5A8) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F5B1 && c <= 0x01F5B2) return UCD_PROPERTY_EMOJI; + if (c == 0x01F5BC) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F5C2 && c <= 0x01F5C4) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F5D1 && c <= 0x01F5D3) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F5DC && c <= 0x01F5DE) return UCD_PROPERTY_EMOJI; + if (c == 0x01F5E1) return UCD_PROPERTY_EMOJI; + if (c == 0x01F5E3) return UCD_PROPERTY_EMOJI; + if (c == 0x01F5E8) return UCD_PROPERTY_EMOJI; + if (c == 0x01F5EF) return UCD_PROPERTY_EMOJI; + if (c == 0x01F5F3) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F5FA) return UCD_PROPERTY_EMOJI; + break; + case 0x01F600: + if (c <= 0x01F64F) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F680 && c <= 0x01F6C5) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F6CB && c <= 0x01F6D2) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F6E0 && c <= 0x01F6E5) return UCD_PROPERTY_EMOJI; + if (c == 0x01F6E9) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F6EB && c <= 0x01F6EC) return UCD_PROPERTY_EMOJI; + if (c == 0x01F6F0) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F6F3 && c <= 0x01F6F6) return UCD_PROPERTY_EMOJI; + break; + case 0x01F900: + if (c == 0x01F93B) return 0; + if (c == 0x01F946) return 0; + return UCD_PROPERTY_EMOJI; } return 0; } diff --git a/tools/printdata.py b/tools/printdata.py index 40ee24fd..3d904f63 100755 --- a/tools/printdata.py +++ b/tools/printdata.py @@ -22,16 +22,23 @@ import sys import ucd ucd_rootdir = sys.argv[1] +emoji_rootdir = 'data/emoji' csur_rootdir = 'data/csur' null = ucd.CodePoint('0000') +properties = [ + (ucd_rootdir, 'PropList'), + (ucd_rootdir, 'DerivedCoreProperties'), + (emoji_rootdir, 'emoji-data') +] + unicode_chars = {} for data in ucd.parse_ucd_data(ucd_rootdir, 'UnicodeData'): for codepoint in data['CodePoint']: unicode_chars[codepoint] = data -for propfile in ['PropList', 'DerivedCoreProperties']: - for data in ucd.parse_ucd_data(ucd_rootdir, propfile): +for propdir, propfile in properties: + for data in ucd.parse_ucd_data(propdir, propfile): for codepoint in data['Range']: try: unicode_chars[codepoint][data['Property']] = 1 @@ -154,6 +161,7 @@ def properties(data): props += (2 ** 30) * data.get('Pattern_White_Space', 0) props += (2 ** 31) * data.get('Pattern_Syntax', 0) props += (2 ** 32) * data.get('Prepended_Concatenation_Mark', 0) + props += (2 ** 33) * data.get('Emoji', 0) # emoji-data return props if __name__ == '__main__': diff --git a/tools/ucd.py b/tools/ucd.py index 361cebd9..466997dc 100755 --- a/tools/ucd.py +++ b/tools/ucd.py @@ -105,6 +105,10 @@ def strlist(x): data_items = { # Unicode Character Data: + 'emoji-data': [ + ('Range', codepoint), + ('Property', string) + ], 'Blocks': [ ('Range', codepoint), ('Name', string) From 35ad2497608f61ff370e079355c04d140b3b22d9 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 14 May 2017 07:03:12 +0100 Subject: [PATCH 4/6] Add Emoji_Presentation from emoji-data.txt. --- src/include/ucd/ucd.h | 2 + src/proplist.c | 155 ++++++++++++++++++++++++++---------------- tools/printdata.py | 1 + 3 files changed, 101 insertions(+), 57 deletions(-) diff --git a/src/include/ucd/ucd.h b/src/include/ucd/ucd.h index 486edce1..bdd0a227 100644 --- a/src/include/ucd/ucd.h +++ b/src/include/ucd/ucd.h @@ -363,6 +363,7 @@ typedef uint64_t ucd_property; #define UCD_PROPERTY_PATTERN_SYNTAX 0x0000000080000000ull /**< @brief Pattern_Syntax */ #define UCD_PROPERTY_PREPENDED_CONCATENATION_MARK 0x0000000100000000ull /**< @brief Prepended_Concatenation_Mark */ #define UCD_PROPERTY_EMOJI 0x0000000200000000ull /**< @brief Emoji */ +#define UCD_PROPERTY_EMOJI_PRESENTATION 0x0000000400000000ull /**< @brief Emoji_Presentation */ /** @brief Return the properties of the specified codepoint. * @@ -856,6 +857,7 @@ namespace ucd Pattern_Syntax = UCD_PROPERTY_PATTERN_SYNTAX, /**< @brief Pattern_Syntax */ Prepended_Concatenation_Mark = UCD_PROPERTY_PREPENDED_CONCATENATION_MARK, /**< @brief Prepended_Concatenation_Mark */ Emoji = UCD_PROPERTY_EMOJI, /**< @brief Emoji */ + Emoji_Presentation = UCD_PROPERTY_EMOJI_PRESENTATION, /**< @brief Emoji_Presentation */ }; /** @brief Return the properties of the specified codepoint. diff --git a/src/proplist.c b/src/proplist.c index 73c4c9d4..1146ef8d 100644 --- a/src/proplist.c +++ b/src/proplist.c @@ -1667,8 +1667,7 @@ static ucd_property properties_Sk(codepoint_t c) if (c == 0xFFE3) return UCD_PROPERTY_DIACRITIC; break; case 0x01F300: - if (c >= 0x01F3FB && c <= 0x01F3FF) return UCD_PROPERTY_EMOJI; - break; + return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; } return 0; } @@ -1696,7 +1695,8 @@ static ucd_property properties_Sm(codepoint_t c) case 0x2300: return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2500: - if (c >= 0x25FB && c <= 0x25FE) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x25FB && c <= 0x25FC) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x25FD && c <= 0x25FE) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2600: case 0x2700: @@ -1741,8 +1741,7 @@ static ucd_property properties_So(codepoint_t c) break; case 0x2300: if (c <= 0x2307) return UCD_PROPERTY_PATTERN_SYNTAX; - if (c == 0x231A) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x231B) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x231A && c <= 0x231B) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x230C && c <= 0x231F) return UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x2322 && c <= 0x2327) return UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x2328) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; @@ -1754,6 +1753,9 @@ static ucd_property properties_So(codepoint_t c) if (c == 0x23D0) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c >= 0x23B4 && c <= 0x23DB) return UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x23E2) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; + if (c >= 0x23E9 && c <= 0x23EC) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x23F0) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x23F3) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x23E9 && c <= 0x23F3) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x23F8 && c <= 0x23FA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x23E3 && c <= 0x23FE) return UCD_PROPERTY_PATTERN_SYNTAX; @@ -1783,7 +1785,7 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x2605 && c <= 0x2606) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x260E) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2611) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x2614 && c <= 0x2615) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2614 && c <= 0x2615) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x2618) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x261D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2620) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; @@ -1794,7 +1796,7 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x2638 && c <= 0x263A) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2640) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2642) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x2648 && c <= 0x2653) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2648 && c <= 0x2653) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x2660) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x2661 && c <= 0x2662) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x2663) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; @@ -1802,27 +1804,36 @@ static ucd_property properties_So(codepoint_t c) if (c == 0x2668) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x266D && c <= 0x266E) return UCD_PROPERTY_OTHER_MATH | UCD_PROPERTY_PATTERN_SYNTAX; if (c == 0x267B) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x267F) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x267F) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x2693) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x2692 && c <= 0x2697) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2699) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x269B && c <= 0x269C) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26A0 && c <= 0x26A1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26AA && c <= 0x26AB) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26A0) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26A1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x26AA && c <= 0x26AB) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x26B0 && c <= 0x26B1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26BD && c <= 0x26BE) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26C4 && c <= 0x26C5) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26BD && c <= 0x26BE) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x26C4 && c <= 0x26C5) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x26C8) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26CE && c <= 0x26CF) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26CE) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x26CF) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x26D1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26D3 && c <= 0x26D4) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26E9 && c <= 0x26EA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26F0 && c <= 0x26F5) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x26F7 && c <= 0x26FA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x26FD) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26D3) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26D4) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x26E9) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26EA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x26F4) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26F0 && c <= 0x26F1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26F0 && c <= 0x26F5) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x26F7 && c <= 0x26F9) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26FA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x26FD) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2700: if (c == 0x2702) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x2705) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2705) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x270A && c <= 0x270B) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x2708 && c <= 0x270D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x270F) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2712) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; @@ -1830,27 +1841,27 @@ static ucd_property properties_So(codepoint_t c) if (c == 0x2716) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x271D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2721) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x2728) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x2728) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x2733 && c <= 0x2734) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2744) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2747) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x274C) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x274E) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x2753 && c <= 0x2755) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x2757) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x274C) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x274E) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x2753 && c <= 0x2755) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x2757) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x2763 && c <= 0x2764) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x2795 && c <= 0x2797) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2795 && c <= 0x2797) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x27A1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x27B0) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x27BF) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x27B0) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x27BF) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2800: return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2B00: if (c >= 0x2B05 && c <= 0x2B07) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c >= 0x2B1B && c <= 0x2B1C) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x2B50) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x2B55) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x2B1B && c <= 0x2B1C) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x2B50) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x2B55) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2E00: if (c >= 0x2E80 && c <= 0x2E99) return UCD_PROPERTY_RADICAL; @@ -1871,8 +1882,8 @@ static ucd_property properties_So(codepoint_t c) if (c == 0x3299) return UCD_PROPERTY_EMOJI; break; case 0x01F000: - if (c == 0x01F004) return UCD_PROPERTY_EMOJI; - if (c == 0x01F0CF) return UCD_PROPERTY_EMOJI; + if (c == 0x01F004) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F0CF) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; break; case 0x01F100: if (c >= 0x01F130 && c <= 0x01F149) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE; @@ -1880,40 +1891,58 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x01F170 && c <= 0x01F171) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE | UCD_PROPERTY_EMOJI; if (c >= 0x01F17E && c <= 0x01F17F) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE | UCD_PROPERTY_EMOJI; if (c >= 0x01F170 && c <= 0x01F189) return UCD_PROPERTY_OTHER_ALPHABETIC | UCD_PROPERTY_OTHER_UPPERCASE; - if (c == 0x01F18E) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F191 && c <= 0x01F19A) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F1E6) return UCD_PROPERTY_EMOJI; + if (c == 0x01F18E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F191 && c <= 0x01F19A) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F1E6) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; break; case 0x01F200: - if (c >= 0x01F201 && c <= 0x01F202) return UCD_PROPERTY_EMOJI; - if (c == 0x01F21A) return UCD_PROPERTY_EMOJI; - if (c == 0x01F22F) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F232 && c <= 0x01F23A) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F250 && c <= 0x01F251) return UCD_PROPERTY_EMOJI; + if (c == 0x01F201) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F202) return UCD_PROPERTY_EMOJI; + if (c == 0x01F21A) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F22F) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F237) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F232 && c <= 0x01F23A) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F250 && c <= 0x01F251) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; break; case 0x01F300: - if (c <= 0x01F321) return UCD_PROPERTY_EMOJI; + if (c <= 0x01F320) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F321) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F32D && c <= 0x01F335) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F337 && c <= 0x01F37C) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F37E && c <= 0x01F393) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F324 && c <= 0x01F393) return UCD_PROPERTY_EMOJI; if (c >= 0x01F396 && c <= 0x01F397) return UCD_PROPERTY_EMOJI; if (c >= 0x01F399 && c <= 0x01F39B) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F3A0 && c <= 0x01F3CA) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F3CF && c <= 0x01F3D3) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F3E0 && c <= 0x01F3F0) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F39E && c <= 0x01F3F0) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F3F3 && c <= 0x01F3F5) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F3F7 && c <= 0x01F3FA) return UCD_PROPERTY_EMOJI; + if (c == 0x01F3F3) return UCD_PROPERTY_EMOJI; + if (c == 0x01F3F4) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F3F5) return UCD_PROPERTY_EMOJI; + if (c == 0x01F3F7) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F3F8 && c <= 0x01F3FA) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; break; case 0x01F400: - if (c != 0x01F4FE) return UCD_PROPERTY_EMOJI; - break; + if (c == 0x01F43F) return UCD_PROPERTY_EMOJI; + if (c == 0x01F441) return UCD_PROPERTY_EMOJI; + if (c == 0x01F4FE) return 0; + if (c == 0x01F4FD) return UCD_PROPERTY_EMOJI; + return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; case 0x01F500: - if (c <= 0x01F53D) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F549 && c <= 0x01F54E) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F550 && c <= 0x01F567) return UCD_PROPERTY_EMOJI; + if (c <= 0x01F53D) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F549 && c <= 0x01F54A) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F54B && c <= 0x01F54E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F550 && c <= 0x01F567) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F56F && c <= 0x01F570) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F573 && c <= 0x01F57A) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F573 && c <= 0x01F579) return UCD_PROPERTY_EMOJI; + if (c == 0x01F57A) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x01F587) return UCD_PROPERTY_EMOJI; if (c >= 0x01F58A && c <= 0x01F58D) return UCD_PROPERTY_EMOJI; if (c == 0x01F590) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F595 && c <= 0x01F596) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F5A4 && c <= 0x01F5A5) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F595 && c <= 0x01F596) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F5A4) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F5A5) return UCD_PROPERTY_EMOJI; if (c == 0x01F5A8) return UCD_PROPERTY_EMOJI; if (c >= 0x01F5B1 && c <= 0x01F5B2) return UCD_PROPERTY_EMOJI; if (c == 0x01F5BC) return UCD_PROPERTY_EMOJI; @@ -1925,21 +1954,33 @@ static ucd_property properties_So(codepoint_t c) if (c == 0x01F5E8) return UCD_PROPERTY_EMOJI; if (c == 0x01F5EF) return UCD_PROPERTY_EMOJI; if (c == 0x01F5F3) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F5FA) return UCD_PROPERTY_EMOJI; + if (c == 0x01F5FA) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F5FB) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; break; case 0x01F600: - if (c <= 0x01F64F) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F680 && c <= 0x01F6C5) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F6CB && c <= 0x01F6D2) return UCD_PROPERTY_EMOJI; + if (c <= 0x01F64F) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F680 && c <= 0x01F6C5) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F6CC) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F6CB && c <= 0x01F6CF) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F6D0 && c <= 0x01F6D2) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F6E0 && c <= 0x01F6E5) return UCD_PROPERTY_EMOJI; if (c == 0x01F6E9) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F6EB && c <= 0x01F6EC) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F6EB && c <= 0x01F6EC) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x01F6F0) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F6F3 && c <= 0x01F6F6) return UCD_PROPERTY_EMOJI; + if (c == 0x01F6F3) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F6F4 && c <= 0x01F6F6) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; break; case 0x01F900: + if (c >= 0x01F910 && c <= 0x01F91E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F920 && c <= 0x01F927) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F930) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x01F93B) return 0; + if (c >= 0x01F933 && c <= 0x01F93E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x01F946) return 0; + if (c >= 0x01F940 && c <= 0x01F94B) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F950 && c <= 0x01F95E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F980 && c <= 0x01F991) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F9C0) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; return UCD_PROPERTY_EMOJI; } return 0; diff --git a/tools/printdata.py b/tools/printdata.py index 3d904f63..5f93bff4 100755 --- a/tools/printdata.py +++ b/tools/printdata.py @@ -162,6 +162,7 @@ def properties(data): props += (2 ** 31) * data.get('Pattern_Syntax', 0) props += (2 ** 32) * data.get('Prepended_Concatenation_Mark', 0) props += (2 ** 33) * data.get('Emoji', 0) # emoji-data + props += (2 ** 34) * data.get('Emoji_Presentation', 0) # emoji-data return props if __name__ == '__main__': From 4b874e6dbd777d590cb23226f0f3432e61635c34 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 14 May 2017 07:16:49 +0100 Subject: [PATCH 5/6] Add Emoji_Modifier from emoji-data.txt. --- src/include/ucd/ucd.h | 2 ++ src/proplist.c | 2 +- tools/printdata.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/include/ucd/ucd.h b/src/include/ucd/ucd.h index bdd0a227..0dc3cb70 100644 --- a/src/include/ucd/ucd.h +++ b/src/include/ucd/ucd.h @@ -364,6 +364,7 @@ typedef uint64_t ucd_property; #define UCD_PROPERTY_PREPENDED_CONCATENATION_MARK 0x0000000100000000ull /**< @brief Prepended_Concatenation_Mark */ #define UCD_PROPERTY_EMOJI 0x0000000200000000ull /**< @brief Emoji */ #define UCD_PROPERTY_EMOJI_PRESENTATION 0x0000000400000000ull /**< @brief Emoji_Presentation */ +#define UCD_PROPERTY_EMOJI_MODIFIER 0x0000000800000000ull /**< @brief Emoji_Modifier */ /** @brief Return the properties of the specified codepoint. * @@ -858,6 +859,7 @@ namespace ucd Prepended_Concatenation_Mark = UCD_PROPERTY_PREPENDED_CONCATENATION_MARK, /**< @brief Prepended_Concatenation_Mark */ Emoji = UCD_PROPERTY_EMOJI, /**< @brief Emoji */ Emoji_Presentation = UCD_PROPERTY_EMOJI_PRESENTATION, /**< @brief Emoji_Presentation */ + Emoji_Modifier = UCD_PROPERTY_EMOJI_MODIFIER, /**< @brief Emoji_Modifier */ }; /** @brief Return the properties of the specified codepoint. diff --git a/src/proplist.c b/src/proplist.c index 1146ef8d..df9588a4 100644 --- a/src/proplist.c +++ b/src/proplist.c @@ -1667,7 +1667,7 @@ static ucd_property properties_Sk(codepoint_t c) if (c == 0xFFE3) return UCD_PROPERTY_DIACRITIC; break; case 0x01F300: - return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER; } return 0; } diff --git a/tools/printdata.py b/tools/printdata.py index 5f93bff4..f1dd7233 100755 --- a/tools/printdata.py +++ b/tools/printdata.py @@ -163,6 +163,7 @@ def properties(data): props += (2 ** 32) * data.get('Prepended_Concatenation_Mark', 0) props += (2 ** 33) * data.get('Emoji', 0) # emoji-data props += (2 ** 34) * data.get('Emoji_Presentation', 0) # emoji-data + props += (2 ** 35) * data.get('Emoji_Modifier', 0) # emoji-data return props if __name__ == '__main__': From 32912d6565d194aec92a74fd7a1f2209acd7374e Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 14 May 2017 07:52:06 +0100 Subject: [PATCH 6/6] Add Emoji_Modifier_Base from emoji-data.txt. --- src/include/ucd/ucd.h | 2 ++ src/proplist.c | 48 +++++++++++++++++++++++++++++++++---------- tools/printdata.py | 1 + 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/include/ucd/ucd.h b/src/include/ucd/ucd.h index 0dc3cb70..ddabe65a 100644 --- a/src/include/ucd/ucd.h +++ b/src/include/ucd/ucd.h @@ -365,6 +365,7 @@ typedef uint64_t ucd_property; #define UCD_PROPERTY_EMOJI 0x0000000200000000ull /**< @brief Emoji */ #define UCD_PROPERTY_EMOJI_PRESENTATION 0x0000000400000000ull /**< @brief Emoji_Presentation */ #define UCD_PROPERTY_EMOJI_MODIFIER 0x0000000800000000ull /**< @brief Emoji_Modifier */ +#define UCD_PROPERTY_EMOJI_MODIFIER_BASE 0x0000001000000000ull /**< @brief Emoji_Modifier_Base */ /** @brief Return the properties of the specified codepoint. * @@ -860,6 +861,7 @@ namespace ucd Emoji = UCD_PROPERTY_EMOJI, /**< @brief Emoji */ Emoji_Presentation = UCD_PROPERTY_EMOJI_PRESENTATION, /**< @brief Emoji_Presentation */ Emoji_Modifier = UCD_PROPERTY_EMOJI_MODIFIER, /**< @brief Emoji_Modifier */ + Emoji_Modifier_Base = UCD_PROPERTY_EMOJI_MODIFIER_BASE, /**< @brief Emoji_Modifier_Base */ }; /** @brief Return the properties of the specified codepoint. diff --git a/src/proplist.c b/src/proplist.c index df9588a4..97a6f076 100644 --- a/src/proplist.c +++ b/src/proplist.c @@ -1787,7 +1787,7 @@ static ucd_property properties_So(codepoint_t c) if (c == 0x2611) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x2614 && c <= 0x2615) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x2618) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; - if (c == 0x261D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x261D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c == 0x2620) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x2622 && c <= 0x2623) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2626) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; @@ -1826,14 +1826,16 @@ static ucd_property properties_So(codepoint_t c) if (c == 0x26F4) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x26F0 && c <= 0x26F1) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c >= 0x26F0 && c <= 0x26F5) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; - if (c >= 0x26F7 && c <= 0x26F9) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c >= 0x26F7 && c <= 0x26F8) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; + if (c == 0x26F9) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c == 0x26FA) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x26FD) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; return UCD_PROPERTY_PATTERN_SYNTAX; case 0x2700: if (c == 0x2702) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2705) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; - if (c >= 0x270A && c <= 0x270B) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x270A && c <= 0x270B) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x270C && c <= 0x270D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c >= 0x2708 && c <= 0x270D) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x270F) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; if (c == 0x2712) return UCD_PROPERTY_PATTERN_SYNTAX | UCD_PROPERTY_EMOJI; @@ -1909,11 +1911,16 @@ static ucd_property properties_So(codepoint_t c) if (c == 0x01F321) return UCD_PROPERTY_EMOJI; if (c >= 0x01F32D && c <= 0x01F335) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F337 && c <= 0x01F37C) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F385) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c >= 0x01F37E && c <= 0x01F393) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F324 && c <= 0x01F393) return UCD_PROPERTY_EMOJI; if (c >= 0x01F396 && c <= 0x01F397) return UCD_PROPERTY_EMOJI; if (c >= 0x01F399 && c <= 0x01F39B) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F3A0 && c <= 0x01F3CA) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F3C2 && c <= 0x01F3C4) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c == 0x01F3C7) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F3A0 && c <= 0x01F3C9) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F3CA) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F3CB && c <= 0x01F3CC) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c >= 0x01F3CF && c <= 0x01F3D3) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F3E0 && c <= 0x01F3F0) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F39E && c <= 0x01F3F0) return UCD_PROPERTY_EMOJI; @@ -1926,6 +1933,15 @@ static ucd_property properties_So(codepoint_t c) case 0x01F400: if (c == 0x01F43F) return UCD_PROPERTY_EMOJI; if (c == 0x01F441) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F442 && c <= 0x01F443) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F446 && c <= 0x01F450) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F466 && c <= 0x01F469) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c == 0x01F46E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F470 && c <= 0x01F478) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c == 0x01F47C) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F481 && c <= 0x01F483) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F485 && c <= 0x01F487) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c == 0x01F4AA) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c == 0x01F4FE) return 0; if (c == 0x01F4FD) return UCD_PROPERTY_EMOJI; return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; @@ -1935,12 +1951,13 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x01F54B && c <= 0x01F54E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F550 && c <= 0x01F567) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F56F && c <= 0x01F570) return UCD_PROPERTY_EMOJI; + if (c >= 0x01F574 && c <= 0x01F575) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c >= 0x01F573 && c <= 0x01F579) return UCD_PROPERTY_EMOJI; - if (c == 0x01F57A) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F57A) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c == 0x01F587) return UCD_PROPERTY_EMOJI; if (c >= 0x01F58A && c <= 0x01F58D) return UCD_PROPERTY_EMOJI; - if (c == 0x01F590) return UCD_PROPERTY_EMOJI; - if (c >= 0x01F595 && c <= 0x01F596) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F590) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F595 && c <= 0x01F596) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c == 0x01F5A4) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c == 0x01F5A5) return UCD_PROPERTY_EMOJI; if (c == 0x01F5A8) return UCD_PROPERTY_EMOJI; @@ -1958,9 +1975,14 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x01F5FB) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; break; case 0x01F600: + if (c >= 0x01F645 && c <= 0x01F647) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F64B && c <= 0x01F64F) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c <= 0x01F64F) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F6A3) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F6B4 && c <= 0x01F6B6) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c == 0x01F6C0) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c >= 0x01F680 && c <= 0x01F6C5) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; - if (c == 0x01F6CC) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F6CC) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c >= 0x01F6CB && c <= 0x01F6CF) return UCD_PROPERTY_EMOJI; if (c >= 0x01F6D0 && c <= 0x01F6D2) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F6E0 && c <= 0x01F6E5) return UCD_PROPERTY_EMOJI; @@ -1971,11 +1993,15 @@ static ucd_property properties_So(codepoint_t c) if (c >= 0x01F6F4 && c <= 0x01F6F6) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; break; case 0x01F900: - if (c >= 0x01F910 && c <= 0x01F91E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F918 && c <= 0x01F91C) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c >= 0x01F910 && c <= 0x01F91D) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F91E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; + if (c == 0x01F926) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c >= 0x01F920 && c <= 0x01F927) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; - if (c == 0x01F930) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c == 0x01F930) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c == 0x01F93B) return 0; - if (c >= 0x01F933 && c <= 0x01F93E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F93A && c <= 0x01F93C) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; + if (c >= 0x01F933 && c <= 0x01F93E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION | UCD_PROPERTY_EMOJI_MODIFIER_BASE; if (c == 0x01F946) return 0; if (c >= 0x01F940 && c <= 0x01F94B) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; if (c >= 0x01F950 && c <= 0x01F95E) return UCD_PROPERTY_EMOJI | UCD_PROPERTY_EMOJI_PRESENTATION; diff --git a/tools/printdata.py b/tools/printdata.py index f1dd7233..eac2892f 100755 --- a/tools/printdata.py +++ b/tools/printdata.py @@ -164,6 +164,7 @@ def properties(data): props += (2 ** 33) * data.get('Emoji', 0) # emoji-data props += (2 ** 34) * data.get('Emoji_Presentation', 0) # emoji-data props += (2 ** 35) * data.get('Emoji_Modifier', 0) # emoji-data + props += (2 ** 36) * data.get('Emoji_Modifier_Base', 0) # emoji-data return props if __name__ == '__main__':