X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ffont-ft.c;h=3753a30ccc9bfbb85bd712e7ae2a3439137be893;hb=3dbe5210009c5328999362178544d143a8f7b992;hp=5ba41ba1fb9ee11eacbad8ce5904aed04ca122cc;hpb=14f2d22913449527bf521351c7ef62116236fb16;p=m17n%2Fm17n-lib.git diff --git a/src/font-ft.c b/src/font-ft.c index 5ba41ba..3753a30 100644 --- a/src/font-ft.c +++ b/src/font-ft.c @@ -42,17 +42,20 @@ #ifdef HAVE_FREETYPE +#ifdef HAVE_FTBDF_H #include +#endif #ifdef HAVE_FONTCONFIG -#include - -int fontconfig_initialized = 0; -FcConfig *fc_config; -#endif /* not HAVE_FONTCONFIG */ +static FcConfig *fc_config; +#endif /* HAVE_FONTCONFIG */ +/* Registries. */ static MSymbol Municode_bmp, Municode_full, Miso10646_1, Miso8859_1; +/* Font properties; Mnormal is already defined in face.c. */ +static MSymbol Mmedium, Mr, Mnull; + static FT_Library ft_library; typedef struct @@ -66,7 +69,7 @@ typedef struct static MFTtoProp ft_to_prop[] = { { "italic", 0, MFONT_STYLE, "i" }, { "roman", 0, MFONT_STYLE, "r" }, - { "oblique", 0, MFONT_STYLE, "p" }, + { "oblique", 0, MFONT_STYLE, "o" }, { "regular", 0, MFONT_WEIGHT, "medium" }, { "normal", 0, MFONT_WEIGHT, "medium" }, /* We need this entry even if "bold" is in commone_weight[] to @@ -77,12 +80,36 @@ static MFTtoProp ft_to_prop[] = static int ft_to_prop_size = sizeof ft_to_prop / sizeof ft_to_prop[0]; /** List of FreeType fonts. Keys are family names, values are plists - contains fonts of the corresponding family. In the deeper plist, - keys are Mt, values are (MFTInfo *). */ + containing fonts of the corresponding family. In the deeper + plist, keys are Mt, values are (MFTInfo *). */ static MPlist *ft_font_list; +/** List of FreeType base fonts. Keys are family names, values are + (MFTInfo *). */ +static MPlist *ft_family_list; + static int all_fonts_scaned; +static MSymbol M_generic_family_info; + +enum GenericFamilyType { + GENERIC_FAMILY_SERIF, + GENERIC_FAMILY_SANS_SERIF, + GENERIC_FAMILY_MONOSPACE, + GENERIC_FAMILY_MAX +}; + +/** Table for each generic family. */ + +typedef struct +{ + char *name; + MPlist *list; +} GenericFamilyInfo; + +static GenericFamilyInfo generic_family_table[GENERIC_FAMILY_MAX] = + { { "serif" }, { "sans-serif" }, { "monospace" } }; + /** Return 0 if NAME implies TrueType or OpenType fonts. Othersize return -1. */ @@ -101,46 +128,44 @@ check_otf_filename (const char *name) return 0; } -/** Setup members of FT_INFO from FT_FACE. Return the family name. */ +#define STRDUP_LOWER(s1, size, s2) \ + do { \ + int len = strlen (s2) + 1; \ + char *p1, *p2; \ + \ + if (size < len) \ + s1 = alloca (len), size = len; \ + for (p1 = s1, p2 = s2; *p2; p1++, p2++) \ + *p1 = (*p2 >= 'A' && *p2 <= 'Z' ? *p2 + 'a' - 'A' : *p2); \ + *p1 = *p2; \ + } while (0) + +/** Setup members of FT_INFO from FT_FACE. If the font is a base one + (i.e. medium-r-normal), set BASEP to 1. Otherwise set BASEP to 0. + Return the family name. */ static MSymbol -set_font_info (FT_Face ft_face, MFTInfo *ft_info, MSymbol family) +set_font_info (FT_Face ft_face, MFTInfo *ft_info, + MSymbol family, MSymbol style, int *basep) { MFont *font = &ft_info->font; - int len; - char *buf, *p; MPlist *charmap_list; int unicode_bmp = -1, unicode_full = -1, unicode = -1; int i; MFONT_INIT (font); - if (family == Mnil) - { - len = strlen (ft_face->family_name) + 1; - buf = (char *) alloca (len); - memcpy (buf, ft_face->family_name, len); - for (p = buf; *p; p++) - if (*p >= 'A' && *p <= 'Z') - *p += 'a' - 'A'; - family = msymbol (buf); - } mfont__set_property (font, MFONT_FAMILY, family); - mfont__set_property (font, MFONT_WEIGHT, msymbol ("medium")); - mfont__set_property (font, MFONT_STYLE, msymbol ("r")); - mfont__set_property (font, MFONT_STRETCH, msymbol ("normal")); - mfont__set_property (font, MFONT_ADSTYLE, msymbol ("")); + mfont__set_property (font, MFONT_WEIGHT, Mmedium); + mfont__set_property (font, MFONT_STYLE, Mr); + mfont__set_property (font, MFONT_STRETCH, Mnormal); + mfont__set_property (font, MFONT_ADSTYLE, Mnull); + *basep = 1; - if (ft_face->style_name) + if (style != Mnull) { - len = strlen (ft_face->style_name) + 1; - buf = (char *) alloca (len); - memcpy (buf, ft_face->style_name, len); - for (p = buf; *p; p++) - if (*p >= 'A' && *p <= 'Z') - *p += 'a' - 'A'; - p = buf; - while (*p && (*p < 'a' || *p > 'z')) p++; + char *p = MSYMBOL_NAME (style); + while (*p) { for (i = 0; i < ft_to_prop_size; i++) @@ -168,6 +193,9 @@ set_font_info (FT_Face ft_face, MFTInfo *ft_info, MSymbol family) } while (*p && (*p < 'a' || *p > 'z')) p++; } + *basep = (FONT_PROPERTY (font, MFONT_WEIGHT) == Mmedium + && FONT_PROPERTY (font, MFONT_STYLE) == Mr + && FONT_PROPERTY (font, MFONT_STRETCH) == Mnormal); } charmap_list = mplist (); @@ -219,7 +247,7 @@ set_font_info (FT_Face ft_face, MFTInfo *ft_info, MSymbol family) FT_Set_Charmap (ft_face, ft_face->charmaps[unicode]); for (i = 255; i >= 32; i--) { - if (i == 160) + if (i == 192) i = 126; if (FT_Get_Char_Index (ft_face, (FT_ULong) i) == 0) break; @@ -230,6 +258,7 @@ set_font_info (FT_Face ft_face, MFTInfo *ft_info, MSymbol family) ft_info->charmap_list = charmap_list; +#ifdef HAVE_FTBDF_H if (! FT_IS_SCALABLE (ft_face)) { BDF_PropertyRec prop; @@ -239,6 +268,7 @@ set_font_info (FT_Face ft_face, MFTInfo *ft_info, MSymbol family) FT_Get_BDF_Property (ft_face, "RESOLUTION_Y", &prop); font->property[MFONT_RESY] = prop.u.integer; } +#endif return family; } @@ -260,226 +290,326 @@ close_ft (void *object) #endif /* HAVE_OTF */ } free (ft_info->filename); + if (ft_info->languages) + free (ft_info->languages); M17N_OBJECT_UNREF (ft_info->charmap_list); free (ft_info); } static void -add_font_info (char *filename, MSymbol family) +add_font_info (char *filename, MSymbol family, void *langset, MPlist *plist) { FT_Face ft_face; +#ifdef HAVE_FTBDF_H BDF_PropertyRec prop; - MFTInfo *ft_info = NULL; +#endif if (FT_New_Face (ft_library, filename, 0, &ft_face) == 0) { - if (FT_IS_SCALABLE (ft_face) - || FT_Get_BDF_Property (ft_face, "PIXEL_SIZE", &prop) == 0) + char *buf; + int bufsize = 0; + MSymbol style; + + if (family == Mnil) { - MSymbol fam; - MPlist *plist; + if (ft_face->family_name) + { + STRDUP_LOWER (buf, bufsize, ft_face->family_name); + family = msymbol (buf); + } + else + family = Mnull; + if (! (plist = mplist_get (ft_font_list, family))) + { + plist = mplist (); + mplist_add (ft_font_list, family, plist); + } + } + if (ft_face->style_name) + { + STRDUP_LOWER (buf, bufsize, ft_face->style_name); + style = msymbol (buf); + } + else + style = Mnull; + + if (! mplist_get (plist, style) + && (FT_IS_SCALABLE (ft_face) +#ifdef HAVE_FTBDF_H + || FT_Get_BDF_Property (ft_face, "PIXEL_SIZE", &prop) == 0 +#endif + )) + { + int basep; + MFTInfo *ft_info; M17N_OBJECT (ft_info, close_ft, MERROR_FONT_FT); ft_info->filename = strdup (filename); ft_info->otf_flag = check_otf_filename (filename); - fam = set_font_info (ft_face, ft_info, family); - plist = mplist_get (ft_font_list, fam); - if (! plist) - { - plist = mplist (); - mplist_add (ft_font_list, fam, plist); - } - mplist_add (plist, fam, ft_info); +#ifdef HAVE_FONTCONFIG + if (langset) + ft_info->langset = FcLangSetCopy (langset); +#endif + set_font_info (ft_face, ft_info, family, style, &basep); + mplist_add (plist, style, ft_info); + + if (basep) + mplist_put (ft_family_list, family, ft_info); + else if (! mplist_get (ft_family_list, family)) + mplist_add (ft_family_list, family, ft_info); } FT_Done_Face (ft_face); } } -#ifdef HAVE_FONTCONFIG - -static MPlist *fc_generic_family_list; - -static void -fc_list (MSymbol family) +/* Return an element of ft_font_list for FAMILY. If FAMILY is Mnil, + scan all fonts and return ft_font_list. */ +static MPlist * +ft_list_family (MSymbol family) { - FcPattern *pattern; - FcObjectSet *os; - FcFontSet *fs; - int i; + MPlist *plist, *head; - if (! fc_config) + if (! ft_font_list) { - char *pathname; - struct stat buf; - MPlist *plist; - - FcInit (); - fc_config = FcConfigGetCurrent (); - MPLIST_DO (plist, mfont_freetype_path) - if (MPLIST_STRING_P (plist) - && (pathname = MPLIST_STRING (plist)) - && stat (pathname, &buf) == 0) - FcConfigAppFontAddDir (fc_config, (FcChar8 *) pathname); - /* TODO: avoid duplicate addition by checking the current font - directory list given by FcConfigGetFontDirs (). */ + ft_font_list = mplist (); + ft_family_list = mplist (); } - pattern = FcPatternCreate (); - if (family) - FcPatternAddString (pattern, FC_FAMILY, - (FcChar8 *) (msymbol_name (family))); - os = FcObjectSetBuild (FC_FILE, NULL); - fs = FcFontList (fc_config, pattern, os); - if (fs->nfont == 0 - && family != Mnil - && mplist_get (fc_generic_family_list, family) - && FcConfigSubstitute (fc_config, pattern, FcMatchPattern) == FcTrue) + if (family == Mnil) + head = ft_font_list; + else { - FcFontSetDestroy (fs); - fs = FcFontList (fc_config, pattern, os); + head = mplist_find_by_key (ft_font_list, family); + if (head) + return head; + head = mplist_add (ft_font_list, family, mplist ()); } - for (i = 0; i < fs->nfont; i++) + +#ifdef HAVE_FONTCONFIG + if (! all_fonts_scaned) { - char *filename; + FcPattern *pattern; + FcObjectSet *os; + FcFontSet *fs; + char *buf; + int bufsize = 0; + int i; + + pattern = FcPatternCreate (); + if (family != Mnil) + { + FcPatternAddString (pattern, FC_FAMILY, + (FcChar8 *) (msymbol_name (family))); + plist = head; + os = FcObjectSetBuild (FC_FILE, FC_LANG, NULL); + } + else + { + plist = NULL; + os = FcObjectSetBuild (FC_FILE, FC_FAMILY, FC_LANG, NULL); + } + fs = FcFontList (fc_config, pattern, os); + for (i = 0; i < fs->nfont; i++) + { + char *filename; + FcLangSet *langset; + + if (FcPatternGetString (fs->fonts[i], FC_FILE, 0, + (FcChar8 **) &filename) != FcResultMatch) + continue; + if (FcPatternGetLangSet (fs->fonts[i], FC_LANG, 0, + &langset) != FcResultMatch) + langset = NULL; + if (family == Mnil) + { + MSymbol fam; + char *fname; + + if (FcPatternGetString (fs->fonts[i], FC_FAMILY, 0, + (FcChar8 **) &fname) == FcResultMatch) + { + STRDUP_LOWER (buf, bufsize, fname); + fam = msymbol (buf); + if (! plist || MPLIST_KEY (plist) != fam) + { + plist = mplist_find_by_key (ft_font_list, fam); + if (! plist) + plist = mplist_add (ft_font_list, fam, mplist ()); + } + add_font_info (filename, fam, langset, MPLIST_PLIST (plist)); + } + } + else + add_font_info (filename, family, langset, MPLIST_PLIST (plist)); + } - FcPatternGetString (fs->fonts[i], FC_FILE, 0, (FcChar8 **) &filename); - add_font_info (filename, family); + FcFontSetDestroy (fs); + FcObjectSetDestroy (os); + FcPatternDestroy (pattern); + all_fonts_scaned = family == Mnil; } - FcFontSetDestroy (fs); - FcObjectSetDestroy (os); - FcPatternDestroy (pattern); -} #else /* not HAVE_FONTCONFIG */ -static void -ft_list () -{ - MPlist *plist; - struct stat buf; - char *pathname; - - MPLIST_DO (plist, mfont_freetype_path) - if (MPLIST_STRING_P (plist) - && (pathname = MPLIST_STRING (plist)) - && stat (pathname, &buf) == 0) - { - if (S_ISREG (buf.st_mode)) - add_font_info (pathname, Mnil); - else if (S_ISDIR (buf.st_mode)) - { - int len = strlen (pathname); - char path[PATH_MAX]; - DIR *dir = opendir (pathname); - struct dirent *dp; + if (! all_fonts_scaned) + { + struct stat buf; + char *pathname; - if (dir) + MPLIST_DO (plist, mfont_freetype_path) + if (MPLIST_STRING_P (plist) + && (pathname = MPLIST_STRING (plist)) + && stat (pathname, &buf) == 0) + { + if (S_ISREG (buf.st_mode)) + add_font_info (pathname, Mnil, NULL, NULL); + else if (S_ISDIR (buf.st_mode)) { - strcpy (path, pathname); - strcpy (path + len, "/"); - len++; - while ((dp = readdir (dir)) != NULL) + int len = strlen (pathname); + char path[PATH_MAX]; + DIR *dir = opendir (pathname); + struct dirent *dp; + + if (dir) { - strcpy (path + len, dp->d_name); - add_font_info (path, Mnil); + strcpy (path, pathname); + strcpy (path + len, "/"); + len++; + while ((dp = readdir (dir)) != NULL) + { + strcpy (path + len, dp->d_name); + add_font_info (path, Mnil, NULL, NULL); + } + closedir (dir); } - closedir (dir); } } - } + all_fonts_scaned = 1; + } + +#endif /* not HAVE_FONTCONFIG */ + + return head; } +static MPlist * +ft_list_generic (MSymbol generic) +{ +#ifdef HAVE_FONTCONFIG + GenericFamilyInfo *info = msymbol_get (generic, M_generic_family_info); + FcPattern *pattern; + + if (! info) + return NULL; + if (info->list) + return info->list; + + info->list = mplist (); + pattern = FcPatternCreate (); + FcPatternAddString (pattern, FC_FAMILY, + (FcChar8 *) info->name); + if (FcConfigSubstitute (fc_config, pattern, FcMatchPattern) == FcTrue) + { + int i = 0; + char *family, *buf; + int bufsize = 0; + + while (FcPatternGetString (pattern, FC_FAMILY, i, (FcChar8 **) &family) + == FcResultMatch) + { + MPlist *plist; + + STRDUP_LOWER (buf, bufsize, family); + plist = ft_list_family (msymbol (buf)); + mplist_add (info->list, MPLIST_KEY (plist), MPLIST_VAL (plist)); + i++; + } + } + return info->list; +#else /* not HAVE_FONTCONFIG */ + return NULL; #endif /* not HAVE_FONTCONFIG */ +} + /* The FreeType font driver function SELECT. */ static MRealizedFont * ft_select (MFrame *frame, MFont *spec, MFont *request, int limited_size) { - MPlist *plist, *pl; + MPlist *plist, *pl, *p; MFTInfo *best_font; int best_score; MRealizedFont *rfont; - MSymbol family, registry; + MSymbol registry, family; + unsigned short spec_family_id, request_family_id; - best_font = NULL; - best_score = 0; - family = FONT_PROPERTY (spec, MFONT_FAMILY); - if (family == Mnil) - family = FONT_PROPERTY (request, MFONT_FAMILY); registry = FONT_PROPERTY (spec, MFONT_REGISTRY); if (registry == Mnil) registry = Mt; + family = FONT_PROPERTY (spec, MFONT_FAMILY); + spec_family_id = spec->property[MFONT_FAMILY]; + request_family_id = request->property[MFONT_FAMILY]; - if (! ft_font_list) - ft_font_list = mplist (); -#ifdef HAVE_FONTCONFIG - if (family != Mnil) + if (spec_family_id) { - plist = mplist_get (ft_font_list, family); - if (! plist) + plist = ft_list_generic (family); + if (plist) { - fc_list (family); - plist = mplist_get (ft_font_list, family); - if (! plist) - { - mplist_add (ft_font_list, family, plist = mplist ()); - return NULL; - } + family = Mnil; + spec->property[MFONT_FAMILY] = 0; + if (spec_family_id == request_family_id) + request->property[MFONT_FAMILY] = 0; } - } - else - { - if (! all_fonts_scaned) + else { - fc_list (Mnil); - all_fonts_scaned = 1; + if (request_family_id + && (plist + = ft_list_generic (FONT_PROPERTY (request, MFONT_FAMILY))) + && mplist_get (plist, family)) + request->property[MFONT_FAMILY] = 0; + plist = ft_list_family (family); } } -#else /* not HAVE_FONTCONFIG */ - if (! all_fonts_scaned) - { - ft_list (); - all_fonts_scaned = 1; - } - if (family != Mnil) + else { - plist = mplist_get (ft_font_list, family); - if (! plist) - return NULL; + if (request_family_id + && (plist = ft_list_generic (FONT_PROPERTY (request, MFONT_FAMILY)))) + request->property[MFONT_FAMILY] = 0; + else + plist = ft_list_family (FONT_PROPERTY (request, MFONT_FAMILY)); } -#endif /* not HAVE_FONTCONFIG */ - if (family == Mnil) - plist = MPLIST_VAL (ft_font_list); - - retry: + best_font = NULL; + best_score = -1; MPLIST_DO (pl, plist) { - MFTInfo *ft_info = MPLIST_VAL (pl); - int score; - - if (! mplist_find_by_key (ft_info->charmap_list, registry)) - continue; - /* We always ignore FOUNDRY. */ - ft_info->font.property[MFONT_FOUNDRY] = spec->property[MFONT_FOUNDRY]; - score = mfont__score (&ft_info->font, spec, request, limited_size); - if (score >= 0 - && (! best_font - || best_score > score)) + MPLIST_DO (p, MPLIST_VAL (pl)) { - best_font = ft_info; - best_score = score; - if (score == 0) - break; + MFTInfo *ft_info = MPLIST_VAL (p); + int score; + + if (! mplist_find_by_key (ft_info->charmap_list, registry)) + continue; + + /* Always ignore FOUNDRY. */ + ft_info->font.property[MFONT_FOUNDRY] = spec->property[MFONT_FOUNDRY]; + score = mfont__score (&ft_info->font, spec, request, limited_size); + if (score >= 0 + && (! best_font + || best_score > score)) + { + best_font = ft_info; + best_score = score; + if (best_score == 0) + break; + } } + if (best_score == 0 || family != Mnil) + break; } - if (family == Mnil) - { - plist = MPLIST_NEXT (plist); - if (! MPLIST_TAIL_P (plist)) - goto retry; - } + spec->property[MFONT_FAMILY] = spec_family_id; + request->property[MFONT_FAMILY] = request_family_id; if (! best_font) return NULL; @@ -534,8 +664,8 @@ ft_open (MRealizedFont *rfont) MDEBUG_PRINT1 (" [FT-FONT] o %s\n", ft_info->filename); rfont->status = 1; - rfont->ascent = ft_info->ft_face->ascender >> 6; - rfont->descent = - (ft_info->ft_face->descender >> 6); + rfont->ascent = ft_info->ft_face->size->metrics.ascender >> 6; + rfont->descent = - (ft_info->ft_face->size->metrics.descender >> 6); rfont->type = Mfreetype; rfont->fontp = ft_info->ft_face; return 0; @@ -578,10 +708,13 @@ ft_find_metric (MRealizedFont *rfont, MGlyphString *gstring, } else { +#ifdef HAVE_FTBDF_H BDF_PropertyRec prop; +#endif g->lbearing = 0; g->rbearing = g->width = ft_face->available_sizes->width; +#ifdef HAVE_FTBDF_H if (FT_Get_BDF_Property (ft_face, "ASCENT", &prop) == 0) { g->ascent = prop.u.integer; @@ -589,6 +722,7 @@ ft_find_metric (MRealizedFont *rfont, MGlyphString *gstring, g->descent = prop.u.integer; } else +#endif { g->ascent = ft_face->available_sizes->height; g->descent = 0; @@ -759,11 +893,71 @@ ft_render (MDrawWindow win, int x, int y, } } +static int +ft_list (MFrame *frame, MPlist *plist, MFont *font, MSymbol language, + int maxnum) +{ + MPlist *pl, *p; +#ifdef HAVE_FONTCONFIG + FcChar8 *lang = (language != Mnil ? (FcChar8 *) MSYMBOL_NAME (language) + : NULL); +#endif + int num = 0; + + if (font) + { + MSymbol family = FONT_PROPERTY (font, MFONT_FAMILY); + pl = ft_list_generic (family); + if (pl) + family = Mnil; + else + pl = ft_list_family (family); + MPLIST_DO (pl, pl) + { + MPLIST_DO (p, MPLIST_PLIST (pl)) + { + MFTInfo *ft_info = MPLIST_VAL (p); + +#ifdef HAVE_FONTCONFIG + if (lang && ft_info->langset + && FcLangSetHasLang (ft_info->langset, lang) != FcLangEqual) + continue; +#endif + mplist_add (plist, MPLIST_KEY (pl), &ft_info->font); + num++; + if (num == maxnum) + return num; + } + if (family != Mnil) + break; + } + } + else + { + ft_list_family (Mnil); + MPLIST_DO (p, ft_family_list) + { + MFTInfo *ft_info = MPLIST_VAL (p); + +#ifdef HAVE_FONTCONFIG + if (lang && ft_info->langset + && FcLangSetHasLang (ft_info->langset, lang) != FcLangEqual) + continue; +#endif + mplist_add (plist, MPLIST_KEY (p), &ft_info->font); + num++; + if (num == maxnum) + break; + } + } + return num; +} + /* Internal API */ MFontDriver mfont__ft_driver = - { ft_select, ft_open, ft_find_metric, ft_encode_char, ft_render }; + { ft_select, ft_open, ft_find_metric, ft_encode_char, ft_render, ft_list }; int mfont__ft_init () @@ -781,14 +975,53 @@ mfont__ft_init () Miso10646_1 = msymbol ("iso10646-1"); Miso8859_1 = msymbol ("iso8859-1"); + Mmedium = msymbol ("medium"); + Mr = msymbol ("r"); + Mnull = msymbol (""); + + for (i = 0; i < GENERIC_FAMILY_MAX; i++) + generic_family_table[i].list = NULL; + M_generic_family_info = msymbol (" generic_family_info"); + msymbol_put (msymbol ("serif"), M_generic_family_info, + generic_family_table + GENERIC_FAMILY_SERIF); + msymbol_put (msymbol ("sans-serif"), M_generic_family_info, + generic_family_table + GENERIC_FAMILY_SANS_SERIF); + msymbol_put (msymbol ("sans"), M_generic_family_info, + generic_family_table + GENERIC_FAMILY_SANS_SERIF); + msymbol_put (msymbol ("sans serif"), M_generic_family_info, + generic_family_table + GENERIC_FAMILY_SANS_SERIF); + msymbol_put (msymbol ("monospace"), M_generic_family_info, + generic_family_table + GENERIC_FAMILY_MONOSPACE); + msymbol_put (msymbol ("mono"), M_generic_family_info, + generic_family_table + GENERIC_FAMILY_MONOSPACE); + msymbol_put (msymbol ("m"), M_generic_family_info, + generic_family_table + GENERIC_FAMILY_MONOSPACE); + #ifdef HAVE_FONTCONFIG - fc_generic_family_list = mplist (); - mplist_push (fc_generic_family_list, msymbol ("serif"), Mt); - mplist_push (fc_generic_family_list, msymbol ("sans-serif"), Mt); - mplist_push (fc_generic_family_list, msymbol ("monospace"), Mt); - mplist_push (fc_generic_family_list, msymbol ("sans"), Mt); - mplist_push (fc_generic_family_list, msymbol ("sans serif"), Mt); - mplist_push (fc_generic_family_list, msymbol ("mono"), Mt); + if (! fc_config) + { + char *pathname; + struct stat buf; + MPlist *plist; + + FcInit (); + fc_config = FcConfigGetCurrent (); + MPLIST_DO (plist, mfont_freetype_path) + if (MPLIST_STRING_P (plist) + && (pathname = MPLIST_STRING (plist)) + && stat (pathname, &buf) == 0) + { + FcStrList *strlist = FcConfigGetFontDirs (fc_config); + FcChar8 *dir; + + while ((dir = FcStrListNext (strlist))) + if (strcmp ((char *) dir, pathname) == 0) + break; + if (! dir) + FcConfigAppFontAddDir (fc_config, (FcChar8 *) pathname); + FcStrListDone (strlist); + } + } #endif return 0; @@ -798,7 +1031,11 @@ void mfont__ft_fini () { MPlist *plist, *p; + int i; + for (i = 0; i < GENERIC_FAMILY_MAX; i++) + if (generic_family_table[i].list) + M17N_OBJECT_UNREF (generic_family_table[i].list); if (ft_font_list) { MPLIST_DO (plist, ft_font_list) @@ -813,14 +1050,12 @@ mfont__ft_fini () } M17N_OBJECT_UNREF (ft_font_list); ft_font_list = NULL; + + M17N_OBJECT_UNREF (ft_family_list); + ft_family_list = NULL; } FT_Done_FreeType (ft_library); all_fonts_scaned = 0; - -#ifdef HAVE_FONTCONFIG - m17n_object_unref (fc_generic_family_list); -#endif - } @@ -863,7 +1098,7 @@ fc_decode_prop (int val, FC_vs_M17N_font_prop *table) for (i = 0; table[i].m17n_value; i++) if (val <= table[i].fc_value) - msymbol ("table[i].m17n_value"); + return msymbol ("table[i].m17n_value"); return msymbol ("table[i - 1].m17n_value"); }