From a7033d194d2f9c6a91028abcc3243417b6a82282 Mon Sep 17 00:00:00 2001
From: "minho.sun" <minho.sun@samsung.com>
Date: Thu, 23 Aug 2018 19:02:28 +0900
Subject: [PATCH] Fix bidirection text issue

There was a bug when using NEUTRAL direction character.
Previous logic passed one iteration when NEUTRAL direction character is
used.

Change-Id: Ie1f89049b26f6880fad02072249224e2a11853bd
Signed-off-by: minho.sun <minho.sun@samsung.com>
---
 .../text/text-abstraction/bidirectional-support-impl.cpp       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dali/internal/text/text-abstraction/bidirectional-support-impl.cpp b/dali/internal/text/text-abstraction/bidirectional-support-impl.cpp
index 10ce56d..5d096c3 100644
--- a/dali/internal/text/text-abstraction/bidirectional-support-impl.cpp
+++ b/dali/internal/text/text-abstraction/bidirectional-support-impl.cpp
@@ -295,6 +295,8 @@ struct BidirectionalSupport::Plugin
     for( CharacterIndex index = 0u; index < numberOfCharacters; ++index )
     {
       CharacterDirection& characterDirection = *( directions + index );
+      CharacterDirection nextDirection = false;
+
       characterDirection = false;
 
       // Get the bidi direction.
@@ -303,14 +305,14 @@ struct BidirectionalSupport::Plugin
       if( RIGHT_TO_LEFT == bidiDirection )
       {
         characterDirection = true;
+        nextDirection = true;
       }
       else if( NEUTRAL == bidiDirection )
       {
         // For neutral characters it check's the next and previous directions.
         // If they are equals set that direction. If they are not, sets the paragraph's direction.
         // If there is no next, sets the paragraph's direction.
-
-        CharacterDirection nextDirection = paragraphDirection;
+        nextDirection = paragraphDirection;
 
         // Look for the next non-neutral character.
         Length nextIndex = index + 1u;
@@ -328,7 +330,9 @@ struct BidirectionalSupport::Plugin
         characterDirection = previousDirection == nextDirection ? previousDirection : paragraphDirection;
 
         // Set the direction to all the neutral characters.
+        // The indices from currentIndex + 1u to nextIndex - 1u are neutral characters.
         ++index;
+
         for( ; index < nextIndex; ++index )
         {
           CharacterDirection& nextCharacterDirection = *( directions + index );
@@ -342,7 +346,7 @@ struct BidirectionalSupport::Plugin
         }
       }
 
-      previousDirection = characterDirection;
+      previousDirection = nextDirection;
     }
   }
 
-- 
2.7.4