X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmarkup-processor.h;h=f751843e85c242366cd06eb2ecb2cfd2c5d4c9f8;hb=33efb36d4d62bff6febf074ae94feb18ae619ee5;hp=3ef7a2d6275adec8a48ea68f2e25ab2acefbea82;hpb=29bbe2381a1cfdd96757dfd441e7f9747560b2c8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/markup-processor.h b/dali-toolkit/internal/text/markup-processor.h index 3ef7a2d..f751843 100644 --- a/dali-toolkit/internal/text/markup-processor.h +++ b/dali-toolkit/internal/text/markup-processor.h @@ -25,6 +25,7 @@ // INTERNAL INCLUDES #include #include +#include #include #include #include @@ -42,14 +43,15 @@ namespace Text */ struct MarkupProcessData { - MarkupProcessData(Vector& colorRuns, - Vector& fontRuns, - Vector& items, - Vector& anchors, - Vector& underlinedCharacterRuns, - Vector& backgroundColorRuns, - Vector& strikethroughCharacterRuns, - Vector& boundedParagraphRuns) + MarkupProcessData(Vector& colorRuns, + Vector& fontRuns, + Vector& items, + Vector& anchors, + Vector& underlinedCharacterRuns, + Vector& backgroundColorRuns, + Vector& strikethroughCharacterRuns, + Vector& boundedParagraphRuns, + Vector& characterSpacingCharacterRuns) : colorRuns(colorRuns), fontRuns(fontRuns), items(items), @@ -58,19 +60,22 @@ struct MarkupProcessData backgroundColorRuns(backgroundColorRuns), strikethroughCharacterRuns(strikethroughCharacterRuns), boundedParagraphRuns(boundedParagraphRuns), + characterSpacingCharacterRuns(characterSpacingCharacterRuns), markupProcessedText() { } - Vector& colorRuns; ///< The color runs. - Vector& fontRuns; ///< The font description runs. - Vector& items; ///< The embedded items. - Vector& anchors; ///< The anchors. - Vector& underlinedCharacterRuns; ///< The underlined character runs. - Vector& backgroundColorRuns; ///< The background color runs. - Vector& strikethroughCharacterRuns; ///< The strikethrough character runs. - Vector& boundedParagraphRuns; ///< The bounded paragraph runs - std::string markupProcessedText; ///< The mark-up string. + Vector& colorRuns; ///< The color runs. + Vector& fontRuns; ///< The font description runs. + Vector& items; ///< The embedded items. + Vector& anchors; ///< The anchors. + Vector& underlinedCharacterRuns; ///< The underlined character runs. + Vector& backgroundColorRuns; ///< The background color runs. + Vector& strikethroughCharacterRuns; ///< The strikethrough character runs. + Vector& boundedParagraphRuns; ///< The bounded paragraph runs + Vector& characterSpacingCharacterRuns; ///< The character-spacing runs + + std::string markupProcessedText; ///< The mark-up string. }; /**