1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00

Add Œ ligature

This commit is contained in:
Michael Steenbeek
2021-07-20 14:28:43 +02:00
committed by GitHub
parent 3bb15d9067
commit 2a9481bb99
10 changed files with 65 additions and 21 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

View File

@@ -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,

View File

@@ -64,6 +64,8 @@ static const std::unordered_map<char32_t, int32_t> 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 },

View File

@@ -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;

View File

@@ -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,