mirror of
https://github.com/ValveSoftware/Proton.git
synced 2024-12-27 07:05:46 +03:00
fonts: Add an alternative of Microsoft Sans Serif (micross.ttf).
Fonts are from https://github.com/googlefonts/noto-fonts.git at 04a4c62ce05b628f80c0d3b6a455ca8201b65286, in hinted/ttf folder. CW-Bug-Id: #17132
This commit is contained in:
parent
5525cf9931
commit
ca928d31f9
@ -840,6 +840,7 @@ GOAL_TARGETS += fonts
|
|||||||
|
|
||||||
FONTFORGE = fontforge -quiet
|
FONTFORGE = fontforge -quiet
|
||||||
FONTSCRIPT = $(FONTS)/scripts/generatefont.pe
|
FONTSCRIPT = $(FONTS)/scripts/generatefont.pe
|
||||||
|
MERGEFONTSSCRIPT = $(FONTS)/scripts/mergefonts.pe
|
||||||
|
|
||||||
LIBERATION_SRCDIR = $(FONTS)/liberation-fonts/src
|
LIBERATION_SRCDIR = $(FONTS)/liberation-fonts/src
|
||||||
SOURCE_HAN_SANS_SRCDIR = $(FONTS)/source-han-sans
|
SOURCE_HAN_SANS_SRCDIR = $(FONTS)/source-han-sans
|
||||||
@ -903,6 +904,20 @@ malgun.ttf = $(FONTS_OBJ)/source-han/malgun.ttf
|
|||||||
simsun.ttc = $(FONTS_OBJ)/source-han/simsun.ttc
|
simsun.ttc = $(FONTS_OBJ)/source-han/simsun.ttc
|
||||||
msgothic.ttc = $(FONTS_OBJ)/source-han/msgothic.ttc
|
msgothic.ttc = $(FONTS_OBJ)/source-han/msgothic.ttc
|
||||||
|
|
||||||
|
noto_sans.ttf = $(FONTS)/noto/NotoSans-Regular.ttf
|
||||||
|
noto_sans_arabic.ttf = $(FONTS)/noto/NotoSansArabic-Regular.ttf
|
||||||
|
noto_sans_armenian.tff = $(FONTS)/noto/NotoSansArmenian-Regular.ttf
|
||||||
|
noto_sans_bengali.ttf = $(FONTS)/noto/NotoSansBengali-Regular.ttf
|
||||||
|
noto_sans_coptic.ttf = $(FONTS)/noto/NotoSansCoptic-Regular.ttf
|
||||||
|
noto_sans_georgian.ttf = $(FONTS)/noto/NotoSansGeorgian-Regular.ttf
|
||||||
|
noto_sans_gujarati.ttf = $(FONTS)/noto/NotoSansGujarati-Regular.ttf
|
||||||
|
noto_sans_hebrew.ttf = $(FONTS)/noto/NotoSansHebrew-Regular.ttf
|
||||||
|
noto_sans_khmer.ttf = $(FONTS)/noto/NotoSansKhmer-Regular.ttf
|
||||||
|
noto_sans_tamil.ttf = $(FONTS)/noto/NotoSansTamil-Regular.ttf
|
||||||
|
noto_sans_thaana.ttf = $(FONTS)/noto/NotoSansThaana-Regular.ttf
|
||||||
|
noto_sans_thai.ttf = $(FONTS)/noto/NotoSansThai-Regular.ttf
|
||||||
|
micross.ttf = $(FONTS_OBJ)/micross.ttf
|
||||||
|
|
||||||
#The use of "Arial" here is for compatibility with programs that require that exact string. This font is not Arial.
|
#The use of "Arial" here is for compatibility with programs that require that exact string. This font is not Arial.
|
||||||
LiberationSans-Regular_NAMES := "Arial" "Arial" "Arial"
|
LiberationSans-Regular_NAMES := "Arial" "Arial" "Arial"
|
||||||
#The use of "Arial" here is for compatibility with programs that require that exact string. This font is not Arial.
|
#The use of "Arial" here is for compatibility with programs that require that exact string. This font is not Arial.
|
||||||
@ -946,6 +961,13 @@ $(simsun.ttc): $(simsun.ttf) $(nsimsun.ttf)
|
|||||||
$(msgothic.ttc): $(msgothic.ttf) $(mspgothic.ttf) $(msuigothic.ttf)
|
$(msgothic.ttc): $(msgothic.ttf) $(mspgothic.ttf) $(msuigothic.ttf)
|
||||||
$(AFDKO_VERB) otf2otc -o $@ $^
|
$(AFDKO_VERB) otf2otc -o $@ $^
|
||||||
|
|
||||||
|
$(micross.ttf): $(noto_sans.ttf) $(noto_sans_arabic.ttf) $(noto_sans_armenian.ttf) $(noto_sans_bengali.ttf) $(noto_sans_coptic.ttf) \
|
||||||
|
$(noto_sans_georgian.ttf) $(noto_sans_gujarati.ttf) $(noto_sans_hebrew.ttf) $(noto_sans_khmer.ttf) $(noto_sans_tamil.ttf) \
|
||||||
|
$(noto_sans_thaana.ttf) $(noto_sans_thai.ttf)
|
||||||
|
$(FONTFORGE) -script $(MERGEFONTSSCRIPT) $(noto_sans.ttf) $(noto_sans_arabic.ttf) $(noto_sans_armenian.ttf) $(noto_sans_bengali.ttf) \
|
||||||
|
$(noto_sans_coptic.ttf) $(noto_sans_georgian.ttf) $(noto_sans_gujarati.ttf) $(noto_sans_hebrew.ttf) $(noto_sans_khmer.ttf) \
|
||||||
|
$(noto_sans_tamil.ttf) $(noto_sans_thaana.ttf) $(noto_sans_thai.ttf) "MicrosoftSansSerif" "Microsoft Sans Serif" "Regular" $(micross.ttf)
|
||||||
|
|
||||||
fonts: $(FONTS_OBJ)/LiberationSans-Regular.ttf
|
fonts: $(FONTS_OBJ)/LiberationSans-Regular.ttf
|
||||||
fonts: $(FONTS_OBJ)/LiberationSans-Bold.ttf
|
fonts: $(FONTS_OBJ)/LiberationSans-Bold.ttf
|
||||||
fonts: $(FONTS_OBJ)/LiberationSerif-Regular.ttf
|
fonts: $(FONTS_OBJ)/LiberationSerif-Regular.ttf
|
||||||
@ -955,6 +977,7 @@ fonts: $(msyh.ttf)
|
|||||||
fonts: $(simsun.ttc)
|
fonts: $(simsun.ttc)
|
||||||
fonts: $(msgothic.ttc)
|
fonts: $(msgothic.ttc)
|
||||||
fonts: $(malgun.ttf)
|
fonts: $(malgun.ttf)
|
||||||
|
fonts: $(micross.ttf)
|
||||||
|
|
||||||
##
|
##
|
||||||
## Targets
|
## Targets
|
||||||
|
10
dist.LICENSE
10
dist.LICENSE
@ -108,6 +108,16 @@ Visit Source Han Sans at
|
|||||||
|
|
||||||
---- ---- ---- ----
|
---- ---- ---- ----
|
||||||
|
|
||||||
|
This software contains some fonts from the Google Noto collection, licensed under the SIL Open Font License, available at LICENSE.OFL. They are
|
||||||
|
|
||||||
|
Copyright 2015 Google Inc.
|
||||||
|
|
||||||
|
Visit the Google Noto fonts collection at
|
||||||
|
|
||||||
|
https://www.google.com/get/noto/
|
||||||
|
|
||||||
|
---- ---- ---- ----
|
||||||
|
|
||||||
This software contains wine-mono, parts of which are included under a variety of licenses.
|
This software contains wine-mono, parts of which are included under a variety of licenses.
|
||||||
|
|
||||||
Parts of Mono (mono/) are variously licensed under the GPL, LGPL, and MIT X11 licenses. All parts are available as LGPL or MIT X11 except for the following:
|
Parts of Mono (mono/) are variously licensed under the GPL, LGPL, and MIT X11 licenses. All parts are available as LGPL or MIT X11 except for the following:
|
||||||
|
94
fonts/noto/LICENSE
Normal file
94
fonts/noto/LICENSE
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
Copyright 2018 The Noto Project Authors (github.com/googlei18n/noto-fonts)
|
||||||
|
|
||||||
|
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.
|
BIN
fonts/noto/NotoSans-Regular.ttf
Normal file
BIN
fonts/noto/NotoSans-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansArabic-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansArabic-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansArmenian-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansArmenian-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansBengali-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansBengali-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansCoptic-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansCoptic-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansGeorgian-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansGeorgian-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansGujarati-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansGujarati-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansHebrew-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansHebrew-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansKhmer-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansKhmer-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansTamil-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansTamil-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansThaana-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansThaana-Regular.ttf
Normal file
Binary file not shown.
BIN
fonts/noto/NotoSansThai-Regular.ttf
Normal file
BIN
fonts/noto/NotoSansThai-Regular.ttf
Normal file
Binary file not shown.
29
fonts/scripts/mergefonts.pe
Normal file
29
fonts/scripts/mergefonts.pe
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
if ($argc < 6)
|
||||||
|
Error ("Expected arguments - Font1, Font2, Font3, ..., FontName, FullName, FontWeight, OutputFilename")
|
||||||
|
endif
|
||||||
|
|
||||||
|
FONTNAME = ToString($argv[$argc - 4])
|
||||||
|
FULLNAME = ToString($argv[$argc - 3])
|
||||||
|
FONTWEIGHT = ToString($argv[$argc - 2])
|
||||||
|
SRCFONTNAME = ToString($argv[1])
|
||||||
|
DESTFONTNAME = ToString($argv[$argc - 1])
|
||||||
|
|
||||||
|
Open(SRCFONTNAME)
|
||||||
|
|
||||||
|
i = 2
|
||||||
|
while (i < $argc - 4)
|
||||||
|
MergeFonts($argv[i])
|
||||||
|
i = i + 1
|
||||||
|
endloop
|
||||||
|
|
||||||
|
SetFontNames(FONTNAME, FULLNAME, FULLNAME, FONTWEIGHT, "", "1.0.0")
|
||||||
|
Generate(DESTFONTNAME)
|
||||||
|
Close()
|
||||||
|
|
||||||
|
Open(DESTFONTNAME)
|
||||||
|
Reencode("unicode")
|
||||||
|
SelectWorthOutputting()
|
||||||
|
SelectInvert()
|
||||||
|
BuildAccented()
|
||||||
|
Generate(DESTFONTNAME)
|
||||||
|
Close()
|
1
proton
1
proton
@ -579,6 +579,7 @@ class CompatData:
|
|||||||
( g_proton.fonts_dir, "simsun.ttc", "simsun.ttc" ),
|
( g_proton.fonts_dir, "simsun.ttc", "simsun.ttc" ),
|
||||||
( g_proton.fonts_dir, "msgothic.ttc", "msgothic.ttc" ),
|
( g_proton.fonts_dir, "msgothic.ttc", "msgothic.ttc" ),
|
||||||
( g_proton.fonts_dir, "malgun.ttf", "malgun.ttf" ),
|
( g_proton.fonts_dir, "malgun.ttf", "malgun.ttf" ),
|
||||||
|
( g_proton.fonts_dir, "micross.ttf", "micross.ttf" ),
|
||||||
|
|
||||||
( g_proton.wine_fonts_dir, "tahoma.ttf", "tahoma.ttf" ),
|
( g_proton.wine_fonts_dir, "tahoma.ttf", "tahoma.ttf" ),
|
||||||
]
|
]
|
||||||
|
Loading…
Reference in New Issue
Block a user