{
// 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()
currentScriptRun.characterRun.numberOfCharacters += numberOfAllScriptCharacters;
// Store the script run.
- if( TextAbstraction::UNKNOWN == currentScriptRun.script )
- {
- currentScriptRun.script = TextAbstraction::LATIN;
- }
scripts.Insert( scripts.Begin() + scriptIndex, currentScriptRun );
++scriptIndex;
else if( ( TextAbstraction::UNKNOWN == currentScriptRun.script ) &&
( TextAbstraction::EMOJI == script ) )
{
- currentScriptRun.script = TextAbstraction::LATIN;
currentScriptRun.characterRun.numberOfCharacters += numberOfAllScriptCharacters;
numberOfAllScriptCharacters = 0u;
}
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;
FontId previousFontId = 0u;
bool isPreviousEmojiScript = false;
- // Whether it's the first set of characters to be validated.
- // Used in case the paragraph starts with characters common to all scripts.
- bool isFirstSetToBeValidated = true;
+ // 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;
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;
// Check first in the cache of default fonts per script and size.
- DefaultFonts* defaultFonts = *( defaultFontPerScriptCacheBuffer + script );
FontId cachedDefaultFontId = 0u;
+ DefaultFonts* defaultFonts = *( defaultFontPerScriptCacheBuffer + script );
if( NULL != defaultFonts )
{
+ // This cache stores fall-back fonts.
cachedDefaultFontId = defaultFonts->FindFont( fontClient,
currentFontDescription,
currentFontPointSize );
// The font is valid if it matches with the default one for the current script and size and it's different than zero.
isValidFont = isValidCachedDefaultFont && ( fontId == cachedDefaultFontId );
+ if( isValidFont )
+ {
+ // Check if the font supports the character.
+ isValidFont = fontClient.IsCharacterSupportedByFont( fontId, character );
+ }
+
bool isCommonScript = false;
bool isEmojiScript = TextAbstraction::EMOJI == script;
currentFontRun.fontId = fontId;
}
-
// If the given font is not valid, it means either:
// - there is no cached font for the current script yet or,
// - the user has set a different font than the default one for the current script or,
if( NULL != validateFontsPerScript )
{
+ // 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 )
+ {
+ // Checks if the current character is supported by the font is needed.
+ isValidFont = fontClient.IsCharacterSupportedByFont( fontId, character );
+ }
}
if( !isValidFont ) // (2)
{
- // Use the font client to validate the font.
- const GlyphIndex glyphIndex = fontClient.GetGlyphIndex( fontId, character );
+ // The selected font is not stored in any cache.
- // The font is valid if there is a glyph for that character.
- isValidFont = 0u != glyphIndex;
+ // Checks if the current character is supported by the selected font.
+ isValidFont = fontClient.IsCharacterSupportedByFont( fontId, character );
// Emojis are present in many monochrome fonts; prefer color by default.
if( isValidFont &&
isEmojiScript )
{
+ 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 );
}
validateFontsPerScript->mValidFonts.PushBack( fontId );
}
- if( !isValidFont ) // (3)
+ if( !isValidFont && ( fontId != cachedDefaultFontId ) ) // (3)
{
- // The given font has not been validated.
- int validCharacterIndex = fontClient.GetGlyphIndex(cachedDefaultFontId, character );
+ // The selected font by the user or the platform's default font has failed to validate the character.
- if( isValidCachedDefaultFont && validCharacterIndex != 0u )
+ // Checks if the previously discarted cached default font supports the character.
+ bool isValidCachedFont = false;
+ if( isValidCachedDefaultFont )
+ {
+ isValidCachedFont = fontClient.IsCharacterSupportedByFont( cachedDefaultFontId, character );
+ }
+
+ if( isValidCachedFont )
{
// Use the cached default font for the script if there is one.
fontId = cachedDefaultFontId;
fontId = fontClient.FindDefaultFont( UTF32_A, currentFontPointSize );
}
- // Cache the font.
- if( NULL == defaultFontsPerScript )
+ if ( script != TextAbstraction::UNKNOWN )
{
- defaultFontsPerScript = *( defaultFontPerScriptCacheBuffer + script );
-
+ // Cache the font if it is not an unknown script
if( NULL == defaultFontsPerScript )
{
- defaultFontsPerScript = new DefaultFonts();
- *( defaultFontPerScriptCacheBuffer + script ) = defaultFontsPerScript;
+ defaultFontsPerScript = *( defaultFontPerScriptCacheBuffer + script );
+
+ if( NULL == defaultFontsPerScript )
+ {
+ defaultFontsPerScript = new DefaultFonts();
+ *( defaultFontPerScriptCacheBuffer + script ) = defaultFontsPerScript;
+ }
}
+ defaultFontsPerScript->Cache( currentFontDescription, fontId );
}
- defaultFontsPerScript->Cache( currentFontDescription, fontId );
}
} // !isValidFont (3)
} // !isValidFont (2)
}
#endif
- if( isFirstSetToBeValidated && !isCommonScript )
+ if( fontId != currentFontRun.fontId )
{
- currentFontRun.fontId = fontId;
- isFirstSetToBeValidated = false;
+ 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.
currentFontRun.characterRun.characterIndex = currentFontRun.characterRun.characterIndex + currentFontRun.characterRun.numberOfCharacters;
currentFontRun.characterRun.numberOfCharacters = 0u;
currentFontRun.fontId = fontId;
-
- if( isNewParagraphCharacter )
- {
- isFirstSetToBeValidated = true;
- }
+ currentFontRun.softwareItalic = needSoftwareItalic;
+ currentFontRun.softwareBold = needSoftwareBoldening;
}
// Add one more character to the run.
projects / platform / core / uifw / dali-toolkit.git / blobdiff