X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmarkup-processor.cpp;h=1df19ca48e55888fd4f7fdebc8bc2fffe4c23169;hb=702cdc29b907688eef62afbc63f0edb9e2dfb7d2;hp=9c26b396e47bf42f10e03fb363bde966de1e1331;hpb=ca37fd65672a1f1628d0d09b8c39cb52f2acf66c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/markup-processor.cpp b/dali-toolkit/internal/text/markup-processor.cpp index 9c26b39..1df19ca 100644 --- a/dali-toolkit/internal/text/markup-processor.cpp +++ b/dali-toolkit/internal/text/markup-processor.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -62,6 +63,7 @@ const std::string XHTML_BACKGROUND_TAG("background"); const std::string XHTML_SPAN_TAG("span"); const std::string XHTML_STRIKETHROUGH_TAG("s"); const std::string XHTML_PARAGRAPH_TAG("p"); +const std::string XHTML_CHARACTER_SPACING_TAG("char-spacing"); const char LESS_THAN = '<'; const char GREATER_THAN = '>'; @@ -83,7 +85,8 @@ const char NEW_LINE = 0x0A; // ASCII value of the newline. // Range 3 0x10000u < XHTML_DECIMAL_ENTITY_RANGE <= 0x10FFFFu const unsigned long XHTML_DECIMAL_ENTITY_RANGE[] = {0x0u, 0xD7FFu, 0xE000u, 0xFFFDu, 0x10000u, 0x10FFFFu}; -const unsigned int MAX_NUM_OF_ATTRIBUTES = 13u; ///< The span tag has the 'font-family', 'font-size' 'font-weight', 'font-width', 'font-slant','text-color', 'u-color', 'u-height','u-type','u-dash-gap', 'u-dash-width', 's-color' and 's-height' attrubutes. +// The MAX_NUM_OF_ATTRIBUTES is the number of attributes in span tag "markup-processor-span.cpp". Because it contains the maximum number of attributes in all tags. +const unsigned int MAX_NUM_OF_ATTRIBUTES = 14u; ///< The span tag has the 'font-family', 'font-size' 'font-weight', 'font-width', 'font-slant','text-color', 'u-color', 'u-height','u-type','u-dash-gap', 'u-dash-width', 's-color', 's-height' and 'char-space-value' attrubutes. const unsigned int DEFAULT_VECTOR_SIZE = 16u; ///< Default size of run vectors. #if defined(DEBUG_ENABLED) @@ -143,12 +146,14 @@ struct Span RunIndex underlinedCharacterRunIndex; RunIndex backgroundColorRunIndex; RunIndex strikethroughCharacterRunIndex; + RunIndex characterSpacingCharacterRunIndex; bool isColorDefined; bool isFontDefined; bool isUnderlinedCharacterDefined; bool isBackgroundColorDefined; bool isStrikethroughDefined; + bool isCharacterSpacingDefined; }; /** @@ -202,10 +207,12 @@ void Initialize(UnderlinedCharacterRun& underlinedCharacterRun) */ void Initialize(Span& span) { - span.colorRunIndex = 0u; - span.isColorDefined = false; - span.fontRunIndex = 0u; - span.isFontDefined = false; + span.colorRunIndex = 0u; + span.isColorDefined = false; + + span.fontRunIndex = 0u; + span.isFontDefined = false; + span.underlinedCharacterRunIndex = 0u; span.isUnderlinedCharacterDefined = false; span.backgroundColorRunIndex = 0u; @@ -214,6 +221,10 @@ void Initialize(Span& span) //strikethrough span.strikethroughCharacterRunIndex = 0u; span.isStrikethroughDefined = false; + + //characterSpacing + span.characterSpacingCharacterRunIndex = 0u; + span.isCharacterSpacingDefined = false; } /** @@ -240,6 +251,18 @@ void Initialize(BoundedParagraphRun& boundedParagraphRun) } /** + * @brief Initializes a character-spacing run to its defaults. + * + * @param[in,out] characterSpacingCharacterRun The character-spacing run to initialize. + */ +void Initialize(CharacterSpacingCharacterRun& characterSpacingCharacterRun) +{ + characterSpacingCharacterRun.characterRun.characterIndex = 0u; + characterSpacingCharacterRun.characterRun.numberOfCharacters = 0u; + characterSpacingCharacterRun.value = 0.0f; +} + +/** * @brief Splits the tag string into the tag name and its attributes. * * The attributes are stored in a vector in the tag. @@ -738,20 +761,22 @@ void ProcessAnchorTag( * @param[in] tagReference The tagReference we should increment/decrement */ void ProcessSpanForRun( - const Tag& spanTag, - StyleStack& spanStack, - Vector& colorRuns, - Vector& fontRuns, - Vector& underlinedCharacterRuns, - Vector& backgroundColorRuns, - Vector& strikethroughCharacterRuns, - RunIndex& colorRunIndex, - RunIndex& fontRunIndex, - RunIndex& underlinedCharacterRunIndex, - RunIndex& backgroundColorRunIndex, - RunIndex& strikethroughCharacterRunIndex, - const CharacterIndex characterIndex, - int& tagReference) + const Tag& spanTag, + StyleStack& spanStack, + Vector& colorRuns, + Vector& fontRuns, + Vector& underlinedCharacterRuns, + Vector& backgroundColorRuns, + Vector& strikethroughCharacterRuns, + Vector& characterSpacingCharacterRuns, + RunIndex& colorRunIndex, + RunIndex& fontRunIndex, + RunIndex& underlinedCharacterRunIndex, + RunIndex& backgroundColorRunIndex, + RunIndex& strikethroughCharacterRunIndex, + RunIndex& characterSpacingCharacterRunIndex, + const CharacterIndex characterIndex, + int& tagReference) { if(!spanTag.isEndTag) { @@ -771,21 +796,26 @@ void ProcessSpanForRun( StrikethroughCharacterRun strikethroughCharacterRun; Initialize(strikethroughCharacterRun); + CharacterSpacingCharacterRun characterSpacingCharacterRun; + Initialize(characterSpacingCharacterRun); + Span span; Initialize(span); // Fill the run with the parameters. - colorRun.characterRun.characterIndex = characterIndex; - fontRun.characterRun.characterIndex = characterIndex; - underlinedCharacterRun.characterRun.characterIndex = characterIndex; - backgroundColorRun.characterRun.characterIndex = characterIndex; - strikethroughCharacterRun.characterRun.characterIndex = characterIndex; - - span.colorRunIndex = colorRunIndex; - span.fontRunIndex = fontRunIndex; - span.underlinedCharacterRunIndex = underlinedCharacterRunIndex; - span.backgroundColorRunIndex = backgroundColorRunIndex; - span.strikethroughCharacterRunIndex = strikethroughCharacterRunIndex; + colorRun.characterRun.characterIndex = characterIndex; + fontRun.characterRun.characterIndex = characterIndex; + underlinedCharacterRun.characterRun.characterIndex = characterIndex; + backgroundColorRun.characterRun.characterIndex = characterIndex; + strikethroughCharacterRun.characterRun.characterIndex = characterIndex; + characterSpacingCharacterRun.characterRun.characterIndex = characterIndex; + + span.colorRunIndex = colorRunIndex; + span.fontRunIndex = fontRunIndex; + span.underlinedCharacterRunIndex = underlinedCharacterRunIndex; + span.backgroundColorRunIndex = backgroundColorRunIndex; + span.strikethroughCharacterRunIndex = strikethroughCharacterRunIndex; + span.characterSpacingCharacterRunIndex = characterSpacingCharacterRunIndex; ProcessSpanTag(spanTag, colorRun, @@ -793,11 +823,13 @@ void ProcessSpanForRun( underlinedCharacterRun, backgroundColorRun, strikethroughCharacterRun, + characterSpacingCharacterRun, span.isColorDefined, span.isFontDefined, span.isUnderlinedCharacterDefined, span.isBackgroundColorDefined, - span.isStrikethroughDefined); + span.isStrikethroughDefined, + span.isCharacterSpacingDefined); // Push the span into the stack. spanStack.Push(span); @@ -838,6 +870,13 @@ void ProcessSpanForRun( ++strikethroughCharacterRunIndex; } + if(span.isCharacterSpacingDefined) + { + // Push the run in the logical model. + characterSpacingCharacterRuns.PushBack(characterSpacingCharacterRun); + ++characterSpacingCharacterRunIndex; + } + // Increase reference ++tagReference; } @@ -878,6 +917,12 @@ void ProcessSpanForRun( strikethroughCharacterRun.characterRun.numberOfCharacters = characterIndex - strikethroughCharacterRun.characterRun.characterIndex; } + if(span.isCharacterSpacingDefined) + { + CharacterSpacingCharacterRun& characterSpacingCharacterRun = *(characterSpacingCharacterRuns.Begin() + span.characterSpacingCharacterRunIndex); + characterSpacingCharacterRun.characterRun.numberOfCharacters = characterIndex - characterSpacingCharacterRun.characterRun.characterIndex; + } + --tagReference; } } @@ -893,6 +938,7 @@ void ProcessSpanForRun( * @param[in] strikethroughCharacterRunIndex The strikethroughed character run index * @param[in] backgroundRunIndex The background run index * @param[in] boundedParagraphRunIndex The bounded paragraph run index + * @param[in] characterSpacingCharacterRunIndex The character-spacing character run index * */ void ResizeModelVectors(MarkupProcessData& markupProcessData, @@ -901,7 +947,8 @@ void ResizeModelVectors(MarkupProcessData& markupProcessData, const RunIndex underlinedCharacterRunIndex, const RunIndex strikethroughCharacterRunIndex, const RunIndex backgroundRunIndex, - const RunIndex boundedParagraphRunIndex) + const RunIndex boundedParagraphRunIndex, + const RunIndex characterSpacingCharacterRunIndex) { markupProcessData.fontRuns.Resize(fontRunIndex); markupProcessData.colorRuns.Resize(colorRunIndex); @@ -909,6 +956,7 @@ void ResizeModelVectors(MarkupProcessData& markupProcessData, markupProcessData.strikethroughCharacterRuns.Resize(strikethroughCharacterRunIndex); markupProcessData.backgroundColorRuns.Resize(backgroundRunIndex); markupProcessData.boundedParagraphRuns.Resize(boundedParagraphRunIndex); + markupProcessData.characterSpacingCharacterRuns.Resize(characterSpacingCharacterRunIndex); #ifdef DEBUG_ENABLED for(unsigned int i = 0; i < colorRunIndex; ++i) @@ -1028,23 +1076,25 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar StyleStack spanStack; // Points the next free position in the vector of runs. - RunIndex colorRunIndex = 0u; - RunIndex fontRunIndex = 0u; - RunIndex underlinedCharacterRunIndex = 0u; - RunIndex backgroundRunIndex = 0u; - RunIndex strikethroughCharacterRunIndex = 0u; - RunIndex boundedParagraphRunIndex = 0u; + RunIndex colorRunIndex = 0u; + RunIndex fontRunIndex = 0u; + RunIndex underlinedCharacterRunIndex = 0u; + RunIndex backgroundRunIndex = 0u; + RunIndex strikethroughCharacterRunIndex = 0u; + RunIndex boundedParagraphRunIndex = 0u; + RunIndex characterSpacingCharacterRunIndex = 0u; // check tag reference - int colorTagReference = 0u; - int fontTagReference = 0u; - int iTagReference = 0u; - int bTagReference = 0u; - int uTagReference = 0u; - int backgroundTagReference = 0u; - int spanTagReference = 0u; - int sTagReference = 0u; - int pTagReference = 0u; + int colorTagReference = 0u; + int fontTagReference = 0u; + int iTagReference = 0u; + int bTagReference = 0u; + int uTagReference = 0u; + int backgroundTagReference = 0u; + int spanTagReference = 0u; + int sTagReference = 0u; + int pTagReference = 0u; + int characterSpacingTagReference = 0u; // Give an initial default value to the model's vectors. markupProcessData.colorRuns.Reserve(DEFAULT_VECTOR_SIZE); @@ -1052,6 +1102,7 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar markupProcessData.underlinedCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE); markupProcessData.backgroundColorRuns.Reserve(DEFAULT_VECTOR_SIZE); markupProcessData.strikethroughCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE); + markupProcessData.characterSpacingCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE); // Get the mark-up string buffer. const char* markupStringBuffer = markupString.c_str(); @@ -1148,11 +1199,13 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar markupProcessData.underlinedCharacterRuns, markupProcessData.backgroundColorRuns, markupProcessData.strikethroughCharacterRuns, + markupProcessData.characterSpacingCharacterRuns, colorRunIndex, fontRunIndex, underlinedCharacterRunIndex, backgroundRunIndex, strikethroughCharacterRunIndex, + characterSpacingCharacterRunIndex, characterIndex, spanTagReference); } @@ -1167,6 +1220,11 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar ProcessTagForRun( markupProcessData.boundedParagraphRuns, styleStack, tag, characterIndex, boundedParagraphRunIndex, pTagReference, [](const Tag& tag, BoundedParagraphRun& run) { ProcessAttributesOfParagraphTag(tag, run); }); } //

+ else if(TokenComparison(XHTML_CHARACTER_SPACING_TAG, tag.buffer, tag.length)) + { + ProcessTagForRun( + markupProcessData.characterSpacingCharacterRuns, styleStack, tag, characterIndex, characterSpacingCharacterRunIndex, characterSpacingTagReference, [](const Tag& tag, CharacterSpacingCharacterRun& run) { ProcessCharacterSpacingTag(tag, run); }); + } // } // end if( IsTag() ) else if(markupStringBuffer < markupStringEndBuffer) { @@ -1175,7 +1233,7 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar } // Resize the model's vectors. - ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex, strikethroughCharacterRunIndex, backgroundRunIndex, boundedParagraphRunIndex); + ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex, strikethroughCharacterRunIndex, backgroundRunIndex, boundedParagraphRunIndex, characterSpacingCharacterRunIndex); // Handle the nested tags OverrideNestedUnderlinedCharacterRuns(markupProcessData.underlinedCharacterRuns);