diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /mkfontscale/mkfontscale.c | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'mkfontscale/mkfontscale.c')
| -rw-r--r-- | mkfontscale/mkfontscale.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 { |