diff --git a/dox/text.c b/dox/text.c index 281a4acc..fa1a3c20 100644 --- a/dox/text.c +++ b/dox/text.c @@ -78,7 +78,7 @@ TextStateLoadFont(TextState * ts) { *ss = ' '; word(s2, 1, w); - sprintf(s, "%s/%s.ttf", docdir, w); + sprintf(s, "%s.ttf", w); word(s2, 2, w); ts->efont = Efont_load(s, atoi(w)); if (ts->efont) diff --git a/dox/ttfont.c b/dox/ttfont.c index af22dc19..090fbc76 100644 --- a/dox/ttfont.c +++ b/dox/ttfont.c @@ -78,10 +78,19 @@ Efont_free(Efont * f) Efont * Efont_load(const char *file, int size) { + static char fp_set = 0; char s[4096]; Efont *f; Imlib_Font ff; + if (!fp_set) + { + imlib_add_path_to_font_path(docdir); + sprintf(s, "%s/../ttfonts", docdir); + imlib_add_path_to_font_path(s); + fp_set = 1; + } + Esnprintf(s, sizeof(s), "%s/%d", file, size); ff = imlib_load_font(s); if (ff == NULL)