This commit is contained in:
iatll 2014-07-24 11:51:55 -04:00
parent e07dc10343
commit c90ae23253

38
bar.c
View File

@ -938,29 +938,29 @@ parse_font_list (char *str)
if (!str) if (!str)
return; return;
tok = strtok(str, ","); mfont = str; // font face
if (tok) {
mfont = tok; // font face
// if a colon is found // check for a colon
tok = strtok(mfont, ":"); tok = strtok(mfont, ":");
// if there's a string before the colon
if(tok) {
// treat the string before the colon as the font face
mfont = tok;
// check for characters after the colon
tok = strtok(NULL, ":");
// if they exist
if(tok) { if(tok) {
// treat the string before the colon as the font face double candidate_size;
mfont = tok; // font face // convert them to a double
candidate_size = atof(tok);
// if characters exist after the colon // if the size is non-zero
tok = strtok(NULL, ":"); if(candidate_size != 0) {
if(tok) { // use as the new font size
double candidate_size; mfont_size = candidate_size;
candidate_size = atof(tok);
// and the size is non-zero
if(candidate_size != 0) {
// treat the rest of the string as the font size
mfont_size = candidate_size; // font size
}
} }
} }
} }
return; return;
} }