Emoji 17.0 beta charts (#1133)

Author: nedley

docs/emoji/generate-emoji.md

@@ -92,4 +92,8 @@ be updated as well. In particular, they need to be added to
 
 ## Final Candidates
 
+In many respects Final is not much different from Draft. One notable difference
+is that new code points lose their "X" prefix in emoji-released.html, so if you
+are still seeing those it is a sign that this Stage has not been reached.
+
 Moving from final candidates involves a number of changes.

unicodetools/data/emoji/dev/internal/emoji-proposals.txt

@@ -2251,8 +2251,10 @@ public UnicodeSet getMultiPersonGroupings() {
                     .put("👩‍🤝‍👩", "👭")
                     .put("🧑‍❤️‍💋‍🧑", "💏")
                     .put("🧑‍❤️‍🧑", "💑")
+                    .put("🧑‍🐰‍🧑", "👯")
                     .put("👨‍🐰‍👨", "👯")
                     .put("👩‍🐰‍👩", "👯")
+                    .put("🧑‍🫯‍🧑", "🤼")
                     .put("👨‍🫯‍👨", "🤼")
                     .put("👩‍🫯‍👩", "🤼")
                     .build();

unicodetools/src/main/java/org/unicode/tools/emoji/EmojiData.java

@@ -1,7 +1,6 @@
 package org.unicode.tools.emoji;
 
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
@@ -173,7 +172,7 @@ public String formatProposalsForHtml(Collection<String> proposals) {
     static UnicodeMap<Set<String>> load(StringBuffer header) {
         UnicodeMap<Set<String>> builder = new UnicodeMap<>();
         Set<String> skinProposals = ImmutableSet.<String>builder().add("L2/14-173").build();
-        Set<String> genProposals = ImmutableSet.<String>builder().add("L2/16‑160").build();
+        Set<String> genProposals = ImmutableSet.<String>builder().add("L2/16-160").build();
 
         boolean haveData = false;
         for (String line : FileUtilities.in(ProposalData.class, "proposalData.txt")) {
@@ -313,32 +312,27 @@ public static Set<String> cleanProposalString(String proposalString) {
         return ImmutableSet.copyOf(result);
     }
 
-    static final Map<String, String> SHORTEST_SKELETON =
-            ImmutableMap.<String, String>builder()
-                    .put("🧑🏿‍❤️‍💋‍🧑🏿", "💏🏿")
-                    .put("🧑🏿‍❤️‍🧑🏿", "💑🏿")
-                    .put("👨🏿‍🐰‍👨🏿", "👯🏿")
-                    .put("👩🏿‍🐰‍👩🏿", "👯🏿")
-                    .put("🧑🏿‍🐰‍🧑🏿", "👯🏿")
-                    .put("👨🏿‍🫯‍👨🏿", "🤼🏿")
-                    .put("👩🏿‍🫯‍👩🏿", "🤼🏿")
-                    .put("🧑🏿‍🫯‍🧑🏿", "🤼🏿")
-                    .build();
-
-    //    static {
-    //        for (Entry<String, String> entry : SHORTEST_SKELETON.entrySet()) {
-    //            System.out.println(".put(\"" + entry.getKey() + "\",\"" + entry.getValue() + "\")"
-    //                    + "\t// " + Utility.hex(entry.getKey()) + " => " +
-    // Utility.hex(entry.getValue()));
-    //        }
-    //    }
-
     private static String shortestForm(String s) {
-        String result = SHORTEST_SKELETON.get(s);
-        if (result == null) {
-            return s;
+        if (EmojiData.EMOJI_DATA_BETA.isHandshake(s)) {
+            // All handshake sequences have the same proposal.
+            return EmojiData.HANDSHAKE_STRING;
         }
-        return result;
+
+        // Use the existing mapping maintained by EmojiData,
+        // adding emoji variants for sequences containing ❤️.
+        String withoutTone = EmojiData.SKIN_SPANNER.deleteFrom(s);
+        String standardized = EmojiData.EMOJI_DATA_BETA.addEmojiVariants(withoutTone);
+        String couple = EmojiData.MAP_TO_COUPLES.get(standardized);
+        if (couple != null) {
+            if (s.indexOf(SKIN_REPRESENTATIVE) >= 0) {
+                // The provided string has normalized skin tone(s) and
+                // the result is a single code point, re-add the tone.
+                couple += SKIN_REPRESENTATIVE;
+            }
+            return couple;
+        }
+
+        return s;
     }
 
     public static String removeEmojiVariant(String s) {

unicodetools/src/main/java/org/unicode/tools/emoji/ProposalData.java

@@ -14,7 +14,7 @@
 # Then run ProposalData.java to generate an updated version of proposalData.txt that incorporates all the proposal data from this file.
 
 #================================
-Status=Draft Candidate
+Status=Final Candidate
 #================================
 
 Proposal=L2/24-250