/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
const TextAbstraction::FontDescription& description,
PointSize26Dot6 size ) const
{
- for( Vector<FontId>::ConstIterator it = mFonts.Begin(),
- endIt = mFonts.End();
+ for( std::vector<CacheItem>::const_iterator it = mFonts.begin(),
+ endIt = mFonts.end();
it != endIt;
++it )
{
- const FontId fontId = *it;
- TextAbstraction::FontDescription fontDescription;
- fontClient.GetDescription( fontId, fontDescription );
-
- if( ( size == fontClient.GetPointSize( fontId ) ) &&
- ( description.weight == fontDescription.weight ) &&
- ( description.width == fontDescription.width ) &&
- ( description.slant == fontDescription.slant ) )
+ const CacheItem& item = *it;
+
+ if( ( ( TextAbstraction::FontWeight::NONE == description.weight ) || ( description.weight == item.description.weight ) ) &&
+ ( ( TextAbstraction::FontWidth::NONE == description.width ) || ( description.width == item.description.width ) ) &&
+ ( ( TextAbstraction::FontSlant::NONE == description.slant ) || ( description.slant == item.description.slant ) ) &&
+ ( size == fontClient.GetPointSize( item.fontId ) ) &&
+ ( description.family.empty() || ( description.family == item.description.family ) ) )
{
- return fontId;
+ return item.fontId;
}
}
return 0u;
}
+void DefaultFonts::Cache( const TextAbstraction::FontDescription& description, FontId fontId )
+{
+ CacheItem item;
+ item.description = description;
+ item.fontId = fontId;
+ mFonts.push_back( item );
+}
+
MultilanguageSupport::MultilanguageSupport()
: mDefaultFontPerScriptCache(),
mValidFontsPerScriptCache()
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;
-
CharacterIndex lastCharacter = startIndex + numberOfCharacters;
for( Length index = startIndex; index < lastCharacter; ++index )
{
currentFontId = fontId;
// Get the script for the current character.
- const Script script = GetScript( index,
- scriptRunIt,
- scriptRunEndIt );
+ Script script = GetScript( index,
+ scriptRunIt,
+ scriptRunEndIt );
#ifdef DEBUG_ENABLED
{
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,
// 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;
- isValidFont = true;
}
}
else
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 PixelData bitmap = fontClient.CreateBitmap( fontId, glyphIndex );
+ const GlyphIndex glyphIndex = fontClient.GetGlyphIndex( fontId, character );
- // For color emojis, the font is valid if the bitmap is RGBA.
- isValidFont = bitmap && ( Pixel::BGRA8888 == bitmap.GetPixelFormat() );
+ // For color emojis, the font is valid if the glyph is a color glyph (the bitmap is RGBA).
+ isValidFont = fontClient.IsColorGlyph( fontId, glyphIndex );
}
// If there is a valid font, cache it.
validateFontsPerScript->mValidFonts.PushBack( fontId );
}
- if( !isValidFont ) // (3)
+ if( !isValidFont && ( fontId != cachedDefaultFontId ) ) // (3)
{
- // The given font has not been validated.
+ // The selected font by the user or the platform's default font has failed to validate the character.
+ // 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;
}
*( defaultFontPerScriptCacheBuffer + script ) = defaultFontsPerScript;
}
}
- defaultFontsPerScript->mFonts.PushBack( fontId );
+ defaultFontsPerScript->Cache( currentFontDescription, fontId );
}
} // !isValidFont (3)
} // !isValidFont (2)
}
#endif
- if( isFirstSetToBeValidated && !isCommonScript )
- {
- currentFontRun.fontId = fontId;
- isFirstSetToBeValidated = false;
- }
-
// The font is now validated.
if( ( fontId != currentFontRun.fontId ) ||
isNewParagraphCharacter )
currentFontRun.characterRun.characterIndex = currentFontRun.characterRun.characterIndex + currentFontRun.characterRun.numberOfCharacters;
currentFontRun.characterRun.numberOfCharacters = 0u;
currentFontRun.fontId = fontId;
-
- if( isNewParagraphCharacter )
- {
- isFirstSetToBeValidated = true;
- }
}
// Add one more character to the run.
projects / platform / core / uifw / dali-toolkit.git / blobdiff