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=9b1e0195486cdcb76dc5375f00d6ebcbcc030d3c;hp=ea7f869588a7ee8d73203f56308dd91bfb12764d;hb=82031ca68ee58a2f30f01af3992523d0bb8e5fa6;hpb=38217811ad89debdb195c12f6c059f265fe6d5cd diff --git a/dali-toolkit/internal/text/markup-processor.cpp b/dali-toolkit/internal/text/markup-processor.cpp index ea7f869..9b1e019 100644 --- a/dali-toolkit/internal/text/markup-processor.cpp +++ b/dali-toolkit/internal/text/markup-processor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -26,10 +26,15 @@ // INTERNAL INCLUDES #include #include +#include #include #include #include #include +#include +#include +#include +#include #include namespace Dali @@ -53,6 +58,10 @@ const std::string XHTML_GLOW_TAG("glow"); const std::string XHTML_OUTLINE_TAG("outline"); const std::string XHTML_ITEM_TAG("item"); 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 = '>'; @@ -67,6 +76,7 @@ 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 @@ -80,15 +90,16 @@ const unsigned int DEFAULT_VECTOR_SIZE = 16u; ///< Default size of run vectors Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_MARKUP_PROCESSOR"); #endif +typedef VectorBase::SizeType RunIndex; + /** * @brief Struct used to retrieve the style runs from the mark-up string. */ +template struct StyleStack { - typedef VectorBase::SizeType RunIndex; - - Vector stack; ///< Use a vector as a style stack. Stores the indices pointing where the run is stored inside the logical model. - unsigned int topIndex; ///< Points the top of the stack. + Vector stack; ///< Use a vector as a style stack. + unsigned int topIndex; ///< Points the top of the stack. StyleStack() : stack(), @@ -97,7 +108,7 @@ struct StyleStack stack.Resize(DEFAULT_VECTOR_SIZE); } - void Push(RunIndex index) + void Push(StyleStackType item) { // Check if there is space inside the style stack. const VectorBase::SizeType size = stack.Count(); @@ -107,14 +118,14 @@ struct StyleStack stack.Resize(2u * size); } - // Set the run index in the top of the stack. - *(stack.Begin() + topIndex) = index; + // Set the item in the top of the stack. + *(stack.Begin() + topIndex) = item; // Reposition the pointer to the top of the stack. ++topIndex; } - RunIndex Pop() + StyleStackType Pop() { // Pop the top of the stack. --topIndex; @@ -123,6 +134,17 @@ struct StyleStack }; /** + * @brief Struct used to retrieve spans from the mark-up string. + */ +struct Span +{ + RunIndex colorRunIndex; + RunIndex fontRunIndex; + bool isColorDefined; + bool isFontDefined; +}; + +/** * @brief Initializes a font run description to its defaults. * * @param[in,out] fontRun The font description run to initialize. @@ -167,6 +189,42 @@ void Initialize(UnderlinedCharacterRun& underlinedCharacterRun) } /** + * @brief Initializes a span to its defaults. + * + * @param[in,out] span The span to be initialized. + */ +void Initialize(Span& span) +{ + span.colorRunIndex = 0u; + span.isColorDefined = false; + span.fontRunIndex = 0u; + span.isFontDefined = false; +} + +/** + * @brief Initializes a strikethrough character run to its defaults. + * + * @param[in,out] strikethroughCharacterRun The strikethrough character run to initialize. + */ +void Initialize(StrikethroughCharacterRun& strikethroughCharacterRun) +{ + strikethroughCharacterRun.characterRun.characterIndex = 0u; + strikethroughCharacterRun.characterRun.numberOfCharacters = 0u; + strikethroughCharacterRun.isColorSet = 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; +} + +/** * @brief Splits the tag string into the tag name and its attributes. * * The attributes are stored in a vector in the tag. @@ -524,10 +582,10 @@ bool XHTMLNumericEntityToUtf8(const char* markupText, char* utf8) template void ProcessTagForRun( Vector& runsContainer, - StyleStack& styleStack, + StyleStack& styleStack, const Tag& tag, const CharacterIndex characterIndex, - StyleStack::RunIndex& runIndex, + RunIndex& runIndex, int& tagReference, std::function parameterSettingFunction) { @@ -593,6 +651,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 @@ -625,18 +707,116 @@ 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[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) +{ + if(!spanTag.isEndTag) + { + // Create a new run. + ColorRun colorRun; + Initialize(colorRun); + + FontDescriptionRun fontRun; + Initialize(fontRun); + + 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); + + // Push the span into the stack. + spanStack.Push(span); + + // Point the next free run. + if(span.isColorDefined) + { + // Push the run in the logical model. + colorRuns.PushBack(colorRun); + ++colorRunIndex; + } + + if(span.isFontDefined) + { + // Push the run in the logical model. + fontRuns.PushBack(fontRun); + ++fontRunIndex; + } + + // Increase reference + ++tagReference; + } + else + { + if(tagReference > 0) + { + // Pop the top of the stack and set the number of characters of the run. + Span span = spanStack.Pop(); + + if(span.isColorDefined) + { + ColorRun& colorRun = *(colorRuns.Begin() + span.colorRunIndex); + colorRun.characterRun.numberOfCharacters = characterIndex - colorRun.characterRun.characterIndex; + } + + if(span.isFontDefined) + { + FontDescriptionRun& fontRun = *(fontRuns.Begin() + span.fontRunIndex); + fontRun.characterRun.numberOfCharacters = characterIndex - fontRun.characterRun.characterIndex; + } + + --tagReference; + } + } +} + +/** * @brief Resizes the model's vectors * * @param[in/out] 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] backgroundRunIndex The background run index + * @param[in] boundedParagraphRunIndex The bounded paragraph run index + * */ -void ResizeModelVectors(MarkupProcessData& markupProcessData, const StyleStack::RunIndex fontRunIndex, const StyleStack::RunIndex colorRunIndex, const StyleStack::RunIndex underlinedCharacterRunIndex) +void ResizeModelVectors(MarkupProcessData& markupProcessData, + const RunIndex fontRunIndex, + const RunIndex colorRunIndex, + const RunIndex underlinedCharacterRunIndex, + const RunIndex backgroundRunIndex, + const RunIndex boundedParagraphRunIndex) { markupProcessData.fontRuns.Resize(fontRunIndex); markupProcessData.colorRuns.Resize(colorRunIndex); markupProcessData.underlinedCharacterRuns.Resize(underlinedCharacterRunIndex); + markupProcessData.backgroundColorRuns.Resize(backgroundRunIndex); + markupProcessData.boundedParagraphRuns.Resize(boundedParagraphRunIndex); #ifdef DEBUG_ENABLED for(unsigned int i = 0; i < colorRunIndex; ++i) @@ -750,24 +930,35 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar markupProcessData.markupProcessedText.reserve(markupStringSize); // Stores a struct with the index to the first character of the run, the type of run and its parameters. - StyleStack styleStack; + StyleStack styleStack; + + // Stores a struct with the index to the first character of the color run & color font for the span. + StyleStack spanStack; // Points the next free position in the vector of runs. - StyleStack::RunIndex colorRunIndex = 0u; - StyleStack::RunIndex fontRunIndex = 0u; - StyleStack::RunIndex underlinedCharacterRunIndex = 0u; + RunIndex colorRunIndex = 0u; + RunIndex fontRunIndex = 0u; + RunIndex underlinedCharacterRunIndex = 0u; + RunIndex backgroundRunIndex = 0u; + RunIndex strikethroughCharacterRunIndex = 0u; + RunIndex boundedParagraphRunIndex = 0u; // check tag reference - int colorTagReference = 0u; - int fontTagReference = 0u; - int iTagReference = 0u; - int bTagReference = 0u; - int uTagReference = 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; // 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); // Get the mark-up string buffer. const char* markupStringBuffer = markupString.c_str(); @@ -798,8 +989,8 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar else if(TokenComparison(XHTML_U_TAG, tag.buffer, tag.length)) { ProcessTagForRun( - markupProcessData.underlinedCharacterRuns, styleStack, tag, characterIndex, underlinedCharacterRunIndex, uTagReference, [](const Tag& tag, UnderlinedCharacterRun& run) { }); - } // + markupProcessData.underlinedCharacterRuns, styleStack, tag, characterIndex, underlinedCharacterRunIndex, uTagReference, [](const Tag& tag, UnderlinedCharacterRun& run) { ProcessUnderlineTag(tag, run); }); + } // else if(TokenComparison(XHTML_B_TAG, tag.buffer, tag.length)) { ProcessTagForRun( @@ -844,7 +1035,27 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar { ProcessItemTag(markupProcessData, tag, characterIndex); } - } // end if( IsTag() ) + else if(TokenComparison(XHTML_BACKGROUND_TAG, tag.buffer, tag.length)) + { + ProcessTagForRun( + markupProcessData.backgroundColorRuns, styleStack, tag, characterIndex, backgroundRunIndex, backgroundTagReference, [](const Tag& tag, ColorRun& run) { ProcessBackground(tag, run); }); + } + else if(TokenComparison(XHTML_SPAN_TAG, tag.buffer, tag.length)) + { + ProcessSpanForRun(tag, spanStack, markupProcessData.colorRuns, markupProcessData.fontRuns, colorRunIndex, fontRunIndex, 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) { ProcessMarkupStringBuffer(markupProcessData, markupStringBuffer, markupStringEndBuffer, characterIndex); @@ -852,7 +1063,7 @@ void ProcessMarkupString(const std::string& markupString, MarkupProcessData& mar } // Resize the model's vectors. - ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex); + ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex, backgroundRunIndex, boundedParagraphRunIndex); } } // namespace Text