diff --git a/indra/newview/fonts/NotoFSREADME.txt b/indra/newview/fonts/NotoFSREADME.txt new file mode 100644 index 0000000000..b48304c370 --- /dev/null +++ b/indra/newview/fonts/NotoFSREADME.txt @@ -0,0 +1,14 @@ +The NotoSansCombined.ttf file included in this directory is the two font +files NotoSans-Regular.ttf and NotoSansSymbols-Regular.ttf merged into one. +No other changes were made. This was necessary because the two Unicode +characters U+2714, HEAVY CHECK MARK, and U+25B6, BLACK RIGHT-POINTING +TRIANGLE, are in the Symbol font file, not the base file where the viewer +(specifically, the menu building code in llui/llmenugl.cpp) expects to find +it. This also allows proper display of many other symbols, as well. + +The viewer really should allow specifying multiple font files and having +glyphs missing from one be read from the next, but the code to do that seems +far hairier than I care to tackle. + +Tonya Souther +10 Oct 2016 diff --git a/indra/newview/fonts/NotoLICENSE_OFL.txt b/indra/newview/fonts/NotoLICENSE_OFL.txt new file mode 100644 index 0000000000..d952d62c06 --- /dev/null +++ b/indra/newview/fonts/NotoLICENSE_OFL.txt @@ -0,0 +1,92 @@ +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +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 THE +COPYRIGHT HOLDER 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. diff --git a/indra/newview/fonts/NotoMono-Regular.ttf b/indra/newview/fonts/NotoMono-Regular.ttf new file mode 100644 index 0000000000..3560a3a0c8 Binary files /dev/null and b/indra/newview/fonts/NotoMono-Regular.ttf differ diff --git a/indra/newview/fonts/NotoSans-Bold.ttf b/indra/newview/fonts/NotoSans-Bold.ttf new file mode 100644 index 0000000000..ab4cdeeda7 Binary files /dev/null and b/indra/newview/fonts/NotoSans-Bold.ttf differ diff --git a/indra/newview/fonts/NotoSans-BoldItalic.ttf b/indra/newview/fonts/NotoSans-BoldItalic.ttf new file mode 100644 index 0000000000..c10e146c45 Binary files /dev/null and b/indra/newview/fonts/NotoSans-BoldItalic.ttf differ diff --git a/indra/newview/fonts/NotoSans-Italic.ttf b/indra/newview/fonts/NotoSans-Italic.ttf new file mode 100644 index 0000000000..1aa2a520bf Binary files /dev/null and b/indra/newview/fonts/NotoSans-Italic.ttf differ diff --git a/indra/newview/fonts/NotoSansCombined-Regular.ttf b/indra/newview/fonts/NotoSansCombined-Regular.ttf new file mode 100644 index 0000000000..5f179d3313 Binary files /dev/null and b/indra/newview/fonts/NotoSansCombined-Regular.ttf differ diff --git a/indra/newview/fonts/fonts_noto.xml b/indra/newview/fonts/fonts_noto.xml new file mode 100644 index 0000000000..d65a56d800 --- /dev/null +++ b/indra/newview/fonts/fonts_noto.xml @@ -0,0 +1,187 @@ + + + + + NotoSans.ttf + + YuGothR.ttc + MSGOTHIC.TTC + gulim.ttc + simhei.ttf + ArialUni.ttf + seguisym.ttf + + + ヒラギノ角ゴシック W3.ttc + ヒラギノ角ゴ Pro W3.otf + ヒラギノ角ゴ ProN W3.otf + ヒラギノ明朝 ProN W3.ttc + + AppleSDGothicNeo.ttc + + AppleGothic.dfont + AppleGothic.ttf + AppleSDGothicNeo-Regular.otf + 华文细黑.ttf + + + + + NotoSans-Bold.ttf + + arialbd.ttf + + + Helvetica.dfont + + + + + NotoSansCombined-Regular.ttf + + arial.ttf + + + Helvetica.dfont + + + + + NotoSans-Bold.ttf + + + + NotoSans-Italic.ttf + + + + NotoSans-BoldItalic.ttf + + + + NotoMono-Regular.ttf + + + + SourceCodePro-Regular.ttf + + + + ocra.ttf + + + + NotoSansCombined-Regular.ttf + + + + NotoSans-Bold.ttf + + + + NotoSans-Italic.ttf + + + + NotoSans-BoldItalic.ttf + + + + NotoSansCombined-Regular.ttf + + arial.ttf + + + arial.ttf + + + + + NotoSans-Bold.ttf + + arialbd.ttf + + + arialbd.ttf + + + + + NotoSans-Italic.ttf + + ariali.ttf + + + ariali.ttf + + + + + NotoSans-BoldItalic.ttf + + arialbi.ttf + + + arialbi.ttf + + + + + times.ttf + NotoSansCombined-Regular.ttf + + + + + + + + + + diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8ea29d1d8e..85964aa011 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3855,6 +3855,7 @@ LLSD LLAppViewer::getViewerInfo() const else if (fsInternalFontSettingsFile == "fonts_roboto.xml") info["FONT"] = "Roboto"; else if (fsInternalFontSettingsFile == "fonts_dyslexia.xml") info["FONT"] = "OpenDyslexic"; else if (fsInternalFontSettingsFile == "fonts_deja_vu_all_caps.xml") info["FONT"] = "Deja Vu All Caps"; + else if (fsInternalFontSettingsFile == "fonts_noto.xml") info["FONT"] = "Noto Sans"; info["FONT_SIZE"] = gSavedSettings.getF32("FSFontSizeAdjustment"); info["FONT_SCREEN_DPI"] = gSavedSettings.getF32("FontScreenDPI");