15 |
|
#define galloc(nv) (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv)) |
16 |
|
|
17 |
|
|
18 |
< |
extern char *libpath; /* list of library directories */ |
18 |
> |
extern char *fgetword(), *getlibpath(); |
19 |
|
|
20 |
– |
extern char *fgetword(); |
21 |
– |
|
20 |
|
static FONT *fontlist = NULL; /* list of loaded fonts */ |
21 |
|
|
22 |
|
|
38 |
|
if (!strcmp(f->name, fname)) |
39 |
|
return(f); |
40 |
|
/* load the font file */ |
41 |
< |
if ((pathname = getpath(fname, libpath, R_OK)) == NULL) { |
41 |
> |
if ((pathname = getpath(fname, getlibpath(), R_OK)) == NULL) { |
42 |
|
sprintf(errmsg, "cannot find font file \"%s\"", fname); |
43 |
|
error(USER, errmsg); |
44 |
|
} |
158 |
|
if (f->fg[*tp++&0xff] == NULL) |
159 |
|
*sp++ = 0; |
160 |
|
else |
161 |
< |
linelen += *sp++ = 256; |
161 |
> |
linelen += *sp++ = 255; |
162 |
|
return(linelen); |
163 |
|
} |
164 |
|
|
173 |
|
int linelen; |
174 |
|
register GLYPH *gp; |
175 |
|
|
176 |
+ |
linelen = 0; |
177 |
|
gp = NULL; |
178 |
|
while (*tp && (gp = f->fg[*tp++&0xff]) == NULL) |
179 |
|
*sp++ = 0; |
180 |
|
cis /= 2; |
181 |
< |
linelen = *sp = cis; |
181 |
> |
*sp = cis; |
182 |
|
while (gp != NULL) { |
183 |
|
if (gp->nverts) { /* regular character */ |
184 |
|
linelen += *sp++ += cis - gp->left; |