[reactos] 01/01: Revert "[FONTS] Add Selawik as a substitution for Segoe UI" CORE-17122 (#2921)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cb8ee6d7e40b2558736df...
commit 3cb8ee6d7e40b2558736df8f815385d59b78e1d5 Author: Oleg Dubinskiy oleg.dubinskij2013@yandex.ua AuthorDate: Sun Jun 14 13:09:41 2020 +0300 Commit: GitHub noreply@github.com CommitDate: Sun Jun 14 19:09:41 2020 +0900
Revert "[FONTS] Add Selawik as a substitution for Segoe UI" CORE-17122 (#2921)
This reverts commit 97fb49a3d2bfdbbf5f03e193f922a80dd39ca9ba. --- base/setup/lib/muifonts.h | 1 - boot/bootdata/livecd.inf | 1 - media/fonts/CMakeLists.txt | 5 -- media/fonts/Selawik-Bold.ttf | Bin 58228 -> 0 bytes media/fonts/Selawik-ExtraLight.ttf | Bin 58956 -> 0 bytes media/fonts/Selawik-Light.ttf | Bin 59240 -> 0 bytes media/fonts/Selawik-Regular.ttf | Bin 58284 -> 0 bytes media/fonts/Selawik-SemiBold.ttf | Bin 58448 -> 0 bytes media/fonts/doc/Selawik/LICENSE.txt | 93 ------------------------------------ media/fonts/doc/Selawik/README.txt | 3 -- 10 files changed, 103 deletions(-)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 30ccfa87899..258cae7e1b5 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -29,7 +29,6 @@ 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 363066e595d..eae91147fa4 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -58,7 +58,6 @@ 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 159eec1f7cc..ef0284283c6 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -37,11 +37,6 @@ 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 deleted file mode 100644 index 7f5484094a0..00000000000 Binary files a/media/fonts/Selawik-Bold.ttf and /dev/null differ diff --git a/media/fonts/Selawik-ExtraLight.ttf b/media/fonts/Selawik-ExtraLight.ttf deleted file mode 100644 index cff82b75a52..00000000000 Binary files a/media/fonts/Selawik-ExtraLight.ttf and /dev/null differ diff --git a/media/fonts/Selawik-Light.ttf b/media/fonts/Selawik-Light.ttf deleted file mode 100644 index bf01cf4ccfd..00000000000 Binary files a/media/fonts/Selawik-Light.ttf and /dev/null differ diff --git a/media/fonts/Selawik-Regular.ttf b/media/fonts/Selawik-Regular.ttf deleted file mode 100644 index a474725c9d5..00000000000 Binary files a/media/fonts/Selawik-Regular.ttf and /dev/null differ diff --git a/media/fonts/Selawik-SemiBold.ttf b/media/fonts/Selawik-SemiBold.ttf deleted file mode 100644 index 069bd1adf14..00000000000 Binary files a/media/fonts/Selawik-SemiBold.ttf and /dev/null differ diff --git a/media/fonts/doc/Selawik/LICENSE.txt b/media/fonts/doc/Selawik/LICENSE.txt deleted file mode 100644 index 7525d224635..00000000000 --- a/media/fonts/doc/Selawik/LICENSE.txt +++ /dev/null @@ -1,93 +0,0 @@ -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 deleted file mode 100644 index 06d41c97555..00000000000 --- a/media/fonts/doc/Selawik/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -The Selawik font files come from this GitHub repo: - -https://github.com/vv-monsalve/Selawik/tree/QA-Selawik
-
Oleg Dubinskiy