mirror of
https://github.com/suyu-emu/Yucom.git
synced 2026-09-21 13:22:43 -07:00
fonts: Use Ume fonts instead of Source Han Sans Japanese.
They are metrically compatible with MS Gothic fonts. Attack on Titan 2 - A.O.T.2 - 進撃の巨人2 and Touhou Fuujinroku ~ Mountain of Faith are known to render better with Ume fonts. CW-Bug-Id: #19849 CW-Bug-Id: #19971
This commit is contained in:
committed by
Arkadiusz Hiler
parent
18f4555528
commit
7a46a3cf40
+18
-23
@@ -343,7 +343,7 @@ $(DIST_FONTS): fonts
|
||||
cp $(FONTS_OBJ)/*.ttf "$@"
|
||||
cp $(FONTS_OBJ)/source-han/msyh.ttf "$@"
|
||||
cp $(FONTS_OBJ)/source-han/simsun.ttc "$@"
|
||||
cp $(FONTS_OBJ)/source-han/msgothic.ttc "$@"
|
||||
cp $(FONTS_OBJ)/ume-gothic/msgothic.ttc "$@"
|
||||
cp $(FONTS_OBJ)/source-han/malgun.ttf "$@"
|
||||
|
||||
.PHONY: dist
|
||||
@@ -860,6 +860,7 @@ MERGEFONTSSCRIPT = $(FONTS)/scripts/mergefonts.pe
|
||||
|
||||
LIBERATION_SRCDIR = $(FONTS)/liberation-fonts/src
|
||||
SOURCE_HAN_SANS_SRCDIR = $(FONTS)/source-han-sans
|
||||
UME_DIR = $(FONTS)/ume
|
||||
|
||||
msyh.ttf_CIDFONTINFO = $(SOURCE_HAN_SANS_SRCDIR)/cidfontinfo.OTC.SC
|
||||
msyh.ttf_CIDFONT = $(SOURCE_HAN_SANS_SRCDIR)/cidfont.ps.OTC.SC
|
||||
@@ -885,29 +886,17 @@ nsimsun.ttf_UNISOURCE = $(SOURCE_HAN_SANS_SRCDIR)/UniSourceHanSansCN-UTF32-H
|
||||
nsimsun.ttf_MENUNAMEDB = $(FONTS)/patches/NSimSun-FontMenuNameDB
|
||||
nsimsun.ttf = $(FONTS_OBJ)/source-han/nsimsun.ttf
|
||||
|
||||
msgothic.ttf_CIDFONTINFO = $(SOURCE_HAN_SANS_SRCDIR)/cidfontinfo.OTC.J
|
||||
msgothic.ttf_CIDFONT = $(SOURCE_HAN_SANS_SRCDIR)/cidfont.ps.OTC.J
|
||||
msgothic.ttf_FEATURES = $(SOURCE_HAN_SANS_SRCDIR)/features.OTC.J
|
||||
msgothic.ttf_SEQUENCES = $(SOURCE_HAN_SANS_SRCDIR)/SourceHanSans_JP_sequences.txt
|
||||
msgothic.ttf_UNISOURCE = $(SOURCE_HAN_SANS_SRCDIR)/UniSourceHanSansJP-UTF32-H
|
||||
msgothic.ttf_MENUNAMEDB = $(FONTS)/patches/MSGothic-FontMenuNameDB
|
||||
msgothic.ttf = $(FONTS_OBJ)/source-han/msgothic.ttf
|
||||
msgothic.ttf_FONT = $(UME_DIR)/ume-tgo4.ttf
|
||||
msgothic.ttf_NAMETABLE_PATCH = $(FONTS)/patches/UmeGothic-nametable.patch
|
||||
msgothic.ttf = $(FONTS_OBJ)/ume-gothic/msgothic.ttf
|
||||
|
||||
mspgothic.ttf_CIDFONTINFO = $(SOURCE_HAN_SANS_SRCDIR)/cidfontinfo.OTC.J
|
||||
mspgothic.ttf_CIDFONT = $(SOURCE_HAN_SANS_SRCDIR)/cidfont.ps.OTC.J
|
||||
mspgothic.ttf_FEATURES = $(SOURCE_HAN_SANS_SRCDIR)/features.OTC.J
|
||||
mspgothic.ttf_SEQUENCES = $(SOURCE_HAN_SANS_SRCDIR)/SourceHanSans_JP_sequences.txt
|
||||
mspgothic.ttf_UNISOURCE = $(SOURCE_HAN_SANS_SRCDIR)/UniSourceHanSansJP-UTF32-H
|
||||
mspgothic.ttf_MENUNAMEDB = $(FONTS)/patches/MSPGothic-FontMenuNameDB
|
||||
mspgothic.ttf = $(FONTS_OBJ)/source-han/mspgothic.ttf
|
||||
mspgothic.ttf_FONT = $(UME_DIR)/ume-pgo4.ttf
|
||||
mspgothic.ttf_NAMETABLE_PATCH = $(FONTS)/patches/UmePGothic-nametable.patch
|
||||
mspgothic.ttf = $(FONTS_OBJ)/ume-gothic/mspgothic.ttf
|
||||
|
||||
msuigothic.ttf_CIDFONTINFO = $(SOURCE_HAN_SANS_SRCDIR)/cidfontinfo.OTC.J
|
||||
msuigothic.ttf_CIDFONT = $(SOURCE_HAN_SANS_SRCDIR)/cidfont.ps.OTC.J
|
||||
msuigothic.ttf_FEATURES = $(SOURCE_HAN_SANS_SRCDIR)/features.OTC.J
|
||||
msuigothic.ttf_SEQUENCES = $(SOURCE_HAN_SANS_SRCDIR)/SourceHanSans_JP_sequences.txt
|
||||
msuigothic.ttf_UNISOURCE = $(SOURCE_HAN_SANS_SRCDIR)/UniSourceHanSansJP-UTF32-H
|
||||
msuigothic.ttf_MENUNAMEDB = $(FONTS)/patches/MSUIGothic-FontMenuNameDB
|
||||
msuigothic.ttf = $(FONTS_OBJ)/source-han/msuigothic.ttf
|
||||
msuigothic.ttf_FONT = $(UME_DIR)/ume-ugo4.ttf
|
||||
msuigothic.ttf_NAMETABLE_PATCH = $(FONTS)/patches/UmeUIGothic-nametable.patch
|
||||
msuigothic.ttf = $(FONTS_OBJ)/ume-gothic/msuigothic.ttf
|
||||
|
||||
malgun.ttf_CIDFONTINFO = $(SOURCE_HAN_SANS_SRCDIR)/cidfontinfo.OTC.K
|
||||
malgun.ttf_CIDFONT = $(SOURCE_HAN_SANS_SRCDIR)/cidfont.ps.OTC.K
|
||||
@@ -918,7 +907,7 @@ malgun.ttf_MENUNAMEDB = $(FONTS)/patches/Malgun-FontMenuNameDB
|
||||
malgun.ttf = $(FONTS_OBJ)/source-han/malgun.ttf
|
||||
|
||||
simsun.ttc = $(FONTS_OBJ)/source-han/simsun.ttc
|
||||
msgothic.ttc = $(FONTS_OBJ)/source-han/msgothic.ttc
|
||||
msgothic.ttc = $(FONTS_OBJ)/ume-gothic/msgothic.ttc
|
||||
|
||||
noto_sans.ttf = $(FONTS)/noto/NotoSans-Regular.ttf
|
||||
noto_sans_arabic.ttf = $(FONTS)/noto/NotoSansArabic-Regular.ttf
|
||||
@@ -986,6 +975,12 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONTINFO) $$(%.ttf_CIDFONTINFO) $$(%.
|
||||
(TEMP_DIR=`mktemp -d` && cd $$TEMP_DIR && $(AFDKO_VERB) sfntedit -a CFF=$(abspath $($(notdir $@)).cff) $(abspath $@.tmp) && rm -fr $$TEMP_DIR)
|
||||
mv $@.tmp $@
|
||||
|
||||
$(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
|
||||
mkdir -p $(FONTS_OBJ)/ume-gothic
|
||||
ttx -o $(FONTS_OBJ)/ume-gothic/$(notdir $(basename $($(notdir $@)_NAMETABLE_PATCH))).ttx -t name $($(notdir $@)_FONT)
|
||||
patch $(FONTS_OBJ)/ume-gothic/$(notdir $(basename $($(notdir $@)_NAMETABLE_PATCH))).ttx $($(notdir $@)_NAMETABLE_PATCH)
|
||||
ttx -o $@ -m $($(notdir $@)_FONT) $(FONTS_OBJ)/ume-gothic/$(notdir $(basename $($(notdir $@)_NAMETABLE_PATCH))).ttx
|
||||
|
||||
$(simsun.ttc): $(simsun.ttf) $(nsimsun.ttf)
|
||||
$(AFDKO_VERB) otf2otc -o $@ $^
|
||||
|
||||
|
||||
Reference in New Issue
Block a user