2 Aug
2019
2 Aug
'19
11:37 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1463f4b02ac7d8514baa8…
commit 1463f4b02ac7d8514baa808614a18b280cae1972
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Fri Aug 2 20:37:53 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Fri Aug 2 20:37:53 2019 +0900
[FONTS][SETUP][BOOTDATA] Add Arial fonts (#1781)
Add Arial fonts. CORE-16272
- Add "Arial", "Arial Bold", "Arial Bold Italic" and
"Arial Italic" fonts by duplicating Liberation Sans fonts and renaming them.
- Disable some Arial font substitutes.
- Add LICENSE file.
I made these font files by using FontForge. Their family name is "Arial".
Their display names are "Arial", "Arial Bold", "Arial Bold
Italic" and "Arial Italic". Their font filenames are arial.ttf,
arialbd.ttf, arialbi.ttf and ariali.ttf. The Underline Positions are hacked by adding an
integer value for workaround of FontForge's bug.
---
base/setup/lib/muifonts.h | 8 ---
boot/bootdata/livecd.inf | 1 -
media/fonts/CMakeLists.txt | 4 ++
media/fonts/arial.ttf | Bin 0 -> 180120 bytes
media/fonts/arialbd.ttf | Bin 0 -> 180000 bytes
media/fonts/arialbi.ttf | Bin 0 -> 187656 bytes
media/fonts/ariali.ttf | Bin 0 -> 188056 bytes
media/fonts/doc/Arial/AUTHORS.txt | 13 +++++
media/fonts/doc/Arial/ChangeLog.txt | 24 +++++++++
media/fonts/doc/Arial/LICENSE.txt | 104 ++++++++++++++++++++++++++++++++++++
media/fonts/doc/Arial/README.txt | 8 +++
11 files changed, 153 insertions(+), 9 deletions(-)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index a01176ac088..653373487c2 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -3,7 +3,6 @@
MUI_SUBFONT LatinFonts[] =
{
/*Font Substitute */
- { L"Arial", L"Liberation Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
@@ -43,7 +42,6 @@ MUI_SUBFONT LatinFonts[] =
MUI_SUBFONT CyrillicFonts[] =
{
- { L"Arial", L"Liberation Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
@@ -83,7 +81,6 @@ MUI_SUBFONT CyrillicFonts[] =
MUI_SUBFONT GreekFonts[] =
{
- { L"Arial", L"Liberation Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
@@ -169,7 +166,6 @@ WCHAR CSF_LocalName3[] = {0xFC4B, 0x91CC, 0}; /*
SimHei */
WCHAR CSF_LocalName4[] = {'M', 'S', 0x5B8B, 0x4F53, 0}; /* MS
Song */
MUI_SUBFONT ChineseSimplifiedFonts[] =
{
- { L"Arial", L"Liberation Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
@@ -226,7 +222,6 @@ WCHAR CTF_LocalName2[] = {0x83EF, 0x5EB7, 0x4E2D, 0x660E, 0x9AD4, 0};
/* D
WCHAR CTF_LocalName3[] = {0x83EF, 0x5EB7, 0x7C97, 0x660E, 0x9AD4, 0}; /*
DLCMingBold */
MUI_SUBFONT ChineseTraditionalFonts[] =
{
- { L"Arial", L"Liberation Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
@@ -283,7 +278,6 @@ WCHAR JF_LocalName2[] = {0xFF2D, 0xFF33, ' ', 0x30B4, 0x30B7,
0x30C3, 0x30AF, 0}
WCHAR JF_LocalName3[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3,
0x30AF, 0}; /* MS PGothic */
MUI_SUBFONT JapaneseFonts[] =
{
- { L"Arial", L"Liberation Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
@@ -341,7 +335,6 @@ WCHAR KF_LocalName4[] = {0xAD74, 0xB9BC, 0}; /* Gulim */
WCHAR KF_LocalName5[] = {0xAD74, 0xB9BC, 0xCCB4, 0}; /* GulimChe */
MUI_SUBFONT KoreanFonts[] =
{
- { L"Arial", L"Liberation Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
@@ -438,7 +431,6 @@ MUI_SUBFONT UnicodeFonts[] =
MUI_SUBFONT HindiFonts[] =
{
/*Font Substitute */
- { L"Arial", L"Liberation Sans" },
{ L"Arial Baltic,186", L"Arial,186" },
{ L"Arial CE,238", L"Arial,238" },
{ L"Arial CYR,204", L"Arial,204" },
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf
index 465f9ef1969..81452350c24 100644
--- a/boot/bootdata/livecd.inf
+++ b/boot/bootdata/livecd.inf
@@ -48,7 +48,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session
Manager\Environment","ALLUSERSPRO
HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory
Management","PagingFiles",0x00000000,""
; Font Substitution
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"Liberation
Sans"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Courier
New",0x00000000,"FreeMono"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys
Excelsior 3.01-L2"
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt
index 47c8f723097..e558028d2db 100644
--- a/media/fonts/CMakeLists.txt
+++ b/media/fonts/CMakeLists.txt
@@ -1,5 +1,9 @@
list(APPEND FONT_FILES
+ arial.ttf
+ arialbd.ttf
+ arialbi.ttf
+ ariali.ttf
comic.ttf
comicbd.ttf
DejaVuMathTeXGyre.ttf
diff --git a/media/fonts/arial.ttf b/media/fonts/arial.ttf
new file mode 100644
index 00000000000..9996deef116
Binary files /dev/null and b/media/fonts/arial.ttf differ
diff --git a/media/fonts/arialbd.ttf b/media/fonts/arialbd.ttf
new file mode 100644
index 00000000000..1334d0526db
Binary files /dev/null and b/media/fonts/arialbd.ttf differ
diff --git a/media/fonts/arialbi.ttf b/media/fonts/arialbi.ttf
new file mode 100644
index 00000000000..643ddb8d52f
Binary files /dev/null and b/media/fonts/arialbi.ttf differ
diff --git a/media/fonts/ariali.ttf b/media/fonts/ariali.ttf
new file mode 100644
index 00000000000..0b499ce88a8
Binary files /dev/null and b/media/fonts/ariali.ttf differ
diff --git a/media/fonts/doc/Arial/AUTHORS.txt b/media/fonts/doc/Arial/AUTHORS.txt
new file mode 100644
index 00000000000..8d3f86585b0
--- /dev/null
+++ b/media/fonts/doc/Arial/AUTHORS.txt
@@ -0,0 +1,13 @@
+AUTHORS
+
+Current Contributors (sorted alphabetically):
+ - Katayama Hirofumi MZ
+
+Previous Contributors
+ - Pravin Satpute <psatpute at redhat dot com>
+ Project Owner (Current)
+ Red Hat, Inc.
+
+ - Steve Matteson
+ Original Designer
+ Ascender, Inc.
diff --git a/media/fonts/doc/Arial/ChangeLog.txt b/media/fonts/doc/Arial/ChangeLog.txt
new file mode 100644
index 00000000000..a78b3a3eadd
--- /dev/null
+++ b/media/fonts/doc/Arial/ChangeLog.txt
@@ -0,0 +1,24 @@
+* Thu Oct 04 2012 Pravin Satpute <psatpute AT redhat DOT com>
+- Resolved "Glyphs with multiple unicode encodings inhibit subsetting" #851790
+- Resolved #851791, #854601 and #851825
+- Following GASP table version as per Liberation old version. (Anti-aliasing disabled)
+- Added support for Serbian glyphs for wikipedia #657849
+- In Monospace fonts, isFixedPitch bit set via script for getting it recognized as
Monospace in putty.exe
+
+* Fri Jul 06 2012 Pravin Satpute <psatpute AT redhat DOT com>
+- Initial version of Liberation fonts based on croscore fonts version 1.21.0
+- Converted TTF files into SFD files to be open source.
+- Update Copyright and License file
+- set fsType bit to 0, Installable Embedding is allowed.
+- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility.
+
+* Fri Aug 02 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
+- Renamed filename "LiberationSans-Regular.ttf" as "arial.ttf".
+- Renamed filename "LiberationSans-Bold.ttf" as "arialbd.ttf".
+- Renamed filename "LiberationSans-BoldItalic.ttf" as "arialbi.ttf".
+- Renamed filename "LiberationSans-Italic.ttf" as "ariali.ttf".
+- Renamed family name "Liberation Sans" as "Arial".
+- Renamed display name "Liberation Sans" as "Arial".
+- Renamed display name "Liberation Sans Bold" as "Arial Bold".
+- Renamed display name "Liberation Sans Bold Italic" as "Arial Bold
Italic".
+- Renamed display name "Liberation Sans Italic" as "Arial Italic".
diff --git a/media/fonts/doc/Arial/LICENSE.txt b/media/fonts/doc/Arial/LICENSE.txt
new file mode 100644
index 00000000000..ad3ff4979a1
--- /dev/null
+++ b/media/fonts/doc/Arial/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 "Arial".
+
+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/Arial/README.txt b/media/fonts/doc/Arial/README.txt
new file mode 100644
index 00000000000..b52515317a2
--- /dev/null
+++ b/media/fonts/doc/Arial/README.txt
@@ -0,0 +1,8 @@
+ReactOS Arial fonts are based on Liberation Sans.
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+Please read file "LICENSE" for details.
+
+Please read file "AUTHORS" for list of contributors.
1926
days inactive
1926
days old
0 comments
1 participants
participants (1)
-
Katayama Hirofumi MZ