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/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. 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/latin/c-caron-bold.png b/resources/g2/font/latin/c-caron-bold.png new file mode 100644 index 0000000000..2e5369f262 Binary files /dev/null and b/resources/g2/font/latin/c-caron-bold.png differ diff --git a/resources/g2/font/latin/c-caron-small.png b/resources/g2/font/latin/c-caron-small.png new file mode 100644 index 0000000000..befc492673 Binary files /dev/null and b/resources/g2/font/latin/c-caron-small.png differ diff --git a/resources/g2/font/latin/c-caron-tiny.png b/resources/g2/font/latin/c-caron-tiny.png new file mode 100644 index 0000000000..3b117f22ec Binary files /dev/null and b/resources/g2/font/latin/c-caron-tiny.png differ diff --git a/resources/g2/font/latin/c-caron-uc-bold.png b/resources/g2/font/latin/c-caron-uc-bold.png new file mode 100644 index 0000000000..acd8888454 Binary files /dev/null and b/resources/g2/font/latin/c-caron-uc-bold.png differ diff --git a/resources/g2/font/latin/c-caron-uc-small.png b/resources/g2/font/latin/c-caron-uc-small.png new file mode 100644 index 0000000000..d9ec9db365 Binary files /dev/null and b/resources/g2/font/latin/c-caron-uc-small.png differ diff --git a/resources/g2/font/latin/c-caron-uc-tiny.png b/resources/g2/font/latin/c-caron-uc-tiny.png new file mode 100644 index 0000000000..87b5644ff1 Binary files /dev/null and b/resources/g2/font/latin/c-caron-uc-tiny.png differ 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/latin/o-double-acute-bold.png b/resources/g2/font/latin/o-double-acute-bold.png new file mode 100644 index 0000000000..81ce371b85 Binary files /dev/null and b/resources/g2/font/latin/o-double-acute-bold.png differ 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 0000000000..fd786d6353 Binary files /dev/null and b/resources/g2/font/latin/o-double-acute-small.png differ diff --git a/resources/g2/font/latin/o-double-acute-tiny.png b/resources/g2/font/latin/o-double-acute-tiny.png new file mode 100644 index 0000000000..8987536b5a Binary files /dev/null and b/resources/g2/font/latin/o-double-acute-tiny.png differ 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 0000000000..0eee001185 Binary files /dev/null and b/resources/g2/font/latin/o-double-acute-uc-bold.png differ diff --git a/resources/g2/font/latin/o-double-acute-uc-small.png b/resources/g2/font/latin/o-double-acute-uc-small.png new file mode 100644 index 0000000000..00ec331849 Binary files /dev/null and b/resources/g2/font/latin/o-double-acute-uc-small.png differ 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 0000000000..aea06720a5 Binary files /dev/null and b/resources/g2/font/latin/o-double-acute-uc-tiny.png differ 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/latin/u-double-acute-bold.png b/resources/g2/font/latin/u-double-acute-bold.png new file mode 100644 index 0000000000..df959f4b29 Binary files /dev/null and b/resources/g2/font/latin/u-double-acute-bold.png differ diff --git a/resources/g2/font/latin/u-double-acute-small.png b/resources/g2/font/latin/u-double-acute-small.png new file mode 100644 index 0000000000..ea2edf65f2 Binary files /dev/null and b/resources/g2/font/latin/u-double-acute-small.png differ 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 0000000000..5b2d9959e4 Binary files /dev/null and b/resources/g2/font/latin/u-double-acute-tiny.png differ 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 0000000000..05bf8a5d18 Binary files /dev/null and b/resources/g2/font/latin/u-double-acute-uc-bold.png differ 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 0000000000..7e27c943cd Binary files /dev/null and b/resources/g2/font/latin/u-double-acute-uc-small.png differ 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 0000000000..91c1c94330 Binary files /dev/null and b/resources/g2/font/latin/u-double-acute-uc-tiny.png differ diff --git a/resources/g2/font/latin/y-acute-bold.png b/resources/g2/font/latin/y-acute-bold.png new file mode 100644 index 0000000000..9c5feb208f Binary files /dev/null and b/resources/g2/font/latin/y-acute-bold.png differ diff --git a/resources/g2/font/latin/y-acute-small.png b/resources/g2/font/latin/y-acute-small.png new file mode 100644 index 0000000000..d4a6948427 Binary files /dev/null and b/resources/g2/font/latin/y-acute-small.png differ diff --git a/resources/g2/font/latin/y-acute-tiny.png b/resources/g2/font/latin/y-acute-tiny.png new file mode 100644 index 0000000000..30d7ee5a43 Binary files /dev/null and b/resources/g2/font/latin/y-acute-tiny.png differ diff --git a/resources/g2/font/latin/y-acute-uc-bold.png b/resources/g2/font/latin/y-acute-uc-bold.png new file mode 100644 index 0000000000..9a8f78294f Binary files /dev/null and b/resources/g2/font/latin/y-acute-uc-bold.png differ diff --git a/resources/g2/font/latin/y-acute-uc-small.png b/resources/g2/font/latin/y-acute-uc-small.png new file mode 100644 index 0000000000..8364c106b7 Binary files /dev/null and b/resources/g2/font/latin/y-acute-uc-small.png differ diff --git a/resources/g2/font/latin/y-acute-uc-tiny.png b/resources/g2/font/latin/y-acute-uc-tiny.png new file mode 100644 index 0000000000..fbf95955e4 Binary files /dev/null and b/resources/g2/font/latin/y-acute-uc-tiny.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index adb43ff9f0..9d6dd329c4 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,26 +771,74 @@ "forceBmp": true }, { - "path": "font/ae-uc-bold.png", + "path": "font/latin/c-caron-uc-small.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/ae-bold.png", + "path": "font/latin/c-caron-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/y-acute-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/y-acute-small.png", + "y_offset": 1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/o-double-acute-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/o-double-acute-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/u-double-acute-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/u-double-acute-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/ae-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "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", @@ -1036,61 +1084,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 @@ -1102,25 +1150,73 @@ "forceBmp": true }, { - "path": "font/ae-uc-tiny.png", + "path": "font/latin/c-caron-uc-bold.png", + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/c-caron-bold.png", "y_offset": 0, "palette": "keep", "forceBmp": true }, { - "path": "font/ae-tiny.png", + "path": "font/latin/y-acute-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/y-acute-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/o-double-acute-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/o-double-acute-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/u-double-acute-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/u-double-acute-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/ae-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "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 @@ -1375,61 +1471,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 @@ -1439,5 +1535,53 @@ "y_offset": 4, "palette": "keep", "forceBmp": true + }, + { + "path": "font/latin/c-caron-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/c-caron-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/y-acute-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/y-acute-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/o-double-acute-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/o-double-acute-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/u-double-acute-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/latin/u-double-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 f60037f076..a44346475a 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -375,6 +375,26 @@ int32_t font_sprite_get_codepoint_offset(int32_t codepoint) case UNICODE_F_WITH_HOOK_UC: return 'F' - 32; + // Czech + case UNICODE_C_CARON_UC: + 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; + + // Hungarian + case UNICODE_O_DOUBLE_ACUTE_UC: + return SPR_G2_O_DOUBLE_ACUTE_UPPER - SPR_CHAR_START; + case UNICODE_O_DOUBLE_ACUTE: + return SPR_G2_O_DOUBLE_ACUTE_LOWER - SPR_CHAR_START; + case UNICODE_U_DOUBLE_ACUTE_UC: + return SPR_G2_U_DOUBLE_ACUTE_UPPER - SPR_CHAR_START; + case UNICODE_U_DOUBLE_ACUTE: + return SPR_G2_U_DOUBLE_ACUTE_LOWER - SPR_CHAR_START; + default: if (codepoint < 32 || codepoint >= 256) codepoint = '?'; @@ -554,6 +574,16 @@ 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: + 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 f0689376b1..8acfaad5f3 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/src/openrct2/localisation/FormatCodes.h @@ -309,4 +309,20 @@ enum UnicodePunctuation UNICODE_ELLIPSIS = 8230, }; +enum UnicodeCzech +{ + UNICODE_C_CARON_UC = 268, + UNICODE_C_CARON = 269, + UNICODE_Y_ACUTE_UC = 221, + 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 22fa434e6f..f6cbd50356 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -913,7 +913,18 @@ 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_Y_ACUTE_UPPER = SPR_G2_CHAR_BEGIN + 64, + SPR_G2_Y_ACUTE_LOWER = SPR_G2_CHAR_BEGIN + 65, + + 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