From 58add286042b9b46f10e0f7da9856758c6203cc6 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Fri, 27 Oct 2017 17:32:27 +0200 Subject: [PATCH] Introduce 'Hiragino Maru Gothic' for Japanese on macOS. --- src/openrct2/interface/FontFamilies.cpp | 1 + src/openrct2/interface/Fonts.cpp | 7 +++++++ src/openrct2/interface/Fonts.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/openrct2/interface/FontFamilies.cpp b/src/openrct2/interface/FontFamilies.cpp index d870058492..d9b3b518a9 100644 --- a/src/openrct2/interface/FontFamilies.cpp +++ b/src/openrct2/interface/FontFamilies.cpp @@ -30,6 +30,7 @@ TTFontFamily const TTFFamilyChineseTraditional = TTFontFamily const TTFFamilyJapanese = { + &TTFFontHiragano, &TTFFontMSGothic, }; diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp index 39a8f37b51..07b18843ff 100644 --- a/src/openrct2/interface/Fonts.cpp +++ b/src/openrct2/interface/Fonts.cpp @@ -36,6 +36,13 @@ TTFFontSetDescriptor TTFFontMSGothic = { { { "msgothic.ttc", "MS PGothic", 13, 1, 0, 15, HINTING_THRESHOLD_MEDIUM, nullptr }, } }; +TTFFontSetDescriptor TTFFontHiragano = { { + { u8"ヒラギノ丸ゴ ProN W4.ttc", "Hiragino Maru Gothic ProN", 8, 1, -1, 9, HINTING_THRESHOLD_MEDIUM, nullptr }, + { u8"ヒラギノ丸ゴ ProN W4.ttc", "Hiragino Maru Gothic ProN", 11, 1, 0, 13, HINTING_THRESHOLD_MEDIUM, nullptr }, + { u8"ヒラギノ丸ゴ ProN W4.ttc", "Hiragino Maru Gothic ProN", 11, 1, 0, 13, HINTING_THRESHOLD_MEDIUM, nullptr }, + { u8"ヒラギノ丸ゴ ProN W4.ttc", "Hiragino Maru Gothic ProN", 12, 1, 0, 14, HINTING_THRESHOLD_MEDIUM, nullptr }, +} }; + TTFFontSetDescriptor TTFFontMingLiu = { { { "msjh.ttc", "JhengHei", 9, -1, -3, 6, HINTING_THRESHOLD_MEDIUM, nullptr }, { "mingliu.ttc", "MingLiU", 11, 1, 1, 14, HINTING_THRESHOLD_MEDIUM, nullptr }, diff --git a/src/openrct2/interface/Fonts.h b/src/openrct2/interface/Fonts.h index 56f82f6790..a5731b9e5a 100644 --- a/src/openrct2/interface/Fonts.h +++ b/src/openrct2/interface/Fonts.h @@ -21,6 +21,7 @@ #ifndef NO_TTF extern TTFFontSetDescriptor TTFFontMSGothic; +extern TTFFontSetDescriptor TTFFontHiragano; extern TTFFontSetDescriptor TTFFontMingLiu; extern TTFFontSetDescriptor TTFFontSimSun; extern TTFFontSetDescriptor TTFFontGulim;