Commit a4caf051 authored by Huw D M Davies's avatar Huw D M Davies Committed by Alexandre Julliard

Add Black as a valid font weight.

Cope with afm files that do not contain {Family|Full}Name entries.
parent a555ceb8
......@@ -181,6 +181,8 @@ static AFM *PSDRV_AFMParse(char const *file)
afm->Weight = FW_BOLD;
else if(!strncmp("Light", value, 5))
afm->Weight = FW_LIGHT;
else if(!strncmp("Black", value, 5))
afm->Weight = FW_BLACK;
else {
FIXME("Unkown AFM Weight '%s'\n", value);
afm->Weight = FW_NORMAL;
......@@ -252,12 +254,20 @@ static AFM *PSDRV_AFMParse(char const *file)
}
fclose(fp);
if(afm->FontName == NULL)
WARN("%s contains no FontName.\n", file);
if(afm->FullName == NULL)
afm->FullName = HEAP_strdupA(PSDRV_Heap, 0, afm->FontName);
if(afm->FamilyName == NULL)
afm->FamilyName = HEAP_strdupA(PSDRV_Heap, 0, afm->FontName);
if(afm->Ascender == 0.0)
afm->Ascender = afm->FontBBox.ury;
if(afm->Descender == 0.0)
afm->Descender = afm->FontBBox.lly;
if(afm->FullAscender == 0.0)
afm->FullAscender = afm->Ascender;
if(afm->Weight == 0)
afm->Weight = FW_NORMAL;
return afm;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment