notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

black means bold, for now

Browse source
This commit is contained in:
Albert Cahalan 2005-01-06 05:17:04 +00:00
parent b837826f5d
commit 4c136a0dac
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tuxpaint.c
View file

@ -1562,13 +1562,18 @@ static int compar_fontscore(const void *v1, const void *v2)
return f2->score - f1->score; return f2->score - f1->score;
} }
// Font style names are a mess that we must try to make
// sense of. For example...
//
// Cooper: Light, Medium, Light Bold, Black
// HoeflerText: (nil), Black
static void parse_font_style(style_info *si) static void parse_font_style(style_info *si)
{ {
int have_light = 0; int have_light = 0;
int have_demi = 0; int have_demi = 0;
int have_bold = 0; int have_bold = 0;
int have_medium = 0; int have_medium = 0;
int have_black = 0;
si->italic = 0; si->italic = 0;
@ -1582,6 +1587,12 @@ static void parse_font_style(style_info *si)
sp++; sp++;
continue; continue;
} }
if(!strncmp(sp,"Black",strlen("Black")))
{
sp += strlen("Black");
have_black = 1;
continue;
}
if(!strncmp(sp,"Bold",strlen("Bold"))) if(!strncmp(sp,"Bold",strlen("Bold")))
{ {
sp += strlen("Bold"); sp += strlen("Bold");
@ -1661,7 +1672,7 @@ static void parse_font_style(style_info *si)
if (have_demi || have_medium) if (have_demi || have_medium)
si->boldness = 2; si->boldness = 2;
else if (have_bold) else if (have_bold || have_black) // TODO: black should be a level above
si->boldness = 3; si->boldness = 3;
else if (have_light) else if (have_light)
si->boldness = 0; si->boldness = 0;
@ -14104,7 +14115,7 @@ static void loadfonts(const char * const dir, int fatal)
// Compressed files (with .gz or .bz2) might also work. // Compressed files (with .gz or .bz2) might also work.
if (strstr(d_names[i], ".ttf") || strstr(d_names[i], ".pfa") || strstr(d_names[i], ".pfb")) if (strstr(d_names[i], ".ttf") || strstr(d_names[i], ".pfa") || strstr(d_names[i], ".pfb"))
{ {
printf("Loading font: %s/%s\n", dir, d_names[i]); //printf("Loading font: %s/%s\n", dir, d_names[i]);
TTF_Font *font = TTF_OpenFont(fname, text_sizes[text_size]); TTF_Font *font = TTF_OpenFont(fname, text_sizes[text_size]);
if(font) if(font)
{ {