// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/character-set-conversion.h>
#include <dali-toolkit/internal/text/markup-processor-color.h>
+#include <dali-toolkit/internal/text/markup-processor-font.h>
#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
namespace Dali
const std::string XHTML_GLOW_TAG("glow");
const std::string XHTML_OUTLINE_TAG("outline");
-const char LESS_THAN = '<';
-const char GREATER_THAN = '>';
-const char EQUAL = '=';
-const char QUOTATION_MARK = '\'';
-const char LINE_SEPARATOR_CR = 0x0D; // Carriage return character CR
-const char LINE_SEPARATOR_LF = 0x0A; // New line character LF
-const char SLASH = '/';
-const char BACK_SLASH = '\\';
+const char LESS_THAN = '<';
+const char GREATER_THAN = '>';
+const char EQUAL = '=';
+const char QUOTATION_MARK = '\'';
+const char SLASH = '/';
+const char BACK_SLASH = '\\';
-const char WHITE_SPACE = 0x20; // ASCII value of the white space.
+const char WHITE_SPACE = 0x20; // ASCII value of the white space.
const unsigned int MAX_NUM_OF_ATTRIBUTES = 5u; ///< The font tag has the 'family', 'size' 'weight', 'width' and 'slant' attrubutes.
-
const unsigned int DEFAULT_VECTOR_SIZE = 16u; ///< Default size of run vectors.
/**
};
/**
+ * @brief Initializes a font run description to its defaults.
+ *
+ * @param[in,out] fontRun The font description run to initialize.
+ */
+void Initialize( FontDescriptionRun& fontRun )
+{
+ 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;
+}
+
+/**
* @brief Splits the tag string into the tag name and its attributes.
*
* The attributes are stored in a vector in the tag.
// Points the next free position in the vector of runs.
StyleStack::RunIndex colorRunIndex = 0u;
+ StyleStack::RunIndex fontRunIndex = 0u;
// Give an initial default value to the model's vectors.
markupProcessData.colorRuns.Reserve( DEFAULT_VECTOR_SIZE );
+ markupProcessData.fontRuns.Reserve( DEFAULT_VECTOR_SIZE );
// Get the mark-up string buffer.
const char* markupStringBuffer = markupString.c_str();
if( !tag.isEndTag )
{
// Create a new font run.
+ FontDescriptionRun fontRun;
+ Initialize( fontRun );
+
+ // Fill the run with the parameters.
+ fontRun.characterRun.characterIndex = characterIndex;
+ fontRun.slant = TextAbstraction::FontSlant::ITALIC;
+ fontRun.slantDefined = true;
+
+ // Push the font run in the logical model.
+ markupProcessData.fontRuns.PushBack( fontRun );
+
+ // Push the index of the run into the stack.
+ styleStack.Push( fontRunIndex );
+
+ // Point the next free font run.
+ ++fontRunIndex;
}
else
{
// Pop the top of the stack and set the number of characters of the run.
+ FontDescriptionRun& fontRun = *( markupProcessData.fontRuns.Begin() + styleStack.Pop() );
+ fontRun.characterRun.numberOfCharacters = characterIndex - fontRun.characterRun.characterIndex;
}
} // <i></i>
else if( TokenComparison( XHTML_U_TAG, tag.buffer, tag.length ) )
if( !tag.isEndTag )
{
// Create a new font run.
+ FontDescriptionRun fontRun;
+ Initialize( fontRun );
+
+ // Fill the run with the parameters.
+ fontRun.characterRun.characterIndex = characterIndex;
+ fontRun.weight = TextAbstraction::FontWeight::BOLD;
+ fontRun.weightDefined = true;
+
+ // Push the font run in the logical model.
+ markupProcessData.fontRuns.PushBack( fontRun );
+
+ // Push the index of the run into the stack.
+ styleStack.Push( fontRunIndex );
+
+ // Point the next free font run.
+ ++fontRunIndex;
}
else
{
// Pop the top of the stack and set the number of characters of the run.
+ FontDescriptionRun& fontRun = *( markupProcessData.fontRuns.Begin() + styleStack.Pop() );
+ fontRun.characterRun.numberOfCharacters = characterIndex - fontRun.characterRun.characterIndex;
}
} // <b></b>
else if( TokenComparison( XHTML_FONT_TAG, tag.buffer, tag.length ) )
if( !tag.isEndTag )
{
// Create a new font run.
+ FontDescriptionRun fontRun;
+ Initialize( fontRun );
+
+ // Fill the run with the parameters.
+ fontRun.characterRun.characterIndex = characterIndex;
+
+ ProcessFontTag( tag, fontRun );
+
+ // Push the font run in the logical model.
+ markupProcessData.fontRuns.PushBack( fontRun );
+
+ // Push the index of the run into the stack.
+ styleStack.Push( fontRunIndex );
+
+ // Point the next free font run.
+ ++fontRunIndex;
}
else
{
// Pop the top of the stack and set the number of characters of the run.
+ FontDescriptionRun& fontRun = *( markupProcessData.fontRuns.Begin() + styleStack.Pop() );
+ fontRun.characterRun.numberOfCharacters = characterIndex - fontRun.characterRun.characterIndex;
}
} // <font></font>
else if( TokenComparison( XHTML_SHADOW_TAG, tag.buffer, tag.length ) )
++markupStringBuffer;
}
}
- else if( ( LINE_SEPARATOR_CR == character ) && ( markupStringBuffer + 1u < markupStringEndBuffer ) )
- {
- // Replacing CR+LF end line by LF.
- if( LINE_SEPARATOR_LF == *( markupStringBuffer + 1u ) )
- {
- character = LINE_SEPARATOR_LF;
- ++markupStringBuffer;
- }
- }
const unsigned char numberOfBytes = GetUtf8Length( character );
}
// Resize the model's vectors.
+ if( 0u == fontRunIndex )
+ {
+ markupProcessData.fontRuns.Clear();
+ }
+ else
+ {
+ markupProcessData.fontRuns.Resize( fontRunIndex );
+ }
+
if( 0u == colorRunIndex )
{
markupProcessData.colorRuns.Clear();