https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97fb49a3d2bfdbbf5f03e1...
commit 97fb49a3d2bfdbbf5f03e193f922a80dd39ca9ba Author: William Kent wjk011@gmail.com AuthorDate: Sun Apr 26 08:31:16 2020 -0400 Commit: GitHub noreply@github.com CommitDate: Sun Apr 26 15:31:16 2020 +0300
[FONTS] Add Selawik as a substitution for Segoe UI --- base/setup/lib/muifonts.h | 1 + boot/bootdata/livecd.inf | 1 + media/fonts/CMakeLists.txt | 5 ++ media/fonts/Selawik-Bold.ttf | Bin 0 -> 58228 bytes media/fonts/Selawik-ExtraLight.ttf | Bin 0 -> 58956 bytes media/fonts/Selawik-Light.ttf | Bin 0 -> 59240 bytes media/fonts/Selawik-Regular.ttf | Bin 0 -> 58284 bytes media/fonts/Selawik-SemiBold.ttf | Bin 0 -> 58448 bytes media/fonts/doc/Selawik/LICENSE.txt | 93 ++++++++++++++++++++++++++++++++++++ media/fonts/doc/Selawik/README.txt | 3 ++ 10 files changed, 103 insertions(+)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 258cae7e1b5..30ccfa87899 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -29,6 +29,7 @@ MUI_SUBFONT LatinFonts[] = { L"Times New Roman Greek,161", L"Times New Roman,161" }, { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Times New Roman" }, + { L"Segoe UI", L"Selawik" }, { NULL, NULL } };
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index eae91147fa4..363066e595d 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -58,6 +58,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI",0x00000000,"Selawik"
; FIXME: Registration
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index ef0284283c6..159eec1f7cc 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -37,6 +37,11 @@ list(APPEND FONT_FILES palab.ttf palabi.ttf palai.ttf + Selawik-Regular.ttf + Selawik-SemiBold.ttf + Selawik-Bold.ttf + Selawik-Light.ttf + Selawik-ExtraLight.ttf SourceSansPro-Regular.ttf SourceSansPro-Bold.ttf SourceSansPro-BoldIt.ttf diff --git a/media/fonts/Selawik-Bold.ttf b/media/fonts/Selawik-Bold.ttf new file mode 100644 index 00000000000..7f5484094a0 Binary files /dev/null and b/media/fonts/Selawik-Bold.ttf differ diff --git a/media/fonts/Selawik-ExtraLight.ttf b/media/fonts/Selawik-ExtraLight.ttf new file mode 100644 index 00000000000..cff82b75a52 Binary files /dev/null and b/media/fonts/Selawik-ExtraLight.ttf differ diff --git a/media/fonts/Selawik-Light.ttf b/media/fonts/Selawik-Light.ttf new file mode 100644 index 00000000000..bf01cf4ccfd Binary files /dev/null and b/media/fonts/Selawik-Light.ttf differ diff --git a/media/fonts/Selawik-Regular.ttf b/media/fonts/Selawik-Regular.ttf new file mode 100644 index 00000000000..a474725c9d5 Binary files /dev/null and b/media/fonts/Selawik-Regular.ttf differ diff --git a/media/fonts/Selawik-SemiBold.ttf b/media/fonts/Selawik-SemiBold.ttf new file mode 100644 index 00000000000..069bd1adf14 Binary files /dev/null and b/media/fonts/Selawik-SemiBold.ttf differ diff --git a/media/fonts/doc/Selawik/LICENSE.txt b/media/fonts/doc/Selawik/LICENSE.txt new file mode 100644 index 00000000000..7525d224635 --- /dev/null +++ b/media/fonts/doc/Selawik/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright 2015, Microsoft Corporation (www.microsoft.com), with Reserved Font Name Selawik. All Rights Reserved. Selawik is a trademark of Microsoft Corporation in the United States and/or other countries. + +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/media/fonts/doc/Selawik/README.txt b/media/fonts/doc/Selawik/README.txt new file mode 100644 index 00000000000..06d41c97555 --- /dev/null +++ b/media/fonts/doc/Selawik/README.txt @@ -0,0 +1,3 @@ +The Selawik font files come from this GitHub repo: + +https://github.com/vv-monsalve/Selawik/tree/QA-Selawik
-
William Kent