commit 05e826cfabe18b243c833774a867a895e6dec5cb Author: Arthur Edelstein arthuredelstein@gmail.com Date: Thu Jul 16 16:32:47 2015 -0700

fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 199 ++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8188855..95bc04b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -237,3 +237,202 @@ pref("security.cert_pinning.enforcement_level", 2); #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif + +// If we are bundling fonts, only allow bundled fonts to be used. +#ifdef MOZ_BUNDLED_FONTS +pref("font.default.lo", "Noto Sans Lao"); +pref("font.default.my", "Noto Sans Myanmar"); +pref("font.default.x-western", "sans-serif"); +pref("font.internaluseonly.changed", true); +pref("font.name-list.cursive.ar", "Noto Naskh Arabic"); +pref("font.name-list.cursive.el", "Noto Serif"); +pref("font.name-list.cursive.he", "Noto Sans Hebrew"); +pref("font.name-list.cursive.x-cyrillic", "Noto Serif"); +pref("font.name-list.cursive.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.cursive.x-western", "Noto Serif"); +pref("font.name-list.fantasy.ar", "Noto Kufi Arabic"); +pref("font.name-list.fantasy.el", "Noto Serif"); +pref("font.name-list.fantasy.he", "Noto Sans Hebrew"); +pref("font.name-list.fantasy.x-cyrillic", "Noto Serif"); +pref("font.name-list.fantasy.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.fantasy.x-western", "Noto Serif"); +pref("font.name-list.monospace.ar", "Noto Kufi Arabic"); +pref("font.name-list.monospace.el", "Cousine"); +pref("font.name-list.monospace.he", "Noto Sans Hebrew"); +pref("font.name-list.monospace.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.th", "Noto Sans Thai"); +pref("font.name-list.monospace.x-armn", "Noto Sans Armenian"); +pref("font.name-list.monospace.x-beng", "Noto Sans Bengali"); +pref("font.name-list.monospace.x-cyrillic", "Cousine"); +pref("font.name-list.monospace.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.monospace.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.monospace.x-geor", "Noto Sans Georgian"); +pref("font.name-list.monospace.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.monospace.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer"); +pref("font.name-list.monospace.x-knda", "Noto Sans Kannada"); +pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.monospace.x-orya", "Noto Sans Oriya"); +pref("font.name-list.monospace.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.monospace.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.monospace.x-telu", "Noto Sans Telugu"); +pref("font.name-list.monospace.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.monospace.x-unicode", "Cousine, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao"); +pref("font.name-list.monospace.x-western", "Cousine"); +pref("font.name-list.monospace.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic"); +pref("font.name-list.sans-serif.el", "Noto Sans"); +pref("font.name-list.sans-serif.he", "Noto Sans Hebrew"); +pref("font.name-list.sans-serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.th", "Noto Sans Thai"); +pref("font.name-list.sans-serif.x-armn", "Noto Sans Armenian"); +pref("font.name-list.sans-serif.x-beng", "Noto Sans Bengali"); +pref("font.name-list.sans-serif.x-cyrillic", "Noto Sans"); +pref("font.name-list.sans-serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.sans-serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.sans-serif.x-geor", "Noto Sans Georgian"); +pref("font.name-list.sans-serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.sans-serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.sans-serif.x-khmr", "Noto Sans Khmer"); +pref("font.name-list.sans-serif.x-knda", "Noto Sans Kannada"); +pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya"); +pref("font.name-list.sans-serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.sans-serif.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.sans-serif.x-telu", "Noto Sans Telugu"); +pref("font.name-list.sans-serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.sans-serif.x-unicode", "Noto Sans, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao"); +pref("font.name-list.sans-serif.x-western", "Noto Sans"); +pref("font.name-list.sans-serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.ar", "Noto Naskh Arabic"); +pref("font.name-list.serif.el", "Noto Serif"); +pref("font.name-list.serif.he", "Noto Sans Hebrew"); +pref("font.name-list.serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.th", "Noto Sans Thai"); +pref("font.name-list.serif.th", "Noto Serif Thai"); +pref("font.name-list.serif.x-armn", "Noto Serif Armenian"); +pref("font.name-list.serif.x-beng", "Noto Sans Bengali"); +pref("font.name-list.serif.x-cyrillic", "Noto Serif"); +pref("font.name-list.serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.serif.x-geor", "Noto Sans Georgian"); +pref("font.name-list.serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.serif.x-khmr", "Noto Serif Khmer"); +pref("font.name-list.serif.x-knda", "Noto Sans Kannada"); +pref("font.name-list.serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.serif.x-orya", "Noto Sans Oriya"); +pref("font.name-list.serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.serif.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.serif.x-telu", "Noto Sans Telugu"); +pref("font.name-list.serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.serif.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.serif.x-western", "Noto Serif"); +pref("font.name-list.serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.cursive.ar", "Noto Naskh Arabic"); +pref("font.name.cursive.el", "Noto Serif"); +pref("font.name.cursive.he", "Noto Sans Hebrew"); +pref("font.name.cursive.x-cyrillic", "Noto Serif"); +pref("font.name.cursive.x-unicode", "Noto Serif"); +pref("font.name.cursive.x-western", "Noto Serif"); +pref("font.name.fantasy.ar", "Noto Kufi Arabic"); +pref("font.name.fantasy.el", "Noto Serif"); +pref("font.name.fantasy.he", "Noto Sans Hebrew"); +pref("font.name.fantasy.x-cyrillic", "Noto Serif"); +pref("font.name.fantasy.x-unicode", "Noto Serif"); +pref("font.name.fantasy.x-western", "Noto Serif"); +pref("font.name.monospace.ar", "Noto Kufi Arabic"); +pref("font.name.monospace.el", "Cousine"); +pref("font.name.monospace.he", "Noto Sans Hebrew"); +pref("font.name.monospace.ja", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.ko", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.my", "Noto Sans Myanmar"); +pref("font.name.monospace.th", "Noto Sans Thai"); +pref("font.name.monospace.x-armn", "Noto Sans Armenian"); +pref("font.name.monospace.x-beng", "Noto Sans Bengali"); +pref("font.name.monospace.x-cyrillic", "Cousine"); +pref("font.name.monospace.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.monospace.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.monospace.x-geor", "Noto Sans Georgian"); +pref("font.name.monospace.x-gujr", "Noto Sans Gujarati"); +pref("font.name.monospace.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.monospace.x-khmr", "Noto Sans Khmer"); +pref("font.name.monospace.x-knda", "Noto Sans Kannada"); +pref("font.name.monospace.x-mlym", "Noto Sans Malayalam"); +pref("font.name.monospace.x-orya", "Noto Sans Oriya"); +pref("font.name.monospace.x-sinh", "Noto Sans Sinhala"); +pref("font.name.monospace.x-tamil", "Noto Sans Tamil"); +pref("font.name.monospace.x-telu", "Noto Sans Telugu"); +pref("font.name.monospace.x-tibt", "Noto Sans Tibetan"); +pref("font.name.monospace.x-unicode", "Cousine"); +pref("font.name.monospace.x-western", "Cousine"); +pref("font.name.monospace.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.ar", "Noto Naskh Arabic"); +pref("font.name.sans-serif.el", "Noto Sans"); +pref("font.name.sans-serif.he", "Noto Sans Hebrew"); +pref("font.name.sans-serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.th", "Noto Sans Thai"); +pref("font.name.sans-serif.x-armn", "Noto Sans Armenian"); +pref("font.name.sans-serif.x-beng", "Noto Sans Bengali"); +pref("font.name.sans-serif.x-cyrillic", "Noto Sans"); +pref("font.name.sans-serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.sans-serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.sans-serif.x-geor", "Noto Sans Georgian"); +pref("font.name.sans-serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name.sans-serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.sans-serif.x-khmr", "Noto Sans Khmer"); +pref("font.name.sans-serif.x-knda", "Noto Sans Kannada"); +pref("font.name.sans-serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name.sans-serif.x-orya", "Noto Sans Oriya"); +pref("font.name.sans-serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name.sans-serif.x-tamil", "Noto Sans Tamil"); +pref("font.name.sans-serif.x-telu", "Noto Sans Telugu"); +pref("font.name.sans-serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name.sans-serif.x-unicode", "Noto Sans"); +pref("font.name.sans-serif.x-western", "Noto Sans"); +pref("font.name.sans-serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.sans.my", "Noto Sans Myanmar"); +pref("font.name.serif.ar", "Noto Naskh Arabic"); +pref("font.name.serif.el", "Noto Serif"); +pref("font.name.serif.he", "Noto Sans Hebrew"); +pref("font.name.serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name.serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name.serif.my", "Noto Sans Myanmar"); +pref("font.name.serif.th", "Noto Serif Thai"); +pref("font.name.serif.x-armn", "Noto Serif Armenian"); +pref("font.name.serif.x-beng", "Noto Sans Bengali"); +pref("font.name.serif.x-cyrillic", "Noto Serif"); +pref("font.name.serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.serif.x-geor", "Noto Sans Georgian"); +pref("font.name.serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name.serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.serif.x-khmr", "Noto Serif Khmer"); +pref("font.name.serif.x-knda", "Noto Sans Kannada"); +pref("font.name.serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name.serif.x-orya", "Noto Sans Oriya"); +pref("font.name.serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name.serif.x-tamil", "Noto Sans Tamil"); +pref("font.name.serif.x-telu", "Noto Sans Telugu"); +pref("font.name.serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name.serif.x-unicode", "Noto Serif"); +pref("font.name.serif.x-western", "Noto Serif"); +pref("font.name.serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.system.whitelist", "Cousine, Noto Kufi Arabic, Noto Naskh Arabic, Noto Sans, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, 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 Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +#endif