From 429db5ff665a40614f0caf5bf0bbf4d919e1ef90 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Thu, 14 Nov 2013 22:19:40 +0000
Subject: [PATCH] fixed rtl mixed support mode so that words are properly
 placed in the sentence

---
 source/shared_lib/sources/graphics/font.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/shared_lib/sources/graphics/font.cpp b/source/shared_lib/sources/graphics/font.cpp
index ec8468eef..4ad7e7b5b 100644
--- a/source/shared_lib/sources/graphics/font.cpp
+++ b/source/shared_lib/sources/graphics/font.cpp
@@ -404,9 +404,14 @@ void Font::bidi_cvt(string &str_) {
 		//printf("Line: %d [%s]\n",lineIndex,str_.c_str());
 
 		vector<string> words;
-		if(str_.find(" ") != str_.npos) {
-			Tokenize(str_,words," ");
+		if(Font::fontSupportMixedRightToLeft == true) {
+			if(str_.find(" ") != str_.npos) {
+				Tokenize(str_,words," ");
 
+			}
+			else {
+				words.push_back(str_);
+			}
 		}
 		else {
 			words.push_back(str_);