Aric Stewart : usp10: Standard features are only ccmp and locl.
Alexandre Julliard
julliard at winehq.org
Thu Dec 1 14:05:34 CST 2011
Module: wine
Branch: master
Commit: 711dd9b13a59ed3c43237531dc044d630f25785f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=711dd9b13a59ed3c43237531dc044d630f25785f
Author: Aric Stewart <aric at codeweavers.com>
Date: Thu Dec 1 09:08:42 2011 -0600
usp10: Standard features are only ccmp and locl.
---
dlls/usp10/shape.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 3911c1c..e1cadd1 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -340,6 +340,12 @@ static const char* contextual_features[] =
static OPENTYPE_FEATURE_RECORD standard_features[] =
{
+ { MS_MAKE_TAG('c','c','m','p'), 1},
+ { MS_MAKE_TAG('l','o','c','l'), 1},
+};
+
+static OPENTYPE_FEATURE_RECORD latin_features[] =
+{
{ MS_MAKE_TAG('l','i','g','a'), 1},
{ MS_MAKE_TAG('c','l','i','g'), 1},
};
@@ -539,11 +545,11 @@ typedef struct ScriptShapeDataTag {
static const ScriptShapeData ShapingData[] =
{
{{ standard_features, 2}, NULL, "", "", NULL, NULL},
- {{ standard_features, 2}, NULL, "latn", "", NULL, NULL},
- {{ standard_features, 2}, NULL, "latn", "", NULL, NULL},
- {{ standard_features, 2}, NULL, "latn", "", NULL, NULL},
+ {{ latin_features, 2}, NULL, "latn", "", NULL, NULL},
+ {{ latin_features, 2}, NULL, "latn", "", NULL, NULL},
+ {{ latin_features, 2}, NULL, "latn", "", NULL, NULL},
{{ standard_features, 2}, NULL, "" , "", NULL, NULL},
- {{ standard_features, 2}, NULL, "latn", "", NULL, NULL},
+ {{ latin_features, 2}, NULL, "latn", "", NULL, NULL},
{{ arabic_features, 6}, required_arabic_features, "arab", "", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic},
{{ arabic_features, 6}, required_arabic_features, "arab", "", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic},
{{ hebrew_features, 1}, NULL, "hebr", "", NULL, NULL},
@@ -583,7 +589,7 @@ static const ScriptShapeData ShapingData[] =
{{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam},
{{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam},
{{ standard_features, 2}, NULL, "" , "", NULL, NULL},
- {{ standard_features, 2}, NULL, "latn" , "", NULL, NULL},
+ {{ latin_features, 2}, NULL, "latn" , "", NULL, NULL},
{{ standard_features, 2}, NULL, "" , "", NULL, NULL},
};
More information about the wine-cvs
mailing list