fontconfig: Branch 'master'
[email protected] (Behdad Esfahbod)
| Newsgroups | gmane.comp.fonts.fontconfig |
|---|---|
| Message-ID | <[email protected]> |
conf.d/45-generic.conf | 35 ++++++++++++++--------------------- conf.d/60-generic.conf | 21 +++++++++++++++++++++ 2 files changed, 35 insertions(+), 21 deletions(-) New commits: commit cc8442dec85e9d416436d19eeae1783f2d3008f0 Author: Behdad Esfahbod <[email protected]> Date: Thu Aug 3 10:36:01 2017 +0100 Adjust color emoji config some more Seems to work now. Either asking for family emoji, or :lang=und-zsye returns the preferred color emoji font available, or just any color emoji font if none of the preferred ones was found. diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf index cc3eb58..f41ff84 100644 --- a/conf.d/45-generic.conf +++ b/conf.d/45-generic.conf @@ -5,27 +5,6 @@ <!-- Emoji --> - <!-- Prefer to match color emoji font. --> - <match> - <test name="lang"> - <string>und-zsye</string> - </test> - <test qual="all" name="color" compare="not_eq"> - <bool>true</bool> - </test> - <test qual="all" name="color" compare="not_eq"> - <bool>false</bool> - </test> - <edit name="color" mode="append"> - <bool>true</bool> - </edit> - </match> - - <!-- TODO - ! Match on "color" and alias B&W ones first if no color is requested. - ! That's "hard" because <alias> doesn't work in match and needs to be - ! expanded to its non-sugar form. - !--> <alias binding="same"> <family>Emoji Two</family> <default><family>emoji</family></default> @@ -74,6 +53,20 @@ </edit> </match> + <match> + <test name="lang"> + <string>und-zsye</string> + </test> + <test qual="all" name="family" compare="not_eq"> + <string>emoji</string> + </test> + + <!-- Add generic family. --> + <edit name="family" mode="append" binding="strong"> + <string>emoji</string> + </edit> + </match> + <!-- Math --> diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf index 00246fa..2a2b809 100644 --- a/conf.d/60-generic.conf +++ b/conf.d/60-generic.conf @@ -5,6 +5,27 @@ <!-- Emoji --> + <!-- Prefer to match color emoji font. --> + <match> + <test name="lang"> + <string>und-zsye</string> + </test> + <test qual="all" name="color" compare="not_eq"> + <bool>true</bool> + </test> + <test qual="all" name="color" compare="not_eq"> + <bool>false</bool> + </test> + <edit name="color" mode="append"> + <bool>true</bool> + </edit> + </match> + + <!-- TODO + ! Match on "color" and alias B&W ones first if no color is requested. + ! That's "hard" because <alias> doesn't work in match and needs to be + ! expanded to its non-sugar form. + !--> <alias binding="same"> <family>emoji</family> <prefer> _______________________________________________ Fontconfig mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/fontconfig