4 Aug
2019
4 Aug
'19
2:22 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbb4432b25dc65b9d65f0…
commit dbb4432b25dc65b9d65f02bfc09d47d63b8cd5e5
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sun Aug 4 11:22:51 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Sun Aug 4 11:22:51 2019 +0900
[FONTS][SETUP][BOOTDATA] Add Times New Roman fonts (#1790)
Add "Times New Roman" fonts. CORE-16272
- Add "Times New Roman" and "Times New Roman Italic" fonts by
duplicating "Liberation Serif" fonts and renaming them.
- Delete some "Times New Roman" font substitutes.
- Add LICENSE file.
I made these font files by using FontForge. Their family name is "Times New
Roman". Their display names are "Times New Roman", "Times New Roman
Bold", "Times New Roman Bold Italic" and "Times New Roman
Italic". Their font filenames are times.ttf, timesbd.ttf, timesbi.ttf and timesi.ttf.
The Underline Positions are hacked by adding an integer value for workaround of
FontForge's bug.
---
base/setup/lib/muifonts.h | 46 ++++++-------
boot/bootdata/livecd.inf | 5 +-
media/fonts/CMakeLists.txt | 4 ++
media/fonts/doc/TimesNewRoman/LICENSE.txt | 104 ++++++++++++++++++++++++++++++
media/fonts/doc/TimesNewRoman/README.txt | 6 ++
media/fonts/times.ttf | Bin 0 -> 204888 bytes
media/fonts/timesbd.ttf | Bin 0 -> 198920 bytes
media/fonts/timesbi.ttf | Bin 0 -> 205404 bytes
media/fonts/timesi.ttf | Bin 0 -> 207432 bytes
9 files changed, 135 insertions(+), 30 deletions(-)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 9dae43fd2a7..289d54f3c85 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -24,14 +24,13 @@ MUI_SUBFONT LatinFonts[] =
{ L"System", L"FreeSans" },
{ L"Tahoma", L"Tahoma" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"Liberation Serif" },
- { L"Times New Roman", L"Liberation Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"Liberation Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Open Sans" },
{ NULL, NULL }
};
@@ -59,14 +58,13 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"System", L"FreeSans" },
{ L"Tahoma", L"Tahoma" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"Liberation Serif" },
- { L"Times New Roman", L"Liberation Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"Liberation Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Open Sans" },
{ NULL, NULL }
};
@@ -94,14 +92,13 @@ MUI_SUBFONT GreekFonts[] =
{ L"System", L"FreeSans" },
{ L"Tahoma", L"DejaVu Sans" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"Liberation Serif" },
- { L"Times New Roman", L"Liberation Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"Liberation Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Open Sans" },
{ NULL, NULL }
};
@@ -130,14 +127,14 @@ MUI_SUBFONT HebrewFonts[] =
{ L"System", L"FreeSans" },
{ L"Tahoma", L"Tahoma" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"DejaVu Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman", L"DejaVu Serif" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"DejaVu Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Open Sans" },
{ L"Ubuntu", L"Tahoma" },
{ NULL, NULL }
@@ -178,14 +175,13 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"Liberation Serif" },
- { L"Times New Roman", L"Liberation Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"Liberation Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Droid Sans Fallback" },
{ L"Ubuntu", L"Droid Sans Fallback" },
/* localized names */
@@ -232,14 +228,13 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"Liberation Serif" },
- { L"Times New Roman", L"Liberation Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"Liberation Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Droid Sans Fallback" },
{ L"Ubuntu", L"Droid Sans Fallback" },
/* localized names */
@@ -284,14 +279,13 @@ MUI_SUBFONT JapaneseFonts[] =
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"Liberation Serif" },
- { L"Times New Roman", L"Liberation Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"Liberation Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Droid Sans Fallback" },
{ L"Ubuntu", L"Droid Sans Fallback" },
/* localized names */
@@ -340,14 +334,13 @@ MUI_SUBFONT KoreanFonts[] =
{ L"System", L"Droid Sans Fallback" },
{ L"Tahoma", L"Droid Sans Fallback" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"Liberation Serif" },
- { L"Times New Roman", L"Liberation Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"Liberation Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Droid Sans Fallback" },
{ L"Ubuntu", L"Droid Sans Fallback" },
/* localized names */
@@ -385,14 +378,14 @@ MUI_SUBFONT UnicodeFonts[] =
{ L"System", L"FreeSans" },
{ L"Tahoma", L"DejaVu Sans" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"DejaVu Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman", L"DejaVu Serif" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
{ 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"DejaVu Serif" },
+ { L"Tms Rmn", L"Times New Roman" },
{ L"Trebuchet MS", L"Open Sans" },
{ NULL, NULL }
};
@@ -422,8 +415,7 @@ MUI_SUBFONT HindiFonts[] =
{ L"System", L"FreeSans" },
{ L"Tahoma", L"FreeSans" },
{ L"Terminal", L"DejaVu Sans Mono" },
- { L"Times", L"Liberation Serif" },
- { L"Times New Roman", L"Liberation Serif" },
+ { L"Times", L"Times New Roman" },
{ L"Times New Roman Baltic,186", L"Times New Roman,186" },
{ L"Times New Roman CE,238", L"Times New Roman,238" },
{ L"Times New Roman CYR,204", L"Times New Roman,204" },
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf
index 434a533adef..049c6b7a692 100644
--- a/boot/bootdata/livecd.inf
+++ b/boot/bootdata/livecd.inf
@@ -58,9 +58,8 @@ HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","MS Shell Dl
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Shell Dlg 2",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans
Mono"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation
Serif"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times
New Roman",0x00000000,"Liberation Serif"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms
Rmn",0x00000000,"Liberation Serif"
+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"
; FIXME: Registration
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt
index 5394df3eade..659ae00c997 100644
--- a/media/fonts/CMakeLists.txt
+++ b/media/fonts/CMakeLists.txt
@@ -151,6 +151,10 @@ list(APPEND FONT_FILES
#sserifeg.fon
#sserifer.fon
#sserifet.fon
+ times.ttf
+ timesbd.ttf
+ timesbi.ttf
+ timesi.ttf
UniVGA16.ttf)
foreach(item ${FONT_FILES})
diff --git a/media/fonts/doc/TimesNewRoman/LICENSE.txt
b/media/fonts/doc/TimesNewRoman/LICENSE.txt
new file mode 100644
index 00000000000..be16b546d90
--- /dev/null
+++ b/media/fonts/doc/TimesNewRoman/LICENSE.txt
@@ -0,0 +1,104 @@
+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 renamed as "Times New Roman".
+
+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/TimesNewRoman/README.txt
b/media/fonts/doc/TimesNewRoman/README.txt
new file mode 100644
index 00000000000..e7ca2d4eacb
--- /dev/null
+++ b/media/fonts/doc/TimesNewRoman/README.txt
@@ -0,0 +1,6 @@
+ReactOS "Times New Roman" fonts are based on Liberation Serif.
+
+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/times.ttf b/media/fonts/times.ttf
new file mode 100644
index 00000000000..7ba32fb1b45
Binary files /dev/null and b/media/fonts/times.ttf differ
diff --git a/media/fonts/timesbd.ttf b/media/fonts/timesbd.ttf
new file mode 100644
index 00000000000..b7c59e5779e
Binary files /dev/null and b/media/fonts/timesbd.ttf differ
diff --git a/media/fonts/timesbi.ttf b/media/fonts/timesbi.ttf
new file mode 100644
index 00000000000..b961a68920b
Binary files /dev/null and b/media/fonts/timesbi.ttf differ
diff --git a/media/fonts/timesi.ttf b/media/fonts/timesi.ttf
new file mode 100644
index 00000000000..76684977706
Binary files /dev/null and b/media/fonts/timesi.ttf differ