summaryrefslogtreecommitdiff
path: root/mkfontscale.c
diff options
context:
space:
mode:
Diffstat (limited to 'mkfontscale.c')
-rw-r--r--mkfontscale.c833
1 files changed, 443 insertions, 390 deletions
diff --git a/mkfontscale.c b/mkfontscale.c
index 356417f..d692e3c 100644
--- a/mkfontscale.c
+++ b/mkfontscale.c
@@ -68,24 +68,24 @@
#define QUOTE(x) #x
#define STRINGIFY(x) QUOTE(x)
-static const char *encodings_array[] =
- { "ascii-0",
- "iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5",
- "iso8859-6", "iso8859-6.8", "iso8859-6.8x", "iso8859-6.16",
- "iso8859-7", "iso8859-8", "iso8859-9", "iso8859-10",
- "iso8859-11", "iso8859-12", "iso8859-13", "iso8859-14",
- "iso8859-15", "iso8859-16",
- "ansi-1251", "koi8-r", "koi8-u", "koi8-ru", "koi8-e", "koi8-uni",
- "tis620-2",
- "sun.unicode.india-0", "suneu-greek",
- "adobe-standard", "adobe-symbol",
- "ibm-cp437", "ibm-cp850", "ibm-cp852", "ibm-cp866", "microsoft-cp1252",
- /* But not "adobe-dingbats", as it uses generic glyph names. */
- "cns11643-1", "cns11643-2", "cns11643-3",
- "jisx0201.1976-0", "jisx0208.1983-0", "jisx0208.1990-0",
- "jisx0212.1990-0", "big5-0", "big5.eten-0", "big5hkscs-0",
- "gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1",
- "ksc5601.1987-0", "ksc5601.1992-3"};
+static const char *encodings_array[] = { "ascii-0",
+ "iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5",
+ "iso8859-6", "iso8859-6.8", "iso8859-6.8x", "iso8859-6.16",
+ "iso8859-7", "iso8859-8", "iso8859-9", "iso8859-10",
+ "iso8859-11", "iso8859-12", "iso8859-13", "iso8859-14",
+ "iso8859-15", "iso8859-16",
+ "ansi-1251", "koi8-r", "koi8-u", "koi8-ru", "koi8-e", "koi8-uni",
+ "tis620-2",
+ "sun.unicode.india-0", "suneu-greek",
+ "adobe-standard", "adobe-symbol",
+ "ibm-cp437", "ibm-cp850", "ibm-cp852", "ibm-cp866", "microsoft-cp1252",
+ /* But not "adobe-dingbats", as it uses generic glyph names. */
+ "cns11643-1", "cns11643-2", "cns11643-3",
+ "jisx0201.1976-0", "jisx0208.1983-0", "jisx0208.1990-0",
+ "jisx0212.1990-0", "big5-0", "big5.eten-0", "big5hkscs-0",
+ "gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1",
+ "ksc5601.1987-0", "ksc5601.1992-3"
+};
static const char *extra_encodings_array[] =
{ "iso10646-1", "adobe-fontspecific", "microsoft-symbol" };
@@ -95,12 +95,13 @@ static const char *outfilename;
#define countof(_a) (sizeof(_a)/sizeof((_a)[0]))
-static int doDirectory(const char*, int, ListPtr);
+static int doDirectory(const char *, int, ListPtr);
static int checkEncoding(FT_Face face, const char *encoding_name);
-static int checkExtraEncoding(FT_Face face, const char *encoding_name, int found);
+static int checkExtraEncoding(FT_Face face, const char *encoding_name,
+ int found);
static int find_cmap(int type, int pid, int eid, FT_Face face);
-static const char* notice_foundry(const char *notice);
-static const char* vendor_foundry(const signed char *vendor);
+static const char *notice_foundry(const char *notice);
+static const char *vendor_foundry(const signed char *vendor);
static int readFontScale(HashTablePtr entries, char *dirname);
ListPtr makeXLFD(char *filename, FT_Face face, int);
static int readEncodings(ListPtr encodings, char *dirname);
@@ -131,7 +132,7 @@ usage(void)
}
static void _X_NORETURN _X_COLD
-missing_arg (const char *option)
+missing_arg(const char *option)
{
fprintf(stderr, "%s: %s requires an argument\n", ProgramName, option);
usage();
@@ -149,22 +150,22 @@ main(int argc, char **argv)
encodingPrefix = NULL;
exclusionSuffix = NULL;
- if(getcwd(prefix, NPREFIX - 1) == NULL) {
+ if (getcwd(prefix, NPREFIX - 1) == NULL) {
perror("Couldn't get cwd");
exit(1);
}
- if(prefix[strlen(prefix) - 1] != '/')
+ if (prefix[strlen(prefix) - 1] != '/')
encodingPrefix = dsprintf("%s/", prefix);
else
encodingPrefix = strdup(prefix);
outfilename = NULL;
- encodings = makeConstList(encodings_array, countof(encodings_array), NULL, 0);
+ encodings =
+ makeConstList(encodings_array, countof(encodings_array), NULL, 0);
extra_encodings = makeConstList(extra_encodings_array,
- countof(extra_encodings_array),
- NULL, 0);
+ countof(extra_encodings_array), NULL, 0);
doBitmaps = 0;
doISO10646_1_encoding = 1;
doScalable = 1;
@@ -174,29 +175,32 @@ main(int argc, char **argv)
encodingsToDo = NULL;
argn = 1;
- while(argn < argc) {
- if(argv[argn][0] == '\0' || argv[argn][0] != '-')
+ while (argn < argc) {
+ if (argv[argn][0] == '\0' || argv[argn][0] != '-')
break;
- if(argv[argn][1] == '-') {
+ if (argv[argn][1] == '-') {
argn++;
break;
- } else if (strcmp(argv[argn], "-x") == 0) {
- if(argn >= argc - 1) {
+ }
+ else if (strcmp(argv[argn], "-x") == 0) {
+ if (argn >= argc - 1) {
missing_arg("-x");
}
exclusionSuffix = argv[argn + 1];
argn += 2;
- } else if(strcmp(argv[argn], "-a") == 0) {
- if(argn >= argc - 1) {
+ }
+ else if (strcmp(argv[argn], "-a") == 0) {
+ if (argn >= argc - 1) {
missing_arg("-a");
}
- makeConstList((const char **)&argv[argn + 1], 1, encodings, 0);
+ makeConstList((const char **) &argv[argn + 1], 1, encodings, 0);
argn += 2;
- } else if(strcmp(argv[argn], "-p") == 0) {
- if(argn >= argc - 1) {
+ }
+ else if (strcmp(argv[argn], "-p") == 0) {
+ if (argn >= argc - 1) {
missing_arg("-p");
}
- if(strlen(argv[argn + 1]) > NPREFIX - 1) {
+ if (strlen(argv[argn + 1]) > NPREFIX - 1) {
fprintf(stderr, "%s: argument to -p cannot be longer than "
"%d characters\n", ProgramName, NPREFIX - 1);
usage();
@@ -204,64 +208,76 @@ main(int argc, char **argv)
free(encodingPrefix);
encodingPrefix = strdup(argv[argn + 1]);
argn += 2;
- } else if(strcmp(argv[argn], "-e") == 0) {
- if(argn >= argc - 1) {
+ }
+ else if (strcmp(argv[argn], "-e") == 0) {
+ if (argn >= argc - 1) {
missing_arg("-e");
}
rc = readEncodings(encodingsToDo, argv[argn + 1]);
- if(rc < 0)
+ if (rc < 0)
exit(1);
argn += 2;
- } else if(strcmp(argv[argn], "-b") == 0) {
+ }
+ else if (strcmp(argv[argn], "-b") == 0) {
doBitmaps = 1;
argn++;
- } else if(strcmp(argv[argn], "-u") == 0) {
+ }
+ else if (strcmp(argv[argn], "-u") == 0) {
doISO10646_1_encoding = 0;
argn++;
- } else if(strcmp(argv[argn], "-U") == 0) {
+ }
+ else if (strcmp(argv[argn], "-U") == 0) {
doISO10646_1_encoding = 1;
argn++;
- } else if(strcmp(argv[argn], "-s") == 0) {
+ }
+ else if (strcmp(argv[argn], "-s") == 0) {
doScalable = 0;
argn++;
- } else if(strcmp(argv[argn], "-n") == 0) {
+ }
+ else if (strcmp(argv[argn], "-n") == 0) {
onlyEncodings = 1;
argn++;
- } else if(strcmp(argv[argn], "-r") == 0) {
+ }
+ else if (strcmp(argv[argn], "-r") == 0) {
relative = 1;
argn++;
- } else if(strcmp(argv[argn], "-l") == 0) {
+ }
+ else if (strcmp(argv[argn], "-l") == 0) {
reencodeLegacy = !reencodeLegacy;
argn++;
- } else if(strcmp(argv[argn], "-o") == 0) {
- if(argn >= argc - 1) {
+ }
+ else if (strcmp(argv[argn], "-o") == 0) {
+ if (argn >= argc - 1) {
missing_arg("-o");
}
outfilename = argv[argn + 1];
argn += 2;
- } else if(strcmp(argv[argn], "-f") == 0) {
- if(argn >= argc - 1) {
+ }
+ else if (strcmp(argv[argn], "-f") == 0) {
+ if (argn >= argc - 1) {
missing_arg("-f");
}
bigEncodingFuzz = atof(argv[argn + 1]) / 100.0;
argn += 2;
- } else if (strcmp(argv[argn], "-v") == 0) {
- printf("%s\n", PACKAGE_STRING);
- exit(0);
- } else {
+ }
+ else if (strcmp(argv[argn], "-v") == 0) {
+ printf("%s\n", PACKAGE_STRING);
+ exit(0);
+ }
+ else {
usage();
}
}
- if(outfilename == NULL) {
- if(doBitmaps)
+ if (outfilename == NULL) {
+ if (doBitmaps)
outfilename = "fonts.dir";
else
outfilename = "fonts.scale";
}
ftrc = FT_Init_FreeType(&ft_library);
- if(ftrc) {
+ if (ftrc) {
fprintf(stderr, "Could not initialise FreeType library: %d\n", ftrc);
exit(1);
}
@@ -271,7 +287,7 @@ main(int argc, char **argv)
if (argn == argc)
doDirectory(".", ll, encodingsToDo);
else
- while(argn < argc) {
+ while (argn < argc) {
doDirectory(argv[argn], ll, encodingsToDo);
argn++;
}
@@ -286,30 +302,29 @@ getNameHelper(FT_Face face, int nid, int pid, int eid,
int n, i;
n = FT_Get_Sfnt_Name_Count(face);
- if(n <= 0)
+ if (n <= 0)
return 0;
- for(i = 0; i < n; i++) {
- if(FT_Get_Sfnt_Name(face, i, &name))
+ for (i = 0; i < n; i++) {
+ if (FT_Get_Sfnt_Name(face, i, &name))
continue;
- if(name.name_id == nid &&
- name.platform_id == pid &&
- (eid < 0 || name.encoding_id == eid)) {
- switch(name.platform_id) {
+ if (name.name_id == nid &&
+ name.platform_id == pid && (eid < 0 || name.encoding_id == eid)) {
+ switch (name.platform_id) {
case TT_PLATFORM_APPLE_UNICODE:
case TT_PLATFORM_MACINTOSH:
- if(name.language_id != TT_MAC_LANGID_ENGLISH)
+ if (name.language_id != TT_MAC_LANGID_ENGLISH)
continue;
break;
case TT_PLATFORM_MICROSOFT:
- if(name.language_id != TT_MS_LANGID_ENGLISH_UNITED_STATES &&
- name.language_id != TT_MS_LANGID_ENGLISH_UNITED_KINGDOM)
+ if (name.language_id != TT_MS_LANGID_ENGLISH_UNITED_STATES &&
+ name.language_id != TT_MS_LANGID_ENGLISH_UNITED_KINGDOM)
continue;
break;
default:
continue;
}
- if(name.string_len > 0) {
+ if (name.string_len > 0) {
*name_return = name;
return 1;
}
@@ -325,17 +340,16 @@ getName(FT_Face face, int nid)
char *string;
unsigned int i;
- if(getNameHelper(face, nid,
- TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
- getNameHelper(face, nid,
- TT_PLATFORM_APPLE_UNICODE, -1, &name)) {
+ if (getNameHelper(face, nid,
+ TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
+ getNameHelper(face, nid, TT_PLATFORM_APPLE_UNICODE, -1, &name)) {
string = malloc(name.string_len / 2 + 1);
- if(string == NULL) {
+ if (string == NULL) {
fprintf(stderr, "Couldn't allocate name\n");
exit(1);
}
- for(i = 0; i < name.string_len / 2; i++) {
- if(name.string[2 * i] != 0)
+ for (i = 0; i < name.string_len / 2; i++) {
+ if (name.string[2 * i] != 0)
string[i] = '?';
else
string[i] = name.string[2 * i + 1];
@@ -345,10 +359,9 @@ getName(FT_Face face, int nid)
}
/* Pretend that Apple Roman is ISO 8859-1. */
- if(getNameHelper(face, nid, TT_PLATFORM_MACINTOSH, TT_MAC_ID_ROMAN,
- &name)) {
+ if (getNameHelper(face, nid, TT_PLATFORM_MACINTOSH, TT_MAC_ID_ROMAN, &name)) {
string = malloc(name.string_len + 1);
- if(string == NULL) {
+ if (string == NULL) {
fprintf(stderr, "Couldn't allocate name\n");
exit(1);
}
@@ -360,47 +373,47 @@ getName(FT_Face face, int nid)
return NULL;
}
-static const char*
+static const char *
os2Weight(int weight)
{
- if(weight < 150)
+ if (weight < 150)
return "thin";
- else if(weight < 250)
+ else if (weight < 250)
return "extralight";
- else if(weight < 350)
+ else if (weight < 350)
return "light";
- else if(weight < 450)
+ else if (weight < 450)
return "medium"; /* officially "normal" */
- else if(weight < 550)
+ else if (weight < 550)
return "medium";
- else if(weight < 650)
+ else if (weight < 650)
return "semibold";
- else if(weight < 750)
+ else if (weight < 750)
return "bold";
- else if(weight < 850)
+ else if (weight < 850)
return "extrabold";
else
return "black";
}
-static const char*
+static const char *
os2Width(int width)
{
- if(width <= 1)
+ if (width <= 1)
return "ultracondensed";
- else if(width <= 2)
+ else if (width <= 2)
return "extracondensed";
- else if(width <= 3)
+ else if (width <= 3)
return "condensed";
- else if(width <= 4)
+ else if (width <= 4)
return "semicondensed";
- else if(width <= 5)
+ else if (width <= 5)
return "normal";
- else if(width <= 6)
+ else if (width <= 6)
return "semiexpanded";
- else if(width <= 7)
+ else if (width <= 7)
return "expanded";
- else if(width <= 8)
+ else if (width <= 8)
return "extraexpanded";
else
return "ultraexpanded";
@@ -413,60 +426,61 @@ static const char *widths[] = {
#define NUMWIDTHS (sizeof(widths) / sizeof(widths[0]))
-static const char*
+static const char *
nameWidth(const char *name)
{
char buf[500];
unsigned int i;
size_t n = strlen(name);
- if(n >= 499) return NULL;
- for(i = 0; i < n; i++)
+ if (n >= 499)
+ return NULL;
+ for (i = 0; i < n; i++)
buf[i] = tolower(name[i]);
buf[i] = '\0';
- for(i = 0; i < NUMWIDTHS; i++)
- if(strstr(buf, widths[i]))
+ for (i = 0; i < NUMWIDTHS; i++)
+ if (strstr(buf, widths[i]))
return widths[i];
return NULL;
}
-static const char*
+static const char *
t1Weight(const char *weight)
{
- if(!weight)
+ if (!weight)
return NULL;
- if(strcasecmp(weight, "Thin") == 0)
+ if (strcasecmp(weight, "Thin") == 0)
return "thin";
- if(strcasecmp(weight, "ExtraLight") == 0) /* FontForge uses this for 200*/
+ if (strcasecmp(weight, "ExtraLight") == 0) /* FontForge uses this for 200 */
return "extralight";
- if(strcasecmp(weight, "Light") == 0)
+ if (strcasecmp(weight, "Light") == 0)
return "light";
- if(strcasecmp(weight, "Regular") == 0)
+ if (strcasecmp(weight, "Regular") == 0)
return "medium";
- if(strcasecmp(weight, "Normal") == 0)
+ if (strcasecmp(weight, "Normal") == 0)
return "medium";
- if(strcasecmp(weight, "Plain") == 0)
+ if (strcasecmp(weight, "Plain") == 0)
return "medium";
- if(strcasecmp(weight, "Medium") == 0)
+ if (strcasecmp(weight, "Medium") == 0)
return "medium";
- if(strcasecmp(weight, "Book") == 0)
+ if (strcasecmp(weight, "Book") == 0)
return "medium";
- if(strcasecmp(weight, "Roman") == 0) /* Some URW++ fonts do that! */
+ if (strcasecmp(weight, "Roman") == 0) /* Some URW++ fonts do that! */
return "medium";
- if(strcasecmp(weight, "Demi") == 0)
+ if (strcasecmp(weight, "Demi") == 0)
return "semibold";
- if(strcasecmp(weight, "DemiBold") == 0)
+ if (strcasecmp(weight, "DemiBold") == 0)
return "semibold";
- if(strcasecmp(weight, "SemiBold") == 0) /* some TeX fonts apparently do that */
+ if (strcasecmp(weight, "SemiBold") == 0) /* some TeX fonts apparently do that */
return "semibold";
- else if(strcasecmp(weight, "Bold") == 0)
+ else if (strcasecmp(weight, "Bold") == 0)
return "bold";
- else if(strcasecmp(weight, "ExtraBold") == 0) /* freefonts uses this */
+ else if (strcasecmp(weight, "ExtraBold") == 0) /* freefonts uses this */
return "extrabold";
- else if(strcasecmp(weight, "Heavy") == 0) /* FontForge uses this for 800*/
+ else if (strcasecmp(weight, "Heavy") == 0) /* FontForge uses this for 800 */
return "extrabold";
- else if(strcasecmp(weight, "Black") == 0)
+ else if (strcasecmp(weight, "Black") == 0)
return "black";
else {
fprintf(stderr, "Unknown Type 1 weight \"%s\"\n", weight);
@@ -483,29 +497,30 @@ unsafe(char c)
}
static const char *
-safe(const char* s)
+safe(const char *s)
{
int i, len, safe_flag = 1;
char *t;
i = 0;
- while(s[i] != '\0') {
- if(unsafe(s[i]))
+ while (s[i] != '\0') {
+ if (unsafe(s[i]))
safe_flag = 0;
i++;
}
- if(safe_flag) return strdup(s);
+ if (safe_flag)
+ return strdup(s);
len = i;
t = malloc(len + 1);
- if(t == NULL) {
+ if (t == NULL) {
perror("Couldn't allocate string");
exit(1);
}
- for(i = 0; i < len; i++) {
- if(unsafe(s[i]))
+ for (i = 0; i < len; i++) {
+ if (unsafe(s[i]))
t[i] = ' ';
else
t[i] = s[i];
@@ -542,66 +557,68 @@ makeXLFD(char *filename, FT_Face face, int isBitmap)
post = FT_Get_Sfnt_Table(face, ft_sfnt_post);
rc = FT_Get_PS_Font_Info(face, &t1info_rec);
- if(rc == 0)
+ if (rc == 0)
t1info = &t1info_rec;
else
t1info = NULL;
- if(!family)
+ if (!family)
family = getName(face, TT_NAME_ID_FONT_FAMILY);
- if(!family)
+ if (!family)
family = getName(face, TT_NAME_ID_FULL_NAME);
- if(!family)
+ if (!family)
family = getName(face, TT_NAME_ID_PS_NAME);
- if(!full_name)
+ if (!full_name)
full_name = getName(face, TT_NAME_ID_FULL_NAME);
- if(!full_name)
+ if (!full_name)
full_name = getName(face, TT_NAME_ID_PS_NAME);
- if(os2 && os2->version != 0xFFFF) {
- if(!weight)
+ if (os2 && os2->version != 0xFFFF) {
+ if (!weight)
weight = os2Weight(os2->usWeightClass);
- if(!sWidth)
+ if (!sWidth)
sWidth = os2Width(os2->usWidthClass);
- if(!foundry)
+ if (!foundry)
foundry = vendor_foundry(os2->achVendID);
- if(!slant)
+ if (!slant)
slant = os2->fsSelection & 1 ? "i" : "r";
}
- if(post) {
- if(!spacing) {
- if(post->isFixedPitch) {
- if(hhea->min_Left_Side_Bearing >= 0 &&
- hhea->xMax_Extent <= hhea->advance_Width_Max) {
+ if (post) {
+ if (!spacing) {
+ if (post->isFixedPitch) {
+ if (hhea->min_Left_Side_Bearing >= 0 &&
+ hhea->xMax_Extent <= hhea->advance_Width_Max) {
spacing = "c";
- } else {
+ }
+ else {
spacing = "m";
}
- } else {
+ }
+ else {
spacing = "p";
}
}
}
- if(t1info) {
- if(!family && t1info->family_name)
+ if (t1info) {
+ if (!family && t1info->family_name)
family = strdup(t1info->family_name);
- if(!family && t1info->full_name)
+ if (!family && t1info->full_name)
family = strdup(t1info->full_name);
/* Hershey fonts miss /FamilyName */
- if(!family && face->family_name)
+ if (!family && face->family_name)
family = strdup(face->family_name);
- if(!full_name && t1info->full_name)
+ if (!full_name && t1info->full_name)
full_name = strdup(t1info->full_name);
- if(!foundry)
+ if (!foundry)
foundry = notice_foundry(t1info->notice);
- if(!weight)
+ if (!weight)
weight = t1Weight(t1info->weight);
- if(!spacing)
+ if (!spacing)
spacing = t1info->is_fixed_pitch ? "m" : "p";
- if(!slant) {
+ if (!slant) {
/* Bitstream fonts have positive italic angle. */
slant =
t1info->italic_angle <= -4 || t1info->italic_angle >= 4 ?
@@ -609,97 +626,105 @@ makeXLFD(char *filename, FT_Face face, int isBitmap)
}
}
- if(!full_name) {
+ if (!full_name) {
fprintf(stderr, "Couldn't determine full name for %s\n", filename);
full_name = strdup(filename);
}
- if(head) {
- if(!slant)
+ if (head) {
+ if (!slant)
slant = head->Mac_Style & 2 ? "i" : "r";
- if(!weight)
+ if (!weight)
weight = head->Mac_Style & 1 ? "bold" : "medium";
}
- if(!slant) {
+ if (!slant) {
fprintf(stderr, "Couldn't determine slant for %s\n", filename);
slant = "r";
}
- if(!weight) {
+ if (!weight) {
fprintf(stderr, "Couldn't determine weight for %s\n", filename);
weight = "medium";
}
- if(!foundry) {
+ if (!foundry) {
char *notice;
+
notice = getName(face, TT_NAME_ID_TRADEMARK);
- if(notice) {
+ if (notice) {
foundry = notice_foundry(notice);
free(notice);
}
- if(!foundry) {
+ if (!foundry) {
notice = getName(face, TT_NAME_ID_MANUFACTURER);
- if(notice) {
+ if (notice) {
foundry = notice_foundry(notice);
free(notice);
}
}
}
- if(strcmp(slant, "i") == 0) {
- if(strstr(full_name, "Oblique"))
+ if (strcmp(slant, "i") == 0) {
+ if (strstr(full_name, "Oblique"))
slant = "o";
- if(strstr(full_name, "Slanted"))
+ if (strstr(full_name, "Slanted"))
slant = "o";
}
- if(!sWidth)
+ if (!sWidth)
sWidth = nameWidth(full_name);
- if(!foundry) foundry = "misc";
- if(!family) {
+ if (!foundry)
+ foundry = "misc";
+ if (!family) {
fprintf(stderr, "Couldn't get family name for %s\n", filename);
family = strdup(filename);
}
- if(!weight) weight = "medium";
- if(!slant) slant = "r";
- if(!sWidth) sWidth = "normal";
- if(!adstyle) adstyle = "";
- if(!spacing) spacing = "p";
+ if (!weight)
+ weight = "medium";
+ if (!slant)
+ slant = "r";
+ if (!sWidth)
+ sWidth = "normal";
+ if (!adstyle)
+ adstyle = "";
+ if (!spacing)
+ spacing = "p";
foundry = safe(foundry);
tmp = family;
family = safe(family);
- free((void *)tmp);
+ free((void *) tmp);
- if(!isBitmap) {
+ if (!isBitmap) {
xlfd = listConsF(xlfd,
"-%s-%s-%s-%s-%s-%s-0-0-0-0-%s-0",
foundry, family,
weight, slant, sWidth, adstyle, spacing);
- } else {
+ }
+ else {
int i, w, h, xres, yres;
- for(i = 0; i < face->num_fixed_sizes; i++) {
+
+ for (i = 0; i < face->num_fixed_sizes; i++) {
w = face->available_sizes[i].width;
h = face->available_sizes[i].height;
xres = 75;
- yres = (double)h / w * xres;
+ yres = (double) h / w * xres;
xlfd = listConsF(xlfd,
"-%s-%s-%s-%s-%s-%s-%d-%d-%d-%d-%s-%d",
foundry, family,
weight, slant, sWidth, adstyle,
- h, (int)(h / (double)yres * 72.27 * 10 + 0.5),
- xres, yres,
- spacing, 60);
+ h, (int) (h / (double) yres * 72.27 * 10 + 0.5),
+ xres, yres, spacing, 60);
}
}
- free((void *)family);
- free((void *)foundry);
- free((void *)full_name);
+ free((void *) family);
+ free((void *) foundry);
+ free((void *) full_name);
return xlfd;
}
@@ -710,36 +735,36 @@ readFontScale(HashTablePtr entries, char *dirname)
char *filename;
FILE *in;
int rc, count, i;
- char file[MAXFONTFILENAMELEN+1], font[MAXFONTNAMELEN+1];
+ char file[MAXFONTFILENAMELEN + 1], font[MAXFONTNAMELEN + 1];
- if(dirname[n - 1] == '/')
+ if (dirname[n - 1] == '/')
filename = dsprintf("%sfonts.scale", dirname);
else
filename = dsprintf("%s/fonts.scale", dirname);
- if(filename == NULL)
+ if (filename == NULL)
return -1;
in = fopen(filename, "r");
free(filename);
- if(in == NULL) {
- if(errno != ENOENT)
+ if (in == NULL) {
+ if (errno != ENOENT)
perror("open(fonts.scale)");
return -1;
}
rc = fscanf(in, "%d\n", &count);
- if(rc != 1) {
+ if (rc != 1) {
fprintf(stderr, "Invalid fonts.scale in %s.\n", dirname);
fclose(in);
return -1;
}
- for(i = 0; i < count; i++) {
+ for (i = 0; i < count; i++) {
rc = fscanf(in,
- "%" STRINGIFY(MAXFONTFILENAMELEN) "s "
- "%" STRINGIFY(MAXFONTNAMELEN) "[^\n]\n",
- file, font);
- if(rc != 2)
+ "%" STRINGIFY(MAXFONTFILENAMELEN) "s "
+ "%" STRINGIFY(MAXFONTNAMELEN) "[^\n]\n",
+ file, font);
+ if (rc != 2)
break;
putHash(entries, font, file, 100);
}
@@ -751,31 +776,32 @@ static int
filePrio(char *filename)
{
size_t n = strlen(filename);
- if(n < 4)
+
+ if (n < 4)
return 0;
- if(strcmp(filename + n - 4, ".otf") == 0)
+ if (strcmp(filename + n - 4, ".otf") == 0)
return 6;
- if(strcmp(filename + n - 4, ".OTF") == 0)
+ if (strcmp(filename + n - 4, ".OTF") == 0)
return 6;
- if(strcmp(filename + n - 4, ".ttf") == 0)
+ if (strcmp(filename + n - 4, ".ttf") == 0)
return 5;
- if(strcmp(filename + n - 4, ".TTF") == 0)
+ if (strcmp(filename + n - 4, ".TTF") == 0)
return 5;
- if(strcmp(filename + n - 4, ".pcf") == 0)
+ if (strcmp(filename + n - 4, ".pcf") == 0)
return 4;
- if(strcmp(filename + n - 4, ".PCF") == 0)
+ if (strcmp(filename + n - 4, ".PCF") == 0)
return 4;
- if(strcmp(filename + n - 3, ".gz") == 0)
+ if (strcmp(filename + n - 3, ".gz") == 0)
return 3;
#ifdef X_BZIP2_FONT_COMPRESSION
- if(strcmp(filename + n - 4, ".bz2") == 0)
+ if (strcmp(filename + n - 4, ".bz2") == 0)
return 2;
#endif
- if(strcmp(filename + n - 2, ".Z") == 0)
+ if (strcmp(filename + n - 2, ".Z") == 0)
return 2;
- if(strcmp(filename + n - 4, ".bdf") == 0)
+ if (strcmp(filename + n - 4, ".bdf") == 0)
return 1;
- if(strcmp(filename + n - 4, ".BDF") == 0)
+ if (strcmp(filename + n - 4, ".BDF") == 0)
return 1;
return 0;
}
@@ -785,7 +811,7 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
{
char *dirname, *fontscale_name, *filename, *encdir;
FILE *fontscale, *encfile;
- struct dirent** namelist;
+ struct dirent **namelist;
FT_Error ftrc;
FT_Face face;
ConstListPtr encoding;
@@ -793,206 +819,218 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
HashTablePtr entries;
HashBucketPtr *array;
int i, n, dirn, diri, found, rc;
- int isBitmap=0;
- size_t d, xl=0;
+ int isBitmap = 0;
+ size_t d, xl = 0;
if (exclusionSuffix)
- xl = strlen (exclusionSuffix);
+ xl = strlen(exclusionSuffix);
d = strlen(dirname_given);
- if(d == 0)
+ if (d == 0)
dirname = dsprintf("./");
- else if(dirname_given[d - 1] != '/')
+ else if (dirname_given[d - 1] != '/')
dirname = dsprintf("%s/", dirname_given);
else
dirname = strdup(dirname_given);
- if(dirname == NULL) {
+ if (dirname == NULL) {
perror("dirname");
exit(1);
}
if (onlyEncodings)
- goto encodings;
+ goto encodings;
entries = makeHashTable();
- if(doBitmaps && !doScalable) {
+ if (doBitmaps && !doScalable) {
readFontScale(entries, dirname);
}
- if(strcmp(outfilename, "-") == 0)
+ if (strcmp(outfilename, "-") == 0)
fontscale_name = NULL;
else {
- if(outfilename[0] == '/')
+ if (outfilename[0] == '/')
fontscale_name = strdup(outfilename);
else
fontscale_name = dsprintf("%s%s", dirname, outfilename);
- if(fontscale_name == NULL) {
+ if (fontscale_name == NULL) {
perror("fontscale_name");
exit(1);
}
}
dirn = scandir(dirname, &namelist, NULL, alphasort);
- if(dirn < 0) {
+ if (dirn < 0) {
fprintf(stderr, "%s: ", dirname);
perror("scandir");
return 0;
}
- if(fontscale_name == NULL)
+ if (fontscale_name == NULL)
fontscale = stdout;
else
fontscale = fopen(fontscale_name, "wb");
- if(fontscale == NULL) {
+ if (fontscale == NULL) {
fprintf(stderr, "%s: ", fontscale_name);
perror("fopen(w)");
return 0;
}
- for(diri = dirn - 1; diri >= 0; diri--) {
+ for (diri = dirn - 1; diri >= 0; diri--) {
struct dirent *entry = namelist[diri];
int have_face = 0;
char *xlfd_name = NULL;
- struct stat f_stat;
- int tprio = 1;
+ struct stat f_stat;
+ int tprio = 1;
xlfd = NULL;
- if (xl) {
- size_t dl = strlen (entry->d_name);
- if (strcmp (entry->d_name + dl - xl, exclusionSuffix) == 0)
- continue;
- }
+ if (xl) {
+ size_t dl = strlen(entry->d_name);
+
+ if (strcmp(entry->d_name + dl - xl, exclusionSuffix) == 0)
+ continue;
+ }
filename = dsprintf("%s%s", dirname, entry->d_name);
#define PRIO(x) ((x << 1) + tprio)
#ifdef DT_LNK
- if (entry->d_type != DT_UNKNOWN) {
- if (entry->d_type == DT_LNK)
- tprio = 0;
- } else
+ if (entry->d_type != DT_UNKNOWN) {
+ if (entry->d_type == DT_LNK)
+ tprio = 0;
+ }
+ else
#endif
#ifdef S_ISLNK
- {
- if (lstat(filename, &f_stat))
- goto done;
- if (S_ISLNK(f_stat.st_mode))
- tprio = 0;
- }
+ {
+ if (lstat(filename, &f_stat))
+ goto done;
+ if (S_ISLNK(f_stat.st_mode))
+ tprio = 0;
+ }
#else
- ;
+ ;
#endif
- if(doBitmaps)
+ if (doBitmaps)
rc = bitmapIdentify(filename, &xlfd_name);
else
rc = 0;
- if(rc < 0)
+ if (rc < 0)
goto done;
- if(rc == 0) {
+ if (rc == 0) {
ftrc = FT_New_Face(ft_library, filename, 0, &face);
- if(ftrc)
+ if (ftrc)
goto done;
have_face = 1;
isBitmap = ((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0);
- if(!isBitmap) {
+ if (!isBitmap) {
/* 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) {
+ 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)
+ if (maxp != NULL && maxp->maxContours == 0)
isBitmap = 1;
}
}
- if(isBitmap) {
- if(!doBitmaps)
+ if (isBitmap) {
+ if (!doBitmaps)
goto done;
- } else {
- if(!doScalable)
+ }
+ else {
+ if (!doScalable)
goto done;
}
- if(isBitmap) {
+ if (isBitmap) {
BDF_PropertyRec prop;
+
rc = FT_Get_BDF_Property(face, "FONT", &prop);
- if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_ATOM) {
+ if (rc == 0 && prop.type == BDF_PROPERTY_TYPE_ATOM) {
xlfd_name = strdup(prop.u.atom);
- if(xlfd_name == NULL)
+ if (xlfd_name == NULL)
goto done;
}
}
}
- if(xlfd_name) {
+ if (xlfd_name) {
/* We know it's a bitmap font, and we know its XLFD */
size_t l = strlen(xlfd_name);
- if(reencodeLegacy &&
- l >= 12 && strcasecmp(xlfd_name + l - 11, "-iso10646-1") == 0) {
+
+ if (reencodeLegacy &&
+ l >= 12 && strcasecmp(xlfd_name + l - 11, "-iso10646-1") == 0) {
char *s;
s = malloc(l - 10);
memcpy(s, xlfd_name, l - 11);
s[l - 11] = '\0';
xlfd = listCons(s, xlfd);
- } else {
+ }
+ else {
/* Not a reencodable font -- skip all the rest of the loop body */
- putHash(entries, xlfd_name, entry->d_name, PRIO(filePrio(entry->d_name)));
+ putHash(entries, xlfd_name, entry->d_name,
+ PRIO(filePrio(entry->d_name)));
goto done;
}
}
- if(!have_face) {
+ if (!have_face) {
ftrc = FT_New_Face(ft_library, filename, 0, &face);
- if(ftrc)
+ if (ftrc)
goto done;
have_face = 1;
isBitmap = ((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0);
- if(!isBitmap) {
- if(face->num_fixed_sizes > 0) {
+ if (!isBitmap) {
+ if (face->num_fixed_sizes > 0) {
TT_MaxProfile *maxp;
+
maxp = FT_Get_Sfnt_Table(face, ft_sfnt_maxp);
- if(maxp != NULL && maxp->maxContours == 0)
+ if (maxp != NULL && maxp->maxContours == 0)
isBitmap = 1;
}
}
}
- if(xlfd == NULL)
+ if (xlfd == NULL)
xlfd = makeXLFD(entry->d_name, face, isBitmap);
found = 0;
- for(lp = xlfd; lp; lp = lp->next) {
+ for (lp = xlfd; lp; lp = lp->next) {
char buf[MAXFONTNAMELEN];
- for(encoding = encodings; encoding; encoding = encoding->next) {
- if(checkEncoding(face, encoding->value)) {
+
+ for (encoding = encodings; encoding; encoding = encoding->next) {
+ if (checkEncoding(face, encoding->value)) {
found = 1;
snprintf(buf, MAXFONTNAMELEN, "%s-%s",
- lp->value, encoding->value);
- putHash(entries, buf, entry->d_name, PRIO(filePrio(entry->d_name)));
+ lp->value, encoding->value);
+ putHash(entries, buf, entry->d_name,
+ PRIO(filePrio(entry->d_name)));
}
}
- for(encoding = extra_encodings; encoding;
- encoding = encoding->next) {
- if(checkExtraEncoding(face, encoding->value, found)) {
+ for (encoding = extra_encodings; encoding;
+ encoding = encoding->next) {
+ if (checkExtraEncoding(face, encoding->value, found)) {
/* Do not set found! */
snprintf(buf, MAXFONTNAMELEN, "%s-%s",
- lp->value, encoding->value);
- putHash(entries, buf, entry->d_name, PRIO(filePrio(entry->d_name)));
+ lp->value, encoding->value);
+ putHash(entries, buf, entry->d_name,
+ PRIO(filePrio(entry->d_name)));
}
}
}
- done:
- if(have_face)
+ done:
+ if (have_face)
FT_Done_Face(face);
deepDestroyList(xlfd);
xlfd = NULL;
@@ -1000,17 +1038,17 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
#undef PRIO
}
- while(dirn--)
+ while (dirn--)
free(namelist[dirn]);
free(namelist);
n = hashElements(entries);
fprintf(fontscale, "%d\n", n);
array = hashArray(entries, 1);
- for(i = 0; i < n; i++)
+ for (i = 0; i < n; i++)
fprintf(fontscale, "%s %s\n", array[i]->value, array[i]->key);
destroyHashArray(array);
entries = NULL;
- if(fontscale_name) {
+ if (fontscale_name) {
fclose(fontscale);
free(fontscale_name);
}
@@ -1018,24 +1056,24 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
encodings:
encdir = dsprintf("%s%s", dirname, "encodings.dir");
- if(encdir == NULL) {
- perror("encodings");
- exit(1);
+ if (encdir == NULL) {
+ perror("encodings");
+ exit(1);
}
unlink(encdir);
if (numEncodings) {
- encfile = fopen(encdir, "w");
- if(encfile == NULL) {
- perror("open(encodings.dir)");
- exit(1);
- }
+ encfile = fopen(encdir, "w");
+ if (encfile == NULL) {
+ perror("open(encodings.dir)");
+ exit(1);
+ }
fprintf(encfile, "%d\n", numEncodings);
encodingsToDo = sortList(encodingsToDo);
- for(lp = encodingsToDo; lp; lp = lp->next) {
+ for (lp = encodingsToDo; lp; lp = lp->next) {
fprintf(encfile, "%s\n", lp->value);
}
- fclose (encfile);
+ fclose(encfile);
}
free(dirname);
@@ -1055,12 +1093,12 @@ checkEncoding(FT_Face face, const char *encoding_name)
char *n;
encoding = FontEncFind(encoding_name, NULL);
- if(!encoding)
+ if (!encoding)
return 0;
/* An encoding is ``small'' if one of the following is true:
- - it is linear and has no more than 256 codepoints; or
- - it is a matrix encoding and has no more than one column.
+ - it is linear and has no more than 256 codepoints; or
+ - it is a matrix encoding and has no more than one column.
For small encodings using Unicode indices, we require perfect
coverage except for CODE_IGNORED and KOI-8 IBM-PC compatibility.
@@ -1070,26 +1108,25 @@ checkEncoding(FT_Face face, const char *encoding_name)
For encodings using PS names (currently Adobe Standard and
Adobe Symbol only), we require perfect coverage. */
-
- if(FT_Has_PS_Glyph_Names(face)) {
- for(mapping = encoding->mappings; mapping; mapping = mapping->next) {
- if(mapping->type == FONT_ENCODING_POSTSCRIPT) {
- if(encoding->row_size > 0) {
- for(i = encoding->first; i < encoding->size; i++) {
- for(j = encoding->first_col;
- j < encoding->row_size;
- j++) {
- n = FontEncName((i<<8) | j, mapping);
- if(n && FT_Get_Name_Index(face, n) == 0) {
+ if (FT_Has_PS_Glyph_Names(face)) {
+ for (mapping = encoding->mappings; mapping; mapping = mapping->next) {
+ if (mapping->type == FONT_ENCODING_POSTSCRIPT) {
+ if (encoding->row_size > 0) {
+ for (i = encoding->first; i < encoding->size; i++) {
+ for (j = encoding->first_col;
+ j < encoding->row_size; j++) {
+ n = FontEncName((i << 8) | j, mapping);
+ if (n && FT_Get_Name_Index(face, n) == 0) {
return 0;
}
}
}
return 1;
- } else {
- for(i = encoding->first; i < encoding->size; i++) {
+ }
+ else {
+ for (i = encoding->first; i < encoding->size; i++) {
n = FontEncName(i, mapping);
- if(n && FT_Get_Name_Index(face, n) == 0) {
+ if (n && FT_Get_Name_Index(face, n) == 0) {
return 0;
}
}
@@ -1099,61 +1136,66 @@ checkEncoding(FT_Face face, const char *encoding_name)
}
}
- for(mapping = encoding->mappings; mapping; mapping = mapping->next) {
- if(find_cmap(mapping->type, mapping->pid, mapping->eid, face)) {
+ for (mapping = encoding->mappings; mapping; mapping = mapping->next) {
+ if (find_cmap(mapping->type, mapping->pid, mapping->eid, face)) {
int total = 0, failed = 0;
- if(encoding->row_size > 0) {
+
+ if (encoding->row_size > 0) {
int estimate =
(encoding->size - encoding->first) *
(encoding->row_size - encoding->first_col);
- for(i = encoding->first; i < encoding->size; i++) {
- for(j = encoding->first_col;
- j < encoding->row_size;
- j++) {
- c = FontEncRecode((i<<8) | j, mapping);
- if(CODE_IGNORED(c)) {
+ for (i = encoding->first; i < encoding->size; i++) {
+ for (j = encoding->first_col; j < encoding->row_size; j++) {
+ c = FontEncRecode((i << 8) | j, mapping);
+ if (CODE_IGNORED(c)) {
continue;
- } else {
- if(FT_Get_Char_Index(face, c) == 0) {
+ }
+ else {
+ if (FT_Get_Char_Index(face, c) == 0) {
failed++;
}
total++;
- if((encoding->size <= 1 && failed > 0) ||
- ((float)failed >= bigEncodingFuzz * estimate)) {
+ if ((encoding->size <= 1 && failed > 0) ||
+ ((float) failed >=
+ bigEncodingFuzz * estimate)) {
return 0;
}
}
}
}
- if((float)failed >= total * bigEncodingFuzz)
+ if ((float) failed >= total * bigEncodingFuzz)
return 0;
else
return 1;
- } else {
+ }
+ else {
int estimate = encoding->size - encoding->first;
+
/* For the KOI8 encodings, we ignore the lack of
linedrawing and pseudo-math characters */
- if(strncmp(encoding->name, "koi8-", 5) == 0)
+ if (strncmp(encoding->name, "koi8-", 5) == 0)
koi8 = 1;
else
koi8 = 0;
- for(i = encoding->first; i < encoding->size; i++) {
+ for (i = encoding->first; i < encoding->size; i++) {
c = FontEncRecode(i, mapping);
- if(CODE_IGNORED(c) ||
- (koi8 && ((c >= 0x2200 && c < 0x2600) || c == 0x00b2))) {
+ if (CODE_IGNORED(c) ||
+ (koi8 &&
+ ((c >= 0x2200 && c < 0x2600) || c == 0x00b2))) {
continue;
- } else {
- if(FT_Get_Char_Index(face, c) == 0) {
+ }
+ else {
+ if (FT_Get_Char_Index(face, c) == 0) {
failed++;
}
total++;
- if((encoding->size <= 256 && failed > 0) ||
- ((float)failed >= bigEncodingFuzz * estimate)) {
+ if ((encoding->size <= 256 && failed > 0) ||
+ ((float) failed >= bigEncodingFuzz * estimate)) {
return 0;
}
}
}
- if((float)failed >= total * bigEncodingFuzz)
+ if ((float) failed >= total * bigEncodingFuzz)
return 0;
else
return 1;
@@ -1171,43 +1213,43 @@ find_cmap(int type, int pid, int eid, FT_Face face)
n = face->num_charmaps;
- switch(type) {
- case FONT_ENCODING_TRUETYPE: /* specific cmap */
- for(i=0; i<n; i++) {
+ switch (type) {
+ case FONT_ENCODING_TRUETYPE: /* specific cmap */
+ for (i = 0; i < n; i++) {
cmap = face->charmaps[i];
- if(cmap->platform_id == pid && cmap->encoding_id == eid) {
+ if (cmap->platform_id == pid && cmap->encoding_id == eid) {
rc = FT_Set_Charmap(face, cmap);
- if(rc == 0)
+ if (rc == 0)
return 1;
}
}
break;
- case FONT_ENCODING_UNICODE: /* any Unicode cmap */
+ case FONT_ENCODING_UNICODE: /* any Unicode cmap */
/* prefer Microsoft Unicode */
- for(i=0; i<n; i++) {
+ for (i = 0; i < n; i++) {
cmap = face->charmaps[i];
- if(cmap->platform_id == TT_PLATFORM_MICROSOFT &&
- cmap->encoding_id == TT_MS_ID_UNICODE_CS) {
+ if (cmap->platform_id == TT_PLATFORM_MICROSOFT &&
+ cmap->encoding_id == TT_MS_ID_UNICODE_CS) {
rc = FT_Set_Charmap(face, cmap);
- if(rc == 0)
+ if (rc == 0)
return 1;
}
}
/* Try Apple Unicode */
- for(i=0; i<n; i++) {
+ for (i = 0; i < n; i++) {
cmap = face->charmaps[i];
- if(cmap->platform_id == TT_PLATFORM_APPLE_UNICODE) {
+ if (cmap->platform_id == TT_PLATFORM_APPLE_UNICODE) {
rc = FT_Set_Charmap(face, cmap);
- if(rc == 0)
+ if (rc == 0)
return 1;
}
}
/* ISO Unicode? */
- for(i=0; i<n; i++) {
+ for (i = 0; i < n; i++) {
cmap = face->charmaps[i];
- if(cmap->platform_id == TT_PLATFORM_ISO) {
+ if (cmap->platform_id == TT_PLATFORM_ISO) {
rc = FT_Set_Charmap(face, cmap);
- if(rc == 0)
+ if (rc == 0)
return 1;
}
}
@@ -1223,49 +1265,56 @@ checkExtraEncoding(FT_Face face, const char *encoding_name, int found)
{
int c;
- if(strcasecmp(encoding_name, "iso10646-1") == 0) {
- if(doISO10646_1_encoding && find_cmap(FONT_ENCODING_UNICODE, -1, -1, face)) {
+ if (strcasecmp(encoding_name, "iso10646-1") == 0) {
+ if (doISO10646_1_encoding &&
+ find_cmap(FONT_ENCODING_UNICODE, -1, -1, face)) {
int cfound = 0;
- /* Export as Unicode if there are at least 15 BMP
+
+ /* Export as Unicode if there are at least 15 BMP
characters that are not a space or ignored. */
- for(c = 0x21; c < 0x10000; c++) {
- if(CODE_IGNORED(c))
+ for (c = 0x21; c < 0x10000; c++) {
+ if (CODE_IGNORED(c))
continue;
- if(FT_Get_Char_Index(face, c) > 0)
+ if (FT_Get_Char_Index(face, c) > 0)
cfound++;
- if(cfound >= 15)
+ if (cfound >= 15)
return 1;
}
return 0;
- } else
+ }
+ else
return 0;
- } else if(strcasecmp(encoding_name, "microsoft-symbol") == 0) {
- if(find_cmap(FONT_ENCODING_TRUETYPE,
- TT_PLATFORM_MICROSOFT, TT_MS_ID_SYMBOL_CS,
- face))
+ }
+ else if (strcasecmp(encoding_name, "microsoft-symbol") == 0) {
+ if (find_cmap(FONT_ENCODING_TRUETYPE,
+ TT_PLATFORM_MICROSOFT, TT_MS_ID_SYMBOL_CS, face))
return 1;
else
return 0;
- } else if(strcasecmp(encoding_name, "adobe-fontspecific") == 0) {
- if(!found) {
- if(FT_Has_PS_Glyph_Names(face))
+ }
+ else if (strcasecmp(encoding_name, "adobe-fontspecific") == 0) {
+ if (!found) {
+ if (FT_Has_PS_Glyph_Names(face))
return 1;
else
return 0;
- } else
+ }
+ else
return 0;
- } else {
+ }
+ else {
fprintf(stderr, "Unknown extra encoding %s\n", encoding_name);
return 0;
}
}
-static const char*
+static const char *
notice_foundry(const char *notice)
{
unsigned int i;
- for(i = 0; i < countof(notice_foundries); i++)
- if(notice && strstr(notice, notice_foundries[i][0]))
+
+ for (i = 0; i < countof(notice_foundries); i++)
+ if (notice && strstr(notice, notice_foundries[i][0]))
return notice_foundries[i][1];
return NULL;
}
@@ -1275,21 +1324,23 @@ vendor_match(const signed char *vendor, const char *vendor_string)
{
/* vendor is not necessarily NUL-terminated. */
size_t i, len;
+
len = strlen(vendor_string);
- if(memcmp(vendor, vendor_string, len) != 0)
+ if (memcmp(vendor, vendor_string, len) != 0)
return 0;
- for(i = len; i < 4; i++)
- if(vendor[i] != ' ' && vendor[i] != '\0')
+ for (i = len; i < 4; i++)
+ if (vendor[i] != ' ' && vendor[i] != '\0')
return 0;
return 1;
}
-static const char*
+static const char *
vendor_foundry(const signed char *vendor)
{
unsigned int i;
- for(i = 0; i < countof(vendor_foundries); i++)
- if(vendor_match(vendor, vendor_foundries[i][0]))
+
+ for (i = 0; i < countof(vendor_foundries); i++)
+ if (vendor_match(vendor, vendor_foundries[i][0]))
return vendor_foundries[i][1];
return NULL;
}
@@ -1302,43 +1353,45 @@ readEncodings(ListPtr encodings, char *dirname)
struct dirent *file;
char **names, **name;
- if(strlen(dirname) > 1 && dirname[strlen(dirname) - 1] == '/')
+ if (strlen(dirname) > 1 && dirname[strlen(dirname) - 1] == '/')
dirname[strlen(dirname) - 1] = '\0';
dirp = opendir(dirname);
- if(dirp == NULL) {
+ if (dirp == NULL) {
perror("opendir");
return -1;
}
- while((file = readdir(dirp)) != NULL) {
+ while ((file = readdir(dirp)) != NULL) {
fullname = dsprintf("%s/%s", dirname, file->d_name);
- if(fullname == NULL) {
+ if (fullname == NULL) {
fprintf(stderr, "Couldn't allocate fullname\n");
closedir(dirp);
return -1;
}
names = FontEncIdentify(fullname);
- if(!names)
+ if (!names)
continue;
- for(name = names; *name; name++) {
- if(fullname[0] != '/' && !relative) {
+ for (name = names; *name; name++) {
+ if (fullname[0] != '/' && !relative) {
char *n;
+
n = dsprintf("%s%s", encodingPrefix, fullname);
- if(n == NULL) {
+ if (n == NULL) {
fprintf(stderr, "Couldn't allocate name\n");
closedir(dirp);
return -1;
}
encodingsToDo = listConsF(encodingsToDo, "%s %s", *name, n);
free(n);
- } else {
+ }
+ else {
encodingsToDo =
listConsF(encodingsToDo, "%s %s", *name, fullname);
}
- if(encodingsToDo == NULL) {
+ if (encodingsToDo == NULL) {
fprintf(stderr, "Couldn't allocate encodings\n");
closedir(dirp);
return -1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 16:19:16 +0000