diff --git a/asciifont_atlasscript.txt b/asciifont_atlasscript.txt index 44664ab4d4..72573b94f7 100644 --- a/asciifont_atlasscript.txt +++ b/asciifont_atlasscript.txt @@ -1,2 +1,2 @@ 2048 -font UBUNTU24 assets/Roboto-Condensed.ttf UWERs 34 -2 +font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2 diff --git a/ext/native/tools/atlastool.cpp b/ext/native/tools/atlastool.cpp index 63b1dfa9d0..9609213a20 100644 --- a/ext/native/tools/atlastool.cpp +++ b/ext/native/tools/atlastool.cpp @@ -823,21 +823,15 @@ void GetLocales(const char *locales, std::vector &ranges) ranges.push_back(range(0x0590, 0x05FF)); break; - case 'S': // Unicode symbols - ranges.push_back(range(0x2000, 0x2312)); // General Punctuation, Letterlike Symbols, Arrows, - // Mathematical Operators, Miscellaneous Technical - ranges.push_back(range(0x2500, 0x254B)); // Box drawing - ranges.push_back(range(0x25A0, 0x266F)); // Geometric Shapes, Miscellaneous Symbols - // fallthrough select symbols - case 's': // Select symbols - ranges.push_back(range(0x2007, 0x2007)); // Figure space (digit-wide) - ranges.push_back(range(0x2020, 0x2020)); // Dagger + case 'S': // Select symbols + ranges.push_back(range(0x2007, 0x2007)); // Figure Space (digit-wide) + ranges.push_back(range(0x2020, 0x2021)); // Dagger and Double Dagger ranges.push_back(range(0x20AC, 0x20AC)); // Euro sign ranges.push_back(range(0x2116, 0x2116)); // "No." symbol ranges.push_back(range(0x2120, 0x2122)); // "SM", "TEL" and "TM" symbols ranges.push_back(range(0x2139, 0x2139)); // "i" symbol ranges.push_back(range(0x2302, 0x2302)); // House sign - ranges.push_back(range(0x2314, 0x2314)); // Cmd Key symbol + ranges.push_back(range(0x2314, 0x2314)); // Place of Interest sign ranges.push_back(range(0x2328, 0x2328)); // Keyboard sign ranges.push_back(range(0x232B, 0x232B)); // Backspace symbol ranges.push_back(range(0x23CE, 0x23CF)); // Return and Eject symbols @@ -860,6 +854,12 @@ void GetLocales(const char *locales, std::vector &ranges) ranges.push_back(range(0x3041, 0x3097)); ranges.push_back(range(0x3099, 0x309F)); break; + case 'J': // Shift JIS (for Japanese fonts) + ranges.push_back(range(0x2010, 0x2312)); // General Punctuation, Letterlike Symbols, Arrows, + // Mathematical Operators, Miscellaneous Technical + ranges.push_back(range(0x2500, 0x254B)); // Box drawing + ranges.push_back(range(0x25A0, 0x266F)); // Geometric Shapes, Miscellaneous Symbols + break; case 'c': // All Kanji, filtered though! ranges.push_back(range(0x3000, 0x303F)); // Ideographic symbols ranges.push_back(range(0x4E00, 0x9FFF, kanji)); diff --git a/font_atlasscript.txt b/font_atlasscript.txt index 21f483cdaa..3bffccd33d 100644 --- a/font_atlasscript.txt +++ b/font_atlasscript.txt @@ -1,3 +1,3 @@ 2048 -font UBUNTU24 assets/Roboto-Condensed.ttf UWERs 34 -2 -font UBUNTU24 C:/Windows/Fonts/ARIALUNI.ttf UWEhkcRGHKVTes 30 0 +font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2 +font UBUNTU24 C:/Windows/Fonts/ARIALUNI.ttf UWEhkcRGHKVTeS 30 0 diff --git a/ppge_atlasscript.txt b/ppge_atlasscript.txt index 15de2cc14b..7277aaa09e 100644 --- a/ppge_atlasscript.txt +++ b/ppge_atlasscript.txt @@ -1,6 +1,6 @@ 2048 -font UBUNTU24 C:/Windows/Fonts/KozGoPro-Medium.otf UWkhcSGR 24 -font UBUNTU24 C:/Windows/Fonts/ARIALUNI.ttf UWEhkcRGHKVTes 24 0 +font UBUNTU24 C:/Windows/Fonts/KozGoPro-Medium.otf UWkhcJGR 24 +font UBUNTU24 C:/Windows/Fonts/ARIALUNI.ttf UWEhkcRGHKVTeS 24 0 image I_CROSS source_assets/image/cross.png copy image I_CIRCLE source_assets/image/circle.png copy image I_SQUARE source_assets/image/square.png copy