| 1 |
< |
/* Copyright (c) 1991 Regents of the University of California */ |
| 1 |
> |
/* Copyright (c) 1992 Regents of the University of California */ |
| 2 |
|
|
| 3 |
|
#ifndef lint |
| 4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
| 221 |
|
i = sndx(tm); |
| 222 |
|
d = i < tm->oargs.nfargs ? tm->oargs.farg[i] : 0.0; |
| 223 |
|
i = d * 256.0; |
| 224 |
+ |
t->tl.width = 0; |
| 225 |
|
for (tlp = t->tl.next; tlp != NULL; tlp = tlp->next) { |
| 226 |
|
if ((tlp->spc = (short *)malloc( |
| 227 |
|
(strlen(TLSTR(tlp))+1)*sizeof(short))) == NULL) |
| 232 |
|
tlp->width = proptext(tlp->spc, TLSTR(tlp), t->f, i, 3); |
| 233 |
|
else |
| 234 |
|
tlp->width = uniftext(tlp->spc, TLSTR(tlp), t->f); |
| 235 |
+ |
if (tlp->width > t->tl.width) |
| 236 |
+ |
t->tl.width = tlp->width; |
| 237 |
|
} |
| 238 |
|
/* we're done */ |
| 239 |
|
tm->os = (char *)t; |
| 254 |
|
tp = (TEXT *)m->os; |
| 255 |
|
if (tp == NULL) |
| 256 |
|
return; |
| 257 |
< |
for (tlp = tp->tl.next; tlp != NULL; tlp = tlp->next) { |
| 257 |
> |
while ((tlp = tp->tl.next) != NULL) { |
| 258 |
> |
tp->tl.next = tlp->next; |
| 259 |
|
free((char *)tlp->spc); |
| 260 |
|
free((char *)tlp); |
| 261 |
|
} |
| 278 |
|
v[0] = p[0] - m->oargs.farg[0]; |
| 279 |
|
v[1] = p[1] - m->oargs.farg[1]; |
| 280 |
|
v[2] = p[2] - m->oargs.farg[2]; |
| 281 |
< |
h = x = DOT(v, tp->right)*256.; |
| 281 |
> |
x = DOT(v, tp->right); |
| 282 |
> |
i = sndx(m); |
| 283 |
> |
if (i < m->oargs.nfargs) |
| 284 |
> |
x *= tp->f->mwidth + 256.*fabs(m->oargs.farg[i]); |
| 285 |
> |
else |
| 286 |
> |
x *= 256.; |
| 287 |
> |
h = x; |
| 288 |
|
i = y = DOT(v, tp->down); |
| 289 |
|
if (x < 0.0 || y < 0.0) |
| 290 |
|
return(0); |
