usp10: Handle dangling joiners when processing Indic GlyphProps.

746679e1 · Aric Stewart · Alexandre Julliard · b036c8a3 · 746679e1
Commit 746679e1 authored Dec 07, 2011 by Aric Stewart Committed by Alexandre Julliard Dec 07, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

shape.c dlls/usp10/shape.c +5 -1

No files found.
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -3302,7 +3302,11 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL
                    break;
                case lex_ZWJ:
                case lex_ZWNJ:
-                    k = char_count;
+                    /* check for dangling joiners */
+                    if (pwcChars[char_index[k]-1] == 0x0020 || pwcChars[char_index[k]+1] == 0x0020)
+                        pGlyphProp[i].sva.fClusterStart = 1;
+                    else
+                        k = char_count;
                    break;
                default:
                    pGlyphProp[i].sva.fClusterStart = 1;