https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be731acfdeb94f75287eaa691d63d40e610a927c
commit be731acfdeb94f75287eaa691d63d40e610a927c Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Sat Nov 2 09:25:00 2019 +0900 Commit: GitHub <[email protected]> CommitDate: Sat Nov 2 09:25:00 2019 +0900 [MEDIA][FONTS] Restore 'Source Sans Pro' partially for Mizu theme (#1957) Deleting some fonts caused font regression in Mizu theme. CORE-16415 This PR will restore the following font files and related documents: SourceSansPro-Regular.ttf SourceSansPro-Bold.ttf SourceSansPro-BoldIt.ttf SourceSansPro-It.ttf --- media/fonts/CMakeLists.txt | 10 +++- media/fonts/SourceSansPro-Bold.ttf | Bin 0 -> 291424 bytes media/fonts/SourceSansPro-BoldIt.ttf | Bin 0 -> 103608 bytes media/fonts/SourceSansPro-It.ttf | Bin 0 -> 104236 bytes media/fonts/SourceSansPro-Regular.ttf | Bin 0 -> 293956 bytes media/fonts/doc/SourceSansPro/LICENSE.txt | 93 ++++++++++++++++++++++++++++++ media/fonts/doc/SourceSansPro/README.md | 20 +++++++ 7 files changed, 120 insertions(+), 3 deletions(-) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 46bb4587c55..61cc87db140 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -38,9 +38,10 @@ list(APPEND FONT_FILES palab.ttf palabi.ttf palai.ttf - symbol.ttf - tahoma.ttf - tahomabd.ttf + SourceSansPro-Regular.ttf + SourceSansPro-Bold.ttf + SourceSansPro-BoldIt.ttf + SourceSansPro-It.ttf #ssee874.fon # to be added #ssee1255.fon # to be added #ssee1256.fon # to be added @@ -49,6 +50,9 @@ list(APPEND FONT_FILES #sserifeg.fon # to be added #sserifer.fon # to be added #sserifet.fon # to be added + symbol.ttf + tahoma.ttf + tahomabd.ttf times.ttf timesbd.ttf timesbi.ttf diff --git a/media/fonts/SourceSansPro-Bold.ttf b/media/fonts/SourceSansPro-Bold.ttf new file mode 100644 index 00000000000..5d65c93242f Binary files /dev/null and b/media/fonts/SourceSansPro-Bold.ttf differ diff --git a/media/fonts/SourceSansPro-BoldIt.ttf b/media/fonts/SourceSansPro-BoldIt.ttf new file mode 100644 index 00000000000..3decd130070 Binary files /dev/null and b/media/fonts/SourceSansPro-BoldIt.ttf differ diff --git a/media/fonts/SourceSansPro-It.ttf b/media/fonts/SourceSansPro-It.ttf new file mode 100644 index 00000000000..f7af5377595 Binary files /dev/null and b/media/fonts/SourceSansPro-It.ttf differ diff --git a/media/fonts/SourceSansPro-Regular.ttf b/media/fonts/SourceSansPro-Regular.ttf new file mode 100644 index 00000000000..44486cdc670 Binary files /dev/null and b/media/fonts/SourceSansPro-Regular.ttf differ diff --git a/media/fonts/doc/SourceSansPro/LICENSE.txt b/media/fonts/doc/SourceSansPro/LICENSE.txt new file mode 100644 index 00000000000..df187637e18 --- /dev/null +++ b/media/fonts/doc/SourceSansPro/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated 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/SourceSansPro/README.md b/media/fonts/doc/SourceSansPro/README.md new file mode 100644 index 00000000000..a3e1b9dded8 --- /dev/null +++ b/media/fonts/doc/SourceSansPro/README.md @@ -0,0 +1,20 @@ +# Source Sans Pro + +Source Sans Pro is a set of OpenType fonts that have been designed to work well +in user interface (UI) environments. In addition to a functional OpenType font, this open +source project provides all of the source files that were used to build this OpenType font +by using the AFDKO makeotf tool. + +## Font installation instructions + +* [Mac OS X](http://support.apple.com/kb/HT2509) +* [Windows](http://windows.microsoft.com/en-us/windows-vista/install-or-uninstall-fonts) +* [Linux/Unix-based systems](https://github.com/adobe-fonts/source-code-pro/issues/17#issuecomment-8967116) + +## Getting Involved + +Send suggestions for changes to the Source Sans OpenType font project maintainer, [Paul D. Hunt](mailto:[email protected]?subject=[GitHub] Source Sans Pro), for consideration. + +## Further information + +For information about the design and background of Source Sans, please refer to the [official font readme file](http://www.adobe.com/products/type/font-information/source-sans-pro-readme.html).
