Merge pull request #12806 from tellovishous/tellovishous-eo-diacritics

Add Esperanto diacritics

resources/g2/sprites.json

@@ -961,6 +961,79 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/c-circumflex-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/c-circumflex-small.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/g-circumflex-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/g-circumflex-small.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/h-circumflex-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/h-circumflex-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/j-circumflex-uc-small.png",
+        "x_offset": -1,
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/j-circumflex-small.png",
+        "x_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/s-circumflex-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/s-circumflex-small.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-breve-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-breve-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/latin/ae-uc-bold.png",
         "y_offset": 0,
@@ -1448,6 +1521,79 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/c-circumflex-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/c-circumflex-bold.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/g-circumflex-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/g-circumflex-bold.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/h-circumflex-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/h-circumflex-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/j-circumflex-uc-bold.png",
+        "x_offset": -1,
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/j-circumflex-bold.png",
+        "x_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/s-circumflex-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/s-circumflex-bold.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-breve-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-breve-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/latin/ae-uc-tiny.png",
         "y_offset": 0,
@@ -1942,5 +2088,77 @@
         "x_offset": 0,
         "palette": "keep",
         "forceBmp": true
+    },
+    {
+        "path": "font/latin/c-circumflex-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/c-circumflex-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/g-circumflex-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/g-circumflex-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/h-circumflex-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/h-circumflex-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/j-circumflex-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/j-circumflex-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/s-circumflex-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/s-circumflex-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-breve-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/u-breve-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
     }
 ]

src/openrct2/drawing/Font.cpp

@@ -89,6 +89,18 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::t_comma_uc, SPR_G2_T_COMMA_UPPER - SPR_CHAR_START },
     { UnicodeChar::t_comma, SPR_G2_T_COMMA_LOWER - SPR_CHAR_START },
     { UnicodeChar::sharp_s_uc, 223 - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::c_circumflex_uc, SPR_G2_C_CIRCUMFLEX_UPPER - SPR_CHAR_START },
+    { UnicodeChar::c_circumflex, SPR_G2_C_CIRCUMFLEX_LOWER - SPR_CHAR_START },
+    { UnicodeChar::g_circumflex_uc, SPR_G2_G_CIRCUMFLEX_UPPER - SPR_CHAR_START },
+    { UnicodeChar::g_circumflex, SPR_G2_G_CIRCUMFLEX_LOWER - SPR_CHAR_START },
+    { UnicodeChar::h_circumflex_uc, SPR_G2_H_CIRCUMFLEX_UPPER - SPR_CHAR_START },
+    { UnicodeChar::h_circumflex, SPR_G2_H_CIRCUMFLEX_LOWER - SPR_CHAR_START },
+    { UnicodeChar::j_circumflex_uc, SPR_G2_J_CIRCUMFLEX_UPPER - SPR_CHAR_START },
+    { UnicodeChar::j_circumflex, SPR_G2_J_CIRCUMFLEX_LOWER - SPR_CHAR_START },
+    { UnicodeChar::s_circumflex_uc, SPR_G2_S_CIRCUMFLEX_UPPER - SPR_CHAR_START },
+    { UnicodeChar::s_circumflex, SPR_G2_S_CIRCUMFLEX_LOWER - SPR_CHAR_START },
+    { UnicodeChar::u_breve_uc, SPR_G2_U_BREVE_UPPER - SPR_CHAR_START },
+    { UnicodeChar::u_breve, SPR_G2_U_BREVE_LOWER - SPR_CHAR_START },
 
     // Cyrillic alphabet
     { UnicodeChar::cyrillic_io_uc, 203 - CS_SPRITE_FONT_OFFSET }, // Looks just like Ë

src/openrct2/localisation/FormatCodes.h

@@ -158,6 +158,8 @@ namespace UnicodeChar
     constexpr char32_t a_ogonek = 0x105;
     constexpr char32_t c_acute_uc = 0x106;
     constexpr char32_t c_acute = 0x107;
+    constexpr char32_t c_circumflex_uc = 0x108;
+    constexpr char32_t c_circumflex = 0x109;
     constexpr char32_t c_caron_uc = 0x10C;
     constexpr char32_t c_caron = 0x10D;
     constexpr char32_t d_caron_uc = 0x10E;
@@ -166,10 +168,16 @@ namespace UnicodeChar
     constexpr char32_t e_ogonek = 0x119;
     constexpr char32_t e_caron_uc = 0x11A;
     constexpr char32_t e_caron = 0x11B;
+    constexpr char32_t g_circumflex_uc = 0x11C;
+    constexpr char32_t g_circumflex = 0x11D;
     constexpr char32_t g_breve_uc = 0x11E;
     constexpr char32_t g_breve = 0x11F;
+    constexpr char32_t h_circumflex_uc = 0x124;
+    constexpr char32_t h_circumflex = 0x125;
     constexpr char32_t i_with_dot_uc = 0x130;
     constexpr char32_t i_without_dot = 0x131;
+    constexpr char32_t j_circumflex_uc = 0x134;
+    constexpr char32_t j_circumflex = 0x135;
     constexpr char32_t l_stroke_uc = 0x141;
     constexpr char32_t l_stroke = 0x142;
     constexpr char32_t n_acute_uc = 0x143;
@@ -183,12 +191,16 @@ namespace UnicodeChar
     constexpr char32_t r_caron = 0x159;
     constexpr char32_t s_acute_uc = 0x15A;
     constexpr char32_t s_acute = 0x15B;
+    constexpr char32_t s_circumflex_uc = 0x15C;
+    constexpr char32_t s_circumflex = 0x15D;
     constexpr char32_t s_cedilla_uc = 0x15E;
     constexpr char32_t s_cedilla = 0x15F;
     constexpr char32_t s_caron_uc = 0x160;
     constexpr char32_t s_caron = 0x161;
     constexpr char32_t t_caron_uc = 0x164;
     constexpr char32_t t_caron = 0x165;
+    constexpr char32_t u_breve_uc = 0x16C;
+    constexpr char32_t u_breve = 0x16D;
     constexpr char32_t u_ring_uc = 0x16E;
     constexpr char32_t u_ring = 0x16F;
     constexpr char32_t u_double_acute_uc = 0x170;

src/openrct2/sprites.h

@@ -967,7 +967,20 @@ enum
 
     SPR_G2_J = SPR_G2_CHAR_BEGIN + 87,
 
-    SPR_G2_GLYPH_COUNT = (SPR_G2_J - SPR_G2_CHAR_BEGIN) + 1,
+    SPR_G2_C_CIRCUMFLEX_UPPER,
+    SPR_G2_C_CIRCUMFLEX_LOWER,
+    SPR_G2_G_CIRCUMFLEX_UPPER,
+    SPR_G2_G_CIRCUMFLEX_LOWER,
+    SPR_G2_H_CIRCUMFLEX_UPPER,
+    SPR_G2_H_CIRCUMFLEX_LOWER,
+    SPR_G2_J_CIRCUMFLEX_UPPER,
+    SPR_G2_J_CIRCUMFLEX_LOWER,
+    SPR_G2_S_CIRCUMFLEX_UPPER,
+    SPR_G2_S_CIRCUMFLEX_LOWER,
+    SPR_G2_U_BREVE_UPPER,
+    SPR_G2_U_BREVE_LOWER,
+
+    SPR_G2_GLYPH_COUNT = (SPR_G2_U_BREVE_LOWER - SPR_G2_CHAR_BEGIN) + 1,
     SPR_G2_CHAR_END = SPR_G2_CHAR_BEGIN + SPR_G2_GLYPH_COUNT * 3,
     SPR_G2_END = SPR_G2_CHAR_END,