diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-09 19:41:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-09 19:41:33 +0200 |
| commit | fd2b227f19844978021811e9e1a60b8bcbd1ecad (patch) | |
| tree | a378867115a91a3f33ff019f2c303b0406b1c688 /modules | |
| parent | aa662adcfc086965ee9ecdcf4d2c01a1c4869efa (diff) | |
| parent | 2619698a2eb7363940d1e6a2d71a9ce7b366d3f5 (diff) | |
| download | UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.tar UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.tar.gz UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.tar.lz UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.tar.xz UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.zip | |
Merge branch 'intl-ICU-emoji-work'
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/libpref/init/all.js | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 88a9af2da..6506d4bce 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -3171,6 +3171,10 @@ pref("ui.mouse.radius.inputSource.touchOnly", true); #ifdef XP_WIN +// Be as uniform as possible, use Twemoji everywhere. +// Optional: prefix with `Segoe UI Emoji` to use Win8+ Segoe UI font emoji where available. +pref("font.name-list.emoji", "Twemoji Mozilla"); + pref("font.name.serif.ar", "Times New Roman"); pref("font.name.sans-serif.ar", "Segoe UI"); pref("font.name-list.sans-serif.ar", "Segoe UI, Tahoma, Arial"); @@ -3596,6 +3600,8 @@ pref("ui.osk.debug.keyboardDisplayReason", ""); pref("browser.drag_out_of_frame_style", 1); pref("ui.key.saveLink.shift", false); // true = shift, false = meta +pref("font.name-list.emoji", "Apple Color Emoji"); + // default fonts (in UTF8 and using canonical names) // to determine canonical font names, use a debug build and // enable NSPR logging for module fontInfoLog:5 @@ -4018,6 +4024,10 @@ pref("print.print_extra_margin", 0); // twips // font names +// fontconfig doesn't support emoji yet +// https://lists.freedesktop.org/archives/fontconfig/2016-October/005842.html +pref("font.name-list.emoji", "Twemoji Mozilla"); + pref("font.name.serif.ar", "serif"); pref("font.name.sans-serif.ar", "sans-serif"); pref("font.name.monospace.ar", "monospace"); @@ -4262,6 +4272,8 @@ pref("font.name.monospace.x-math", "Fira Mono"); #elif defined(ANDROID) // We use the bundled fonts for Firefox for Android +pref("font.name-list.emoji", "Noto Color Emoji"); + // ar pref("font.name.serif.el", "Droid Serif"); // not Charis SIL Compact, only has a few Greek chars |