3 Aug
2019
3 Aug
'19
7:24 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb1878157bbe4ca825764…
commit bb1878157bbe4ca825764a4ef933f3f086b369dd
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sat Aug 3 16:24:32 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Sat Aug 3 16:24:32 2019 +0900
[FONTS][SETUP] Add Palatino Linotype fonts (#1785)
Add "Palatino Linotype" fonts. CORE-16272
- Add "Palatino Linotype", "Palatino Linotype Bold",
"Palatino Linotype Bold Italic" and "Palatino Linotype Italic" fonts
by duplicating "DejaVu Serif" fonts and renaming them.
- Delete some "Palatino Linotype" font substitutes.
- Add LICENSE file.
I made these font files by using FontForge. Their family name is "Palatino
Linotype". Their display names are "Palatino Linotype", "Palatino
Linotype Bold", "Palatino Linotype Bold Italic" and "Palatino Linotype
Italic". Their font filenames are pala.ttf, palab.ttf, palabi.ttf and palai.ttf. The
Underline Positions are hacked by adding an integer value for workaround of
FontForge's bug.
---
base/setup/lib/muifonts.h | 9 --
media/fonts/CMakeLists.txt | 4 +
media/fonts/doc/PalatinoLinotype/LICENSE.txt | 188 +++++++++++++++++++++++++++
media/fonts/doc/PalatinoLinotype/README.txt | 3 +
media/fonts/pala.ttf | Bin 0 -> 293776 bytes
media/fonts/palab.ttf | Bin 0 -> 282244 bytes
media/fonts/palabi.ttf | Bin 0 -> 298676 bytes
media/fonts/palai.ttf | Bin 0 -> 296672 bytes
8 files changed, 195 insertions(+), 9 deletions(-)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 0e2ce9a0ab9..967f229d07d 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -22,7 +22,6 @@ MUI_SUBFONT LatinFonts[] =
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"Tahoma" },
{ L"Terminal", L"DejaVu Sans Mono" },
@@ -59,7 +58,6 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"Tahoma" },
{ L"Terminal", L"DejaVu Sans Mono" },
@@ -96,7 +94,6 @@ MUI_SUBFONT GreekFonts[] =
{ L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"DejaVu Sans" },
{ L"Terminal", L"DejaVu Sans Mono" },
@@ -134,7 +131,6 @@ MUI_SUBFONT HebrewFonts[] =
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"Tahoma" },
{ L"Terminal", L"DejaVu Sans Mono" },
@@ -181,7 +177,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"MS UI Gothic", L"Droid Sans Fallback" },
{ L"MS UI Gothic 2", L"Droid Sans Fallback" },
{ L"NSimSun", L"Droid Sans Fallback" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"SimHei", L"Droid Sans Fallback" },
{ L"SimSun", L"Droid Sans Fallback" },
{ L"System", L"Droid Sans Fallback" },
@@ -238,7 +233,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
{ L"Ming Light", L"Droid Sans Fallback" },
{ L"MingLiU", L"Droid Sans Fallback" },
{ L"PMingLiU", L"Droid Sans Fallback" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
@@ -291,7 +285,6 @@ MUI_SUBFONT JapaneseFonts[] =
{ L"MS Shell Dlg 2", L"Droid Sans Fallback" },
{ L"MS UI Gothic", L"Droid Sans Fallback" },
{ L"MS UI Gothic 2", L"Droid Sans Fallback" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
@@ -348,7 +341,6 @@ MUI_SUBFONT KoreanFonts[] =
{ L"MS Shell Dlg 2", L"Droid Sans Fallback" },
{ L"MS UI Gothic", L"Droid Sans Fallback" },
{ L"MS UI Gothic 2", L"Droid Sans Fallback" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
@@ -395,7 +387,6 @@ MUI_SUBFONT UnicodeFonts[] =
{ L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" },
- { L"Palatino Linotype", L"DejaVu Serif" },
{ L"System", L"FreeSans" },
{ L"Tahoma", L"DejaVu Sans" },
{ L"Terminal", L"DejaVu Sans Mono" },
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt
index 9ad30283b5b..1c4c70cfba1 100644
--- a/media/fonts/CMakeLists.txt
+++ b/media/fonts/CMakeLists.txt
@@ -98,6 +98,10 @@ list(APPEND FONT_FILES
OpenSans-Regular.ttf
OpenSans-Semibold.ttf
OpenSans-SemiboldItalic.ttf
+ pala.ttf
+ palab.ttf
+ palabi.ttf
+ palai.ttf
symbol.ttf
tahoma.ttf
tahomabd.ttf
diff --git a/media/fonts/doc/PalatinoLinotype/LICENSE.txt
b/media/fonts/doc/PalatinoLinotype/LICENSE.txt
new file mode 100644
index 00000000000..fae1d512b3c
--- /dev/null
+++ b/media/fonts/doc/PalatinoLinotype/LICENSE.txt
@@ -0,0 +1,188 @@
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+
+Copyright (c) 2019 Katayama Hirofumi MZ.
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+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 BITSTREAM OR THE GNOME
+FOUNDATION 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.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org.
+
+Arev Fonts Copyright
+------------------------------
+
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and
+associated documentation files (the "Font Software"), to reproduce
+and distribute the modifications to the Bitstream Vera Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Tavmjong Bah" or the word "Arev".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Tavmjong Bah Arev" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+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
+TAVMJONG BAH 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.
+
+Except as contained in this notice, the name of Tavmjong Bah shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization
+from Tavmjong Bah. For further information, contact: tavmjong @ free
+. fr.
+
+TeX Gyre DJV Math
+-----------------
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+
+Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski
+(on behalf of TeX users groups) are in public domain.
+
+Letters imported from Euler Fraktur from AMSfonts are (c) American
+Mathematical Society (see below).
+Bitstream Vera Fonts Copyright
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera
+is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license (“Fonts”) and associated
+documentation
+files (the “Font Software”), to reproduce and distribute the Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute,
+and/or sell copies of the Font Software, and to permit persons to whom
+the Font Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be
+included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional
+glyphs or characters may be added to the Fonts, only if the fonts are
+renamed
+to names not containing either the words “Bitstream” or the word “Vera”.
+
+This License becomes null and void to the extent applicable to Fonts or
+Font Software
+that has been modified and is distributed under the “Bitstream Vera”
+names.
+
+The Font Software may be sold as part of a larger software package but
+no copy
+of one or more of the Font Software typefaces may be sold by itself.
+
+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 BITSTREAM OR THE GNOME
+FOUNDATION
+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.
+Except as contained in this notice, the names of GNOME, the GNOME
+Foundation,
+and Bitstream Inc., shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Font Software without prior written
+authorization from the GNOME Foundation or Bitstream Inc., respectively.
+For further information, contact: fonts at gnome dot org.
+
+AMSFonts (v. 2.2) copyright
+
+The PostScript Type 1 implementation of the AMSFonts produced by and
+previously distributed by Blue Sky Research and Y&Y, Inc. are now freely
+available for general use. This has been accomplished through the
+cooperation
+of a consortium of scientific publishers with Blue Sky Research and Y&Y.
+Members of this consortium include:
+
+Elsevier Science IBM Corporation Society for Industrial and Applied
+Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS)
+
+In order to assure the authenticity of these fonts, copyright will be
+held by
+the American Mathematical Society. This is not meant to restrict in any way
+the legitimate use of the fonts, such as (but not limited to) electronic
+distribution of documents containing these fonts, inclusion of these fonts
+into other public domain or commercial font collections or computer
+applications, use of the outline data to create derivative fonts and/or
+faces, etc. However, the AMS does require that the AMS copyright notice be
+removed from any derivative versions of the fonts which have been altered in
+any way. In addition, to ensure the fidelity of TeX documents using Computer
+Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces,
+has requested that any alterations which yield different font metrics be
+given a different name.
+
+$Id$
diff --git a/media/fonts/doc/PalatinoLinotype/README.txt
b/media/fonts/doc/PalatinoLinotype/README.txt
new file mode 100644
index 00000000000..a93d1c08b94
--- /dev/null
+++ b/media/fonts/doc/PalatinoLinotype/README.txt
@@ -0,0 +1,3 @@
+ReactOS Palatino Linotype fonts are based on DejaVu Serif fonts.
+
+See LICENSE.txt for license terms.
diff --git a/media/fonts/pala.ttf b/media/fonts/pala.ttf
new file mode 100644
index 00000000000..b3ea1a154b1
Binary files /dev/null and b/media/fonts/pala.ttf differ
diff --git a/media/fonts/palab.ttf b/media/fonts/palab.ttf
new file mode 100644
index 00000000000..0eabb35181b
Binary files /dev/null and b/media/fonts/palab.ttf differ
diff --git a/media/fonts/palabi.ttf b/media/fonts/palabi.ttf
new file mode 100644
index 00000000000..5aa9201efba
Binary files /dev/null and b/media/fonts/palabi.ttf differ
diff --git a/media/fonts/palai.ttf b/media/fonts/palai.ttf
new file mode 100644
index 00000000000..f4f8e936fb3
Binary files /dev/null and b/media/fonts/palai.ttf differ
2152
days inactive
2152
days old
0 comments
1 participants
participants (1)
-
Katayama Hirofumi MZ