FIRE-20215: Add Google Noto font to the viewer.
Tonya Souther
parent
b658e3cce5
commit
d19d9694f9
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,187 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<fonts>
|
||||
|
||||
<font name="default" comment="default font files (global fallbacks)">
|
||||
<file>NotoSans.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>YuGothR.ttc</file>
|
||||
<file>MSGOTHIC.TTC</file>
|
||||
<file>gulim.ttc</file>
|
||||
<file>simhei.ttf</file>
|
||||
<file>ArialUni.ttf</file>
|
||||
<file>seguisym.ttf</file>
|
||||
</os>
|
||||
<os name="Mac">
|
||||
<file>ヒラギノ角ゴシック W3.ttc</file>
|
||||
<file>ヒラギノ角ゴ Pro W3.otf</file>
|
||||
<file>ヒラギノ角ゴ ProN W3.otf</file>
|
||||
<file>ヒラギノ明朝 ProN W3.ttc</file>
|
||||
<!-- <FS:TS> FIRE-17481: Add El Capitan Korean font -->
|
||||
<file>AppleSDGothicNeo.ttc</file>
|
||||
<!-- </FS:TS> FIRE-17481 -->
|
||||
<file>AppleGothic.dfont</file>
|
||||
<file>AppleGothic.ttf</file>
|
||||
<file>AppleSDGothicNeo-Regular.otf</file>
|
||||
<file>华文细黑.ttf</file>
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="SansSerifBold"
|
||||
comment="Name of bold sans-serif font">
|
||||
<file>NotoSans-Bold.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arialbd.ttf</file>
|
||||
</os>
|
||||
<os name="Mac">
|
||||
<file>Helvetica.dfont</file>
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
|
||||
<file>NotoSansCombined-Regular.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arial.ttf</file>
|
||||
</os>
|
||||
<os name="Mac">
|
||||
<file>Helvetica.dfont</file>
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="SansSerif"
|
||||
comment="Name of bold sans-serif font"
|
||||
font_style="BOLD">
|
||||
<file>NotoSans-Bold.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="SansSerif"
|
||||
comment="Name of italic sans-serif font"
|
||||
font_style="ITALIC">
|
||||
<file>NotoSans-Italic.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="SansSerif"
|
||||
comment="Name of bold italic sans-serif font"
|
||||
font_style="BOLD|ITALIC">
|
||||
<file>NotoSans-BoldItalic.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="Monospace"
|
||||
comment="Name of monospace font">
|
||||
<file>NotoMono-Regular.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="Scripting"
|
||||
comment="Name of an optional font used for the script editor">
|
||||
<file>SourceCodePro-Regular.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="OCRA"
|
||||
comment="OCRA machine character recognition used in script editor compile errors">
|
||||
<file>ocra.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="DejaVu"
|
||||
comment="Name of DejaVu font">
|
||||
<file>NotoSansCombined-Regular.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="DejaVu"
|
||||
comment="Name of DejaVu font (bold)"
|
||||
font_style="BOLD">
|
||||
<file>NotoSans-Bold.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="DejaVu"
|
||||
comment="Name of DejaVu font (italic)"
|
||||
font_style="ITALIC">
|
||||
<file>NotoSans-Italic.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="DejaVu"
|
||||
comment="Name of DejaVu font (bold italic)"
|
||||
font_style="BOLD|ITALIC">
|
||||
<file>NotoSans-BoldItalic.ttf</file>
|
||||
</font>
|
||||
|
||||
<font name="Helvetica"
|
||||
comment="Name of Helvetica font">
|
||||
<file>NotoSansCombined-Regular.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arial.ttf</file>
|
||||
</os>
|
||||
<os name="Mac">
|
||||
<file>arial.ttf</file>
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="Helvetica"
|
||||
comment="Name of Helvetica font (bold)"
|
||||
font_style="BOLD">
|
||||
<file>NotoSans-Bold.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arialbd.ttf</file>
|
||||
</os>
|
||||
<os name="Mac">
|
||||
<file>arialbd.ttf</file>
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="Helvetica"
|
||||
comment="Name of Helvetica font (italic)"
|
||||
font_style="ITALIC">
|
||||
<file>NotoSans-Italic.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>ariali.ttf</file>
|
||||
</os>
|
||||
<os name="Mac">
|
||||
<file>ariali.ttf</file>
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="Helvetica"
|
||||
comment="Name of Helvetica font (bold italic)"
|
||||
font_style="BOLD|ITALIC">
|
||||
<file>NotoSans-BoldItalic.ttf</file>
|
||||
<os name="Windows">
|
||||
<file>arialbi.ttf</file>
|
||||
</os>
|
||||
<os name="Mac">
|
||||
<file>arialbi.ttf</file>
|
||||
</os>
|
||||
</font>
|
||||
|
||||
<font name="OverrideTest"
|
||||
comment="Name of font to test overriding">
|
||||
<file>times.ttf</file>
|
||||
<file>NotoSansCombined-Regular.ttf</file>
|
||||
</font>
|
||||
|
||||
<font_size name="Scripting"
|
||||
comment="Size of script editor font (points, or 1/72 of an inch)"
|
||||
size="9.6"
|
||||
/>
|
||||
<font_size name="Monospace"
|
||||
comment="Size for monospaced font (points, or 1/72 of an inch)"
|
||||
size="8.0"
|
||||
/>
|
||||
<font_size name="Huge"
|
||||
comment="Size of huge font (points, or 1/72 of an inch)"
|
||||
size="16.0"
|
||||
/>
|
||||
<font_size name="Large"
|
||||
comment="Size of large font (points, or 1/72 of an inch)"
|
||||
size="11.0"
|
||||
/>
|
||||
<font_size name="Medium"
|
||||
comment="Size of medium font (points, or 1/72 of an inch)"
|
||||
size="10.0"
|
||||
/>
|
||||
<font_size name="Small"
|
||||
comment="Size of small font (points, or 1/72 of an inch)"
|
||||
size="9.0"
|
||||
/>
|
||||
<font_size name="Pie"
|
||||
comment="Size of pie menu font (points, or 1/72 of an inch)"
|
||||
size="7.5"
|
||||
/>
|
||||
</fonts>
|
||||
|
|
@ -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");
|
||||
|
|
|
|||
Loading…
Reference in New Issue