Aric Stewart : usp10: Determine glyph properties after shaping for scripts with no justification .
Alexandre Julliard
julliard at winehq.org
Tue May 24 12:53:48 CDT 2011
Module: wine
Branch: master
Commit: 953c7a34275390b17b83f12df3e612ed03882994
URL: http://source.winehq.org/git/wine.git/?a=commit;h=953c7a34275390b17b83f12df3e612ed03882994
Author: Aric Stewart <aric at codeweavers.com>
Date: Mon May 23 11:41:43 2011 -0500
usp10: Determine glyph properties after shaping for scripts with no justification.
---
dlls/usp10/shape.c | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 18ae11b..047acc5 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -50,6 +50,7 @@ typedef VOID (*ShapeCharGlyphPropProc)( HDC , ScriptCache*, SCRIPT_ANALYSIS*, co
static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp);
static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp );
static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp );
+static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp );
extern const unsigned short wine_shaping_table[];
extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4];
@@ -390,16 +391,16 @@ static const ScriptShapeData ShapingData[] =
{{ 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},
- {{ syriac_features, 4}, required_syriac_features, "syrc", ContextualShape_Syriac, NULL},
+ {{ syriac_features, 4}, required_syriac_features, "syrc", ContextualShape_Syriac, ShapeCharGlyphProp_None},
{{ arabic_features, 6}, required_arabic_features, "arab", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic},
- {{ NULL, 0}, NULL, "thaa", NULL, NULL},
+ {{ NULL, 0}, NULL, "thaa", NULL, ShapeCharGlyphProp_None},
{{ standard_features, 2}, NULL, "grek", NULL, NULL},
{{ standard_features, 2}, NULL, "cyrl", NULL, NULL},
{{ standard_features, 2}, NULL, "armn", NULL, NULL},
{{ standard_features, 2}, NULL, "geor", NULL, NULL},
{{ sinhala_features, 7}, NULL, "sinh", NULL, NULL},
- {{ tibetan_features, 2}, NULL, "tibt", NULL, NULL},
- {{ tibetan_features, 2}, NULL, "tibt", NULL, NULL},
+ {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_None},
+ {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_None},
{{ tibetan_features, 2}, NULL, "phag", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai},
{{ thai_features, 1}, NULL, "thai", NULL, ShapeCharGlyphProp_Thai},
{{ thai_features, 1}, NULL, "thai", NULL, ShapeCharGlyphProp_Thai},
@@ -1703,6 +1704,42 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS
}
}
+static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp)
+{
+ int i,k;
+
+ for (i = 0; i < cGlyphs; i++)
+ {
+ int char_index[20];
+ int char_count = 0;
+
+ for (k = 0; k < cChars; k++)
+ {
+ if (pwLogClust[k] == i)
+ {
+ char_index[char_count] = k;
+ char_count++;
+ }
+ }
+
+ if (char_count == 0)
+ {
+ FIXME("No chars in this glyph? Must be an error\n");
+ continue;
+ }
+
+ if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */
+ {
+ pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER;
+ pCharProp[char_index[0]].fCanGlyphAlone = 1;
+ }
+ else
+ pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE;
+ }
+ GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp);
+ UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp);
+}
+
void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp)
{
if (ShapingData[psa->eScript].charGlyphPropProc)
More information about the wine-cvs
mailing list