Skip to content

W
wine-winehq
Commit 6c3398d9 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

usp10: Pay attention to script changes for bidi run itemization.

parent 145102c7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
dlls/usp10/usp10.c
View file @ 6c3398d9
...@@ -859,7 +859,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int ...@@ -859,7 +859,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int
for (i = 0; i < cInChars; i++) for (i = 0; i < cInChars; i++)
{ {
if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i]))
{
scripts[i] = Script_Numeric;
levels[i] = 2; levels[i] = 2;
}
else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric) else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric)
{ {
levels[i] = 2; levels[i] = 2;
...@@ -982,7 +985,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int ...@@ -982,7 +985,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int
new_run = TRUE; new_run = TRUE;
} }
/* changes in script */ /* changes in script */
else if ((!levels) && (((pwcInChars[cnt] != Numeric_space) && (New_Script != -1) && (New_Script != pItems[index].a.eScript)) || (New_Script == Script_Control))) else if (((pwcInChars[cnt] != Numeric_space) && (New_Script != -1) && (New_Script != pItems[index].a.eScript)) || (New_Script == Script_Control))
{ {
TRACE("Script break(%i/%i)\n",pItems[index].a.eScript,New_Script); TRACE("Script break(%i/%i)\n",pItems[index].a.eScript,New_Script);
new_run = TRUE; new_run = TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment