diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
| commit | 1e90ede4237374dfbb2c8c506a906233bcfd3c5d (patch) | |
| tree | 13b59b0ab2715fd0bb9eea788c73b08f3b07c01e /mkfontscale/data.h | |
| parent | baf98f9bb36f956245d83ecd04f90625d6d68d2b (diff) | |
| parent | 9f986778bd4393c5a9108426969d45aa7f10f334 (diff) | |
| download | vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.gz vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.bz2 vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/os.h
Diffstat (limited to 'mkfontscale/data.h')
| -rw-r--r-- | mkfontscale/data.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mkfontscale/data.h b/mkfontscale/data.h index bb5b170d5..6fb43ae79 100644 --- a/mkfontscale/data.h +++ b/mkfontscale/data.h @@ -26,7 +26,7 @@ /* Order is significant. For example, some B&H fonts are hinted by URW++, and both strings appear in the notice. */ -static char *notice_foundries[][2] = +static const char *notice_foundries[][2] = {{"Bigelow", "b&h"}, {"Adobe", "adobe"}, {"Bitstream", "bitstream"}, @@ -42,14 +42,16 @@ static char *notice_foundries[][2] = {"Microsoft", "microsoft"}, {"Omega", "omega"}, {"Font21", "hwan"}, - {"HanYang System", "hanyang"}}; + {"HanYang System", "hanyang"}, + {"Iorsh", "culmus"}, + {"Gnat", "culmus"}}; /* This table is partly taken from ttmkfdir by Joerg Pommnitz. */ /* It should not contain useless entries (such as UNKN) nor duplicate entries for padding both with spaces and NULs. */ -static char *vendor_foundries[][2] = +static const char *vendor_foundries[][2] = {{"ADBE", "adobe"}, {"AGFA", "agfa"}, {"ALTS", "altsys"}, @@ -59,6 +61,7 @@ static char *vendor_foundries[][2] = {"B&H", "b&h"}, {"BITS", "bitstream"}, {"CANO", "cannon"}, + {"CLM", "culmus"}, {"DYNA", "dynalab"}, {"EPSN", "epson"}, {"FJ", "fujitsu"}, |