X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=docs%2Fcontent%2Fshared-javascript-and-cpp-documentation%2Ftext-label.md;h=13d2ab08b865b514a7030d50032a51c81d92b186;hb=4d763eb68b5aa2448dfc81d90fc5ce598c68c99f;hp=5986eeea29d951b08d8bce12a96321e2493149e7;hpb=f3da11c2818c6d17706fbb2417f21b602b3190f5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/docs/content/shared-javascript-and-cpp-documentation/text-label.md b/docs/content/shared-javascript-and-cpp-documentation/text-label.md
index 5986eee..13d2ab0 100644
--- a/docs/content/shared-javascript-and-cpp-documentation/text-label.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/text-label.md
@@ -43,6 +43,10 @@ The position of the label on-screen is dependent on the parentOrigin and anchorP
 
 By default TextLabel will automatically select a suitable font from the platform. However, a different font could be selected. See the [Font Selection](@ref font-selection) section for more details.
 
+### Mark-up Style
+
+Mark-up tags can be used to change the style of the text. See the [Mark-up Style](@ref markup-style) section for more details.
+
 ### Text Alignment
 
 Wrapping can be enabled using the MULTI_LINE property:
@@ -312,22 +316,23 @@ label1.underlineHeight = 1;
 
 ### Text Label Properties
 
- Name (JavaScript)   |  Name (C++)         |  Type        | Writable     | Animatable
----------------------|---------------------|--------------|--------------|-----------
- renderingBackend    | RENDERING_BACKEND   |  INTEGER     | O            | X
- text                | TEXT                |  STRING      | O            | X
- fontFamily          | FONT_FAMILY         |  STRING      | O            | X
- fontStyle           | FONT_STYLE          |  STRING      | O            | X
- pointSize           | POINT_SIZE          |  FLOAT       | O            | X
- multiLine           | MULTI_LINE          |  BOOLEAN     | O            | X
- horizontalAlignment | HORIZONTAL_ALIGNMENT|  STRING      | O            | X
- verticalAlignment   | VERTICAL_ALIGNMENT  |  STRING      | O            | X
- textColor           | TEXT_COLOR          |  VECTOR4     | O            | X
- shadowOffset        | SHADOW_OFFSET       |  VECTOR2     | O            | X
- shadowColor         | SHADOW_COLOR        |  VECTOR4     | O            | X
- underlineEnabled    | UNDERLINE_ENABLED   |  BOOLEAN     | O            | X
- underlineColor      | UNDERLINE_COLOR     |  VECTOR4     | O            | X
- underlineHeight     | UNDERLINE_HEIGHT    |  FLOAT       | O            | X
+ Name (JavaScript)   |  Name (C++)          |  Type        | Writable     | Animatable
+---------------------|----------------------|--------------|--------------|-----------
+ renderingBackend    | RENDERING_BACKEND    |  INTEGER     | O            | X
+ text                | TEXT                 |  STRING      | O            | X
+ fontFamily          | FONT_FAMILY          |  STRING      | O            | X
+ fontStyle           | FONT_STYLE           |  STRING      | O            | X
+ pointSize           | POINT_SIZE           |  FLOAT       | O            | X
+ multiLine           | MULTI_LINE           |  BOOLEAN     | O            | X
+ horizontalAlignment | HORIZONTAL_ALIGNMENT |  STRING      | O            | X
+ verticalAlignment   | VERTICAL_ALIGNMENT   |  STRING      | O            | X
+ textColor           | TEXT_COLOR           |  VECTOR4     | O            | X
+ shadowOffset        | SHADOW_OFFSET        |  VECTOR2     | O            | X
+ shadowColor         | SHADOW_COLOR         |  VECTOR4     | O            | X
+ underlineEnabled    | UNDERLINE_ENABLED    |  BOOLEAN     | O            | X
+ underlineColor      | UNDERLINE_COLOR      |  VECTOR4     | O            | X
+ underlineHeight     | UNDERLINE_HEIGHT     |  FLOAT       | O            | X
+ enableMarkup        | ENABLE_MARKUP        |  BOOLEAN     | O            | X