Aric Stewart : usp10: Update diacritical script handling for non OpenType Itemization.
Alexandre Julliard
julliard at winehq.org
Tue Feb 5 13:25:27 CST 2013
Module: wine
Branch: master
Commit: ef4b7c5948e43d4ceeed98ba4ddbf6c222259d36
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4b7c5948e43d4ceeed98ba4ddbf6c222259d36
Author: Aric Stewart <aric at codeweavers.com>
Date: Tue Feb 5 08:57:44 2013 -0600
usp10: Update diacritical script handling for non OpenType Itemization.
---
dlls/usp10/usp10.c | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index da0752d..41a7f32 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1329,8 +1329,36 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
forceLevels = TRUE;
/* Diacritical marks merge with other scripts */
- if (scripts[i] == Script_Diacritical && i > 0)
- scripts[i] = scripts[i-1];
+ if (scripts[i] == Script_Diacritical)
+ {
+ if (i > 0)
+ {
+ if (pScriptTags)
+ scripts[i] = scripts[i-1];
+ else
+ {
+ int j;
+ BOOL asian = FALSE;
+ WORD first_script = scripts[i-1];
+ for (j = i-1; j >= 0 && scripts[j] == first_script && pwcInChars[j] != Numeric_space; j--)
+ {
+ WORD original = scripts[j];
+ if (original == Script_Ideograph || original == Script_Kana || original == Script_Yi || original == Script_CJK_Han || original == Script_Bopomofo)
+ {
+ asian = TRUE;
+ break;
+ }
+ if (original != Script_MathAlpha && scriptInformation[scripts[j]].props.fComplex)
+ break;
+ scripts[j] = scripts[i];
+ if (original == Script_Punctuation2)
+ break;
+ }
+ if (scriptInformation[scripts[j]].props.fComplex || asian)
+ scripts[i] = scripts[j];
+ }
+ }
+ }
}
for (i = 0; i < cInChars; i++)
More information about the wine-cvs
mailing list