DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lookup glyph from color emoji font before and after ZWJ.

Browse Source 
Unicode recommends that the zwj sequences should be emoji presentation
even if they don't have the proper U+FE0F. Thus always lookup the glyph
for the code point before and after zwj as if they have a U+FE0F
variation selector.

Bug: 30056627
Change-Id: I03958a92337eaba4a8dd9c5be824b2665aa4a103
This commit is contained in:
Seigo Nonaka 2016-07-11 17:28:44 +09:00 committed by Raph Levien
parent c2642f9a33
commit 9431bb9640
8 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/minikin/FontCollection.cpp
View File

@ -335,18 +335,15 @@ FontFamily* FontCollection::getFamilyForChar(uint32_t ch, uint32_t vs,
}
const uint32_t NBSP = 0xa0;
const uint32_t ZWJ = 0x200c;
const uint32_t ZWNJ = 0x200d;
const uint32_t ZWJ = 0x200d;
const uint32_t ZWNJ = 0x200c;
const uint32_t HYPHEN = 0x2010;
const uint32_t NB_HYPHEN = 0x2011;
const uint32_t FEMALE_SIGN = 0x2640;
const uint32_t MALE_SIGN = 0x2642;
const uint32_t STAFF_OF_AESCULAPIUS = 0x2695;
// Characters where we want to continue using existing font run instead of
// recomputing the best match in the fallback list.
static const uint32_t stickyWhitelist[] = { '!', ',', '-', '.', ':', ';', '?', NBSP, ZWJ, ZWNJ,
HYPHEN, NB_HYPHEN, FEMALE_SIGN, MALE_SIGN, STAFF_OF_AESCULAPIUS };
HYPHEN, NB_HYPHEN };
static bool isStickyWhitelisted(uint32_t c) {
for (size_t i = 0; i < sizeof(stickyWhitelist) / sizeof(stickyWhitelist[0]); i++) {
@ -432,8 +429,15 @@ void FontCollection::itemize(const uint16_t *string, size_t string_size, FontSty
}
if (!shouldContinueRun) {
FontFamily* family = getFamilyForChar(ch, isVariationSelector(nextCh) ? nextCh : 0,
FontFamily* family;
if ((prevCh == ZWJ || nextCh == ZWJ) && isEmoji(ch)) {
// Treat emoji before and after ZWJ as emoji presentation.
family = getFamilyForChar(ch, EMOJI_STYLE_VS, langListId, variant);
} else {
family = getFamilyForChar(ch, isVariationSelector(nextCh) ? nextCh : 0,
langListId, variant);
}
if (utf16Pos == 0 || family != lastFamily) {
size_t start = utf16Pos;
// Workaround for combining marks and emoji modifiers until we implement

12
tests/FontCollectionItemizeTest.cpp
View File

@ -1223,7 +1223,7 @@ TEST_F(FontCollectionItemizeTest, itemize_emojiSelection_withFE0E) {
EXPECT_EQ(2, runs[0].end);
EXPECT_EQ(kNoGlyphFont, getFontPath(runs[0]));
// U+26FA U+FE0E is specified but ColorTextMixedEmojiFont has a variation sequence U+26F9 U+FE0F
// U+26FA U+FE0E is specified but ColorTextMixedEmojiFont has a variation sequence U+26FA U+FE0F
// in its cmap, so ColorTextMixedEmojiFont should be selected instaed of ColorEmojiFont.
itemize(collection.get(), "U+26FA U+FE0E", kDefaultFontStyle, &runs);
ASSERT_EQ(1U, runs.size());
@ -1305,9 +1305,9 @@ TEST_F(FontCollectionItemizeTest, itemize_emojiSelection_withFE0F) {
EXPECT_EQ(2, runs[0].end);
EXPECT_EQ(kNoGlyphFont, getFontPath(runs[0]));
// U+26F9 U+FE0F is specified but ColorTextMixedEmojiFont has a variation sequence U+26F9 U+FE0F
// U+26F8 U+FE0F is specified but ColorTextMixedEmojiFont has a variation sequence U+26F8 U+FE0F
// in its cmap, so ColorTextMixedEmojiFont should be selected instaed of ColorEmojiFont.
itemize(collection.get(), "U+26F9 U+FE0F", kDefaultFontStyle, &runs);
itemize(collection.get(), "U+26F8 U+FE0F", kDefaultFontStyle, &runs);
ASSERT_EQ(1U, runs.size());
EXPECT_EQ(0, runs[0].start);
EXPECT_EQ(2, runs[0].end);
@ -1396,4 +1396,10 @@ TEST_F(FontCollectionItemizeTest, itemize_genderBalancedEmoji) {
EXPECT_EQ(0, runs[0].start);
EXPECT_EQ(4, runs[0].end);
EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
itemize(collection.get(), "U+26F9 U+200D U+2695", kDefaultFontStyle, &runs);
ASSERT_EQ(1U, runs.size());
EXPECT_EQ(0, runs[0].start);
EXPECT_EQ(3, runs[0].end);
EXPECT_EQ(kColorEmojiFont, getFontPath(runs[0]));
}

BIN
tests/data/ColorEmojiFont.ttf
View File

Binary file not shown.

5
tests/data/ColorEmojiFont.ttx
View File

@ -147,7 +147,7 @@
<map code="0x203C" name="defaultGlyph" /> <!-- Text Default -->
<map code="0x231B" name="defaultGlyph" /> <!-- Emoji Default -->
<map code="0x23E9" name="defaultGlyph" /> <!-- Emoji Default -->
<map code="0x26F9" name="defaultGlyph" /> <!-- U+26F9 U+FE0F is in ColorTextMixedEmojiFont.ttf -->
<map code="0x26F8" name="defaultGlyph" /> <!-- U+26F8 U+FE0F is in ColorTextMixedEmojiFont.ttf -->
<map code="0x261D" name="defaultGlyph" />
<map code="0x1F3FD" name="defaultGlyph" />
@ -158,10 +158,11 @@
<map code="0x262E" name="defaultGlyph" />
<map code="0x262F" name="defaultGlyph" />
<!--For FontCollectionItemizeTest,.itemize_genderBalancedEmoji -->
<!--For FontCollectionItemizeTest.itemize_genderBalancedEmoji -->
<map code="0x1F469" name="defaultGlyph" />
<map code="0x1F373" name="defaultGlyph" />
<map code="0x200D" name="defaultGlyph" />
<map code="0x26F9" name="defaultGlyph" />
<map code="0x2695" name="defaultGlyph" />
<!-- U+2640, U+2642 are reserved for FontCollectionTest.newEmojiTest -->

BIN
tests/data/ColorTextMixedEmojiFont.ttf
View File

Binary file not shown.

2
tests/data/ColorTextMixedEmojiFont.ttx
View File

@ -145,7 +145,7 @@
<tableVersion version="0"/>
<cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="2">
<map uvs="0xFE0E" uv="0x26FA" name="Emoji1" />
<map uvs="0xFE0F" uv="0x26F9" name="Emoji2" />
<map uvs="0xFE0F" uv="0x26F8" name="Emoji2" />
</cmap_format_14>
</cmap>

BIN
tests/data/TextEmojiFont.ttf
View File

Binary file not shown.

1
tests/data/TextEmojiFont.ttx
View File

@ -165,6 +165,7 @@
<!-- For FontCollectionTest.newEmojiTest -->
<map code="0x2640" name="defaultGlyph" />
<map code="0x2642" name="defaultGlyph" />
<map code="0x26F9" name="defaultGlyph" />
</cmap_format_4>
<cmap_format_14 format="14" platformID="0" platEncID="5" length="40" numVarSelectorRecords="2">