Dali-Text: Keyboard Shortcuts

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-io.cpp

diff --git a/dali-toolkit/internal/text/text-io.cpp b/dali-toolkit/internal/text/text-io.cpp
index 3bc1761..279e1aa 100644 (file)
--- a/dali-toolkit/internal/text/text-io.cpp
+++ b/dali-toolkit/internal/text/text-io.cpp
@@ -20,8 +20,8 @@
 
 // EXTERNAL INCLUDES
 #include <iostream>
-#include <dali/public-api/text-abstraction/font-client.h>
-#include <dali/public-api/text-abstraction/script.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/devel-api/text-abstraction/script.h>
 
 namespace Dali
 {
@@ -77,7 +77,7 @@ std::ostream& operator<< (std::ostream& o, const Vector<FontRun>& fontRun)
     FontId id = fontRun[i].fontId;
     TextAbstraction::FontDescription fontDescription;
     fontClient.GetDescription( id, fontDescription );
-    o << "ID:" << id << ", " << fontDescription.family << " style:" << fontDescription.style << " size:" << (fontClient.GetPointSize(id) / 64);
+    o << "ID:" << id << ", " << fontDescription.family << " width: " << fontDescription.width << " weight: " << fontDescription.weight << " slant: " << fontDescription.slant <<  " size:" << (fontClient.GetPointSize(id) / 64);
 
     if( i+1 < fontRun.Count() )
     {
@@ -93,7 +93,7 @@ std::ostream& operator<< (std::ostream& o, const Vector<LineRun>& lineRuns)
   for( unsigned int i=0; i<lineRuns.Count(); ++i )
   {
     // e.g. Print "Line 0 Glyphs: 0->9 Characters: 0->9 (10)" for a ten character run staring from beginning of the model
-    o << "Line " << i << " Glyphs: " << lineRuns[i].glyphIndex << "->" << (lineRuns[i].glyphIndex + lineRuns[i].numberOfGlyphs );
+    o << "Line " << i << " Glyphs: " << lineRuns[i].glyphRun.glyphIndex << "->" << (lineRuns[i].glyphRun.glyphIndex + lineRuns[i].glyphRun.numberOfGlyphs );
     o << " Characters: " << lineRuns[i].characterRun.characterIndex << "->" << (lineRuns[i].characterRun.characterIndex + lineRuns[i].characterRun.numberOfCharacters );
     o << " Width: " << lineRuns[i].width;
     o << " Ascender: " << lineRuns[i].ascender;