Do not remove blacklisted fonts during cache generation. We already
apply the blacklist when reading the caches. The idea always has been
that the config should not affect caches built, although that design
was tarnished with the introduction of target="scan" configurations.
/*
* Edit pattern with user-defined rules
*/
/*
* Edit pattern with user-defined rules
*/
- if (font && config && !FcConfigSubstituteWithPat (config, font, NULL, FcMatchScan))
+ if (font && config && !FcConfigSubstitute (config, font, FcMatchScan))
{
FcPatternDestroy (font);
font = NULL;
{
FcPatternDestroy (font);
font = NULL;
- if (font && (!config || FcConfigAcceptFont (config, font)))
{
if (FcDebug() & FC_DBG_SCANV)
{
{
if (FcDebug() & FC_DBG_SCANV)
{
- if (config && !FcConfigAcceptFilename (config, dir))
- return NULL;
-
/* Try to use existing cache file */
if (!force)
cache = FcDirCacheLoad (dir, config, NULL);
/* Try to use existing cache file */
if (!force)
cache = FcDirCacheLoad (dir, config, NULL);