From 2a9481bb9902eff584bd9ab96918993e25428fa9 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 20 Jul 2021 14:28:43 +0200 Subject: [PATCH] =?UTF-8?q?Add=20=C5=92=20ligature?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/g2/font/latin/oe-bold.png | Bin 0 -> 8271 bytes resources/g2/font/latin/oe-small.png | Bin 0 -> 9491 bytes resources/g2/font/latin/oe-tiny.png | Bin 0 -> 8732 bytes resources/g2/font/latin/oe-uc-bold.png | Bin 0 -> 8053 bytes resources/g2/font/latin/oe-uc-small.png | Bin 0 -> 8972 bytes resources/g2/font/latin/oe-uc-tiny.png | Bin 0 -> 7278 bytes resources/g2/sprites.json | 36 +++++++++++++++++++ src/openrct2/drawing/Font.cpp | 2 ++ src/openrct2/localisation/FormatCodes.h | 2 ++ src/openrct2/sprites.h | 46 +++++++++++++----------- 10 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 resources/g2/font/latin/oe-bold.png create mode 100644 resources/g2/font/latin/oe-small.png create mode 100644 resources/g2/font/latin/oe-tiny.png create mode 100644 resources/g2/font/latin/oe-uc-bold.png create mode 100644 resources/g2/font/latin/oe-uc-small.png create mode 100644 resources/g2/font/latin/oe-uc-tiny.png diff --git a/resources/g2/font/latin/oe-bold.png b/resources/g2/font/latin/oe-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..3adb863d11ac519d12ac695d45c4ce32109a47e6 GIT binary patch literal 8271 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%0Ajn>hteu!(xoG&gg>MU=_If?< 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 BTi5^q literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/oe-tiny.png b/resources/g2/font/latin/oe-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..14784522101d5d205caaa469bcaa4d65b20ace1c GIT binary patch literal 8732 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 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/oe-uc-bold.png b/resources/g2/font/latin/oe-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..fd7d9926ecd5de1f8a494be858ca6f45c46add93 GIT binary patch literal 8053 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 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/oe-uc-small.png b/resources/g2/font/latin/oe-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..146b2c769eef906a5ec4b3a58b1db92c656a19c4 GIT binary patch literal 8972 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 literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 6343ff1cbe..6250ec5297 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -844,6 +844,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/oe-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/oe-small.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, { "path": "font/latin/u-double-acute-uc-small.png", "y_offset": 0, @@ -1409,6 +1421,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/oe-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/oe-bold.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, { "path": "font/latin/u-double-acute-uc-bold.png", "y_offset": 0, @@ -1982,6 +2006,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/latin/oe-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/oe-tiny.png", + "y_offset": 1, + "palette": "keep", + "forceBmp": true + }, { "path": "font/latin/u-double-acute-uc-tiny.png", "y_offset": 0, diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index 24573ecf09..c68b4dcd0a 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -64,6 +64,8 @@ static const std::unordered_map codepointOffsetMap = { { UnicodeChar::o_macron, CSChar::o_circumflex - CS_SPRITE_FONT_OFFSET }, // No visual difference { UnicodeChar::o_double_acute_uc, SPR_G2_O_DOUBLE_ACUTE_UPPER - SPR_CHAR_START }, { UnicodeChar::o_double_acute, SPR_G2_O_DOUBLE_ACUTE_LOWER - SPR_CHAR_START }, + { UnicodeChar::oe_uc, SPR_G2_OE_UPPER - SPR_CHAR_START }, + { UnicodeChar::oe, SPR_G2_OE_LOWER - SPR_CHAR_START }, { UnicodeChar::r_caron_uc, SPR_G2_R_CARON_UPPER - SPR_CHAR_START }, { UnicodeChar::r_caron, SPR_G2_R_CARON_LOWER - SPR_CHAR_START }, { UnicodeChar::s_acute_uc, CSChar::s_acute_uc - CS_SPRITE_FONT_OFFSET }, diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index 9e70f682bd..82a092c847 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -174,6 +174,8 @@ namespace UnicodeChar constexpr char32_t o_macron = 0x14D; constexpr char32_t o_double_acute_uc = 0x150; constexpr char32_t o_double_acute = 0x151; + constexpr char32_t oe_uc = 0x152; + constexpr char32_t oe = 0x153; constexpr char32_t r_caron_uc = 0x158; constexpr char32_t r_caron = 0x159; constexpr char32_t s_acute_uc = 0x15A; diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 6efc5e0347..87b9c8ee91 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -946,30 +946,34 @@ enum SPR_G2_O_DOUBLE_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 66, SPR_G2_O_DOUBLE_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 67, - SPR_G2_U_DOUBLE_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 68, - SPR_G2_U_DOUBLE_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 69, - SPR_G2_D_CARON_UPPER = SPR_G2_CHAR_BEGIN + 70, - SPR_G2_D_CARON_LOWER = SPR_G2_CHAR_BEGIN + 71, - SPR_G2_E_CARON_UPPER = SPR_G2_CHAR_BEGIN + 72, - SPR_G2_E_CARON_LOWER = SPR_G2_CHAR_BEGIN + 73, - SPR_G2_N_CARON_UPPER = SPR_G2_CHAR_BEGIN + 74, - SPR_G2_N_CARON_LOWER = SPR_G2_CHAR_BEGIN + 75, - SPR_G2_R_CARON_UPPER = SPR_G2_CHAR_BEGIN + 76, - SPR_G2_R_CARON_LOWER = SPR_G2_CHAR_BEGIN + 77, - SPR_G2_S_CARON_UPPER = SPR_G2_CHAR_BEGIN + 78, - SPR_G2_S_CARON_LOWER = SPR_G2_CHAR_BEGIN + 79, - SPR_G2_T_CARON_UPPER = SPR_G2_CHAR_BEGIN + 80, - SPR_G2_T_CARON_LOWER = SPR_G2_CHAR_BEGIN + 81, - SPR_G2_U_RING_UPPER = SPR_G2_CHAR_BEGIN + 82, - SPR_G2_U_RING_LOWER = SPR_G2_CHAR_BEGIN + 83, - SPR_G2_Z_CARON_UPPER = SPR_G2_CHAR_BEGIN + 84, - SPR_G2_Z_CARON_LOWER = SPR_G2_CHAR_BEGIN + 85, + SPR_G2_OE_UPPER, + SPR_G2_OE_LOWER, - SPR_G2_ROUBLE_SIGN = SPR_G2_CHAR_BEGIN + 86, + SPR_G2_U_DOUBLE_ACUTE_UPPER, + SPR_G2_U_DOUBLE_ACUTE_LOWER, - SPR_G2_J = SPR_G2_CHAR_BEGIN + 87, - SPR_G2_L = SPR_G2_CHAR_BEGIN + 88, + SPR_G2_D_CARON_UPPER, + SPR_G2_D_CARON_LOWER, + SPR_G2_E_CARON_UPPER, + SPR_G2_E_CARON_LOWER, + SPR_G2_N_CARON_UPPER, + SPR_G2_N_CARON_LOWER, + SPR_G2_R_CARON_UPPER, + SPR_G2_R_CARON_LOWER, + SPR_G2_S_CARON_UPPER, + SPR_G2_S_CARON_LOWER, + SPR_G2_T_CARON_UPPER, + SPR_G2_T_CARON_LOWER, + SPR_G2_U_RING_UPPER, + SPR_G2_U_RING_LOWER, + SPR_G2_Z_CARON_UPPER, + SPR_G2_Z_CARON_LOWER, + + SPR_G2_ROUBLE_SIGN, + + SPR_G2_J, + SPR_G2_L, SPR_G2_C_CIRCUMFLEX_UPPER, SPR_G2_C_CIRCUMFLEX_LOWER,