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=197dff19a7814fb64fcea90541b44df5db62ee88;hp=8e0b85b31de16c031d3c84eead20b13cbebaae92;hb=22451f7abe0230b418d551d9eac0c685273e72f1;hpb=10f0460155a75c3829242df27171a4f3161385b1 diff --git a/dali-toolkit/internal/text/markup-processor.cpp b/dali-toolkit/internal/text/markup-processor.cpp old mode 100755 new mode 100644 index 8e0b85b..197dff1 --- a/dali-toolkit/internal/text/markup-processor.cpp +++ b/dali-toolkit/internal/text/markup-processor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 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. @@ -19,27 +19,30 @@ #include // EXTERNAL INCLUDES -#include // for ULONG_MAX -#include #include +#include // for ULONG_MAX +#include // INTERNAL INCLUDES #include +#include +#include #include #include #include #include +#include +#include +#include +#include #include namespace Dali { - namespace Toolkit { - namespace Text { - namespace { // HTML-ISH tag and attribute constants. @@ -54,6 +57,11 @@ const std::string XHTML_SHADOW_TAG("shadow"); 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,82 +75,97 @@ const char SEMI_COLON = ';'; const char CHAR_ARRAY_END = '\0'; const char HEX_CODE = 'x'; -const char WHITE_SPACE = 0x20; // ASCII value of the white space. +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 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 = 11u; ///< 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'and 'u-dash-width' attrubutes. const unsigned int DEFAULT_VECTOR_SIZE = 16u; ///< Default size of run vectors. #if defined(DEBUG_ENABLED) 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(), - topIndex( 0u ) + topIndex(0u) { - stack.Resize( DEFAULT_VECTOR_SIZE ); + 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(); - if( topIndex >= size ) + if(topIndex >= size) { // Resize the style stack. - stack.Resize( 2u * size ); + 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; - return *( stack.Begin() + topIndex ); + return *(stack.Begin() + topIndex); } }; /** + * @brief Struct used to retrieve spans from the mark-up string. + */ +struct Span +{ + RunIndex colorRunIndex; + RunIndex fontRunIndex; + RunIndex underlinedCharacterRunIndex; + bool isColorDefined; + bool isFontDefined; + bool isUnderlinedCharacterDefined; +}; + +/** * @brief Initializes a font run description to its defaults. * * @param[in,out] fontRun The font description run to initialize. */ -void Initialize( FontDescriptionRun& fontRun ) +void Initialize(FontDescriptionRun& fontRun) { - fontRun.characterRun.characterIndex = 0u; + fontRun.characterRun.characterIndex = 0u; fontRun.characterRun.numberOfCharacters = 0u; - fontRun.familyName = NULL; - fontRun.familyLength = 0u; - fontRun.weight = TextAbstraction::FontWeight::NORMAL; - fontRun.width = TextAbstraction::FontWidth::NORMAL; - fontRun.slant = TextAbstraction::FontSlant::NORMAL; - fontRun.size = 0u; - fontRun.familyDefined = false; - fontRun.weightDefined = false; - fontRun.widthDefined = false; - fontRun.slantDefined = false; - fontRun.sizeDefined = false; + fontRun.familyName = NULL; + fontRun.familyLength = 0u; + fontRun.weight = TextAbstraction::FontWeight::NORMAL; + fontRun.width = TextAbstraction::FontWidth::NORMAL; + fontRun.slant = TextAbstraction::FontSlant::NORMAL; + fontRun.size = 0u; + fontRun.familyDefined = false; + fontRun.weightDefined = false; + fontRun.widthDefined = false; + fontRun.slantDefined = false; + fontRun.sizeDefined = false; } /** @@ -150,38 +173,87 @@ void Initialize( FontDescriptionRun& fontRun ) * * @param[in,out] colorRun The font description run to initialize. */ -void Initialize( ColorRun& colorRun ) +void Initialize(ColorRun& colorRun) { - colorRun.characterRun.characterIndex = 0u; + colorRun.characterRun.characterIndex = 0u; colorRun.characterRun.numberOfCharacters = 0u; } /** + * @brief Initializes a underlined character run to its defaults. + * + * @param[in,out] underlinedCharacterRun The underelined character run to initialize. + */ +void Initialize(UnderlinedCharacterRun& underlinedCharacterRun) +{ + underlinedCharacterRun.characterRun.characterIndex = 0u; + underlinedCharacterRun.characterRun.numberOfCharacters = 0u; +} + +/** + * @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; + span.underlinedCharacterRunIndex = 0u; + span.isUnderlinedCharacterDefined = 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. * * @param[in,out] tag The tag. */ -void ParseAttributes( Tag& tag ) +void ParseAttributes(Tag& tag) { - if( tag.buffer == NULL ) + if(tag.buffer == NULL) { return; } - tag.attributes.Resize( MAX_NUM_OF_ATTRIBUTES ); + tag.attributes.Resize(MAX_NUM_OF_ATTRIBUTES); // Find first the tag name. bool isQuotationOpen = false; - const char* tagBuffer = tag.buffer; + const char* tagBuffer = tag.buffer; const char* const tagEndBuffer = tagBuffer + tag.length; - tag.length = 0u; - for( ; tagBuffer < tagEndBuffer; ++tagBuffer ) + tag.length = 0u; + for(; tagBuffer < tagEndBuffer; ++tagBuffer) { const char character = *tagBuffer; - if( WHITE_SPACE < character ) + if(WHITE_SPACE < character) { ++tag.length; } @@ -192,70 +264,70 @@ void ParseAttributes( Tag& tag ) break; } } - SkipWhiteSpace( tagBuffer, tagEndBuffer ); + SkipWhiteSpace(tagBuffer, tagEndBuffer); // Find the attributes. unsigned int attributeIndex = 0u; - const char* nameBuffer = NULL; - const char* valueBuffer = NULL; - Length nameLength = 0u; - Length valueLength = 0u; + const char* nameBuffer = NULL; + const char* valueBuffer = NULL; + Length nameLength = 0u; + Length valueLength = 0u; - bool addToNameValue = true; + bool addToNameValue = true; Length numberOfWhiteSpace = 0u; - for( ; tagBuffer < tagEndBuffer; ++tagBuffer ) + for(; tagBuffer < tagEndBuffer; ++tagBuffer) { const char character = *tagBuffer; - if( ( WHITE_SPACE >= character ) && !isQuotationOpen ) + if((WHITE_SPACE >= character) && !isQuotationOpen) { - if( NULL != valueBuffer ) + if(NULL != valueBuffer) { // Remove white spaces at the end of the value. valueLength -= numberOfWhiteSpace; } - if( ( NULL != nameBuffer ) && ( NULL != valueBuffer ) ) + if((NULL != nameBuffer) && (NULL != valueBuffer)) { // Every time a white space is found, a new attribute is created and stored in the attributes vector. - Attribute& attribute = *( tag.attributes.Begin() + attributeIndex ); + Attribute& attribute = *(tag.attributes.Begin() + attributeIndex); ++attributeIndex; - attribute.nameBuffer = nameBuffer; + attribute.nameBuffer = nameBuffer; attribute.valueBuffer = valueBuffer; - attribute.nameLength = nameLength; + attribute.nameLength = nameLength; attribute.valueLength = valueLength; - nameBuffer = NULL; + nameBuffer = NULL; valueBuffer = NULL; - nameLength = 0u; + nameLength = 0u; valueLength = 0u; addToNameValue = true; // next read characters will be added to the name. } } - else if( EQUAL == character ) // '=' + else if(EQUAL == character) // '=' { addToNameValue = false; // next read characters will be added to the value. - SkipWhiteSpace( tagBuffer, tagEndBuffer ); + SkipWhiteSpace(tagBuffer, tagEndBuffer); } - else if( QUOTATION_MARK == character ) // '\'' + else if(QUOTATION_MARK == character) // '\'' { // Do not add quotation marks to neither name nor value. isQuotationOpen = !isQuotationOpen; - if( isQuotationOpen ) + if(isQuotationOpen) { ++tagBuffer; - SkipWhiteSpace( tagBuffer, tagEndBuffer ); + SkipWhiteSpace(tagBuffer, tagEndBuffer); --tagBuffer; } } else { // Adds characters to the name or the value. - if( addToNameValue ) + if(addToNameValue) { - if( NULL == nameBuffer ) + if(NULL == nameBuffer) { nameBuffer = tagBuffer; } @@ -263,9 +335,9 @@ void ParseAttributes( Tag& tag ) } else { - if( isQuotationOpen ) + if(isQuotationOpen) { - if( WHITE_SPACE >= character ) + if(WHITE_SPACE >= character) { ++numberOfWhiteSpace; } @@ -274,7 +346,7 @@ void ParseAttributes( Tag& tag ) numberOfWhiteSpace = 0u; } } - if( NULL == valueBuffer ) + if(NULL == valueBuffer) { valueBuffer = tagBuffer; } @@ -283,26 +355,26 @@ void ParseAttributes( Tag& tag ) } } - if( NULL != valueBuffer ) + if(NULL != valueBuffer) { // Remove white spaces at the end of the value. valueLength -= numberOfWhiteSpace; } - if( ( NULL != nameBuffer ) && ( NULL != valueBuffer ) ) + if((NULL != nameBuffer) && (NULL != valueBuffer)) { // Checks if the last attribute needs to be added. - Attribute& attribute = *( tag.attributes.Begin() + attributeIndex ); + Attribute& attribute = *(tag.attributes.Begin() + attributeIndex); ++attributeIndex; - attribute.nameBuffer = nameBuffer; + attribute.nameBuffer = nameBuffer; attribute.valueBuffer = valueBuffer; - attribute.nameLength = nameLength; + attribute.nameLength = nameLength; attribute.valueLength = valueLength; } // Resize the vector of attributes. - tag.attributes.Resize( attributeIndex ); + tag.attributes.Resize(attributeIndex); } /** @@ -314,37 +386,37 @@ void ParseAttributes( Tag& tag ) * * @return @e true if the iterator @e it is pointing a mark-up tag. Otherwise @e false. */ -bool IsTag( const char*& markupStringBuffer, - const char* const markupStringEndBuffer, - Tag& tag ) +bool IsTag(const char*& markupStringBuffer, + const char* const markupStringEndBuffer, + Tag& tag) { - bool isTag = false; - bool isQuotationOpen = false; - bool attributesFound = false; - tag.isEndTag = false; + bool isTag = false; + bool isQuotationOpen = false; + bool attributesFound = false; + tag.isEndTag = false; bool isPreviousLessThan = false; - bool isPreviousSlash = false; + bool isPreviousSlash = false; const char character = *markupStringBuffer; - if( LESS_THAN == character ) // '<' + if(LESS_THAN == character) // '<' { - tag.buffer = NULL; - tag.length = 0u; + tag.buffer = NULL; + tag.length = 0u; isPreviousLessThan = true; // if the iterator is pointing to a '<' character, then check if it's a mark-up tag is needed. ++markupStringBuffer; - if( markupStringBuffer < markupStringEndBuffer ) + if(markupStringBuffer < markupStringEndBuffer) { - SkipWhiteSpace( markupStringBuffer, markupStringEndBuffer ); + SkipWhiteSpace(markupStringBuffer, markupStringEndBuffer); - for( ; ( !isTag ) && ( markupStringBuffer < markupStringEndBuffer ); ++markupStringBuffer ) + for(; (!isTag) && (markupStringBuffer < markupStringEndBuffer); ++markupStringBuffer) { const char character = *markupStringBuffer; - if( !isQuotationOpen && ( SLASH == character ) ) // '/' + if(!isQuotationOpen && (SLASH == character)) // '/' { - if (isPreviousLessThan) + if(isPreviousLessThan) { tag.isEndTag = true; } @@ -355,36 +427,36 @@ bool IsTag( const char*& markupStringBuffer, } isPreviousLessThan = false; - if( ( markupStringBuffer + 1u < markupStringEndBuffer ) && ( WHITE_SPACE >= *( markupStringBuffer + 1u ) ) ) + if((markupStringBuffer + 1u < markupStringEndBuffer) && (WHITE_SPACE >= *(markupStringBuffer + 1u))) { ++markupStringBuffer; - SkipWhiteSpace( markupStringBuffer, markupStringEndBuffer ); + SkipWhiteSpace(markupStringBuffer, markupStringEndBuffer); --markupStringBuffer; } } - else if( GREATER_THAN == character ) // '>' + else if(GREATER_THAN == character) // '>' { isTag = true; - if (isPreviousSlash) + if(isPreviousSlash) { tag.isEndTag = true; } - isPreviousSlash = false; + isPreviousSlash = false; isPreviousLessThan = false; } - else if( QUOTATION_MARK == character ) + else if(QUOTATION_MARK == character) { isQuotationOpen = !isQuotationOpen; ++tag.length; - isPreviousSlash = false; + isPreviousSlash = false; isPreviousLessThan = false; } - else if( WHITE_SPACE >= character ) // ' ' + else if(WHITE_SPACE >= character) // ' ' { // If the tag contains white spaces then it may have attributes. - if( !isQuotationOpen ) + if(!isQuotationOpen) { attributesFound = true; } @@ -392,7 +464,7 @@ bool IsTag( const char*& markupStringBuffer, } else { - if( NULL == tag.buffer ) + if(NULL == tag.buffer) { tag.buffer = markupStringBuffer; } @@ -400,16 +472,16 @@ bool IsTag( const char*& markupStringBuffer, // If it's not any of the 'special' characters then just add it to the tag string. ++tag.length; - isPreviousSlash = false; + isPreviousSlash = false; isPreviousLessThan = false; } } } // If the tag string has white spaces, then parse the attributes is needed. - if( attributesFound ) + if(attributesFound) { - ParseAttributes( tag ); + ParseAttributes(tag); } } @@ -424,28 +496,28 @@ bool IsTag( const char*& markupStringBuffer, * * @return Length of markupText in case of XHTML entity otherwise return 0. */ -unsigned int GetXHTMLEntityLength( const char*& markupStringBuffer, - const char* const markupStringEndBuffer ) +unsigned int GetXHTMLEntityLength(const char*& markupStringBuffer, + const char* const markupStringEndBuffer) { char character = *markupStringBuffer; - if( AMPERSAND == character ) // '&' + if(AMPERSAND == character) // '&' { // if the iterator is pointing to a '&' character, then check for ';' to find end to XHTML entity. ++markupStringBuffer; - if( markupStringBuffer < markupStringEndBuffer ) + if(markupStringBuffer < markupStringEndBuffer) { unsigned int len = 1u; - for( ; markupStringBuffer < markupStringEndBuffer ; ++markupStringBuffer ) + for(; markupStringBuffer < markupStringEndBuffer; ++markupStringBuffer) { character = *markupStringBuffer; ++len; - if( SEMI_COLON == character ) // ';' + if(SEMI_COLON == character) // ';' { // found end of XHTML entity ++markupStringBuffer; return len; } - else if( ( AMPERSAND == character ) || ( BACK_SLASH == character ) || ( LESS_THAN == character )) + else if((AMPERSAND == character) || (BACK_SLASH == character) || (LESS_THAN == character)) { return 0; } @@ -463,45 +535,45 @@ unsigned int GetXHTMLEntityLength( const char*& markupStringBuffer, * * @return true if string is successfully parsed otherwise false */ -bool XHTMLNumericEntityToUtf8 ( const char* markupText, char* utf8 ) +bool XHTMLNumericEntityToUtf8(const char* markupText, char* utf8) { bool result = false; - if( NULL != markupText ) + if(NULL != markupText) { bool isHex = false; // check if hex or decimal entity - if( ( CHAR_ARRAY_END != *markupText ) && ( HEX_CODE == *markupText ) ) + if((CHAR_ARRAY_END != *markupText) && (HEX_CODE == *markupText)) { isHex = true; ++markupText; } - char* end = NULL; - unsigned long l = strtoul( markupText, &end, ( isHex ? 16 : 10 ) ); // l contains UTF-32 code in case of correct XHTML entity + char* end = NULL; + unsigned long l = strtoul(markupText, &end, (isHex ? 16 : 10)); // l contains UTF-32 code in case of correct XHTML entity // check for valid XHTML numeric entities (between '#' or "#x" and ';') - if( ( l > 0 ) && ( l < ULONG_MAX ) && ( *end == SEMI_COLON ) ) // in case wrong XHTML entity is set eg. "abcdefs;" in that case *end will be 'a' + if((l > 0) && (l < ULONG_MAX) && (*end == SEMI_COLON)) // in case wrong XHTML entity is set eg. "abcdefs;" in that case *end will be 'a' { /* characters XML 1.1 permits */ - if( ( ( XHTML_DECIMAL_ENTITY_RANGE[0] < l ) && ( l <= XHTML_DECIMAL_ENTITY_RANGE[1] ) ) || - ( ( XHTML_DECIMAL_ENTITY_RANGE[2] <= l ) && ( l <= XHTML_DECIMAL_ENTITY_RANGE[3] ) ) || - ( ( XHTML_DECIMAL_ENTITY_RANGE[4] <= l ) && ( l <= XHTML_DECIMAL_ENTITY_RANGE[5] ) ) ) + if(((XHTML_DECIMAL_ENTITY_RANGE[0] < l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[1])) || + ((XHTML_DECIMAL_ENTITY_RANGE[2] <= l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[3])) || + ((XHTML_DECIMAL_ENTITY_RANGE[4] <= l) && (l <= XHTML_DECIMAL_ENTITY_RANGE[5]))) { // Convert UTF32 code to UTF8 - Utf32ToUtf8( reinterpret_cast( &l ), 1, reinterpret_cast( utf8 ) ); + Utf32ToUtf8(reinterpret_cast(&l), 1, reinterpret_cast(utf8)); result = true; - } + } } } return result; } /** - * @brief Processes a particular tag for the required run (color-run or font-run). + * @brief Processes a particular tag for the required run (color-run, font-run or underlined-character-run). * - * @tparam RunType Whether ColorRun or FontDescriptionRun + * @tparam RunType Whether ColorRun , FontDescriptionRun or UnderlinedCharacterRun * * @param[in/out] runsContainer The container containing all the runs * @param[in/out] styleStack The style stack @@ -511,17 +583,17 @@ bool XHTMLNumericEntityToUtf8 ( const char* markupText, char* utf8 ) * @param[in/out] tagReference The tagReference we should increment/decrement * @param[in] parameterSettingFunction This function will be called to set run specific parameters */ -template +template void ProcessTagForRun( - Vector& runsContainer, - StyleStack& styleStack, - const Tag& tag, - const CharacterIndex characterIndex, - StyleStack::RunIndex& runIndex, - int& tagReference, - std::function parameterSettingFunction) + Vector& runsContainer, + StyleStack& styleStack, + const Tag& tag, + const CharacterIndex characterIndex, + RunIndex& runIndex, + int& tagReference, + std::function parameterSettingFunction) { - if( !tag.isEndTag ) + if(!tag.isEndTag) { // Create a new run. RunType run; @@ -545,10 +617,10 @@ void ProcessTagForRun( } else { - if( tagReference > 0 ) + if(tagReference > 0) { // Pop the top of the stack and set the number of characters of the run. - RunType& run = *( runsContainer.Begin() + styleStack.Pop() ); + RunType& run = *(runsContainer.Begin() + styleStack.Pop()); run.characterRun.numberOfCharacters = characterIndex - run.characterRun.characterIndex; --tagReference; } @@ -563,11 +635,11 @@ void ProcessTagForRun( * @param[in/out] characterIndex The current character index */ void ProcessItemTag( - MarkupProcessData& markupProcessData, - const Tag tag, - CharacterIndex& characterIndex) + MarkupProcessData& markupProcessData, + const Tag tag, + CharacterIndex& characterIndex) { - if (tag.isEndTag) + if(tag.isEndTag) { // Create an embedded item instance. EmbeddedItem item; @@ -577,28 +649,204 @@ void ProcessItemTag( markupProcessData.items.PushBack(item); // Insert white space character that will be replaced by the item. - markupProcessData.markupProcessedText.append( 1u, WHITE_SPACE ); + markupProcessData.markupProcessedText.append(1u, WHITE_SPACE); + ++characterIndex; + } +} + +/** + * @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 + * @param[in] tag The current tag + * @param[in/out] characterIndex The current character index + */ +void ProcessAnchorTag( + MarkupProcessData& markupProcessData, + const Tag tag, + CharacterIndex& characterIndex) +{ + if(!tag.isEndTag) + { + // Create an anchor instance. + Anchor anchor; + anchor.startIndex = characterIndex; + anchor.endIndex = 0u; + ProcessAnchor(tag, anchor); + markupProcessData.anchors.PushBack(anchor); + } + else + { + // Update end index. + unsigned int count = markupProcessData.anchors.Count(); + if(count > 0) + { + markupProcessData.anchors[count - 1].endIndex = characterIndex; + } + } +} + +/** + * @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, + Vector& underlinedCharacterRuns, + RunIndex& colorRunIndex, + RunIndex& fontRunIndex, + RunIndex& underlinedCharacterRunIndex, + const CharacterIndex characterIndex, + int& tagReference) +{ + if(!spanTag.isEndTag) + { + // Create a new run. + ColorRun colorRun; + Initialize(colorRun); + + FontDescriptionRun fontRun; + Initialize(fontRun); + + UnderlinedCharacterRun underlinedCharacterRun; + Initialize(underlinedCharacterRun); + + Span span; + Initialize(span); + + // Fill the run with the parameters. + colorRun.characterRun.characterIndex = characterIndex; + fontRun.characterRun.characterIndex = characterIndex; + underlinedCharacterRun.characterRun.characterIndex = characterIndex; + + span.colorRunIndex = colorRunIndex; + span.fontRunIndex = fontRunIndex; + span.underlinedCharacterRunIndex = underlinedCharacterRunIndex; + + ProcessSpanTag(spanTag, colorRun, fontRun, underlinedCharacterRun, span.isColorDefined, span.isFontDefined, span.isUnderlinedCharacterDefined); + + // 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; + } + + if(span.isUnderlinedCharacterDefined) + { + // Push the run in the logical model. + underlinedCharacterRuns.PushBack(underlinedCharacterRun); + ++underlinedCharacterRunIndex; + } + + // 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; + } + + if(span.isUnderlinedCharacterDefined) + { + UnderlinedCharacterRun& underlinedCharacterRun = *(underlinedCharacterRuns.Begin() + span.underlinedCharacterRunIndex); + underlinedCharacterRun.characterRun.numberOfCharacters = characterIndex - underlinedCharacterRun.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) +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.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 or & special character. - const unsigned char nextCharacter = *( markupStringBuffer + 1u ); - if( ( LESS_THAN == nextCharacter ) || ( GREATER_THAN == nextCharacter ) || ( AMPERSAND == nextCharacter ) ) + const unsigned char nextCharacter = *(markupStringBuffer + 1u); + if((LESS_THAN == nextCharacter) || (GREATER_THAN == nextCharacter) || (AMPERSAND == nextCharacter)) { character = nextCharacter; ++markupStringBuffer; - count = GetUtf8Length( character ); + count = GetUtf8Length(character); markupBuffer = markupStringBuffer; } } - else // checking if contains XHTML entity or not + else // checking if contains XHTML entity or not { - const unsigned int len = GetXHTMLEntityLength( markupStringBuffer, markupStringEndBuffer); + const unsigned int len = GetXHTMLEntityLength(markupStringBuffer, markupStringEndBuffer); // Parse markupStringTxt if it contains XHTML Entity between '&' and ';' - if( len > 0 ) + if(len > 0) { char* entityCode = NULL; - bool result = false; - count = 0; + bool result = false; + count = 0; // Checking if XHTML Numeric Entity - if( HASH == *( markupBuffer + 1u ) ) + if(HASH == *(markupBuffer + 1u)) { entityCode = &utf8[0]; // markupBuffer is currently pointing to '&'. By adding 2u to markupBuffer it will point to numeric string by skipping "&#' - result = XHTMLNumericEntityToUtf8( ( markupBuffer + 2u ), entityCode ); + result = XHTMLNumericEntityToUtf8((markupBuffer + 2u), entityCode); } - else // Checking if XHTML Named Entity + else // Checking if XHTML Named Entity { - entityCode = const_cast ( NamedEntityToUtf8( markupBuffer, len ) ); - result = ( entityCode != NULL ); + entityCode = const_cast(NamedEntityToUtf8(markupBuffer, len)); + result = (entityCode != NULL); } - if ( result ) + if(result) { markupBuffer = entityCode; //utf8 text assigned to markupBuffer - character = markupBuffer[0]; + character = markupBuffer[0]; } else { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Not valid XHTML entity : (%.*s) \n", len, markupBuffer ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Not valid XHTML entity : (%.*s) \n", len, markupBuffer); markupBuffer = NULL; } } - else // in case string conatins Start of XHTML Entity('&') but not its end character(';') + else // in case string conatins Start of XHTML Entity('&') but not its end character(';') { - if( character == AMPERSAND ) + if(character == AMPERSAND) { markupBuffer = NULL; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Not Well formed XHTML content \n" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Not Well formed XHTML content \n"); } } } - if( markupBuffer != NULL ) + if(markupBuffer != NULL) { - const unsigned char numberOfBytes = GetUtf8Length( character ); - markupProcessData.markupProcessedText.push_back( character ); + const unsigned char numberOfBytes = GetUtf8Length(character); + markupProcessData.markupProcessedText.push_back(character); - for( unsigned char i = 1u; i < numberOfBytes; ++i ) + for(unsigned char i = 1u; i < numberOfBytes; ++i) { ++markupBuffer; - markupProcessData.markupProcessedText.push_back( *markupBuffer ); + markupProcessData.markupProcessedText.push_back(*markupBuffer); } ++characterIndex; @@ -697,109 +945,158 @@ void ProcessMarkupStringBuffer( } // namespace -void ProcessMarkupString( const std::string& markupString, MarkupProcessData& markupProcessData ) +void ProcessMarkupString(const std::string& markupString, MarkupProcessData& markupProcessData) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "markupString: %s\n", markupString.c_str() ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "markupString: %s\n", markupString.c_str()); // Reserve space for the plain text. const Length markupStringSize = markupString.size(); - markupProcessData.markupProcessedText.reserve( markupStringSize ); + 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; + 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 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.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(); + const char* markupStringBuffer = markupString.c_str(); const char* const markupStringEndBuffer = markupStringBuffer + markupStringSize; - Tag tag; + Tag tag; CharacterIndex characterIndex = 0u; - for( ; markupStringBuffer < markupStringEndBuffer; ) + for(; markupStringBuffer < markupStringEndBuffer;) { tag.attributes.Clear(); - if( IsTag( markupStringBuffer, - markupStringEndBuffer, - tag ) ) + if(IsTag(markupStringBuffer, + markupStringEndBuffer, + tag)) { - if( TokenComparison( XHTML_COLOR_TAG, tag.buffer, tag.length ) ) + if(TokenComparison(XHTML_COLOR_TAG, tag.buffer, tag.length)) { ProcessTagForRun( - markupProcessData.colorRuns, styleStack, tag, characterIndex, colorRunIndex, colorTagReference, - [] (const Tag& tag, ColorRun& run) { ProcessColorTag( tag, run ); }); + markupProcessData.colorRuns, styleStack, tag, characterIndex, colorRunIndex, colorTagReference, [](const Tag& tag, ColorRun& run) { ProcessColorTag(tag, run); }); } // - else if( TokenComparison( XHTML_I_TAG, tag.buffer, tag.length ) ) + else if(TokenComparison(XHTML_I_TAG, tag.buffer, tag.length)) { ProcessTagForRun( - markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, iTagReference, - [] (const Tag&, FontDescriptionRun& fontRun) - { - fontRun.slant = TextAbstraction::FontSlant::ITALIC; - fontRun.slantDefined = true; - }); + markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, iTagReference, [](const Tag&, FontDescriptionRun& fontRun) { + fontRun.slant = TextAbstraction::FontSlant::ITALIC; + fontRun.slantDefined = true; + }); } // - else if( TokenComparison( XHTML_U_TAG, tag.buffer, tag.length ) ) + else if(TokenComparison(XHTML_U_TAG, tag.buffer, tag.length)) { - // TODO: If !tag.isEndTag, then create a new underline run. - // else Pop the top of the stack and set the number of characters of the run. + ProcessTagForRun( + 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 ) ) + else if(TokenComparison(XHTML_B_TAG, tag.buffer, tag.length)) { ProcessTagForRun( - markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, bTagReference, - [] (const Tag&, FontDescriptionRun& fontRun) - { - fontRun.weight = TextAbstraction::FontWeight::BOLD; - fontRun.weightDefined = true; - }); + markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, bTagReference, [](const Tag&, FontDescriptionRun& fontRun) { + fontRun.weight = TextAbstraction::FontWeight::BOLD; + fontRun.weightDefined = true; + }); } // - else if( TokenComparison( XHTML_FONT_TAG, tag.buffer, tag.length ) ) + else if(TokenComparison(XHTML_FONT_TAG, tag.buffer, tag.length)) { ProcessTagForRun( - markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, fontTagReference, - [] (const Tag& tag, FontDescriptionRun& fontRun) { ProcessFontTag( tag, fontRun ); }); + markupProcessData.fontRuns, styleStack, tag, characterIndex, fontRunIndex, fontTagReference, [](const Tag& tag, FontDescriptionRun& fontRun) { ProcessFontTag(tag, fontRun); }); } // - else if( TokenComparison( XHTML_SHADOW_TAG, tag.buffer, tag.length ) ) + else if(TokenComparison(XHTML_ANCHOR_TAG, tag.buffer, tag.length)) + { + /* Anchor */ + ProcessAnchorTag(markupProcessData, tag, characterIndex); + /* Color */ + ProcessTagForRun( + markupProcessData.colorRuns, styleStack, tag, characterIndex, colorRunIndex, colorTagReference, [](const Tag& tag, ColorRun& run) { + run.color = Color::BLUE; + ProcessColorTag(tag, run); + }); + /* 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)) { // TODO: If !tag.isEndTag, then create a new shadow run. // else Pop the top of the stack and set the number of characters of the run. } // - else if( TokenComparison( XHTML_GLOW_TAG, tag.buffer, tag.length ) ) + else if(TokenComparison(XHTML_GLOW_TAG, tag.buffer, tag.length)) { // TODO: If !tag.isEndTag, then create a new glow run. // else Pop the top of the stack and set the number of characters of the run. } // - else if( TokenComparison( XHTML_OUTLINE_TAG, tag.buffer, tag.length ) ) + else if(TokenComparison(XHTML_OUTLINE_TAG, tag.buffer, tag.length)) { // TODO: If !tag.isEndTag, then create a new outline run. // else Pop the top of the stack and set the number of characters of the run. } // - else if (TokenComparison(XHTML_ITEM_TAG, tag.buffer, tag.length)) + else if(TokenComparison(XHTML_ITEM_TAG, tag.buffer, tag.length)) { ProcessItemTag(markupProcessData, tag, characterIndex); } - } // end if( IsTag() ) - else if( markupStringBuffer < markupStringEndBuffer ) + 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, markupProcessData.underlinedCharacterRuns, colorRunIndex, fontRunIndex, underlinedCharacterRunIndex, 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); } } // Resize the model's vectors. - ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex); + ResizeModelVectors(markupProcessData, fontRunIndex, colorRunIndex, underlinedCharacterRunIndex, backgroundRunIndex, boundedParagraphRunIndex); + + // Handle the nested tags + OverrideNestedUnderlinedCharacterRuns(markupProcessData.underlinedCharacterRuns); } } // namespace Text