From 6861459c48f72bb714f307d44e59317a466887bc Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Fri, 6 Feb 2009 17:16:06 +0000 Subject: QAR-1202 Mergeme for Viewer font in Russian, Ukrainian (for business reasons): svn merge -r109512:109516 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-l10n/maint-l10n-3 DEV-22792 Russian and Ukrainian Viewer strings submission DEV-24945 Chat console with scaled UI shows vertically misaligned characters DEV-25459 Viewer text-snapping is broken in a few ways DEV-23475 Change the win32 viewer's font prioritization order to be more Cyrillic-friendly QAR-1042 Viewer in Russian, Ukrainian: need to verify that French/German/Japanese/Korean were not effected by import of Russ and Ukr. --- indra/newview/app_settings/settings.xml | 29 +++++++--- indra/newview/fonts/DejaVu-license.txt | 99 ++++++++++++++++++++++++++++++++ indra/newview/fonts/DejaVuSansMono.ttf | Bin 0 -> 319388 bytes indra/newview/llappviewer.cpp | 23 +------- 4 files changed, 121 insertions(+), 30 deletions(-) create mode 100644 indra/newview/fonts/DejaVu-license.txt create mode 100644 indra/newview/fonts/DejaVuSansMono.ttf (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3375d0e946..2cc8224fc6 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3724,31 +3724,42 @@ FontMonospace Comment - Name of monospace font (Truetype file name) + Name of monospace font that definitely exists (Truetype file name) Persist - 1 + 0 Type String Value - profontwindows.ttf + DejaVuSansMono.ttf FontSansSerif Comment - Name of san-serif font (Truetype file name) + Name of primary sans-serif font that definitely exists (Truetype file name) Persist - 1 + 0 Type String Value MtBkLfRg.ttf + FontSansSerifBundledFallback + + Comment + Name of secondary sans-serif font that definitely exists (Truetype file name) + Persist + 0 + Type + String + Value + DejaVuSansCondensed.ttf + FontSansSerifBold Comment Name of bold font (Truetype file name) Persist - 1 + 0 Type String Value @@ -3757,9 +3768,9 @@ FontSansSerifFallback Comment - Name of san-serif font (Truetype file name) + Name of sans-serif font (Truetype file name) Persist - 1 + 0 Type String Value @@ -3829,7 +3840,7 @@ Type F32 Value - 9.0 + 8.1 FontSizeSmall diff --git a/indra/newview/fonts/DejaVu-license.txt b/indra/newview/fonts/DejaVu-license.txt new file mode 100644 index 0000000000..254e2cc42a --- /dev/null +++ b/indra/newview/fonts/DejaVu-license.txt @@ -0,0 +1,99 @@ +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $ diff --git a/indra/newview/fonts/DejaVuSansMono.ttf b/indra/newview/fonts/DejaVuSansMono.ttf new file mode 100644 index 0000000000..19d188832b Binary files /dev/null and b/indra/newview/fonts/DejaVuSansMono.ttf differ diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 359e5df4f8..fd473b66d5 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -165,13 +165,6 @@ #include "llcommandlineparser.h" -// annoying detail to determine whether font prefs are over-ridden -#if LL_LINUX -# define LL_DYNAMIC_FONT_DISCOVERY 1 -#else -# define LL_DYNAMIC_FONT_DISCOVERY 0 -#endif - // *FIX: These extern globals should be cleaned up. // The globals either represent state/config/resource-storage of either // this app, or another 'component' of the viewer. App globals should be @@ -1656,12 +1649,6 @@ bool LLAppViewer::initConfiguration() gSavedSettings.setBOOL("AllowMultipleViewers", TRUE); #endif -#if !LL_DYNAMIC_FONT_DISCOVERY - // static font discovery - user settings can override. - gSavedSettings.setString("FontSansSerifFallback", - LLWindow::getFontListSans()); -#endif - //*FIX:Mani - Set default to disabling watchdog mainloop // timeout for mac and linux. There is no call stack info // on these platform to help debug. @@ -1744,20 +1731,14 @@ bool LLAppViewer::initConfiguration() // - load overrides from user_settings loadSettingsFromDirectory("User"); -#if LL_DYNAMIC_FONT_DISCOVERY - // Linux does *dynamic* font discovery which is preferable to - // whatever got written-out into the config file last time. This - // does remove the ability of the user to hand-define the fallbacks - // though, so from a config-management point of view this is hacky. gSavedSettings.setString("FontSansSerifFallback", - LLWindow::getFontListSans()); -#endif + gSavedSettings.getString("FontSansSerifBundledFallback") + ";" + LLWindow::getFontListSans() ); // - apply command line settings clp.notify(); // Handle initialization from settings. - // Start up the debugging console before handling other options. + // Start up the debugging console before handling other options. if (gSavedSettings.getBOOL("ShowConsoleWindow")) { initConsole(); -- cgit v1.2.3