Skip to content

Commit 58e67f1

Browse files
nedleynedley
authored
Generate Emoji 15.0 charts (#329)
* Generate Emoji 15.0 charts * Reformat
1 parent ba64de7 commit 58e67f1

File tree

3 files changed

+43
-20
lines changed

3 files changed

+43
-20
lines changed

‎unicodetools/src/main/java/org/unicode/tools/emoji/Emoji.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@ public class Emoji {
9494
true; // set to true between the release of Emoji 5.0 & Unicode 10.0. (or similar
9595
// situation)
9696

97-
/** Constants for versions */
97+
// Constants for versions
9898
public static final VersionInfo VERSION15 = VersionInfo.getInstance(15, 0);
99-
10099
public static final VersionInfo VERSION14 = VersionInfo.getInstance(14, 0);
101100
public static final VersionInfo VERSION13_1 = VersionInfo.getInstance(13, 1);
102101
public static final VersionInfo VERSION13 = VersionInfo.getInstance(13);
@@ -129,9 +128,9 @@ public class Emoji {
129128
* Change each following once we release. That is, VERSION_LAST_RELEASED* becomes VERSION_BETA*,
130129
* and both the latter increment. Also add to EMOJI_TO_UNICODE_VERSION
131130
*/
132-
public static final VersionInfo VERSION_LAST_RELEASED2 = VERSION13_1;
131+
public static final VersionInfo VERSION_LAST_RELEASED2 = VERSION14;
133132

134-
public static final VersionInfo VERSION_LAST_RELEASED = VERSION14;
133+
public static final VersionInfo VERSION_LAST_RELEASED = VERSION15;
135134
public static final VersionInfo VERSION_BETA = VERSION15;
136135

137136
public static final VersionInfo VERSION_TO_TEST = VERSION_BETA;
@@ -157,9 +156,9 @@ public class Emoji {
157156

158157
public static final Map<VersionInfo, String> EMOJI_TO_DATE =
159158
ImmutableMap.<VersionInfo, String>builder()
160-
.put(VERSION15, "2022-09-10")
161-
.put(VERSION14, "2021-09-10")
162-
.put(VERSION13_1, "2020-09-10")
159+
.put(VERSION15, "2022-09-13")
160+
.put(VERSION14, "2021-09-14")
161+
.put(VERSION13_1, "2020-09-15")
163162
.put(VERSION13, "2020-03-10")
164163
.put(VERSION12_1, "2019-10-29")
165164
.put(VERSION12, "2019-02-04")

‎unicodetools/src/main/resources/org/unicode/tools/emoji/main-index.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ <h1> Unicode® Emoji Charts v%%VERSION%%</h1>
7979
<td>Emoji recently added to Emoji v%%VERSION%%.</td>
8080
</tr>
8181
<tr>
82-
<td >Emoji Candidates<br>
82+
<td>Emoji Candidates<br>
8383
<span style='white-space: nowrap'>
8484
<a target='candidates' href="../future/emoji-provisional.html">Provisional</a> •
8585
<a target='candidates' href="../future/emoji-candidates.html">Draft</a></span></td>
@@ -88,13 +88,13 @@ <h1> Unicode® Emoji Charts v%%VERSION%%</h1>
8888
for a future version of emoji.</td>
8989
</tr>
9090
<tr>
91-
<td ><a target='zwj' href="emoji-zwj-sequences.html">Emoji
91+
<td><a target='zwj' href="emoji-zwj-sequences.html">Emoji
9292
ZWJ Sequences</a></td>
9393
<td>Recommended <em>emoji zwj sequences</em> for Emoji v%%VERSION%%. </td>
9494
</tr>
9595
<!--
9696
<tr>
97-
<td ><a target='annotate'
97+
<td><a target='annotate'
9898
href="emoji-annotations.html">Emoji Annotations</a></td>
9999
<td>Shows characters grouped by annotation, based on <a
100100
href="https://unicode.org/repos/cldr/trunk/common/annotations/">data
@@ -111,26 +111,26 @@ <h1> Unicode® Emoji Charts v%%VERSION%%</h1>
111111
<th colspan='2'>Sort Order &amp; Counts</th>
112112
</tr>
113113
<tr>
114-
<td ><a target='order' href="emoji-ordering.html">Emoji
114+
<td><a target='order' href="emoji-ordering.html">Emoji
115115
Ordering</a></td>
116116
<td>The Emoji v%%VERSION%% characters and sequences in the
117117
recommended sort order, which groups like characters together;
118118
using <a href='https://cldr.unicode.org/' target='cldr'>CLDR</a> data. </td>
119119
</tr>
120120
<tr>
121-
<td ><a target='counts' href="emoji-counts.html">Emoji
121+
<td><a target='counts' href="emoji-counts.html">Emoji
122122
Counts</a></td>
123123
<td>Detailed counts of the Emoji v%%VERSION%% characters and sequences.</td>
124124
</tr>
125125
<tr>
126126
<th colspan='2'>Versions</th>
127127
</tr>
128128
<tr>
129-
<td class='changed'><a target='proposals' href="emoji-proposals.html">Emoji Proposals</a></td>
130-
<td class='changed'>Proposals for accepted emoji characters.</td>
129+
<td><a target='proposals' href="emoji-proposals.html">Emoji Proposals</a></td>
130+
<td>Proposals for accepted emoji characters.</td>
131131
</tr>
132132
<tr>
133-
<td ><a target='versions' href="emoji-versions.html">Emoji
133+
<td><a target='versions' href="emoji-versions.html">Emoji
134134
Versions</a></td>
135135
<td>When emoji characters were added to Unicode.</td>
136136
</tr>
@@ -140,7 +140,7 @@ <h1> Unicode® Emoji Charts v%%VERSION%%</h1>
140140
</tr>
141141
<!--
142142
<tr>
143-
<td ><a target='style' href="emoji-sequences.html">Emoji
143+
<td><a target='style' href="emoji-sequences.html">Emoji
144144
Sequences</a></td>
145145
<td>Shows emoji character sequences: keycaps, flags, and
146146
modifier sequences.</td>
@@ -150,18 +150,18 @@ <h1> Unicode® Emoji Charts v%%VERSION%%</h1>
150150
<th colspan='2'>Presentation</th>
151151
</tr>
152152
<tr>
153-
<td ><a target='variants' href="emoji-variants.html">Emoji
153+
<td><a target='variants' href="emoji-variants.html">Emoji
154154
Presentation Sequences</a></td>
155155
<td>The <em>emoji presentation sequences</em> for Emoji v%%VERSION%%. </td>
156156
</tr>
157157
<tr>
158-
<td ><a target='text-emoji' href="text-style.html">Text
158+
<td><a target='text-emoji' href="text-style.html">Text
159159
vs Emoji</a></td>
160160
<td>A summary view of which Emoji v%%VERSION%% characters have the
161161
default text style, and which have the default emoji style.</td>
162162
</tr>
163163
<tr>
164-
<td ><a target='style' href="emoji-style.html">Emoji
164+
<td><a target='style' href="emoji-style.html">Emoji
165165
Default Style (html)</a></td>
166166
<td rowSpan='2'>Shows the default presentation style for
167167
each Emoji v%%VERSION%% character. Separate rows show the presentation with and
@@ -171,7 +171,7 @@ <h1> Unicode® Emoji Charts v%%VERSION%%</h1>
171171
images.</em></td>
172172
</tr>
173173
<tr>
174-
<td ><a target='style' href="emoji-style.txt">Emoji
174+
<td><a target='style' href="emoji-style.txt">Emoji
175175
Default Style (text)</a></td>
176176
</tr>
177177
</table>

‎unicodetools/src/main/resources/org/unicode/tools/emoji/proposalData.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,6 +1805,30 @@
18051805
1FAF5 1F3FF; L2/20-212; null
18061806
1FAF6 1F3FF; L2/20-211; null
18071807

1808+
1F6DC; L2/21-191; wireless
1809+
1FA75; L2/21-202, L2/21-075; light blue heart
1810+
1FA76; L2/21-201, L2/21-075; grey heart
1811+
1FA77; L2/21-203, L2/21-075; pink heart
1812+
1FA87; L2/21-194; maracas
1813+
1FA88; L2/21-193; flute
1814+
1FAAD; L2/21-192; folding hand fan
1815+
1FAAE; L2/21-218; hair pick
1816+
1FAAF; L2/21-223; khanda
1817+
1FABB; L2/21-215; hyacinth
1818+
1FABC; L2/21-217; jellyfish
1819+
1FABD; L2/21-198; wing
1820+
1FABF; L2/21-219; goose
1821+
1FACE; L2/21-197; moose
1822+
1FACF; L2/21-196; donkey
1823+
1FADA; L2/21-200; ginger root
1824+
1FADB; L2/21-199; pea pod
1825+
1FAE8; L2/21-214; shaking face
1826+
1FAF7; L2/21-216; leftwards pushing hand
1827+
1FAF8; L2/21-216; rightwards pushing hand
1828+
1F426 200D 2B1B; L2/19-307; black bird
1829+
1FAF7 1F3FF; L2/21-216; null
1830+
1FAF8 1F3FF; L2/21-216; null
1831+
18081832
# MISSING-2015
18091833
1F441 FE0F 200D 1F5E8 FE0F; MISSING # 2015 (👁️‍🗨️) eye in speech bubble
18101834
002A FE0F 20E3; MISSING # 2015 (*️⃣) keycap: *

0 commit comments

Comments
 (0)