diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-06-13 01:01:27 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-06-13 01:01:27 +0000 |
| commit | 498399aec0e2e5f78b8aa689fd9ef072a65c8d91 (patch) | |
| tree | a1317c3823dce8c7ccac616c70340e97c59a9ad8 /app/mkfontscale/mkfontscale.c | |
| parent | e04e726b24999c07b7467320cffc9513c05d8b22 (diff) | |
update to mkfontscale 1.0.5
Diffstat (limited to 'app/mkfontscale/mkfontscale.c')
| -rw-r--r-- | app/mkfontscale/mkfontscale.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/app/mkfontscale/mkfontscale.c b/app/mkfontscale/mkfontscale.c index b538d79b6..e6aacd7e2 100644 --- a/app/mkfontscale/mkfontscale.c +++ b/app/mkfontscale/mkfontscale.c @@ -30,6 +30,7 @@ #include <dirent.h> #include <unistd.h> #include <errno.h> +#include <ctype.h> #include <X11/Xos.h> #include <X11/fonts/fontenc.h> @@ -40,7 +41,7 @@ #include FT_TRUETYPE_IDS_H #include FT_TYPE1_TABLES_H #include FT_BDF_H -#include FT_TRUETYPE_TABLES_H +#include FT_XFREE86_H #include "list.h" #include "hash.h" @@ -726,16 +727,24 @@ filePrio(char *filename) if(n < 4) return 0; if(strcmp(filename + n - 4, ".otf") == 0) - return 4; + return 6; if(strcmp(filename + n - 4, ".OTF") == 0) - return 4; + return 6; if(strcmp(filename + n - 4, ".ttf") == 0) - return 3; + return 5; if(strcmp(filename + n - 4, ".TTF") == 0) - return 3; + return 5; + if(strcmp(filename + n - 4, ".pcf") == 0) + return 4; + if(strcmp(filename + n - 4, ".PCF") == 0) + return 4; if(strcmp(filename + n - 3, ".gz") == 0) - return 2; + return 3; if(strcmp(filename + n - 2, ".Z") == 0) + return 2; + if(strcmp(filename + n - 4, ".bdf") == 0) + return 1; + if(strcmp(filename + n - 4, ".BDF") == 0) return 1; return 0; } @@ -840,8 +849,9 @@ doDirectory(char *dirname_given, int numEncodings, ListPtr encodingsToDo) isBitmap = ((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0); if(!isBitmap) { - /* Workaround for bitmap-only TTF fonts */ - if(face->num_fixed_sizes > 0) { + /* Workaround for bitmap-only SFNT fonts */ + if(FT_IS_SFNT(face) && face->num_fixed_sizes > 0 && + strcmp(FT_Get_X11_Font_Format(face), "TrueType") == 0) { TT_MaxProfile *maxp; maxp = FT_Get_Sfnt_Table(face, ft_sfnt_maxp); if(maxp != NULL && maxp->maxContours == 0) @@ -1129,7 +1139,6 @@ find_cmap(int type, int pid, int eid, FT_Face face) return 1; } } - break; /* Try Apple Unicode */ for(i=0; i<n; i++) { cmap = face->charmaps[i]; |