| 1 |
< |
/* Copyright (c) 1986 Regents of the University of California */ |
| 1 |
> |
/* Copyright (c) 1990 Regents of the University of California */ |
| 2 |
|
|
| 3 |
|
#ifndef lint |
| 4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
| 89 |
|
|
| 90 |
|
/* first, discover position in text */ |
| 91 |
|
ap = m->oargs.farg; |
| 92 |
< |
multp3(v, r->rop, r->robx); |
| 92 |
> |
if (r->rox != NULL) |
| 93 |
> |
multp3(v, r->rop, r->rox->b.xfm); |
| 94 |
> |
else |
| 95 |
> |
VCOPY(v, r->rop); |
| 96 |
|
v[0] -= ap[0]; |
| 97 |
|
v[1] -= ap[1]; |
| 98 |
|
v[2] -= ap[2]; |
| 163 |
|
txt[1] = NULL; |
| 164 |
|
} else { /* text file */ |
| 165 |
|
if ((s = getpath(tm->oargs.sarg[tndx(tm)], |
| 166 |
< |
libpath)) == NULL) { |
| 166 |
> |
libpath, R_OK)) == NULL) { |
| 167 |
|
sprintf(errmsg, "cannot find text file \"%s\"", |
| 168 |
|
tm->oargs.sarg[tndx(tm)]); |
| 169 |
|
error(USER, errmsg); |
| 214 |
|
if (!strcmp(f->name, fname)) |
| 215 |
|
return(f); |
| 216 |
|
/* load the font file */ |
| 217 |
< |
if ((pathname = getpath(fname, libpath)) == NULL) { |
| 217 |
> |
if ((pathname = getpath(fname, libpath, R_OK)) == NULL) { |
| 218 |
|
sprintf(errmsg, "cannot find font file \"%s\"", fname); |
| 219 |
|
error(USER, errmsg); |
| 220 |
|
} |
