mirror of
https://github.com/storytold/effectcraft.git
synced 2026-11-16 15:22:43 +00:00
Merge pull request #3521 from dotCooCoo/fix/font-substitute-test-checks-installed
Fonts: substitute test checks whether the original family is installed
This commit is contained in:
1 file changed
+21
-1
@@ -459,7 +459,9 @@ fn microsoft_families_resolve_to_metric_compatible_substitutes() {
|
||||
|
||||
let resolved = resolve(requested, style);
|
||||
let family = &face(resolved.face).info.family;
|
||||
if family.eq_ignore_ascii_case(requested) {
|
||||
let installed = all_faces().iter().any(|f| f.info.family.eq_ignore_ascii_case(requested));
|
||||
if installed {
|
||||
assert!(family.eq_ignore_ascii_case(requested), "an installed {requested} wins over {family}");
|
||||
assert!(!resolved.missing, "an installed original family is available");
|
||||
} else {
|
||||
assert_eq!(family, substitute);
|
||||
@@ -471,6 +473,24 @@ fn microsoft_families_resolve_to_metric_compatible_substitutes() {
|
||||
assert!(unknown.missing);
|
||||
}
|
||||
|
||||
/// An installed Microsoft family is used as is and not reported missing, even when its
|
||||
/// substitute is also available (#1677). It runs in a child process so the Calibri fixture does
|
||||
/// not reach the substitute test above.
|
||||
#[test]
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
fn an_installed_microsoft_family_wins_over_its_substitute() {
|
||||
const CHILD: &str = "EFFECTCRAFT_TEST_ISOLATED_CALIBRI";
|
||||
if std::env::var_os(CHILD).is_none() {
|
||||
run_in_child(CHILD, "fonts::tests::an_installed_microsoft_family_wins_over_its_substitute");
|
||||
return;
|
||||
}
|
||||
add_font_data(test_font("Carlito"));
|
||||
add_font_data(test_font("Calibri"));
|
||||
let resolved = resolve("Calibri", "Regular");
|
||||
assert_eq!(face(resolved.face).info.family, "Calibri");
|
||||
assert!(!resolved.missing, "the installed family is available");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_han_order_follows_the_cjk_locale() {
|
||||
// Chinese first for any Chinese tag, whether or not it names a script.
|
||||
|
||||
Reference in new issue
Block a user