Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add variation selectors to emoji alt attributes (#700) #920

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Add variation selectors to emoji alt attributes (#700) #920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmoji.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.ibm.icu.lang.UCharacter;
import com.ibm.icu.text.Collator;
import com.ibm.icu.text.Transform;
import com.ibm.icu.text.Transliterator;
import com.ibm.icu.text.UTF16;
import com.ibm.icu.text.UnicodeSet;
import com.ibm.icu.text.UnicodeSet.EntryRange;
Expand Down Expand Up @@ -544,6 +545,8 @@ private static String getSvgImage(
return null;
}

static final Transliterator TO_HEX = Transliterator.getInstance("Any-Hex/XML");

/*
* Note that Emoji.BESTOVERRIDE can override the source type for specific
* characters.
Expand Down Expand Up @@ -597,8 +600,9 @@ public static String getImage(
type, filename, doFlip)
: "../images/" + filename;
}
String escaped = TO_HEX.transliterate(chars);
return "<img alt='"
+ chars
+ escaped
+ "'"
+ " title='"
+ getCodeCharsAndName(chars, " ")
Expand Down Expand Up @@ -1970,15 +1974,18 @@ private static void showVariationSequences() throws IOException {
+ "</td>");
if (EmojiData.EMOJI_DATA.getKeycapBases().contains(cp)) {
// keycaps, treat specially
String cp2 = cp + Emoji.KEYCAP_MARK;
out.println(GenerateEmoji.getCell(Emoji.Source.ref, cp2, "andr", false, null));
out.println(GenerateEmoji.getCell(null, cp2, "andr", false, null));
String cp1 = cp + Emoji.TEXT_VARIANT + Emoji.KEYCAP_MARK;
String cp2 = cp + Emoji.EMOJI_VARIANT + Emoji.KEYCAP_MARK;
out.println(getCell(Emoji.Source.ref, cp1, "andr", false, null));
out.println(getCell(null, cp2, "andr", false, null));
out.println("<td>" + version + "</td>");
out.println(
"<td>" + UCharacter.getName(cp.codePointAt(0)) + keycapIndicator + "</td>");
} else {
out.println(GenerateEmoji.getCell(Emoji.Source.ref, cp, "andr", false, null));
out.println(GenerateEmoji.getCell(null, cp, "andr", false, null));
String cp1 = cp + Emoji.TEXT_VARIANT;
String cp2 = cp + Emoji.EMOJI_VARIANT;
out.println(getCell(Emoji.Source.ref, cp1, "andr", false, null));
out.println(getCell(null, cp2, "andr", false, null));
out.println("<td>" + version + "</td>");
out.println("<td>" + UCharacter.getName(cp.codePointAt(0)) + "</td>");
}
Expand Down Expand Up @@ -3723,17 +3730,17 @@ public static String toSemiString(String chars2, int order, UnicodeSet level1) {
}

public static String getCell(
Emoji.Source type,
String core,
String cellClass,
boolean addLink,
Output<Boolean> found) {
Emoji.Source type, String s, String cellClass, boolean addLink, Output<Boolean> found) {
String core = s;
if (core.contains(Emoji.TEXT_VARIANT_STRING)) {
core = core.replace(Emoji.TEXT_VARIANT_STRING, "");
}
String linkPre = addLink ? getMoreInfoLink("full-emoji-list.html", core) : "";
String linkPost = addLink ? "</a>" : "";
if (type == null) {
return "<td class='andr'>"
+ linkPre
+ getBestImage(core, true, "", Emoji.Source.SAMPLE_SOURCE)
+ getBestImage(s, true, "", Emoji.Source.SAMPLE_SOURCE)
+ linkPost
+ "</td>\n";
}
Expand All @@ -3748,14 +3755,15 @@ public static String getCell(
fullName = EmojiImageData.getDataUrlFromFilename(type, filename);
}
if (fullName != null) {
String escaped = TO_HEX.transliterate(s);
String className = type.getClassAttribute(core);
androidCell =
"<td class='"
+ cellClass
+ "'>"
+ linkPre
+ "<img alt='"
+ core
+ escaped
+ "' class='"
+ className
+ "' src='"
Expand Down
Loading