diff --git a/data/MANIFEST.json b/data/MANIFEST.json index 9b75891206..980da83a5d 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -1480,10 +1480,10 @@ "uncompressed_size_bytes": 25964767, "compressed_size_bytes": 8714926 }, - "data/system/extra_fonts/ZCOOLXiaoWei-Regular.ttf": { - "checksum": "edea762b9f6ccee6d330ec37b6d1cd66", - "uncompressed_size_bytes": 6302056, - "compressed_size_bytes": 3409781 + "data/system/extra_fonts/NotoSerifCJKtc-Regular.otf": { + "checksum": "338584d1454293b6dfd84a9137153b3c", + "uncompressed_size_bytes": 23614420, + "compressed_size_bytes": 19085911 }, "data/system/fr/charleville_mezieres/city.bin": { "checksum": "a283fcc74ca4d6d2b471204440a7a20f", diff --git a/data/system/extra_fonts/NotoSerifCJKtc-Regular.otf b/data/system/extra_fonts/NotoSerifCJKtc-Regular.otf new file mode 100644 index 0000000000..864d3a4adc Binary files /dev/null and b/data/system/extra_fonts/NotoSerifCJKtc-Regular.otf differ diff --git a/data/system/extra_fonts/ZCOOLXiaoWei-Regular.ttf b/data/system/extra_fonts/ZCOOLXiaoWei-Regular.ttf deleted file mode 100644 index 686d7a0575..0000000000 Binary files a/data/system/extra_fonts/ZCOOLXiaoWei-Regular.ttf and /dev/null differ diff --git a/map_gui/src/load.rs b/map_gui/src/load.rs index 6b8b1a05ab..bb2902fb6d 100644 --- a/map_gui/src/load.rs +++ b/map_gui/src/load.rs @@ -41,20 +41,20 @@ impl MapLoader { } // TODO Generalize this more, maybe with some kind of country code -> font config - let zcool = "ZCOOLXiaoWei-Regular.ttf"; - if name.city.country == "tw" && !ctx.is_font_loaded(zcool) { + let chinese_font = "NotoSerifCJKtc-Regular.otf"; + if name.city.country == "tw" && !ctx.is_font_loaded(chinese_font) { return RawFileLoader::::new( ctx, - abstio::path(format!("system/extra_fonts/{}", zcool)), + abstio::path(format!("system/extra_fonts/{}", chinese_font)), Box::new(move |ctx, app, bytes| match bytes { Ok(bytes) => { - ctx.load_font(zcool, bytes); + ctx.load_font(chinese_font, bytes); Transition::Replace(MapLoader::new(ctx, app, name, on_load)) } Err(err) => Transition::Replace(PopupMsg::new( ctx, "Error", - vec![format!("Couldn't load {}", zcool), err.to_string()], + vec![format!("Couldn't load {}", chinese_font), err.to_string()], )), }), ); diff --git a/release/INSTRUCTIONS.txt b/release/INSTRUCTIONS.txt index 23965b9f4e..d9b6f38403 100644 --- a/release/INSTRUCTIONS.txt +++ b/release/INSTRUCTIONS.txt @@ -39,8 +39,7 @@ Other binary data bundled in: - Overpass font (, Open Font License) - Bungee fonts (, Open Font License) -- ZCOOL XiaoWei fonts (, Open - Font License) +- Noto fonts (, SIL Open Font License) - Material Design icons (, Apache license) - Some Graphics textures (, CC0 1.0 Universal) - Snowflake SVG (, CC0)