Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf45f426 authored by Yirui Huang's avatar Yirui Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect emoji presentation for 'Zsym' script"

parents 58b4c329 f9936b9b

data/fonts/fonts.xml

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ 
    <family lang="und-Zsye">

        <font weight="400" style="normal">NotoColorEmoji.ttf</font>

    </family>

    <family>

    <family lang="und-Zsym">

        <font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted2.ttf</font>

    </family>

    <family>

tools/fonts/fontchain_lint.py

+5 −2
Original line number Diff line number Diff line
@@ -314,8 +314,11 @@ def check_emoji_defaults(default_emoji): 
            continue

        # For later fonts, we only check them if they have a script

        # defined, since the defined script may get them to a higher

        # score even if they appear after the emoji font.

        if emoji_font_seen and not record.scripts:

        # score even if they appear after the emoji font. However,

        # we should skip checking the text symbols font, since

        # symbol fonts should be able to override the emoji display

        # style when 'Zsym' is explicitly specified by the user.

        if emoji_font_seen and (not record.scripts or 'Zsym' in record.scripts):

            continue



        # Check default emoji-style characters