X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-definitions.h;h=6ea207b97190163c1979477b5b175957987c0709;hp=17bca2dc82c94a54001439d37e4d8acbc5864cea;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=cc82bd9b187cda8fe2c8336b73fd1fa9376cfebd

diff --git a/dali-toolkit/internal/text/text-definitions.h b/dali-toolkit/internal/text/text-definitions.h
old mode 100644
new mode 100755
index 17bca2d..6ea207b
--- a/dali-toolkit/internal/text/text-definitions.h
+++ b/dali-toolkit/internal/text/text-definitions.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__
-#define __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__
+#ifndef DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H
+#define DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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.
@@ -47,12 +51,17 @@ typedef TextAbstraction::Script             Script;             ///< The charact
 typedef TextAbstraction::LineBreakInfo      LineBreakInfo;      ///< Line break info (must break, allow break, no break). Possible values are: @e LINE_MUST_BREAK, @e LINE_ALLOW_BREAK and @e LINE_NO_BREAK (in the TextAbstraction namespace).
 typedef TextAbstraction::WordBreakInfo      WordBreakInfo;      ///< Word break info (break, no break). Possible values are: @e WORD_BREAK and @e WORD_NO_BREAK (in the TextAbstraction namespace).
 typedef TextAbstraction::CharacterDirection CharacterDirection; ///< The character's direction: @e false is left to right, @e true is right to left.
+typedef TextAbstraction::ColorBlendingMode  ColorBlendingMode;  ///< Defines how a color is blended.
+typedef TextAbstraction::ColorIndex         ColorIndex;         ///< An index into an array of colors.
 
-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                         BidirectionalRunIndex; ///< An index into an array of font runs.
-typedef uint32_t                         LineIndex;             ///< An index into an array of lines.
+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 bidirectional info.
+typedef uint32_t                         BidirectionalLineRunIndex; ///< An index into an array of bidirectional line info.
+typedef uint32_t                         LineIndex;                 ///< An index into an array of lines.
+typedef uint32_t                         ParagraphRunIndex;         ///< An index into an array of paragraphs.
 
 } // namespace Text
 
@@ -60,4 +69,4 @@ typedef uint32_t                         LineIndex;             ///< An index in
 
 } // namespace Dali
 
-#endif // __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__
+#endif // DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H