diff options
| -rw-r--r-- | libass/ass_fontconfig.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 58dc10be6e..ed64d81171 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -105,13 +105,15 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold // An alternative approach could be to reimplement FcFontSort // using FC_FULLNAME instead of FC_FAMILY. family_cnt = 1; - if (strchr(family, ' ')) { - char *p, *s = strdup(family); - while (p = strrchr(s, ' ')) { - *p = '\0'; - FcPatternAddString(pat, FC_FAMILY, (const FcChar8*)s); - ++ family_cnt; - } + { + char* s = strdup(family); + char* p = s + strlen(s); + while (--p > s) + if (*p == ' ' || *p == '-') { + *p = '\0'; + FcPatternAddString(pat, FC_FAMILY, (const FcChar8*)s); + ++ family_cnt; + } free(s); } FcPatternAddBool(pat, FC_OUTLINE, FcTrue); |