3 Aug
2019
3 Aug
'19
10:03 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23faa89d09fa6e048bbc9…
commit 23faa89d09fa6e048bbc90a9d7d4b433109d8d0c
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sat Aug 3 19:03:27 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Sat Aug 3 19:03:27 2019 +0900
[FONTS][SETUP] Add Franklin Gothic Medium fonts (#1786)
Add "Franklin Gothic Medium" fonts. CORE-16272
- Add "Franklin Gothic Medium" and "Franklin Gothic Medium Italic"
fonts by duplicating Alexei Vanyashin's "Libre Franklin" fonts and renaming
them.
- Delete some "Franklin Gothic Medium" font substitutes.
- Add LICENSE file.
I made these font files by using FontForge. Their family name is "Franklin Gothic
Medium". Their display names are "Franklin Gothic Medium" and
"Franklin Gothic Medium Italic". Their font filenames are framd.ttf and
framdit.ttf. The Underline Positions are hacked by adding an integer value for workaround
of FontForge's bug.
Alexei Vanyashin's "Libre Franklin" fonts are available at
https://github.com/alexeiva/Libre-Franklin .
---
base/setup/lib/muifonts.h | 6 ---
media/fonts/CMakeLists.txt | 2 +
media/fonts/doc/FranklinGothicMedium/README.txt | 8 ++++
.../FranklinGothicMedium/SIL Open Font License.txt | 43 +++++++++++++++++++++
media/fonts/framd.ttf | Bin 0 -> 352992 bytes
media/fonts/framdit.ttf | Bin 0 -> 328536 bytes
6 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 967f229d07d..9dae43fd2a7 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -15,7 +15,6 @@ MUI_SUBFONT LatinFonts[] =
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
- { L"Franklin Gothic Medium", L"Libre Franklin Bold" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" },
@@ -51,7 +50,6 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
- { L"Franklin Gothic Medium", L"Libre Franklin" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" },
@@ -87,7 +85,6 @@ MUI_SUBFONT GreekFonts[] =
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
- { L"Franklin Gothic Medium", L"Libre Franklin" },
{ L"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" },
@@ -124,7 +121,6 @@ MUI_SUBFONT HebrewFonts[] =
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
- { L"Franklin Gothic Medium", L"Libre Franklin" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Tahoma" },
{ L"Lucida Console", L"DejaVu Sans Mono" },
@@ -380,7 +376,6 @@ MUI_SUBFONT UnicodeFonts[] =
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
- { L"Franklin Gothic Medium", L"Libre Franklin Bold" },
{ L"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"DejaVu Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" },
@@ -417,7 +412,6 @@ MUI_SUBFONT HindiFonts[] =
{ L"Courier New Greek,161", L"Courier New,161" },
{ L"Courier New TUR,162", L"Courier New,162" },
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
- { L"Franklin Gothic Medium", L"Libre Franklin Bold" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" },
{ L"Lucida Console", L"DejaVu Sans Mono" },
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt
index 1c4c70cfba1..5394df3eade 100644
--- a/media/fonts/CMakeLists.txt
+++ b/media/fonts/CMakeLists.txt
@@ -32,6 +32,8 @@ list(APPEND FONT_FILES
DejaVuSerifCondensed-BoldItalic.ttf
DejaVuSerifCondensed-Italic.ttf
DejaVuSerifCondensed.ttf
+ framd.ttf
+ framdit.ttf
FreeMono.ttf
FreeMonoBold.ttf
FreeMonoBoldOblique.ttf
diff --git a/media/fonts/doc/FranklinGothicMedium/README.txt
b/media/fonts/doc/FranklinGothicMedium/README.txt
new file mode 100644
index 00000000000..ee4a2c9bc74
--- /dev/null
+++ b/media/fonts/doc/FranklinGothicMedium/README.txt
@@ -0,0 +1,8 @@
+ReactOS "Franklin Gothic Medium" fonts are based on
+Alexei Vanyashin's "Libre Franklin" fonts.
+
+These font files are released under the terms of
+SIL Open Font License Version 1.1. See File "SIL Open Font License.txt".
+
+Alexei Vanyashin's "Libre Franklin" fonts are available
+at https://github.com/alexeiva/Libre-Franklin .
diff --git a/media/fonts/doc/FranklinGothicMedium/SIL Open Font License.txt
b/media/fonts/doc/FranklinGothicMedium/SIL Open Font License.txt
new file mode 100644
index 00000000000..e9792ccdb40
--- /dev/null
+++ b/media/fonts/doc/FranklinGothicMedium/SIL Open Font License.txt
@@ -0,0 +1,43 @@
+Copyright (c) 2015, Impallari Type (www.impallari.com)
+
+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 creat [...]
+
+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 [...]
\ No newline at end of file
diff --git a/media/fonts/framd.ttf b/media/fonts/framd.ttf
new file mode 100644
index 00000000000..d08fbf792ee
Binary files /dev/null and b/media/fonts/framd.ttf differ
diff --git a/media/fonts/framdit.ttf b/media/fonts/framdit.ttf
new file mode 100644
index 00000000000..765f7fba100
Binary files /dev/null and b/media/fonts/framdit.ttf differ
1928
days inactive
1928
days old
0 comments
1 participants
participants (1)
-
Katayama Hirofumi MZ