usp10: If leading with a strong character use its bidi level for our intial LayoutRTL.

41db79a8 · Aric Stewart · Alexandre Julliard · 2c8fb3ab · 41db79a8
Commit 41db79a8 authored Nov 17, 2011 by Aric Stewart Committed by Alexandre Julliard Nov 17, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

usp10.c dlls/usp10/usp10.c +4 -1

No files found.
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -949,7 +949,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int 

    if (levels)
    {
-        layoutRTL = (psState->uBidiLevel || odd(levels[cnt]))?1:0;
+        if (strength[cnt] == BIDI_STRONG)
+            layoutRTL = (odd(levels[cnt]))?1:0;
+        else
+            layoutRTL = (psState->uBidiLevel || odd(levels[cnt]))?1:0;
        pItems[index].a.fRTL = odd(levels[cnt]);
        pItems[index].a.fLayoutRTL = layoutRTL;
        pItems[index].a.s.uBidiLevel = levels[cnt];