X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmarkup-processor.cpp;h=f5b90dc28a6408b897297b34da47f428394d3802;hp=17aae96d9967961b555686c7a6f2c58fdc03cb6c;hb=e6c8fad2c1ee24ce368976221941dfec12290b29;hpb=076f84a43592f26ff0aa2bced54583f712800fe3 diff --git a/dali-toolkit/internal/text/markup-processor.cpp b/dali-toolkit/internal/text/markup-processor.cpp index 17aae96..f5b90dc 100644 --- a/dali-toolkit/internal/text/markup-processor.cpp +++ b/dali-toolkit/internal/text/markup-processor.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,7 @@ const std::string XHTML_ANCHOR_TAG("a"); 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 char LESS_THAN = '<'; const char GREATER_THAN = '>'; @@ -74,13 +76,14 @@ const char CHAR_ARRAY_END = '\0'; const char HEX_CODE = 'x'; const char WHITE_SPACE = 0x20; // ASCII value of the white space. +const char NEW_LINE = 0x0A; // ASCII value of the newline. // Range 1 0x0u < XHTML_DECIMAL_ENTITY_RANGE <= 0xD7FFu // Range 2 0xE000u < XHTML_DECIMAL_ENTITY_RANGE <= 0xFFFDu // 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 = 5u; ///< The font tag has the 'family', 'size' 'weight', 'width' and 'slant' attrubutes. +const unsigned int MAX_NUM_OF_ATTRIBUTES = 12u; ///< 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' and 's-color' attrubutes. const unsigned int DEFAULT_VECTOR_SIZE = 16u; ///< Default size of run vectors. #if defined(DEBUG_ENABLED) @@ -137,8 +140,15 @@ struct Span { RunIndex colorRunIndex; RunIndex fontRunIndex; - bool isColorDefined; - bool isFontDefined; + RunIndex underlinedCharacterRunIndex; + RunIndex backgroundColorRunIndex; + RunIndex strikethroughCharacterRunIndex; + + bool isColorDefined; + bool isFontDefined; + bool isUnderlinedCharacterDefined; + bool isBackgroundColorDefined; + bool isStrikethroughDefined; }; /** @@ -192,10 +202,18 @@ 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; + span.isBackgroundColorDefined = false; + + //strikethrough + span.strikethroughCharacterRunIndex = 0u; + span.isStrikethroughDefined = false; } /** @@ -207,7 +225,18 @@ void Initialize(StrikethroughCharacterRun& strikethroughCharacterRun) { strikethroughCharacterRun.characterRun.characterIndex = 0u; strikethroughCharacterRun.characterRun.numberOfCharacters = 0u; - strikethroughCharacterRun.isColorSet = false; + strikethroughCharacterRun.properties.colorDefined = false; +} + +/** + * @brief Initializes a bounded-paragraph character run to its defaults. + * + * @param[in,out] boundedParagraphRun The bounded paragraphRun run to initialize. + */ +void Initialize(BoundedParagraphRun& boundedParagraphRun) +{ + boundedParagraphRun.characterRun.characterIndex = 0u; + boundedParagraphRun.characterRun.numberOfCharacters = 0u; } /** @@ -637,6 +666,30 @@ void ProcessItemTag( } /** + * @brief Processes the paragraph-tag + * + * @param[in/out] markupProcessData The markup process data + * @param[in] tag The current tag + * @param[in] isEndBuffer Whether the end of buffer + * @param[in/out] characterIndex The current character index + */ +void ProcessParagraphTag( + MarkupProcessData& markupProcessData, + const Tag tag, + bool isEndBuffer, + CharacterIndex& characterIndex) +{ + if((characterIndex > 0 && + markupProcessData.markupProcessedText[characterIndex - 1u] != NEW_LINE) && + (!(tag.isEndTag && isEndBuffer))) + { + // Insert new-line character at the start and end of paragraph. + markupProcessData.markupProcessedText.append(1u, NEW_LINE); + ++characterIndex; + } +} + +/** * @brief Processes the anchor tag * * @param[in/out] markupProcessData The markup process data @@ -672,23 +725,33 @@ void ProcessAnchorTag( * @brief Processes span tag for the color-run & font-run. * * @param[in] spanTag The tag we are currently processing - * @param[in/out] spanStack The spans stack - * @param[int/out] colorRuns The container containing all the color runs - * @param[int/out] fontRuns The container containing all the font description runs - * @param[in/out] colorRunIndex The color run index - * @param[in/out] fontRunIndex The font run index + * @param[inout] spanStack The spans stack + * @param[inout] colorRuns The container containing all the color runs + * @param[inout] fontRuns The container containing all the font description runs + * @param[inout] underlinedCharacterRuns The container containing all the underlined character runs + * @param[inout] strikethroughCharacterRuns The container containing all the strikethroughed character runs + * @param[inout] colorRunIndex The color run index + * @param[inout] fontRunIndex The font run index + * @param[inout] underlinedCharacterRunIndex The underlined character run index + * @param[inout] strikethroughCharacterRunIndex The strikethroughed character run index * @param[in] characterIndex The current character index * @param[in] tagReference The tagReference we should increment/decrement */ void ProcessSpanForRun( - const Tag& spanTag, - StyleStack& spanStack, - Vector& colorRuns, - Vector& fontRuns, - RunIndex& colorRunIndex, - RunIndex& fontRunIndex, - const CharacterIndex characterIndex, - int& tagReference) + 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) { if(!spanTag.isEndTag) { @@ -699,17 +762,42 @@ void ProcessSpanForRun( FontDescriptionRun fontRun; Initialize(fontRun); + UnderlinedCharacterRun underlinedCharacterRun; + Initialize(underlinedCharacterRun); + + ColorRun backgroundColorRun; + Initialize(backgroundColorRun); + + StrikethroughCharacterRun strikethroughCharacterRun; + Initialize(strikethroughCharacterRun); + Span span; Initialize(span); // Fill the run with the parameters. - colorRun.characterRun.characterIndex = characterIndex; - fontRun.characterRun.characterIndex = characterIndex; - - span.colorRunIndex = colorRunIndex; - span.fontRunIndex = fontRunIndex; - - ProcessSpanTag(spanTag, colorRun, fontRun, span.isColorDefined, span.isFontDefined); + 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; + + ProcessSpanTag(spanTag, + colorRun, + fontRun, + underlinedCharacterRun, + backgroundColorRun, + strikethroughCharacterRun, + span.isColorDefined, + span.isFontDefined, + span.isUnderlinedCharacterDefined, + span.isBackgroundColorDefined, + span.isStrikethroughDefined); // Push the span into the stack. spanStack.Push(span); @@ -729,6 +817,27 @@ void ProcessSpanForRun( ++fontRunIndex; } + if(span.isUnderlinedCharacterDefined) + { + // Push the run in the logical model. + underlinedCharacterRuns.PushBack(underlinedCharacterRun); + ++underlinedCharacterRunIndex; + } + + if(span.isBackgroundColorDefined) + { + // Push the run in the logical model. + backgroundColorRuns.PushBack(backgroundColorRun); + ++backgroundColorRunIndex; + } + + if(span.isStrikethroughDefined) + { + // Push the run in the logical model. + strikethroughCharacterRuns.PushBack(strikethroughCharacterRun); + ++strikethroughCharacterRunIndex; + } + // Increase reference ++tagReference; } @@ -751,6 +860,24 @@ void ProcessSpanForRun( fontRun.characterRun.numberOfCharacters = characterIndex - fontRun.characterRun.characterIndex; } + if(span.isUnderlinedCharacterDefined) + { + UnderlinedCharacterRun& underlinedCharacterRun = *(underlinedCharacterRuns.Begin() + span.underlinedCharacterRunIndex); + underlinedCharacterRun.characterRun.numberOfCharacters = characterIndex - underlinedCharacterRun.characterRun.characterIndex; + } + + if(span.isBackgroundColorDefined) + { + ColorRun& backgroundColorRun = *(backgroundColorRuns.Begin() + span.backgroundColorRunIndex); + backgroundColorRun.characterRun.numberOfCharacters = characterIndex - backgroundColorRun.characterRun.characterIndex; + } + + if(span.isStrikethroughDefined) + { + StrikethroughCharacterRun& strikethroughCharacterRun = *(strikethroughCharacterRuns.Begin() + span.strikethroughCharacterRunIndex); + strikethroughCharacterRun.characterRun.numberOfCharacters = characterIndex - strikethroughCharacterRun.characterRun.characterIndex; + } + --tagReference; } } @@ -759,18 +886,29 @@ void ProcessSpanForRun( /** * @brief Resizes the model's vectors * - * @param[in/out] markupProcessData The markup process data + * @param[inout] markupProcessData The markup process data * @param[in] fontRunIndex The font run index * @param[in] colorRunIndex The color run index * @param[in] underlinedCharacterRunIndex The underlined character run index + * @param[in] strikethroughCharacterRunIndex The strikethroughed character run index * @param[in] backgroundRunIndex The background run index + * @param[in] boundedParagraphRunIndex The bounded paragraph run index + * */ -void ResizeModelVectors(MarkupProcessData& markupProcessData, const RunIndex fontRunIndex, const RunIndex colorRunIndex, const RunIndex underlinedCharacterRunIndex, const RunIndex backgroundRunIndex) +void ResizeModelVectors(MarkupProcessData& markupProcessData, + const RunIndex fontRunIndex, + const RunIndex colorRunIndex, + const RunIndex underlinedCharacterRunIndex, + const RunIndex strikethroughCharacterRunIndex, + const RunIndex backgroundRunIndex, + const RunIndex boundedParagraphRunIndex) { markupProcessData.fontRuns.Resize(fontRunIndex); markupProcessData.colorRuns.Resize(colorRunIndex); markupProcessData.underlinedCharacterRuns.Resize(underlinedCharacterRunIndex); + markupProcessData.strikethroughCharacterRuns.Resize(strikethroughCharacterRunIndex); markupProcessData.backgroundColorRuns.Resize(backgroundRunIndex); + markupProcessData.boundedParagraphRuns.Resize(boundedParagraphRunIndex); #ifdef DEBUG_ENABLED for(unsigned int i = 0; i < colorRunIndex; ++i) @@ -895,6 +1033,7 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar RunIndex underlinedCharacterRunIndex = 0u; RunIndex backgroundRunIndex = 0u; RunIndex strikethroughCharacterRunIndex = 0u; + RunIndex boundedParagraphRunIndex = 0u; // check tag reference int colorTagReference = 0u; @@ -905,12 +1044,14 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar int backgroundTagReference = 0u; int spanTagReference = 0u; int sTagReference = 0u; + int pTagReference = 0u; // Give an initial default value to the model's vectors. markupProcessData.colorRuns.Reserve(DEFAULT_VECTOR_SIZE); markupProcessData.fontRuns.Reserve(DEFAULT_VECTOR_SIZE); markupProcessData.underlinedCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE); markupProcessData.backgroundColorRuns.Reserve(DEFAULT_VECTOR_SIZE); + markupProcessData.strikethroughCharacterRuns.Reserve(DEFAULT_VECTOR_SIZE); // Get the mark-up string buffer. const char* markupStringBuffer = markupString.c_str(); @@ -966,7 +1107,13 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar run.color = Color::BLUE; ProcessColorTag(tag, run); }); - /* TODO - underline */ + /* Underline */ + ProcessTagForRun( + markupProcessData.underlinedCharacterRuns, styleStack, tag, characterIndex, underlinedCharacterRunIndex, uTagReference, [](const Tag& tag, UnderlinedCharacterRun& run) { + run.properties.color = Color::BLUE; + run.properties.colorDefined = true; + ProcessUnderlineTag(tag, run); + }); } // tizen else if(TokenComparison(XHTML_SHADOW_TAG, tag.buffer, tag.length)) { @@ -994,13 +1141,32 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar } else if(TokenComparison(XHTML_SPAN_TAG, tag.buffer, tag.length)) { - ProcessSpanForRun(tag, spanStack, markupProcessData.colorRuns, markupProcessData.fontRuns, colorRunIndex, fontRunIndex, characterIndex, spanTagReference); + ProcessSpanForRun(tag, + spanStack, + markupProcessData.colorRuns, + markupProcessData.fontRuns, + markupProcessData.underlinedCharacterRuns, + markupProcessData.backgroundColorRuns, + markupProcessData.strikethroughCharacterRuns, + colorRunIndex, + fontRunIndex, + underlinedCharacterRunIndex, + backgroundRunIndex, + strikethroughCharacterRunIndex, + characterIndex, + spanTagReference); } else if(TokenComparison(XHTML_STRIKETHROUGH_TAG, tag.buffer, tag.length)) { ProcessTagForRun( markupProcessData.strikethroughCharacterRuns, styleStack, tag, characterIndex, strikethroughCharacterRunIndex, sTagReference, [](const Tag& tag, StrikethroughCharacterRun& run) { ProcessStrikethroughTag(tag, run); }); } // + else if(TokenComparison(XHTML_PARAGRAPH_TAG, tag.buffer, tag.length)) + { + ProcessParagraphTag(markupProcessData, tag, (markupStringBuffer == markupStringEndBuffer), characterIndex); + ProcessTagForRun( + markupProcessData.boundedParagraphRuns, styleStack, tag, characterIndex, boundedParagraphRunIndex, pTagReference, [](const Tag& tag, BoundedParagraphRun& run) { ProcessAttributesOfParagraphTag(tag, run); }); + } //

} // end if( IsTag() ) else if(markupStringBuffer < markupStringEndBuffer) { @@ -1009,7 +1175,10 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar } // Resize the model's vectors. - ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex, backgroundRunIndex); + ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex, strikethroughCharacterRunIndex, backgroundRunIndex, boundedParagraphRunIndex); + + // Handle the nested tags + OverrideNestedUnderlinedCharacterRuns(markupProcessData.underlinedCharacterRuns); } } // namespace Text