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 |
|
} |
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; |
213 |
|
/* start by squeezing it */ |
214 |
|
squeeztext(sp, tp, f, cis); |
215 |
|
/* now, realign spacing */ |
216 |
< |
len = 0; |
218 |
< |
width = alen = *sp++; |
216 |
> |
width = *sp++; |
217 |
|
while (*tp) { |
218 |
+ |
len = alen = 0; |
219 |
|
nsp = sp; |
220 |
|
for (end = tp; *end; end = tab) { |
221 |
|
tab = end + 1; |
239 |
|
*sp++ += alen; |
240 |
|
len -= alen; |
241 |
|
} |
243 |
– |
len = 0; |
244 |
– |
alen = 0; |
242 |
|
tp = tab; |
243 |
|
} |
244 |
|
return(width); |