From f6bdaf369c755a397bf4e0257b4b61ea3f8847cb Mon Sep 17 00:00:00 2001 From: Aric Stewart Date: Mon, 21 Jan 2013 09:23:14 -0600 Subject: [PATCH] usp10: Only fall back to latin features if the base script tag is not found at all. --- dlls/usp10/shape.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b504b3aafcf..e40a404b733 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -614,7 +614,7 @@ static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache int attempt = 2; OPENTYPE_TAG tags; OPENTYPE_TAG language; - OPENTYPE_TAG script; + OPENTYPE_TAG script = 0x00000000; int cTags; do @@ -631,7 +631,7 @@ static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache } while(attempt && !feature); /* try in the default (latin) table */ - if (!feature) + if (!feature && !script) OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); } -- 2.11.4.GIT