[dali_1.1.15] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-definitions.h

diff --git a/dali-toolkit/internal/text/text-definitions.h b/dali-toolkit/internal/text/text-definitions.h
index 17bca2d..dbb29cd 100644 (file)
--- a/dali-toolkit/internal/text/text-definitions.h
+++ b/dali-toolkit/internal/text/text-definitions.h
@@ -19,10 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/text-abstraction/text-abstraction-definitions.h>
-#include <dali/public-api/text-abstraction/font-metrics.h>
-#include <dali/public-api/text-abstraction/glyph-info.h>
-#include <dali/public-api/text-abstraction/script.h>
+#include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
+#include <dali/devel-api/text-abstraction/font-list.h>
+#include <dali/devel-api/text-abstraction/font-metrics.h>
+#include <dali/devel-api/text-abstraction/glyph-info.h>
+#include <dali/devel-api/text-abstraction/script.h>
 
 namespace Dali
 {
@@ -34,6 +35,9 @@ namespace Text
 {
 
 typedef TextAbstraction::FontId             FontId;             ///< The unique identifier for a font face (generated by FontClient).
+typedef TextAbstraction::FontWidth::Type    FontWidth;          ///< The font's width.
+typedef TextAbstraction::FontWeight::Type   FontWeight;         ///< The font's weight.
+typedef TextAbstraction::FontSlant::Type    FontSlant;          ///< The font's slant.
 typedef TextAbstraction::FontMetrics        FontMetrics;        ///< The metrics for a Font expressed in 26.6 fractional pixel format.
 typedef TextAbstraction::PointSize26Dot6    PointSize26Dot6;    ///< The point size in 26.6 fractional points.
 typedef TextAbstraction::FaceIndex          FaceIndex;          ///< Used with fonts which allow several font faces.
@@ -51,6 +55,7 @@ typedef TextAbstraction::CharacterDirection CharacterDirection; ///< The charact
 typedef uint32_t                         GlyphIndex;            ///< An index into an array of glyphs.
 typedef uint32_t                         ScriptRunIndex;        ///< An index into an array of script runs.
 typedef uint32_t                         FontRunIndex;          ///< An index into an array of font runs.
+typedef uint32_t                         UnderlineRunIndex;     ///< An index into an array of underline runs.
 typedef uint32_t                         BidirectionalRunIndex; ///< An index into an array of font runs.
 typedef uint32_t                         LineIndex;             ///< An index into an array of lines.