X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmulti-language-support-impl.cpp;h=607d1594ee258d673bb1d7984ee35dc1bd03acf0;hp=990d0cee26f06657e5df27b3fe02bfa21f2e7956;hb=3ca7994488b0b5e21bbb0d262c5fa2e4c731308b;hpb=fedf87ade1e326c925e463906b0400a09b86ae0a diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp old mode 100644 new mode 100755 index 990d0ce..607d159 --- a/dali-toolkit/internal/text/multi-language-support-impl.cpp +++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp @@ -101,11 +101,11 @@ MultilanguageSupport::MultilanguageSupport() { // Initializes the default font cache to zero (invalid font). // Reserves space to cache the default fonts and access them with the script as an index. - mDefaultFontPerScriptCache.Resize( TextAbstraction::UNKNOWN, NULL ); + mDefaultFontPerScriptCache.Resize( TextAbstraction::UNKNOWN + 1, NULL ); // Initializes the valid fonts cache to NULL (no valid fonts). // Reserves space to cache the valid fonts and access them with the script as an index. - mValidFontsPerScriptCache.Resize( TextAbstraction::UNKNOWN, NULL ); + mValidFontsPerScriptCache.Resize( TextAbstraction::UNKNOWN + 1, NULL ); } MultilanguageSupport::~MultilanguageSupport() @@ -204,6 +204,9 @@ void MultilanguageSupport::SetScripts( const Vector& text, // Pointers to the text buffer. const Character* const textBuffer = text.Begin(); + // Initialize whether is right to left direction + currentScriptRun.isRightToLeft = false; + // Traverse all characters and set the scripts. const Length lastCharacter = startIndex + numberOfCharacters; for( Length index = startIndex; index < lastCharacter; ++index ) @@ -226,6 +229,9 @@ void MultilanguageSupport::SetScripts( const Vector& text, while( !endOfText && ( TextAbstraction::COMMON == script ) ) { + // Check if whether is right to left markup and Keeps true if the previous value was true. + currentScriptRun.isRightToLeft = currentScriptRun.isRightToLeft || TextAbstraction::IsRightToLeftMark( character ); + if( TextAbstraction::EMOJI == currentScriptRun.script ) { // Emojis doesn't mix well with characters common to all scripts. Insert the emoji run. @@ -254,10 +260,6 @@ void MultilanguageSupport::SetScripts( const Vector& text, currentScriptRun.characterRun.numberOfCharacters += numberOfAllScriptCharacters; // Store the script run. - if( TextAbstraction::UNKNOWN == currentScriptRun.script ) - { - currentScriptRun.script = TextAbstraction::LATIN; - } scripts.Insert( scripts.Begin() + scriptIndex, currentScriptRun ); ++scriptIndex; @@ -266,6 +268,8 @@ void MultilanguageSupport::SetScripts( const Vector& text, currentScriptRun.characterRun.numberOfCharacters = 0u; currentScriptRun.script = TextAbstraction::UNKNOWN; numberOfAllScriptCharacters = 0u; + // Initialize whether is right to left direction + currentScriptRun.isRightToLeft = false; } // Get the next character. @@ -292,7 +296,7 @@ void MultilanguageSupport::SetScripts( const Vector& text, ( TextAbstraction::EMOJI != script ) ) { // Sets the direction of the first valid script. - isParagraphRTL = TextAbstraction::IsRightToLeftScript( script ); + isParagraphRTL = currentScriptRun.isRightToLeft || TextAbstraction::IsRightToLeftScript( script ); isFirstScriptToBeSet = false; } @@ -320,7 +324,6 @@ void MultilanguageSupport::SetScripts( const Vector& text, else if( ( TextAbstraction::UNKNOWN == currentScriptRun.script ) && ( TextAbstraction::EMOJI == script ) ) { - currentScriptRun.script = TextAbstraction::LATIN; currentScriptRun.characterRun.numberOfCharacters += numberOfAllScriptCharacters; numberOfAllScriptCharacters = 0u; } @@ -337,6 +340,8 @@ void MultilanguageSupport::SetScripts( const Vector& text, currentScriptRun.characterRun.numberOfCharacters = numberOfAllScriptCharacters + 1u; // Adds the white spaces which are at the begining of the script. currentScriptRun.script = script; numberOfAllScriptCharacters = 0u; + // Check if whether is right to left script. + currentScriptRun.isRightToLeft = TextAbstraction::IsRightToLeftScript( currentScriptRun.script ); } else { @@ -357,12 +362,6 @@ void MultilanguageSupport::SetScripts( const Vector& text, if( 0u != currentScriptRun.characterRun.numberOfCharacters ) { - if( TextAbstraction::UNKNOWN == currentScriptRun.script ) - { - // There are only white spaces in the last script. Set the latin script. - currentScriptRun.script = TextAbstraction::LATIN; - } - // Store the last run. scripts.Insert( scripts.Begin() + scriptIndex, currentScriptRun ); ++scriptIndex; @@ -447,16 +446,20 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, Vector::ConstIterator scriptRunEndIt = scripts.End(); bool isNewParagraphCharacter = false; - FontId currentFontId = 0u; - FontId previousFontId = 0u; bool isPreviousEmojiScript = false; + // Description of fallback font which is selected at current iteration. + TextAbstraction::FontDescription selectedFontDescription; + CharacterIndex lastCharacter = startIndex + numberOfCharacters; for( Length index = startIndex; index < lastCharacter; ++index ) { // Get the current character. const Character character = *( textBuffer + index ); + bool needSoftwareBoldening = false; + bool needSoftwareItalic = false; + // new description for current character TextAbstraction::FontDescription currentFontDescription; TextAbstraction::PointSize26Dot6 currentFontPointSize = defaultFontPointSize; bool isDefaultFont = true; @@ -470,7 +473,6 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, // Get the font for the current character. FontId fontId = fontClient.GetFontId( currentFontDescription, currentFontPointSize ); - currentFontId = fontId; // Get the script for the current character. Script script = GetScript( index, @@ -490,10 +492,6 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, description.path.c_str() ); } #endif - if( script == TextAbstraction::UNKNOWN ) - { - script = TextAbstraction::LATIN; - } // Validate whether the current character is supported by the given font. bool isValidFont = false; @@ -562,115 +560,92 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, // supports the 'white space'. However, that font may not support the DEVANAGARI script. isCommonScript = TextAbstraction::IsCommonScript( character ); - if( isCommonScript ) + // Check in the valid fonts cache. + ValidateFontsPerScript* validateFontsPerScript = *( validFontsPerScriptCacheBuffer + script ); + + if( NULL != validateFontsPerScript ) { - if( isValidCachedDefaultFont && - ( isDefaultFont || ( currentFontId == previousFontId ) ) && - !isEmojiScript ) + // This cache stores valid fonts set by the user. + isValidFont = validateFontsPerScript->IsValidFont( fontId ); + + // It may happen that a validated font for a script doesn't have all the glyphs for that script. + // i.e a font validated for the CJK script may contain glyphs for the chinese language but not for the Japanese. + if( isValidFont ) { - // At this point the character common for all scripts has no font assigned. - // If there is a valid previously cached default font for it, use that one. - fontId = cachedDefaultFontId; + // Checks if the current character is supported by the font is needed. + isValidFont = fontClient.IsCharacterSupportedByFont( fontId, character ); } } - else + + if( !isValidFont ) // (2) { - // Check in the valid fonts cache. - ValidateFontsPerScript* validateFontsPerScript = *( validFontsPerScriptCacheBuffer + script ); + // The selected font is not stored in any cache. + + // Checks if the current character is supported by the selected font. + isValidFont = fontClient.IsCharacterSupportedByFont( fontId, character ); - if( NULL != validateFontsPerScript ) + // Emojis are present in many monochrome fonts; prefer color by default. + if( isValidFont && + isEmojiScript ) { - // This cache stores valid fonts set by the user. - isValidFont = validateFontsPerScript->IsValidFont( fontId ); + const GlyphIndex glyphIndex = fontClient.GetGlyphIndex( fontId, character ); + + // For color emojis, the font is valid if the glyph is a color glyph (the bitmap is RGBA). + isValidFont = fontClient.IsColorGlyph( fontId, glyphIndex ); + } - // It may happen that a validated font for a script doesn't have all the glyphs for that script. - // i.e a font validated for the CJK script may contain glyphs for the chinese language but not for the Japanese. - if( isValidFont ) + // If there is a valid font, cache it. + if( isValidFont && !isCommonScript ) + { + if( NULL == validateFontsPerScript ) { - // Checks if the current character is supported by the font is needed. - isValidFont = fontClient.IsCharacterSupportedByFont( fontId, character ); + validateFontsPerScript = new ValidateFontsPerScript(); + + *( validFontsPerScriptCacheBuffer + script ) = validateFontsPerScript; } + + validateFontsPerScript->mValidFonts.PushBack( fontId ); } - if( !isValidFont ) // (2) + if( !isValidFont && ( fontId != cachedDefaultFontId ) && ( !TextAbstraction::IsNewParagraph( character ) )) // (3) { - // The selected font is not stored in any cache. - - // Checks if the current character is supported by the selected font. - isValidFont = fontClient.IsCharacterSupportedByFont( fontId, character ); + // The selected font by the user or the platform's default font has failed to validate the character. - // Emojis are present in many monochrome fonts; prefer color by default. - if( isValidFont && - isEmojiScript ) + // Checks if the previously discarted cached default font supports the character. + bool isValidCachedFont = false; + if( isValidCachedDefaultFont ) { - const GlyphIndex glyphIndex = fontClient.GetGlyphIndex( fontId, character ); - - // For color emojis, the font is valid if the glyph is a color glyph (the bitmap is RGBA). - isValidFont = fontClient.IsColorGlyph( fontId, glyphIndex ); + isValidCachedFont = fontClient.IsCharacterSupportedByFont( cachedDefaultFontId, character ); } - // If there is a valid font, cache it. - if( isValidFont ) + if( isValidCachedFont ) { - if( NULL == validateFontsPerScript ) - { - validateFontsPerScript = new ValidateFontsPerScript(); + // Use the cached default font for the script if there is one. + fontId = cachedDefaultFontId; + } + else + { + // There is no valid cached default font for the script. - *( validFontsPerScriptCacheBuffer + script ) = validateFontsPerScript; - } + DefaultFonts* defaultFontsPerScript = NULL; - validateFontsPerScript->mValidFonts.PushBack( fontId ); - } + // Emojis are present in many monochrome fonts; prefer color by default. + const bool preferColor = ( TextAbstraction::EMOJI == script ); - if( !isValidFont && ( fontId != cachedDefaultFontId ) ) // (3) - { - // The selected font by the user or the platform's default font has failed to validate the character. + // Find a fallback-font. + fontId = fontClient.FindFallbackFont( character, + currentFontDescription, + currentFontPointSize, + preferColor ); - // Checks if the previously discarted cached default font supports the character. - bool isValidCachedFont = false; - if( isValidCachedDefaultFont ) + if( 0u == fontId ) { - isValidCachedFont = fontClient.IsCharacterSupportedByFont( cachedDefaultFontId, character ); + fontId = fontClient.FindDefaultFont( UTF32_A, currentFontPointSize ); } - if( isValidCachedFont ) + if ( !isCommonScript && (script != TextAbstraction::UNKNOWN) ) { - // Use the cached default font for the script if there is one. - fontId = cachedDefaultFontId; - } - else - { - // There is no valid cached default font for the script. - - DefaultFonts* defaultFontsPerScript = NULL; - - // Emojis are present in many monochrome fonts; prefer color by default. - const bool preferColor = ( TextAbstraction::EMOJI == script ); - - // Find a fallback-font. - fontId = fontClient.FindFallbackFont( character, - currentFontDescription, - currentFontPointSize, - preferColor ); - - if( 0u == fontId ) - { - // If the system does not support a suitable font, fallback to Latin - defaultFontsPerScript = *( defaultFontPerScriptCacheBuffer + TextAbstraction::LATIN ); - if( NULL != defaultFontsPerScript ) - { - fontId = defaultFontsPerScript->FindFont( fontClient, - currentFontDescription, - currentFontPointSize ); - } - } - - if( 0u == fontId ) - { - fontId = fontClient.FindDefaultFont( UTF32_A, currentFontPointSize ); - } - - // Cache the font. + // Cache the font if it is not an unknown script if( NULL == defaultFontsPerScript ) { defaultFontsPerScript = *( defaultFontPerScriptCacheBuffer + script ); @@ -683,9 +658,9 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, } defaultFontsPerScript->Cache( currentFontDescription, fontId ); } - } // !isValidFont (3) - } // !isValidFont (2) - } // !isCommonScript + } + } // !isValidFont (3) + } // !isValidFont (2) } // !isValidFont (1) #ifdef DEBUG_ENABLED @@ -701,9 +676,22 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, } #endif + if( fontId != currentFontRun.fontId ) + { + fontClient.GetDescription(fontId,selectedFontDescription); + } + + // Developer sets bold to character but selected font cannot support it + needSoftwareBoldening = ( currentFontDescription.weight >= TextAbstraction::FontWeight::BOLD ) && ( selectedFontDescription.weight < TextAbstraction::FontWeight::BOLD ); + + // Developer sets italic to character but selected font cannot support it + needSoftwareItalic = ( currentFontDescription.slant == TextAbstraction::FontSlant::ITALIC ) && ( selectedFontDescription.slant < TextAbstraction::FontSlant::ITALIC ); + // The font is now validated. if( ( fontId != currentFontRun.fontId ) || - isNewParagraphCharacter ) + isNewParagraphCharacter || + // If font id is same as previous but style is diffrent, initialize new one + ( ( fontId == currentFontRun.fontId ) && ( ( needSoftwareBoldening != currentFontRun.softwareBold ) || ( needSoftwareItalic != currentFontRun.softwareItalic ) ) ) ) { // Current run needs to be stored and a new one initialized. @@ -718,6 +706,8 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, currentFontRun.characterRun.characterIndex = currentFontRun.characterRun.characterIndex + currentFontRun.characterRun.numberOfCharacters; currentFontRun.characterRun.numberOfCharacters = 0u; currentFontRun.fontId = fontId; + currentFontRun.softwareItalic = needSoftwareItalic; + currentFontRun.softwareBold = needSoftwareBoldening; } // Add one more character to the run. @@ -725,7 +715,6 @@ void MultilanguageSupport::ValidateFonts( const Vector& text, // Whether the current character is a new paragraph character. isNewParagraphCharacter = TextAbstraction::IsNewParagraph( character ); - previousFontId = currentFontId; isPreviousEmojiScript = isEmojiScript; } // end traverse characters.