From ab1044d2de91d9e7f9cc44a60d430912d8af0e05 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 16 Aug 2018 18:40:06 +0200 Subject: [PATCH 1/5] Add C with caron --- data/language/en-GB.txt | 2 +- resources/g2/font/c-caron-bold.png | Bin 0 -> 179 bytes resources/g2/font/c-caron-small.png | Bin 0 -> 181 bytes resources/g2/font/c-caron-tiny.png | Bin 0 -> 173 bytes resources/g2/font/c-caron-uc-bold.png | Bin 0 -> 194 bytes resources/g2/font/c-caron-uc-small.png | Bin 0 -> 186 bytes resources/g2/font/c-caron-uc-tiny.png | Bin 0 -> 174 bytes resources/g2/sprites.json | 36 ++++++++++++++++++++++++ src/openrct2/drawing/Font.cpp | 9 ++++++ src/openrct2/localisation/FormatCodes.h | 6 ++++ src/openrct2/sprites.h | 5 +++- 11 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 resources/g2/font/c-caron-bold.png create mode 100644 resources/g2/font/c-caron-small.png create mode 100644 resources/g2/font/c-caron-tiny.png create mode 100644 resources/g2/font/c-caron-uc-bold.png create mode 100644 resources/g2/font/c-caron-uc-small.png create mode 100644 resources/g2/font/c-caron-uc-tiny.png diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 2bd2240a22..55a58e28a7 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3079,7 +3079,7 @@ STR_5576 :Port: STR_5577 :South Korean Won (W) STR_5578 :Russian Rouble (R) STR_5579 :Window scale factor: -STR_5580 :Czech koruna (Kc) +STR_5580 :Czech koruna (Kč) STR_5581 :Show FPS STR_5582 :Trap mouse cursor in window STR_5583 :{COMMA1DP16}ms{POWERNEGATIVEONE} diff --git a/resources/g2/font/c-caron-bold.png b/resources/g2/font/c-caron-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..2e5369f262a75f1565a2629b6312f0ef30c06cef GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?lCOu~%I2Mks>IDTbdwr6ID{LA)u T*^8WhplSwBS3j3^P6oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?3p^r=fu;z9FeAgPITAoY_7YEDSN2C7 z0s_*OvMO(;0)_NFT^vI=t|uo%9XxPA^4I}}#i8@%5@!7S$8gw0kF9N`H^0G(Ho1fc gJn0Du{|+-SJZ9kzW7^1H2-M2p>FVdQ&MBb@00Lz-k^lez literal 0 HcmV?d00001 diff --git a/resources/g2/font/c-caron-uc-small.png b/resources/g2/font/c-caron-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..d9ec9db365279af4d19b2b72d56e444d77b775e0 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?mdKI;Vst0RFo#^8f$< literal 0 HcmV?d00001 diff --git a/resources/g2/font/c-caron-uc-tiny.png b/resources/g2/font/c-caron-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..87b5644ff1f095d087611b8e3cace373c0e89bbe GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?= 256) codepoint = '?'; @@ -554,6 +560,9 @@ bool font_supports_string_sprite(const utf8* text) case UNICODE_T_COMMA_UC: case UNICODE_T_COMMA: + case UNICODE_C_CARON_UC: + case UNICODE_C_CARON: + supported = true; break; default: diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index f0689376b1..cb1596cf6f 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -309,4 +309,10 @@ enum UnicodePunctuation UNICODE_ELLIPSIS = 8230, }; +enum UnicodeCzech +{ + UNICODE_C_CARON_UC = 268, + UNICODE_C_CARON = 269, +}; + #endif diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 22fa434e6f..e4f8db66df 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -913,7 +913,10 @@ enum SPR_G2_ELLIPSIS = SPR_G2_CHAR_BEGIN + 61, - SPR_G2_CHAR_END = SPR_G2_ELLIPSIS, + SPR_G2_C_CARON_UPPER = SPR_G2_CHAR_BEGIN + 62, + SPR_G2_C_CARON_LOWER = SPR_G2_CHAR_BEGIN + 63, + + SPR_G2_CHAR_END = SPR_G2_C_CARON_LOWER, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, // 0x60000, chosen because it's a round hex number From 3b97f6d9f6dc592f516a0bd1740aa47e4225df48 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 23 Aug 2018 12:55:31 +0200 Subject: [PATCH 2/5] Add y with acute --- resources/g2/font/y-acute-bold.png | Bin 0 -> 184 bytes resources/g2/font/y-acute-small.png | Bin 0 -> 181 bytes resources/g2/font/y-acute-tiny.png | Bin 0 -> 177 bytes resources/g2/font/y-acute-uc-bold.png | Bin 0 -> 187 bytes resources/g2/font/y-acute-uc-small.png | Bin 0 -> 187 bytes resources/g2/font/y-acute-uc-tiny.png | Bin 0 -> 173 bytes resources/g2/sprites.json | 36 ++++++++++++++++++++++++ src/openrct2/drawing/Font.cpp | 6 ++++ src/openrct2/localisation/FormatCodes.h | 2 ++ src/openrct2/sprites.h | 5 +++- 10 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/y-acute-bold.png create mode 100644 resources/g2/font/y-acute-small.png create mode 100644 resources/g2/font/y-acute-tiny.png create mode 100644 resources/g2/font/y-acute-uc-bold.png create mode 100644 resources/g2/font/y-acute-uc-small.png create mode 100644 resources/g2/font/y-acute-uc-tiny.png diff --git a/resources/g2/font/y-acute-bold.png b/resources/g2/font/y-acute-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..9c5feb208fc092dd5c2acdbded2a7a0985561b13 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^96-#�(^rK8WyvH~~H(uBp1|9Sr~fGjtdm|8M{M zHwGxqSQ6wH%;50sMjD8d|62z{+s}6VDNPHb6Mw<&;$Uhwld2A literal 0 HcmV?d00001 diff --git a/resources/g2/font/y-acute-small.png b/resources/g2/font/y-acute-small.png new file mode 100644 index 0000000000000000000000000000000000000000..d4a6948427c14b4da8b157ffaad9a3c19828468f GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)T#0(_Q{j0YIQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!15FVIVMc~ob0mO*>?NMQuI!IE z#JS8&ciem82NY8Bba4#fxSpJlkr3dOFvGe%@tX|WRwjW*HVjU$codEtW?*P+VC(iR SNU{K`X7F_Nb6Mw<&;$UE_%F!- literal 0 HcmV?d00001 diff --git a/resources/g2/font/y-acute-tiny.png b/resources/g2/font/y-acute-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..30d7ee5a43ef5a2b49536c6a2cbf2ae57bdbd61e GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?FthZz{`C0UzXcTZ&p Ps$}qV^>bP0l+XkKiyJL| literal 0 HcmV?d00001 diff --git a/resources/g2/font/y-acute-uc-bold.png b/resources/g2/font/y-acute-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..9a8f78294fedaef89aa05148533228960c7e7cd2 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2hGm!icqpk;}cmjMvTvK(^I~e}|XXr3C{@?!h zZwyeJu_VYZn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI!IE z#JNmOCx71F3l!4uba4#fxSpKwAR*yGKz70mv&{{OuP!mMUA@4}Gv^@>kB=e8nGcPO Z49ga>ABnOO$pz|R@O1TaS?83{1OS}#GmiiO literal 0 HcmV?d00001 diff --git a/resources/g2/font/y-acute-uc-small.png b/resources/g2/font/y-acute-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..8364c106b75563b5c197e5ed297b851450589542 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRQ#0(^*v*+jnDV_kI5Z6@Q^bUsq{~0=rjsLg* z{Tl-mXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QL70(Y)*K0-AbW|YuPgf_ z4skANg|C`XUO*uYPZ!4!j_b(@0SO5KGmalHSpSLPaL;6Ri7V5L4GNAK7#N5u7#wC~ YW7y))A^-g6ERZn_p00i_>zopr0PIpQ@Bjb+ literal 0 HcmV?d00001 diff --git a/resources/g2/font/y-acute-uc-tiny.png b/resources/g2/font/y-acute-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..fbf95955e481890346f7449f727fea4d8a325b8d GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?bP0l+XkK&`>Pn literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 3a9e046575..30a8ba031a 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -782,6 +782,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/y-acute-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/y-acute-small.png", + "y_offset": 1, + "palette": "keep", + "forceBmp": true + }, { "path": "font/ae-uc-bold.png", "y_offset": 0, @@ -1125,6 +1137,18 @@ "palette": "keep", "forceBmp": true }, + { + "path": "font/y-acute-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/y-acute-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, { "path": "font/ae-uc-tiny.png", "y_offset": 0, @@ -1475,5 +1499,17 @@ "y_offset": 0, "palette": "keep", "forceBmp": true + }, + { + "path": "font/y-acute-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/y-acute-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true } ] diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index 58e16196d8..09e277214b 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -380,6 +380,10 @@ int32_t font_sprite_get_codepoint_offset(int32_t codepoint) return SPR_G2_C_CARON_UPPER - SPR_CHAR_START; case UNICODE_C_CARON: return SPR_G2_C_CARON_LOWER - SPR_CHAR_START; + case UNICODE_Y_ACUTE_UC: + return SPR_G2_Y_ACUTE_UPPER - SPR_CHAR_START; + case UNICODE_Y_ACUTE: + return SPR_G2_Y_ACUTE_LOWER - SPR_CHAR_START; default: if (codepoint < 32 || codepoint >= 256) @@ -562,6 +566,8 @@ bool font_supports_string_sprite(const utf8* text) case UNICODE_C_CARON_UC: case UNICODE_C_CARON: + case UNICODE_Y_ACUTE_UC: + case UNICODE_Y_ACUTE: supported = true; break; diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index cb1596cf6f..702a302c53 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -313,6 +313,8 @@ enum UnicodeCzech { UNICODE_C_CARON_UC = 268, UNICODE_C_CARON = 269, + UNICODE_Y_ACUTE_UC = 221, + UNICODE_Y_ACUTE = 253, }; #endif diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index e4f8db66df..9110a9858b 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -916,7 +916,10 @@ enum SPR_G2_C_CARON_UPPER = SPR_G2_CHAR_BEGIN + 62, SPR_G2_C_CARON_LOWER = SPR_G2_CHAR_BEGIN + 63, - SPR_G2_CHAR_END = SPR_G2_C_CARON_LOWER, + SPR_G2_Y_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 64, + SPR_G2_Y_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 65, + + SPR_G2_CHAR_END = SPR_G2_Y_ACUTE_LOWER, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, // 0x60000, chosen because it's a round hex number From e6d3d15ea1c2c6899c55e7ee4e797be68b8abe83 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 1 Sep 2018 20:18:42 +0200 Subject: [PATCH 3/5] Move Latin letters to a subdirectory --- .../g2/font/{ => latin}/a-breve-uc-bold.png | Bin .../g2/font/{ => latin}/a-breve-uc-small.png | Bin .../g2/font/{ => latin}/a-breve-uc-tiny.png | Bin resources/g2/font/{ => latin}/ae-bold.png | Bin resources/g2/font/{ => latin}/ae-small.png | Bin resources/g2/font/{ => latin}/ae-tiny.png | Bin resources/g2/font/{ => latin}/ae-uc-bold.png | Bin resources/g2/font/{ => latin}/ae-uc-small.png | Bin resources/g2/font/{ => latin}/ae-uc-tiny.png | Bin .../g2/font/{ => latin}/c-caron-bold.png | Bin .../g2/font/{ => latin}/c-caron-small.png | Bin .../g2/font/{ => latin}/c-caron-tiny.png | Bin .../g2/font/{ => latin}/c-caron-uc-bold.png | Bin .../g2/font/{ => latin}/c-caron-uc-small.png | Bin .../g2/font/{ => latin}/c-caron-uc-tiny.png | Bin .../g2/font/{ => latin}/g-breve-bold.png | Bin .../g2/font/{ => latin}/g-breve-small.png | Bin .../g2/font/{ => latin}/g-breve-tiny.png | Bin .../g2/font/{ => latin}/g-breve-uc-bold.png | Bin .../g2/font/{ => latin}/g-breve-uc-small.png | Bin .../g2/font/{ => latin}/g-breve-uc-tiny.png | Bin .../font/{ => latin}/i-with-dot-uc-bold.png | Bin .../font/{ => latin}/i-with-dot-uc-small.png | Bin .../font/{ => latin}/i-with-dot-uc-tiny.png | Bin .../font/{ => latin}/i-without-dot-bold.png | Bin .../font/{ => latin}/i-without-dot-small.png | Bin .../font/{ => latin}/i-without-dot-tiny.png | Bin .../g2/font/{ => latin}/interpunct-bold.png | Bin .../g2/font/{ => latin}/interpunct-small.png | Bin .../g2/font/{ => latin}/interpunct-tiny.png | Bin .../g2/font/{ => latin}/o-stroke-bold.png | Bin .../g2/font/{ => latin}/o-stroke-small.png | Bin .../g2/font/{ => latin}/o-stroke-tiny.png | Bin .../g2/font/{ => latin}/o-stroke-uc-bold.png | Bin .../g2/font/{ => latin}/o-stroke-uc-small.png | Bin .../g2/font/{ => latin}/o-stroke-uc-tiny.png | Bin .../g2/font/{ => latin}/s-cedilla-bold.png | Bin .../g2/font/{ => latin}/s-cedilla-small.png | Bin .../g2/font/{ => latin}/s-cedilla-tiny.png | Bin .../g2/font/{ => latin}/s-cedilla-uc-bold.png | Bin .../font/{ => latin}/s-cedilla-uc-small.png | Bin .../g2/font/{ => latin}/s-cedilla-uc-tiny.png | Bin .../g2/font/{ => latin}/t-comma-bold.png | Bin .../g2/font/{ => latin}/t-comma-small.png | Bin .../g2/font/{ => latin}/t-comma-tiny.png | Bin .../g2/font/{ => latin}/t-comma-uc-bold.png | Bin .../g2/font/{ => latin}/t-comma-uc-small.png | Bin .../g2/font/{ => latin}/t-comma-uc-tiny.png | Bin .../g2/font/{ => latin}/y-acute-bold.png | Bin .../g2/font/{ => latin}/y-acute-small.png | Bin .../g2/font/{ => latin}/y-acute-tiny.png | Bin .../g2/font/{ => latin}/y-acute-uc-bold.png | Bin .../g2/font/{ => latin}/y-acute-uc-small.png | Bin .../g2/font/{ => latin}/y-acute-uc-tiny.png | Bin resources/g2/sprites.json | 108 +++++++++--------- 55 files changed, 54 insertions(+), 54 deletions(-) rename resources/g2/font/{ => latin}/a-breve-uc-bold.png (100%) rename resources/g2/font/{ => latin}/a-breve-uc-small.png (100%) rename resources/g2/font/{ => latin}/a-breve-uc-tiny.png (100%) rename resources/g2/font/{ => latin}/ae-bold.png (100%) rename resources/g2/font/{ => latin}/ae-small.png (100%) rename resources/g2/font/{ => latin}/ae-tiny.png (100%) rename resources/g2/font/{ => latin}/ae-uc-bold.png (100%) rename resources/g2/font/{ => latin}/ae-uc-small.png (100%) rename resources/g2/font/{ => latin}/ae-uc-tiny.png (100%) rename resources/g2/font/{ => latin}/c-caron-bold.png (100%) rename resources/g2/font/{ => latin}/c-caron-small.png (100%) rename resources/g2/font/{ => latin}/c-caron-tiny.png (100%) rename resources/g2/font/{ => latin}/c-caron-uc-bold.png (100%) rename resources/g2/font/{ => latin}/c-caron-uc-small.png (100%) rename resources/g2/font/{ => latin}/c-caron-uc-tiny.png (100%) rename resources/g2/font/{ => latin}/g-breve-bold.png (100%) rename resources/g2/font/{ => latin}/g-breve-small.png (100%) rename resources/g2/font/{ => latin}/g-breve-tiny.png (100%) rename resources/g2/font/{ => latin}/g-breve-uc-bold.png (100%) rename resources/g2/font/{ => latin}/g-breve-uc-small.png (100%) rename resources/g2/font/{ => latin}/g-breve-uc-tiny.png (100%) rename resources/g2/font/{ => latin}/i-with-dot-uc-bold.png (100%) rename resources/g2/font/{ => latin}/i-with-dot-uc-small.png (100%) rename resources/g2/font/{ => latin}/i-with-dot-uc-tiny.png (100%) rename resources/g2/font/{ => latin}/i-without-dot-bold.png (100%) rename resources/g2/font/{ => latin}/i-without-dot-small.png (100%) rename resources/g2/font/{ => latin}/i-without-dot-tiny.png (100%) rename resources/g2/font/{ => latin}/interpunct-bold.png (100%) rename resources/g2/font/{ => latin}/interpunct-small.png (100%) rename resources/g2/font/{ => latin}/interpunct-tiny.png (100%) rename resources/g2/font/{ => latin}/o-stroke-bold.png (100%) rename resources/g2/font/{ => latin}/o-stroke-small.png (100%) rename resources/g2/font/{ => latin}/o-stroke-tiny.png (100%) rename resources/g2/font/{ => latin}/o-stroke-uc-bold.png (100%) rename resources/g2/font/{ => latin}/o-stroke-uc-small.png (100%) rename resources/g2/font/{ => latin}/o-stroke-uc-tiny.png (100%) rename resources/g2/font/{ => latin}/s-cedilla-bold.png (100%) rename resources/g2/font/{ => latin}/s-cedilla-small.png (100%) rename resources/g2/font/{ => latin}/s-cedilla-tiny.png (100%) rename resources/g2/font/{ => latin}/s-cedilla-uc-bold.png (100%) rename resources/g2/font/{ => latin}/s-cedilla-uc-small.png (100%) rename resources/g2/font/{ => latin}/s-cedilla-uc-tiny.png (100%) rename resources/g2/font/{ => latin}/t-comma-bold.png (100%) rename resources/g2/font/{ => latin}/t-comma-small.png (100%) rename resources/g2/font/{ => latin}/t-comma-tiny.png (100%) rename resources/g2/font/{ => latin}/t-comma-uc-bold.png (100%) rename resources/g2/font/{ => latin}/t-comma-uc-small.png (100%) rename resources/g2/font/{ => latin}/t-comma-uc-tiny.png (100%) rename resources/g2/font/{ => latin}/y-acute-bold.png (100%) rename resources/g2/font/{ => latin}/y-acute-small.png (100%) rename resources/g2/font/{ => latin}/y-acute-tiny.png (100%) rename resources/g2/font/{ => latin}/y-acute-uc-bold.png (100%) rename resources/g2/font/{ => latin}/y-acute-uc-small.png (100%) rename resources/g2/font/{ => latin}/y-acute-uc-tiny.png (100%) diff --git a/resources/g2/font/a-breve-uc-bold.png b/resources/g2/font/latin/a-breve-uc-bold.png similarity index 100% rename from resources/g2/font/a-breve-uc-bold.png rename to resources/g2/font/latin/a-breve-uc-bold.png diff --git a/resources/g2/font/a-breve-uc-small.png b/resources/g2/font/latin/a-breve-uc-small.png similarity index 100% rename from resources/g2/font/a-breve-uc-small.png rename to resources/g2/font/latin/a-breve-uc-small.png diff --git a/resources/g2/font/a-breve-uc-tiny.png b/resources/g2/font/latin/a-breve-uc-tiny.png similarity index 100% rename from resources/g2/font/a-breve-uc-tiny.png rename to resources/g2/font/latin/a-breve-uc-tiny.png diff --git a/resources/g2/font/ae-bold.png b/resources/g2/font/latin/ae-bold.png similarity index 100% rename from resources/g2/font/ae-bold.png rename to resources/g2/font/latin/ae-bold.png diff --git a/resources/g2/font/ae-small.png b/resources/g2/font/latin/ae-small.png similarity index 100% rename from resources/g2/font/ae-small.png rename to resources/g2/font/latin/ae-small.png diff --git a/resources/g2/font/ae-tiny.png b/resources/g2/font/latin/ae-tiny.png similarity index 100% rename from resources/g2/font/ae-tiny.png rename to resources/g2/font/latin/ae-tiny.png diff --git a/resources/g2/font/ae-uc-bold.png b/resources/g2/font/latin/ae-uc-bold.png similarity index 100% rename from resources/g2/font/ae-uc-bold.png rename to resources/g2/font/latin/ae-uc-bold.png diff --git a/resources/g2/font/ae-uc-small.png b/resources/g2/font/latin/ae-uc-small.png similarity index 100% rename from resources/g2/font/ae-uc-small.png rename to resources/g2/font/latin/ae-uc-small.png diff --git a/resources/g2/font/ae-uc-tiny.png b/resources/g2/font/latin/ae-uc-tiny.png similarity index 100% rename from resources/g2/font/ae-uc-tiny.png rename to resources/g2/font/latin/ae-uc-tiny.png diff --git a/resources/g2/font/c-caron-bold.png b/resources/g2/font/latin/c-caron-bold.png similarity index 100% rename from resources/g2/font/c-caron-bold.png rename to resources/g2/font/latin/c-caron-bold.png diff --git a/resources/g2/font/c-caron-small.png b/resources/g2/font/latin/c-caron-small.png similarity index 100% rename from resources/g2/font/c-caron-small.png rename to resources/g2/font/latin/c-caron-small.png diff --git a/resources/g2/font/c-caron-tiny.png b/resources/g2/font/latin/c-caron-tiny.png similarity index 100% rename from resources/g2/font/c-caron-tiny.png rename to resources/g2/font/latin/c-caron-tiny.png diff --git a/resources/g2/font/c-caron-uc-bold.png b/resources/g2/font/latin/c-caron-uc-bold.png similarity index 100% rename from resources/g2/font/c-caron-uc-bold.png rename to resources/g2/font/latin/c-caron-uc-bold.png diff --git a/resources/g2/font/c-caron-uc-small.png b/resources/g2/font/latin/c-caron-uc-small.png similarity index 100% rename from resources/g2/font/c-caron-uc-small.png rename to resources/g2/font/latin/c-caron-uc-small.png diff --git a/resources/g2/font/c-caron-uc-tiny.png b/resources/g2/font/latin/c-caron-uc-tiny.png similarity index 100% rename from resources/g2/font/c-caron-uc-tiny.png rename to resources/g2/font/latin/c-caron-uc-tiny.png diff --git a/resources/g2/font/g-breve-bold.png b/resources/g2/font/latin/g-breve-bold.png similarity index 100% rename from resources/g2/font/g-breve-bold.png rename to resources/g2/font/latin/g-breve-bold.png diff --git a/resources/g2/font/g-breve-small.png b/resources/g2/font/latin/g-breve-small.png similarity index 100% rename from resources/g2/font/g-breve-small.png rename to resources/g2/font/latin/g-breve-small.png diff --git a/resources/g2/font/g-breve-tiny.png b/resources/g2/font/latin/g-breve-tiny.png similarity index 100% rename from resources/g2/font/g-breve-tiny.png rename to resources/g2/font/latin/g-breve-tiny.png diff --git a/resources/g2/font/g-breve-uc-bold.png b/resources/g2/font/latin/g-breve-uc-bold.png similarity index 100% rename from resources/g2/font/g-breve-uc-bold.png rename to resources/g2/font/latin/g-breve-uc-bold.png diff --git a/resources/g2/font/g-breve-uc-small.png b/resources/g2/font/latin/g-breve-uc-small.png similarity index 100% rename from resources/g2/font/g-breve-uc-small.png rename to resources/g2/font/latin/g-breve-uc-small.png diff --git a/resources/g2/font/g-breve-uc-tiny.png b/resources/g2/font/latin/g-breve-uc-tiny.png similarity index 100% rename from resources/g2/font/g-breve-uc-tiny.png rename to resources/g2/font/latin/g-breve-uc-tiny.png diff --git a/resources/g2/font/i-with-dot-uc-bold.png b/resources/g2/font/latin/i-with-dot-uc-bold.png similarity index 100% rename from resources/g2/font/i-with-dot-uc-bold.png rename to resources/g2/font/latin/i-with-dot-uc-bold.png diff --git a/resources/g2/font/i-with-dot-uc-small.png b/resources/g2/font/latin/i-with-dot-uc-small.png similarity index 100% rename from resources/g2/font/i-with-dot-uc-small.png rename to resources/g2/font/latin/i-with-dot-uc-small.png diff --git a/resources/g2/font/i-with-dot-uc-tiny.png b/resources/g2/font/latin/i-with-dot-uc-tiny.png similarity index 100% rename from resources/g2/font/i-with-dot-uc-tiny.png rename to resources/g2/font/latin/i-with-dot-uc-tiny.png diff --git a/resources/g2/font/i-without-dot-bold.png b/resources/g2/font/latin/i-without-dot-bold.png similarity index 100% rename from resources/g2/font/i-without-dot-bold.png rename to resources/g2/font/latin/i-without-dot-bold.png diff --git a/resources/g2/font/i-without-dot-small.png b/resources/g2/font/latin/i-without-dot-small.png similarity index 100% rename from resources/g2/font/i-without-dot-small.png rename to resources/g2/font/latin/i-without-dot-small.png diff --git a/resources/g2/font/i-without-dot-tiny.png b/resources/g2/font/latin/i-without-dot-tiny.png similarity index 100% rename from resources/g2/font/i-without-dot-tiny.png rename to resources/g2/font/latin/i-without-dot-tiny.png diff --git a/resources/g2/font/interpunct-bold.png b/resources/g2/font/latin/interpunct-bold.png similarity index 100% rename from resources/g2/font/interpunct-bold.png rename to resources/g2/font/latin/interpunct-bold.png diff --git a/resources/g2/font/interpunct-small.png b/resources/g2/font/latin/interpunct-small.png similarity index 100% rename from resources/g2/font/interpunct-small.png rename to resources/g2/font/latin/interpunct-small.png diff --git a/resources/g2/font/interpunct-tiny.png b/resources/g2/font/latin/interpunct-tiny.png similarity index 100% rename from resources/g2/font/interpunct-tiny.png rename to resources/g2/font/latin/interpunct-tiny.png diff --git a/resources/g2/font/o-stroke-bold.png b/resources/g2/font/latin/o-stroke-bold.png similarity index 100% rename from resources/g2/font/o-stroke-bold.png rename to resources/g2/font/latin/o-stroke-bold.png diff --git a/resources/g2/font/o-stroke-small.png b/resources/g2/font/latin/o-stroke-small.png similarity index 100% rename from resources/g2/font/o-stroke-small.png rename to resources/g2/font/latin/o-stroke-small.png diff --git a/resources/g2/font/o-stroke-tiny.png b/resources/g2/font/latin/o-stroke-tiny.png similarity index 100% rename from resources/g2/font/o-stroke-tiny.png rename to resources/g2/font/latin/o-stroke-tiny.png diff --git a/resources/g2/font/o-stroke-uc-bold.png b/resources/g2/font/latin/o-stroke-uc-bold.png similarity index 100% rename from resources/g2/font/o-stroke-uc-bold.png rename to resources/g2/font/latin/o-stroke-uc-bold.png diff --git a/resources/g2/font/o-stroke-uc-small.png b/resources/g2/font/latin/o-stroke-uc-small.png similarity index 100% rename from resources/g2/font/o-stroke-uc-small.png rename to resources/g2/font/latin/o-stroke-uc-small.png diff --git a/resources/g2/font/o-stroke-uc-tiny.png b/resources/g2/font/latin/o-stroke-uc-tiny.png similarity index 100% rename from resources/g2/font/o-stroke-uc-tiny.png rename to resources/g2/font/latin/o-stroke-uc-tiny.png diff --git a/resources/g2/font/s-cedilla-bold.png b/resources/g2/font/latin/s-cedilla-bold.png similarity index 100% rename from resources/g2/font/s-cedilla-bold.png rename to resources/g2/font/latin/s-cedilla-bold.png diff --git a/resources/g2/font/s-cedilla-small.png b/resources/g2/font/latin/s-cedilla-small.png similarity index 100% rename from resources/g2/font/s-cedilla-small.png rename to resources/g2/font/latin/s-cedilla-small.png diff --git a/resources/g2/font/s-cedilla-tiny.png b/resources/g2/font/latin/s-cedilla-tiny.png similarity index 100% rename from resources/g2/font/s-cedilla-tiny.png rename to resources/g2/font/latin/s-cedilla-tiny.png diff --git a/resources/g2/font/s-cedilla-uc-bold.png b/resources/g2/font/latin/s-cedilla-uc-bold.png similarity index 100% rename from resources/g2/font/s-cedilla-uc-bold.png rename to resources/g2/font/latin/s-cedilla-uc-bold.png diff --git a/resources/g2/font/s-cedilla-uc-small.png b/resources/g2/font/latin/s-cedilla-uc-small.png similarity index 100% rename from resources/g2/font/s-cedilla-uc-small.png rename to resources/g2/font/latin/s-cedilla-uc-small.png diff --git a/resources/g2/font/s-cedilla-uc-tiny.png b/resources/g2/font/latin/s-cedilla-uc-tiny.png similarity index 100% rename from resources/g2/font/s-cedilla-uc-tiny.png rename to resources/g2/font/latin/s-cedilla-uc-tiny.png diff --git a/resources/g2/font/t-comma-bold.png b/resources/g2/font/latin/t-comma-bold.png similarity index 100% rename from resources/g2/font/t-comma-bold.png rename to resources/g2/font/latin/t-comma-bold.png diff --git a/resources/g2/font/t-comma-small.png b/resources/g2/font/latin/t-comma-small.png similarity index 100% rename from resources/g2/font/t-comma-small.png rename to resources/g2/font/latin/t-comma-small.png diff --git a/resources/g2/font/t-comma-tiny.png b/resources/g2/font/latin/t-comma-tiny.png similarity index 100% rename from resources/g2/font/t-comma-tiny.png rename to resources/g2/font/latin/t-comma-tiny.png diff --git a/resources/g2/font/t-comma-uc-bold.png b/resources/g2/font/latin/t-comma-uc-bold.png similarity index 100% rename from resources/g2/font/t-comma-uc-bold.png rename to resources/g2/font/latin/t-comma-uc-bold.png diff --git a/resources/g2/font/t-comma-uc-small.png b/resources/g2/font/latin/t-comma-uc-small.png similarity index 100% rename from resources/g2/font/t-comma-uc-small.png rename to resources/g2/font/latin/t-comma-uc-small.png diff --git a/resources/g2/font/t-comma-uc-tiny.png b/resources/g2/font/latin/t-comma-uc-tiny.png similarity index 100% rename from resources/g2/font/t-comma-uc-tiny.png rename to resources/g2/font/latin/t-comma-uc-tiny.png diff --git a/resources/g2/font/y-acute-bold.png b/resources/g2/font/latin/y-acute-bold.png similarity index 100% rename from resources/g2/font/y-acute-bold.png rename to resources/g2/font/latin/y-acute-bold.png diff --git a/resources/g2/font/y-acute-small.png b/resources/g2/font/latin/y-acute-small.png similarity index 100% rename from resources/g2/font/y-acute-small.png rename to resources/g2/font/latin/y-acute-small.png diff --git a/resources/g2/font/y-acute-tiny.png b/resources/g2/font/latin/y-acute-tiny.png similarity index 100% rename from resources/g2/font/y-acute-tiny.png rename to resources/g2/font/latin/y-acute-tiny.png diff --git a/resources/g2/font/y-acute-uc-bold.png b/resources/g2/font/latin/y-acute-uc-bold.png similarity index 100% rename from resources/g2/font/y-acute-uc-bold.png rename to resources/g2/font/latin/y-acute-uc-bold.png diff --git a/resources/g2/font/y-acute-uc-small.png b/resources/g2/font/latin/y-acute-uc-small.png similarity index 100% rename from resources/g2/font/y-acute-uc-small.png rename to resources/g2/font/latin/y-acute-uc-small.png diff --git a/resources/g2/font/y-acute-uc-tiny.png b/resources/g2/font/latin/y-acute-uc-tiny.png similarity index 100% rename from resources/g2/font/y-acute-uc-tiny.png rename to resources/g2/font/latin/y-acute-uc-tiny.png diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 30a8ba031a..f97632d3d8 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -441,26 +441,26 @@ "y_offset": 5 }, { - "path": "font/ae-uc-small.png", + "path": "font/latin/ae-uc-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/ae-small.png", + "path": "font/latin/ae-small.png", "y_offset": 2, "palette": "keep", "forceBmp": true }, { - "path": "font/o-stroke-uc-small.png", + "path": "font/latin/o-stroke-uc-small.png", "x_offset": -1, "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/o-stroke-small.png", + "path": "font/latin/o-stroke-small.png", "y_offset": 2, "palette": "keep", "forceBmp": true @@ -705,61 +705,61 @@ "forceBmp": true }, { - "path": "font/g-breve-uc-small.png", + "path": "font/latin/g-breve-uc-small.png", "y_offset": -1, "palette": "keep", "forceBmp": true }, { - "path": "font/i-with-dot-uc-small.png", + "path": "font/latin/i-with-dot-uc-small.png", "y_offset": -1, "palette": "keep", "forceBmp": true }, { - "path": "font/s-cedilla-uc-small.png", + "path": "font/latin/s-cedilla-uc-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/g-breve-small.png", + "path": "font/latin/g-breve-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/i-without-dot-small.png", + "path": "font/latin/i-without-dot-small.png", "y_offset": 2, "palette": "keep", "forceBmp": true }, { - "path": "font/s-cedilla-small.png", + "path": "font/latin/s-cedilla-small.png", "y_offset": 2, "palette": "keep", "forceBmp": true }, { - "path": "font/interpunct-small.png", + "path": "font/latin/interpunct-small.png", "y_offset": 3, "palette": "keep", "forceBmp": true }, { - "path": "font/a-breve-uc-small.png", + "path": "font/latin/a-breve-uc-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/t-comma-uc-small.png", + "path": "font/latin/t-comma-uc-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/t-comma-small.png", + "path": "font/latin/t-comma-small.png", "y_offset": 1, "palette": "keep", "forceBmp": true @@ -771,50 +771,50 @@ "forceBmp": true }, { - "path": "font/c-caron-uc-small.png", + "path": "font/latin/c-caron-uc-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/c-caron-small.png", + "path": "font/latin/c-caron-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/y-acute-uc-small.png", + "path": "font/latin/y-acute-uc-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/y-acute-small.png", + "path": "font/latin/y-acute-small.png", "y_offset": 1, "palette": "keep", "forceBmp": true }, { - "path": "font/ae-uc-bold.png", + "path": "font/latin/ae-uc-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/ae-bold.png", + "path": "font/latin/ae-bold.png", "y_offset": 2, "palette": "keep", "forceBmp": true }, { - "path": "font/o-stroke-uc-bold.png", + "path": "font/latin/o-stroke-uc-bold.png", "x_offset": -1, "y_offset": -1, "palette": "keep", "forceBmp": true }, { - "path": "font/o-stroke-bold.png", + "path": "font/latin/o-stroke-bold.png", "x_offset": 0, "y_offset": 2, "palette": "keep", @@ -1060,61 +1060,61 @@ "forceBmp": true }, { - "path": "font/g-breve-uc-bold.png", + "path": "font/latin/g-breve-uc-bold.png", "y_offset": -1, "palette": "keep", "forceBmp": true }, { - "path": "font/i-with-dot-uc-bold.png", + "path": "font/latin/i-with-dot-uc-bold.png", "y_offset": -1, "palette": "keep", "forceBmp": true }, { - "path": "font/s-cedilla-uc-bold.png", + "path": "font/latin/s-cedilla-uc-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/g-breve-bold.png", + "path": "font/latin/g-breve-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/i-without-dot-bold.png", + "path": "font/latin/i-without-dot-bold.png", "y_offset": 2, "palette": "keep", "forceBmp": true }, { - "path": "font/s-cedilla-bold.png", + "path": "font/latin/s-cedilla-bold.png", "y_offset": 2, "palette": "keep", "forceBmp": true }, { - "path": "font/interpunct-bold.png", + "path": "font/latin/interpunct-bold.png", "y_offset": 3, "palette": "keep", "forceBmp": true }, { - "path": "font/a-breve-uc-bold.png", + "path": "font/latin/a-breve-uc-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/t-comma-uc-bold.png", + "path": "font/latin/t-comma-uc-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/t-comma-bold.png", + "path": "font/latin/t-comma-bold.png", "y_offset": 1, "palette": "keep", "forceBmp": true @@ -1126,49 +1126,49 @@ "forceBmp": true }, { - "path": "font/c-caron-uc-bold.png", + "path": "font/latin/c-caron-uc-bold.png", "y_offset": -1, "palette": "keep", "forceBmp": true }, { - "path": "font/c-caron-bold.png", + "path": "font/latin/c-caron-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/y-acute-uc-bold.png", + "path": "font/latin/y-acute-uc-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/y-acute-bold.png", + "path": "font/latin/y-acute-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/ae-uc-tiny.png", + "path": "font/latin/ae-uc-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/ae-tiny.png", + "path": "font/latin/ae-tiny.png", "y_offset": 1, "palette": "keep", "forceBmp": true }, { - "path": "font/o-stroke-uc-tiny.png", + "path": "font/latin/o-stroke-uc-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/o-stroke-tiny.png", + "path": "font/latin/o-stroke-tiny.png", "y_offset": 1, "palette": "keep", "forceBmp": true @@ -1423,61 +1423,61 @@ "forceBmp": true }, { - "path": "font/g-breve-uc-tiny.png", + "path": "font/latin/g-breve-uc-tiny.png", "y_offset": -1, "palette": "keep", "forceBmp": true }, { - "path": "font/i-with-dot-uc-tiny.png", + "path": "font/latin/i-with-dot-uc-tiny.png", "y_offset": -1, "palette": "keep", "forceBmp": true }, { - "path": "font/s-cedilla-uc-tiny.png", + "path": "font/latin/s-cedilla-uc-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/g-breve-tiny.png", + "path": "font/latin/g-breve-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/i-without-dot-tiny.png", + "path": "font/latin/i-without-dot-tiny.png", "y_offset": 2, "palette": "keep", "forceBmp": true }, { - "path": "font/s-cedilla-tiny.png", + "path": "font/latin/s-cedilla-tiny.png", "y_offset": 1, "palette": "keep", "forceBmp": true }, { - "path": "font/interpunct-tiny.png", + "path": "font/latin/interpunct-tiny.png", "y_offset": 2, "palette": "keep", "forceBmp": true }, { - "path": "font/a-breve-uc-tiny.png", + "path": "font/latin/a-breve-uc-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/t-comma-uc-tiny.png", + "path": "font/latin/t-comma-uc-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/t-comma-tiny.png", + "path": "font/latin/t-comma-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true @@ -1489,25 +1489,25 @@ "forceBmp": true }, { - "path": "font/c-caron-uc-tiny.png", + "path": "font/latin/c-caron-uc-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/c-caron-tiny.png", + "path": "font/latin/c-caron-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/y-acute-uc-tiny.png", + "path": "font/latin/y-acute-uc-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/y-acute-tiny.png", + "path": "font/latin/y-acute-tiny.png", "y_offset": 0, "palette": "keep", "forceBmp": true From 3b5a766f34f5c52450f2a79e0d176fa18ea8a1a9 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 1 Sep 2018 20:41:44 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Add=20glyphs=20for=20=C5=90,=20=C5=91,=20?= =?UTF-8?q?=C5=B0=20and=20=C5=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../g2/font/latin/o-double-acute-bold.png | Bin 0 -> 180 bytes .../g2/font/latin/o-double-acute-small.png | Bin 0 -> 180 bytes .../g2/font/latin/o-double-acute-tiny.png | Bin 0 -> 171 bytes .../g2/font/latin/o-double-acute-uc-bold.png | Bin 0 -> 193 bytes .../g2/font/latin/o-double-acute-uc-small.png | Bin 0 -> 192 bytes .../g2/font/latin/o-double-acute-uc-tiny.png | Bin 0 -> 174 bytes .../g2/font/latin/u-double-acute-bold.png | Bin 0 -> 177 bytes .../g2/font/latin/u-double-acute-small.png | Bin 0 -> 177 bytes .../g2/font/latin/u-double-acute-tiny.png | Bin 0 -> 170 bytes .../g2/font/latin/u-double-acute-uc-bold.png | Bin 0 -> 190 bytes .../g2/font/latin/u-double-acute-uc-small.png | Bin 0 -> 190 bytes .../g2/font/latin/u-double-acute-uc-tiny.png | Bin 0 -> 170 bytes resources/g2/sprites.json | 72 ++++++++++++++++++ src/openrct2/drawing/Font.cpp | 15 ++++ src/openrct2/localisation/FormatCodes.h | 8 ++ src/openrct2/sprites.h | 7 +- 16 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/latin/o-double-acute-bold.png create mode 100644 resources/g2/font/latin/o-double-acute-small.png create mode 100644 resources/g2/font/latin/o-double-acute-tiny.png create mode 100644 resources/g2/font/latin/o-double-acute-uc-bold.png create mode 100644 resources/g2/font/latin/o-double-acute-uc-small.png create mode 100644 resources/g2/font/latin/o-double-acute-uc-tiny.png create mode 100644 resources/g2/font/latin/u-double-acute-bold.png create mode 100644 resources/g2/font/latin/u-double-acute-small.png create mode 100644 resources/g2/font/latin/u-double-acute-tiny.png create mode 100644 resources/g2/font/latin/u-double-acute-uc-bold.png create mode 100644 resources/g2/font/latin/u-double-acute-uc-small.png create mode 100644 resources/g2/font/latin/u-double-acute-uc-tiny.png diff --git a/resources/g2/font/latin/o-double-acute-bold.png b/resources/g2/font/latin/o-double-acute-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..81ce371b857b37abdabb69ff58307ee80545ffa1 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?gTe~DWM4f9tbfc literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/o-double-acute-small.png b/resources/g2/font/latin/o-double-acute-small.png new file mode 100644 index 0000000000000000000000000000000000000000..fd786d6353507d9a83266120d8bf03d9985db961 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ##0(@~B^+M>q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?tX4vR?STX585rs{I9y*z S2NVJoGkCiCxvX_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv`= zoQy)Ede=-le*lFfJY5_^IIbrLBqhwKY;ffDVVY>g%*@ZsVElol{if#Pe?T=1p00i_ I>zopr0BZIt1poj5 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/o-double-acute-uc-bold.png b/resources/g2/font/latin/o-double-acute-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..0eee0011858e7769f880a925b9ebd80c7030e539 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2hGm!icqpk;}cmjMvTvK(^I~e}|XXr3C{@?!h zZwyeJu_VYZn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI!IE z8HL1o-BM<80EP5CT^vI=t|uqFN=kU(V|(C$zQ#JMs7buxIm`njxgN@xNAg3p^r=85p>QL70(Y)*K0-AbW|YuPgf_ zPDUYd6_#sEDL^4zPZ!4!j_b(@ml6^l%;7sC$itJB$-`6ZCzmkeaAiXxo4{&a_O9aw e1_t#B3=DIHI8Myi%#{Pw$l&Sf=d#Wzp$Pzd$S`yO literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/o-double-acute-uc-tiny.png b/resources/g2/font/latin/o-double-acute-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..aea06720a5e331891d1c6df6daff7d8d7276ff20 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?_E)L#0(@^7p<8Gq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?q<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?&nhNM~SZe8Z8~b<+4I PP$h$>tDnm{r-UW|48<^h literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-double-acute-tiny.png b/resources/g2/font/latin/u-double-acute-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2d9959e473ee52cdf2d3019055b17b9ed07036 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1p#0(_&p3JWWQak}ZA+D*q=^YIJ|1)$L8~<_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv`= zoQy(}EDNpqm4HIxo-U3d9M_Wrk`iWAHZVFdO|)WW=4WOw-oes5E9=S+pb`d8S3j3^ HP6rp8A literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-double-acute-uc-bold.png b/resources/g2/font/latin/u-double-acute-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..05bf8a5d182480ed0a2ef4ac2b62809f4bae3f82 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2hGm!icqpk;}cmjMvTvK(^I~e}|XXr3C{@?!h zZwyeJu_VYZn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI!IE z8HE|m=Niq40t#t+x;Tb#Tu)ATk&tk~D?4F^)#ir8U8(}bP9L^RW#tKW=9UO?<~R88 bKb?W$Q7`w4Fs_ngKy3`3u6{1-oD!M<%f~Y< literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-double-acute-uc-small.png b/resources/g2/font/latin/u-double-acute-uc-small.png new file mode 100644 index 0000000000000000000000000000000000000000..7e27c943cdc2b10a9f4038d7ca1cc2b994908e5a GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRQ#0(^*v*+jnDV_kI5Z6@Q^bUsq{~0=rjsLg* z{Tl-mXDkWw3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QL70(Y)*K0-AbW|YuPgf_ zPDUXaF6%GX5`aS5o-U3d9M_W*UL+(0cqJ#yu>8z$xaKr7PqBq!1)IQX-SmV9J&6ek c{|+!PJk;TO{cy|Qn?P+0p00i_>zopr0LTC}H~;_u literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/u-double-acute-uc-tiny.png b/resources/g2/font/latin/u-double-acute-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..91c1c94330814b5af51a585f93b0cb6ef061409f GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR?dI(>oac|7YkhHvZrK z_iqePoUtUxFPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?^102_AOR{g|$pb`d8S3j3^ HP6= 256) codepoint = '?'; @@ -569,6 +579,11 @@ bool font_supports_string_sprite(const utf8* text) case UNICODE_Y_ACUTE_UC: case UNICODE_Y_ACUTE: + case UNICODE_O_DOUBLE_ACUTE_UC: + case UNICODE_O_DOUBLE_ACUTE: + case UNICODE_U_DOUBLE_ACUTE_UC: + case UNICODE_U_DOUBLE_ACUTE: + supported = true; break; default: diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index 702a302c53..8acfaad5f3 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -317,4 +317,12 @@ enum UnicodeCzech UNICODE_Y_ACUTE = 253, }; +enum UnicodeHungarian +{ + UNICODE_O_DOUBLE_ACUTE_UC = 336, + UNICODE_O_DOUBLE_ACUTE = 337, + UNICODE_U_DOUBLE_ACUTE_UC = 368, + UNICODE_U_DOUBLE_ACUTE = 369, +}; + #endif diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 9110a9858b..f6cbd50356 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -919,7 +919,12 @@ enum SPR_G2_Y_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 64, SPR_G2_Y_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 65, - SPR_G2_CHAR_END = SPR_G2_Y_ACUTE_LOWER, + 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_CHAR_END = SPR_G2_U_DOUBLE_ACUTE_LOWER, SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, // 0x60000, chosen because it's a round hex number From b1e9afb542ce2f122c48260debe3dac76d456791 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 1 Sep 2018 20:43:57 +0200 Subject: [PATCH 5/5] Amend changelog --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 8f6a3dcbd4..b5513fe124 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,5 +1,6 @@ 0.2.1+ (in development) ------------------------------------------------------------------------ +- Feature: [#7956, #7964] Add sprite font glyphs for Hungarian and some Czech letters. - Improved: [#7930] Automatically create folders for custom content. - Removed: [#7929] Support for scenario text objects.