diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:37:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:37:34 +0200 |
| commit | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (patch) | |
| tree | 3df62b7b501a478e212397883657a8a8be4db7a3 /mkfontscale | |
| parent | 60adbfdea1ee754341d64454274e7aa83bae8971 (diff) | |
| download | vcxsrv-f7025b4baa1ba35ee796785641f04eac5bedb0a6.tar.gz vcxsrv-f7025b4baa1ba35ee796785641f04eac5bedb0a6.tar.bz2 vcxsrv-f7025b4baa1ba35ee796785641f04eac5bedb0a6.zip | |
mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git update 5 oct 2011
Diffstat (limited to 'mkfontscale')
| -rw-r--r-- | mkfontscale/list.c | 2 | ||||
| -rw-r--r-- | mkfontscale/list.h | 2 | ||||
| -rw-r--r-- | mkfontscale/mkfontscale.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mkfontscale/list.c b/mkfontscale/list.c index a10b5ed4c..2854e181c 100644 --- a/mkfontscale/list.c +++ b/mkfontscale/list.c @@ -59,7 +59,7 @@ listAdjoin(char *car, ListPtr cdr) } char * -dsprintf(char *f, ...) +dsprintf(const char *f, ...) { va_list args; char *string; diff --git a/mkfontscale/list.h b/mkfontscale/list.h index 686fd9b09..7403bc0f8 100644 --- a/mkfontscale/list.h +++ b/mkfontscale/list.h @@ -25,7 +25,7 @@ #include <X11/Xfuncproto.h> /* for _X_ATTRIBUTE_PRINTF */ -char *dsprintf(char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); +char *dsprintf(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); typedef struct _List { char *value; diff --git a/mkfontscale/mkfontscale.c b/mkfontscale/mkfontscale.c index 31553cb5d..49bbe77a3 100644 --- a/mkfontscale/mkfontscale.c +++ b/mkfontscale/mkfontscale.c @@ -426,6 +426,8 @@ t1Weight(char *weight) return NULL; if(strcmp(weight, "Thin") == 0) return "thin"; + if(strcmp(weight, "ExtraLight") == 0) /* FontForge uses this for 200*/ + return "extralight"; if(strcmp(weight, "Light") == 0) return "light"; if(strcmp(weight, "Regular") == 0) @@ -446,6 +448,8 @@ t1Weight(char *weight) return "semibold"; else if(strcmp(weight, "Bold") == 0) return "bold"; + else if(strcmp(weight, "Heavy") == 0) /* FontForge uses this for 800*/ + return "extrabold"; else if(strcmp(weight, "Black") == 0) return "black"; else { |