https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23e575c1bcebc130d8ef03...
commit 23e575c1bcebc130d8ef03b5e771b774716981c6 Author: Joachim Henze Joachim.Henze@reactos.org AuthorDate: Tue Nov 12 01:54:07 2019 +0100 Commit: Joachim Henze Joachim.Henze@reactos.org CommitDate: Tue Nov 12 01:54:07 2019 +0100
[MEDIA][FONTS] Revert "Add Microsoft Sans Serif font (#1805)"
To fix regression CORE-16497 "Chromium BSU setup using wrong font"
It is a good idea to add micross.ttf, but we should not use "Liberation Sans" as template but instead either create it from scratch or at least use something with the same metrics as the MS font and does not blur in CORE-16497.
This reverts commit 0.4.13-dev-796-g eefc54420294eda81665fb6eb8f6b4bb92b2d20a
Same revert already done in 0.4.13-RC-25-g c8edd36e3e064b7844c0c46361e08eb33e395aec --- media/fonts/CMakeLists.txt | 1 - media/fonts/doc/MicrosoftSansSerif/LICENSE.txt | 104 ------------------------- media/fonts/doc/MicrosoftSansSerif/README.txt | 6 -- media/fonts/micross.ttf | Bin 183332 -> 0 bytes 4 files changed, 111 deletions(-)
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 3cede56d7d8..ef0284283c6 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -33,7 +33,6 @@ list(APPEND FONT_FILES georgiaz.ttf lucon.ttf Marlett.ttf - micross.ttf pala.ttf palab.ttf palabi.ttf diff --git a/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt b/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt deleted file mode 100644 index cb6c5ce9cfd..00000000000 --- a/media/fonts/doc/MicrosoftSansSerif/LICENSE.txt +++ /dev/null @@ -1,104 +0,0 @@ -Digitized data copyright (c) 2010 Google Corporation - with Reserved Font Arimo, Tinos and Cousine. -Copyright (c) 2012 Red Hat, Inc. - with Reserved Font Name Liberation. -Copyright (c) 2019 Katayama Hirofumi MZ - with renaming as "Microsoft Sans Serif". - -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/MicrosoftSansSerif/README.txt b/media/fonts/doc/MicrosoftSansSerif/README.txt deleted file mode 100644 index 9e07f116ff5..00000000000 --- a/media/fonts/doc/MicrosoftSansSerif/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -ReactOS "Microsoft Sans Serif" font is based on "Liberation Sans". - -This Font Software is licensed under the SIL Open Font License, -Version 1.1. - -Please read file "LICENSE" for details. diff --git a/media/fonts/micross.ttf b/media/fonts/micross.ttf deleted file mode 100644 index fd6b1f36bc8..00000000000 Binary files a/media/fonts/micross.ttf and /dev/null differ
-
Joachim Henze