mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-07-11 01:34:17 +02:00
FSUI: Switch emoji font to COLRv0 Twemoji 17.0.2
This commit is contained in:
TellowKrinkle
committed by
lightningterror
lightningterror
parent
fce3be8544
commit
33a5c4d83e
@@ -153,7 +153,7 @@ jobs:
|
||||
msbuild "PCSX2_qt.sln" /m /v:m /p:Configuration="${{ inputs.configuration }}" /p:Platform="${{ inputs.platform }}"
|
||||
)
|
||||
REM We can use Segoe UI Emoji so we don't need to bundle this
|
||||
del bin\resources\fonts\NotoColorEmoji*
|
||||
del bin\resources\fonts\Twemoji*
|
||||
|
||||
- name: Run Tests
|
||||
if: inputs.configuration == 'CMake'
|
||||
|
||||
@@ -1,93 +0,0 @@
|
||||
Copyright 2021 Google Inc. All Rights Reserved.
|
||||
|
||||
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:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
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.
@@ -0,0 +1,50 @@
|
||||
## License for the Code
|
||||
|
||||
Copyright 2016-2018, Mozilla Foundation
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
|
||||
|
||||
## License for the Visual Design
|
||||
|
||||
The Emoji art in the twe-svg.zip archive comes from [Twemoji](https://twitter.github.io/twemoji),
|
||||
and is used and redistributed under the CC-BY-4.0 [license terms](https://github.com/twitter/twemoji#license)
|
||||
offered by the Twemoji project.
|
||||
|
||||
### Creative Commons Attribution 4.0 International (CC BY 4.0)
|
||||
https://creativecommons.org/licenses/by/4.0/legalcode
|
||||
or for the human readable summary: https://creativecommons.org/licenses/by/4.0/
|
||||
|
||||
|
||||
#### You are free to:
|
||||
**Share** — copy and redistribute the material in any medium or format
|
||||
|
||||
**Adapt** — remix, transform, and build upon the material for any purpose, even commercially.
|
||||
|
||||
The licensor cannot revoke these freedoms as long as you follow the license terms.
|
||||
|
||||
|
||||
#### Under the following terms:
|
||||
**Attribution** — You must give appropriate credit, provide a link to the license,
|
||||
and indicate if changes were made.
|
||||
You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
|
||||
|
||||
**No additional restrictions** — You may not apply legal terms or **technological measures**
|
||||
that legally restrict others from doing anything the license permits.
|
||||
|
||||
#### Notices:
|
||||
You do not have to comply with the license for elements of the material in the public domain
|
||||
or where your use is permitted by an applicable exception or limitation. No warranties are given.
|
||||
The license may not give you all of the permissions necessary for your intended use.
|
||||
For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
|
||||
Binary file not shown.
@@ -337,10 +337,11 @@ namespace FontNames
|
||||
{nullptr, "Noto Sans Devanagari"},
|
||||
};
|
||||
static constexpr FontLoadInfo Emoji[] = {
|
||||
{"NotoColorEmoji-Regular.ttf"},
|
||||
{"Twemoji.Mozilla.ttf"},
|
||||
{"Seguiemj.ttf"},
|
||||
// {nullptr, "Apple Color Emoji"}, // Freetype can't properly render Apple Color Emoji.
|
||||
{nullptr, "Noto Color Emoji"},
|
||||
{nullptr, "Twemoji Mozilla"},
|
||||
// {nullptr, "Noto Color Emoji"}, // Noto Color Emoji comes in bitmap, SVG, and COLRv1 variants, none of which are supported
|
||||
{nullptr, "Noto Emoji"},
|
||||
};
|
||||
static constexpr FontLoadInfo Hebrew[] = {
|
||||
@@ -473,29 +474,7 @@ static std::span<const u8> TryLoadFont(FontSearchContext* ctx, const FontLoadInf
|
||||
|
||||
static bool ValidateFont(const FontLoadInfo& info, std::span<const u8> data)
|
||||
{
|
||||
if (info.face_name && 0 == strcmp(info.face_name, "Noto Color Emoji"))
|
||||
{
|
||||
// Noto Color Emoji comes in bitmap, SVG, and COLRv1 variants.
|
||||
// We can only render the SVG variant.
|
||||
if (data.size() < 8)
|
||||
return false;
|
||||
u32 magic_be;
|
||||
u16 num_tables_be;
|
||||
memcpy(&magic_be, &data[0], sizeof(u32));
|
||||
memcpy(&num_tables_be, &data[4], sizeof(u16));
|
||||
if (qFromBigEndian(magic_be) != 0x10000)
|
||||
return false;
|
||||
size_t num_tables = qFromBigEndian(num_tables_be);
|
||||
if (data.size() < num_tables * 16 + 12)
|
||||
return false;
|
||||
for (size_t i = 0; i < num_tables; i++)
|
||||
{
|
||||
// Check if there's an "SVG " table
|
||||
if (0 == memcmp(&data[i * 16 + 12], "SVG ", 4))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
// We currently don't search for any fonts that might have unsupported versions installed on some OSes
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1277,7 +1277,7 @@ function(setup_main_executable target)
|
||||
if (NOT WIN32 AND "${path}" MATCHES "/dx11/") # Don't include unneccessary stuff
|
||||
continue()
|
||||
endif()
|
||||
if (NOT BUNDLE_EMOJI_FONT AND "${path}" MATCHES "fonts/NotoColorEmoji")
|
||||
if (NOT BUNDLE_EMOJI_FONT AND "${path}" MATCHES "fonts/Twemoji")
|
||||
continue()
|
||||
endif()
|
||||
pcsx2_resource(${target} ${path} ${CMAKE_SOURCE_DIR}/bin/resources/)
|
||||
|
||||
Reference in New Issue
Block a user