4 Aug
2019
4 Aug
'19
6:38 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc1aa8010a1f5c92edc5f…
commit dc1aa8010a1f5c92edc5fa531611950807edf370
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sun Aug 4 15:38:45 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Sun Aug 4 15:38:45 2019 +0900
[FONTS][SETUP][BOOTDATA] Add Lucida Console font (#1793)
Add "Lucida Console" fonts. CORE-16264
- Add "Lucida Console" font by duplicating "DejaVu Sans Mono" font
and renaming it.
- Delete some "Lucida Console" font substitutes.
- Add LICENSE file.
I used FontForge to rename it. Its family name is "Lucida Console". Its
display name is "Lucida Console". Its font filename is lucon.ttf. The Underline
Positions are hacked by adding an integer value for workaround of FontForge's bug.
---
base/setup/lib/muifonts.h | 10 --
boot/bootdata/livecd.inf | 1 -
media/fonts/CMakeLists.txt | 1 +
media/fonts/doc/LucidaConsole/LICENSE.txt | 188 ++++++++++++++++++++++++++++++
media/fonts/doc/LucidaConsole/README.txt | 3 +
media/fonts/lucon.ttf | Bin 0 -> 272612 bytes
6 files changed, 192 insertions(+), 11 deletions(-)
diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 5799f50a27d..dacb4b38224 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -17,7 +17,6 @@ MUI_SUBFONT LatinFonts[] =
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
@@ -50,7 +49,6 @@ MUI_SUBFONT CyrillicFonts[] =
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
@@ -83,7 +81,6 @@ MUI_SUBFONT GreekFonts[] =
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"Liberation Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" },
@@ -117,7 +114,6 @@ MUI_SUBFONT HebrewFonts[] =
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Tahoma" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"Tahoma" },
{ L"MS Shell Dlg", L"Tahoma" },
{ L"MS Shell Dlg 2", L"Tahoma" },
@@ -158,7 +154,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
{ L"Franklin Gothic Medium", L"Droid Sans Fallback" },
{ L"Helv", L"Droid Sans Fallback" },
{ L"Helvetica", L"Liberation Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"Droid Sans Fallback" },
{ L"MS Shell Dlg", L"Droid Sans Fallback" },
{ L"MS Shell Dlg 2", L"Droid Sans Fallback" },
@@ -212,7 +207,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
{ L"Franklin Gothic Medium", L"Droid Sans Fallback" },
{ L"Helv", L"Droid Sans Fallback" },
{ L"Helvetica", L"Liberation Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"Droid Sans Fallback" },
{ L"MS Shell Dlg", L"Droid Sans Fallback" },
{ L"MS Shell Dlg 2", L"Droid Sans Fallback" },
@@ -262,7 +256,6 @@ MUI_SUBFONT JapaneseFonts[] =
{ L"Franklin Gothic Medium", L"Droid Sans Fallback" },
{ L"Helv", L"Droid Sans Fallback" },
{ L"Helvetica", L"Liberation Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Gothic", L"Droid Sans Fallback" },
{ L"MS Mincho", L"Droid Sans Fallback" },
{ L"MS PGothic", L"Droid Sans Fallback" },
@@ -321,7 +314,6 @@ MUI_SUBFONT KoreanFonts[] =
{ L"GungsuhChe", L"Droid Sans Fallback" },
{ L"Helv", L"Droid Sans Fallback" },
{ L"Helvetica", L"Liberation Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"Droid Sans Fallback" },
{ L"MS Shell Dlg", L"Droid Sans Fallback" },
{ L"MS Shell Dlg 2", L"Droid Sans Fallback" },
@@ -367,7 +359,6 @@ MUI_SUBFONT UnicodeFonts[] =
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"DejaVu Sans" },
{ L"Helvetica", L"DejaVu Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"DejaVu Sans" },
{ L"MS Shell Dlg", L"DejaVu Sans" },
{ L"MS Shell Dlg 2", L"DejaVu Sans" },
@@ -402,7 +393,6 @@ MUI_SUBFONT HindiFonts[] =
{ L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" },
{ L"Helv", L"Tahoma" },
{ L"Helvetica", L"Liberation Sans" },
- { L"Lucida Console", L"DejaVu Sans Mono" },
{ L"MS Sans Serif", L"FreeSans" },
{ L"MS Shell Dlg", L"FreeSans" },
{ L"MS Shell Dlg 2", L"FreeSans" },
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf
index 049c6b7a692..ab19610c8b0 100644
--- a/boot/bootdata/livecd.inf
+++ b/boot/bootdata/livecd.inf
@@ -52,7 +52,6 @@ HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Courier",0x
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys
Excelsior 3.01-L2"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation
Sans"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu
Sans Mono"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Sans Serif",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Shell Dlg",0x00000000,"Tahoma"
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS
Shell Dlg 2",0x00000000,"Tahoma"
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt
index 60f8e298843..9ca0aa22509 100644
--- a/media/fonts/CMakeLists.txt
+++ b/media/fonts/CMakeLists.txt
@@ -87,6 +87,7 @@ list(APPEND FONT_FILES
LibreFranklin-SemiBoldItalic.ttf
LibreFranklin-Thin.ttf
LibreFranklin-ThinItalic.ttf
+ lucon.ttf
Marlett.ttf
OpenSans-Bold.ttf
OpenSans-BoldItalic.ttf
diff --git a/media/fonts/doc/LucidaConsole/LICENSE.txt
b/media/fonts/doc/LucidaConsole/LICENSE.txt
new file mode 100644
index 00000000000..fae1d512b3c
--- /dev/null
+++ b/media/fonts/doc/LucidaConsole/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/LucidaConsole/README.txt
b/media/fonts/doc/LucidaConsole/README.txt
new file mode 100644
index 00000000000..df1de0651d0
--- /dev/null
+++ b/media/fonts/doc/LucidaConsole/README.txt
@@ -0,0 +1,3 @@
+ReactOS "Lucida Console" font is based on "DejaVu Sans Mono".
+
+See also LICENSE.txt file.
diff --git a/media/fonts/lucon.ttf b/media/fonts/lucon.ttf
new file mode 100644
index 00000000000..d697e268595
Binary files /dev/null and b/media/fonts/lucon.ttf differ