[tor-commits] [tor-browser/tor-browser-38.6.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.

[gk]

commit 10db8cb3c45ef7290811eac86b5d21deb1fa58c7
Author: Arthur Edelstein <arthuredelst...@gmail.com>
Date:   Thu Jan 28 14:56:24 2016 -0800

    fixup! TB4: Tor Browser's Firefox preference overrides.
    
    Fix for https://bugs.torproject.org/18172 (missing emoji fonts)
    (Windows and OS X part)
---
 browser/app/profile/000-tor-browser.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index bd8e58c..c022719 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -270,7 +270,7 @@ pref("browser.download.panel.shown", true);
 #ifdef MOZ_BUNDLED_FONTS
 
 #ifdef XP_MACOSX
-pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, 
Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino 
Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, 
Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto 
Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto 
Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans 
Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, 
Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, 
Thonburi, Times, Times New Roman, Verdana");
+pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, 
Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue 
DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans 
Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, 
Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans 
Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans 
Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans 
Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans 
Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New 
Roman, Verdana");
 pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, 
Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans 
Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto 
Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans 
Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans 
Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi");
 pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto 
Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans 
Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto 
Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans 
Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans 
Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi");
 pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans 
Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, 
Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans 
Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans 
Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans 
Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans 
Tibetan, Noto Sans Yi");
@@ -283,7 +283,7 @@ pref("font.name.sans-serif.ar", "Arial");
 #endif
 
 #ifdef XP_WIN
-pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier 
New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola 
Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳ ゴシック, 
MS Mincho, ＭＳ 明朝, MS PGothic, ＭＳ Ｐゴシック, MS PMincho, 
ＭＳ Ｐ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft 
Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅
黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans 
Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 
新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, 
Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI");
+pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier 
New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola 
Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳ ゴシック, 
MS Mincho, ＭＳ 明朝, MS PGothic, ＭＳ Ｐゴシック, MS PMincho, 
ＭＳ Ｐ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft 
Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅
黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans 
Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 
新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Segoe UI Emoji, Shruti, 
SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu 
Gothic UI");
 #endif
 
 #ifdef XP_LINUX


_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits