mirror of
https://github.com/Vita3K/Vita3K.git
synced 2026-07-11 01:34:23 +02:00
fonts: Remove bundled fonts (#3974)
This commit is contained in:
Pedro Montes Alcalde
committed by
GitHub
GitHub
parent
88f459c64d
commit
a929a2bded
@@ -1,16 +0,0 @@
|
||||
M+ FONTS Copyright (C) 2002-2017 M+ FONTS PROJECT
|
||||
|
||||
-
|
||||
|
||||
LICENSE_E
|
||||
|
||||
|
||||
|
||||
|
||||
These fonts are free software.
|
||||
Unlimited permission is granted to use, copy, and distribute them, with
|
||||
or without modification, either commercially or noncommercially.
|
||||
THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
|
||||
|
||||
|
||||
http://mplus-fonts.osdn.jp
|
||||
@@ -1,15 +0,0 @@
|
||||
M+ FONTS Copyright (C) 2002-2017 M+ FONTS PROJECT
|
||||
|
||||
-
|
||||
|
||||
LICENSE_J
|
||||
|
||||
|
||||
|
||||
|
||||
これらのフォントはフリー（自由な）ソフトウエアです。
|
||||
あらゆる改変の有無に関わらず、また商業的な利用であっても、自由にご利用、
|
||||
複製、再配布することができますが、全て無保証とさせていただきます。
|
||||
|
||||
|
||||
http://mplus-fonts.osdn.jp
|
||||
@@ -1,97 +0,0 @@
|
||||
Copyright (c) 2017-2021, Eunbin Jeong (Dalgona.) <project-neodgm@dalgona.dev>
|
||||
with Reserved Font Name "Neo둥근모",
|
||||
"Neo둥근모 Code",
|
||||
"NeoDunggeunmo",
|
||||
and "NeoDunggeunmo Code".
|
||||
|
||||
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.
|
||||
@@ -1,98 +0,0 @@
|
||||
Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font
|
||||
Name 'Source'. Source is a trademark of Adobe in the United States
|
||||
and/or other countries.
|
||||
Copyright 2021-2023, SourceHanSansCN-TTF-Min
|
||||
(https://github.com/iizyd/SourceHanSansCN-TTF-Min),
|
||||
|
||||
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.
@@ -117,7 +117,6 @@ private:
|
||||
static fontmgr *m_instance;
|
||||
static std::vector<std::string> s_system_font_dirs;
|
||||
static std::string s_firmware_font_dir;
|
||||
static std::string s_fallback_font_dir;
|
||||
static int s_system_lang;
|
||||
|
||||
font *find(std::string_view name, int size, bool bold) {
|
||||
@@ -161,14 +160,6 @@ public:
|
||||
return s_firmware_font_dir;
|
||||
}
|
||||
|
||||
static void set_fallback_font_dir(const std::string &dir) {
|
||||
s_fallback_font_dir = dir;
|
||||
}
|
||||
|
||||
static const std::string &get_fallback_font_dir() {
|
||||
return s_fallback_font_dir;
|
||||
}
|
||||
|
||||
// System language (SceSystemParamLang value) for language-aware font selection
|
||||
static void set_system_lang(int lang) {
|
||||
s_system_lang = lang;
|
||||
@@ -183,7 +174,6 @@ public:
|
||||
m_instance = nullptr;
|
||||
s_system_font_dirs.clear();
|
||||
s_firmware_font_dir.clear();
|
||||
s_fallback_font_dir.clear();
|
||||
s_system_lang = 0;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -38,7 +38,6 @@ namespace overlay {
|
||||
fontmgr *fontmgr::m_instance = nullptr;
|
||||
std::vector<std::string> fontmgr::s_system_font_dirs;
|
||||
std::string fontmgr::s_firmware_font_dir;
|
||||
std::string fontmgr::s_fallback_font_dir;
|
||||
int fontmgr::s_system_lang = 0;
|
||||
|
||||
static bool file_exists(const std::string &path) {
|
||||
@@ -165,12 +164,6 @@ glyph_load_setup font::get_glyph_files(language_class class_) const {
|
||||
#endif
|
||||
}
|
||||
|
||||
// Bundled fallback font directorylast resort
|
||||
const auto &fallback_dir = fontmgr::get_fallback_font_dir();
|
||||
if (!fallback_dir.empty()) {
|
||||
result.lookup_font_dirs.push_back(fallback_dir);
|
||||
}
|
||||
|
||||
switch (class_) {
|
||||
case language_class::default_: {
|
||||
result.font_names.clear();
|
||||
@@ -196,8 +189,6 @@ glyph_load_setup font::get_glyph_files(language_class class_) const {
|
||||
result.font_names.emplace_back("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf");
|
||||
result.font_names.emplace_back("/usr/share/fonts/TTF/DejaVuSans.ttf");
|
||||
#endif
|
||||
// Bundled font as absolute last resort
|
||||
result.font_names.emplace_back("mplus-1mn-bold.ttf");
|
||||
break;
|
||||
}
|
||||
case language_class::cjk_base: {
|
||||
@@ -231,9 +222,6 @@ glyph_load_setup font::get_glyph_files(language_class class_) const {
|
||||
result.font_names.emplace_back("NotoSansSC-Regular.otf");
|
||||
result.font_names.emplace_back("wqy-microhei.ttc");
|
||||
#endif
|
||||
// Bundled fallback as last resort
|
||||
result.font_names.emplace_back("SourceHanSansSC-Bold-Min.ttf");
|
||||
break;
|
||||
}
|
||||
case language_class::hangul: {
|
||||
result.font_names.clear();
|
||||
@@ -256,8 +244,6 @@ glyph_load_setup font::get_glyph_files(language_class class_) const {
|
||||
result.font_names.emplace_back("NotoSansKR-Regular.otf");
|
||||
result.font_names.emplace_back("NotoSansCJK-Regular.ttc");
|
||||
#endif
|
||||
// Bundled fallback as last resort
|
||||
result.font_names.emplace_back("neodgm.ttf");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,15 +127,6 @@ void State::init_overlay_font_dirs() {
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto dir = fs_utils::path_to_utf8(static_assets / "data" / "fonts");
|
||||
if (!dir.empty()) {
|
||||
if (dir.back() != '/' && dir.back() != '\\')
|
||||
dir += '/';
|
||||
overlay::fontmgr::set_fallback_font_dir(dir);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto icons_dir = fs_utils::path_to_utf8(static_assets / "icons");
|
||||
if (!icons_dir.empty()) {
|
||||
@@ -149,7 +140,6 @@ void State::init_overlay_font_dirs() {
|
||||
LOG_INFO("Overlay font system dirs: {} entries", overlay::fontmgr::get_system_font_dirs().size());
|
||||
for (const auto &d : overlay::fontmgr::get_system_font_dirs())
|
||||
LOG_DEBUG(" system font dir: {}", d);
|
||||
LOG_INFO("Overlay font fallback dir: {}", overlay::fontmgr::get_fallback_font_dir().empty() ? "(none)" : overlay::fontmgr::get_fallback_font_dir());
|
||||
}
|
||||
|
||||
void set_depth_bias(State &state, Context *ctx, bool is_front, int factor, int units) {
|
||||
|
||||
Reference in New Issue
Block a user