X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Ftext%2Ftext-controller.cpp;h=6fe0f33832bfd9c0f4d5bc90204112cbf65dba87;hp=a5763d580a2ef85ec8d49a5d03f7ba725a850c5c;hb=2dd044328238768ae8b27a223cb7d0f5cda53513;hpb=30ead727af1371695a21bccc5be36f58912090ca

diff --git a/dali-toolkit/public-api/text/text-controller.cpp b/dali-toolkit/public-api/text/text-controller.cpp
index a5763d5..6fe0f33 100644
--- a/dali-toolkit/public-api/text/text-controller.cpp
+++ b/dali-toolkit/public-api/text/text-controller.cpp
@@ -25,6 +25,8 @@
 #include <dali-toolkit/public-api/text/character-set-conversion.h>
 #include <dali-toolkit/public-api/text/layouts/layout-engine.h>
 #include <dali-toolkit/public-api/text/logical-model.h>
+#include <dali-toolkit/public-api/text/multi-language-support.h>
+#include <dali-toolkit/public-api/text/script-run.h>
 #include <dali-toolkit/public-api/text/text-view.h>
 #include <dali-toolkit/public-api/text/visual-model.h>
 
@@ -91,9 +93,23 @@ bool Controller::Relayout( const Vector2& size )
     const uint8_t* utf8 = reinterpret_cast<const uint8_t*>( text.c_str() );
 
     Length characterCount = Utf8ToUtf32( utf8, text.size(), &utf32Characters[0] );
+    utf32Characters.Resize( characterCount );
+
+    Vector<ScriptRun> scripts;
+    MultilanguageSupport multilanguageSupport = MultilanguageSupport::Get();
+
+    multilanguageSupport.SetScripts( utf32Characters,
+                                     scripts );
+
+    Vector<FontRun> fonts;
+    multilanguageSupport.ValidateFonts( utf32Characters,
+                                        scripts,
+                                        fonts );
 
     // Manipulate the logical model
     mImpl->mLogicalModel->SetText( &utf32Characters[0], characterCount );
+    mImpl->mLogicalModel->SetScripts( &scripts[0], scripts.Count() );
+    mImpl->mLogicalModel->SetFonts( &fonts[0], fonts.Count() );
 
     // Update the visual model
     mImpl->mLayoutEngine.UpdateVisualModel( size, *mImpl->mLogicalModel, *mImpl->mVisualModel );