--- ray/src/px/psign.c 1992/06/16 15:34:47 2.4 +++ ray/src/px/psign.c 1994/02/28 09:25:31 2.16 @@ -1,4 +1,4 @@ -/* Copyright (c) 1991 Regents of the University of California */ +/* Copyright (c) 1992 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -16,37 +16,35 @@ static char SCCSid[] = "$SunId$ LBL"; #include "font.h" -#define SSS 2 /* super-sample size */ +#include "paths.h" -#define MAXLINE 512 /* longest allowable line */ - -#ifndef DEFPATH -#define DEFPATH ":/usr/local/lib/ray" +#ifndef SSS +#define SSS 3 /* super-sample size */ #endif -#ifndef ULIBVAR -#define ULIBVAR "RAYPATH" -#endif +#define MAXLINE 512 /* longest allowable line */ + char *fontfile = "helvet.fnt"; /* our font file */ -COLR bgcolr = WHTCOLR; /* background color */ -COLR fgcolr = BLKCOLR; /* foreground color */ +COLOR bgcolor = WHTCOLOR; /* background color */ +COLOR fgcolor = BLKCOLOR; /* foreground color */ int direct = 'r'; /* direction (right, up, left, down) */ -int cheight = 32; /* character height */ -double aspect = 1.67; /* height/width character aspect */ +int cheight = 32*SSS; /* character height */ +double aspect = 1.67; /* height/width character aspect */ +double spacing = 0.0; /* character spacing */ int cwidth; /* computed character width */ unsigned char *ourbitmap; /* our output bitmap */ int xsiz, ysiz; /* bitmap dimensions */ int xdim; /* size of horizontal scan (bytes) */ -#define bitop(x,y,op) (ourbitmap[(y)*xdim+((x)>>3)] op (1<<((x)&7))) -#define tstbit(x,y) bitop(x,y,&) -#define setbit(x,y) bitop(x,y,|=) -#define clrbit(x,y) bitop(x,y,&=~) -#define tglbit(x,y) bitop(x,y,^=) +#define bitop(x,y,op) (ourbitmap[(y)*xdim+((x)>>3)] op (1<<((x)&7))) +#define tstbit(x,y) bitop(x,y,&) +#define setbit(x,y) bitop(x,y,|=) +#define clrbit(x,y) bitop(x,y,&=~) +#define tglbit(x,y) bitop(x,y,^=) FONT *ourfont; /* our font */ @@ -62,28 +60,27 @@ LINE *ourtext; /* our text */ int nlines, maxline; /* text dimensions */ int maxwidth; /* maximum line width (dvi) */ -extern char *getenv(); -extern char *malloc(), *calloc(); - main(argc, argv) int argc; char *argv[]; { int an; - +#ifdef MSDOS + setmode(fileno(stdout), O_BINARY); +#endif for (an = 1; an < argc && argv[an][0] == '-'; an++) switch (argv[an][1]) { case 'c': /* color */ switch (argv[an][2]) { case 'f': /* foreground */ - setcolr(fgcolr, atof(argv[an+1]), + setcolor(fgcolor, atof(argv[an+1]), atof(argv[an+2]), atof(argv[an+3])); an += 3; break; case 'b': /* background */ - setcolr(bgcolr, atof(argv[an+1]), + setcolor(bgcolor, atof(argv[an+1]), atof(argv[an+2]), atof(argv[an+3])); an += 3; @@ -107,12 +104,21 @@ char *argv[]; goto unkopt; } break; + case 'x': /* x resolution */ + xsiz = atoi(argv[++an])*SSS; + break; + case 'y': + ysiz = atoi(argv[++an])*SSS; + break; case 'h': /* height of characters */ - cheight = atoi(argv[++an]); + cheight = atoi(argv[++an])*SSS; break; case 'a': /* aspect ratio */ aspect = atof(argv[++an]); break; + case 's': /* spacing */ + spacing = atof(argv[++an]); + break; default:; unkopt: fprintf(stderr, "%s: unknown option: %s\n", @@ -134,6 +140,7 @@ unkopt: /* convert text to bitmap */ maptext(); /* print header */ + newheader("RADIANCE", stdout); printargs(argc, argv, stdout); fputformat(COLRFMT, stdout); putchar('\n'); @@ -146,27 +153,70 @@ unkopt: makemap() /* create the bit map */ { - cwidth = cheight/aspect + 0.5; + double pictaspect; + if (direct == 'r' || direct == 'l') { - xsiz = maxline*cwidth; - ysiz = nlines*cheight; + if (xsiz <= 0) { + cwidth = cheight/aspect + 0.5; + xsiz = (long)maxwidth*cwidth >> 8; + ysiz = nlines*cheight; + } else if (aspect > FTINY) { + if (ysiz <= 0) + ysiz = cheight*nlines; + pictaspect = 256*nlines*aspect/maxwidth; + if (pictaspect*xsiz < ysiz) + ysiz = pictaspect*xsiz + 0.5; + else + xsiz = ysiz/pictaspect + 0.5; + cheight = ysiz/nlines; + cwidth = cheight/aspect; + } else { + if (ysiz <= 0) + ysiz = cheight*nlines; + pictaspect = (double)ysiz/xsiz; + aspect = pictaspect*maxwidth/(256*nlines); + cheight = ysiz/nlines; + cwidth = cheight/aspect; + } } else { /* reverse orientation */ - xsiz = nlines*cheight; - ysiz = maxline*cwidth; + if (ysiz <= 0) { + cwidth = cheight/aspect + 0.5; + xsiz = nlines*cheight; + ysiz = (long)maxwidth*cwidth >> 8; + } else if (aspect > FTINY) { + if (xsiz <= 0) + xsiz = cheight*nlines; + pictaspect = maxwidth/(256*nlines*aspect); + if (pictaspect*xsiz < ysiz) + ysiz = pictaspect*xsiz + 0.5; + else + xsiz = ysiz/pictaspect + 0.5; + cheight = xsiz/nlines; + cwidth = cheight/aspect; + } else { + if (xsiz <= 0) + xsiz = cheight*nlines; + pictaspect = (double)ysiz/xsiz; + aspect = maxwidth/(256*nlines*pictaspect); + cheight = xsiz/nlines; + cwidth = cheight/aspect; + } } + if (xsiz % SSS) + xsiz += SSS - xsiz%SSS; + if (ysiz % SSS) + ysiz += SSS - ysiz%SSS; xdim = (xsiz+7)/8; - ourbitmap = (BYTE *)calloc(ysiz, xdim); - if (ourbitmap == NULL) { - fprintf(stderr, "out of memory in makemap\n"); - exit(1); - } + ourbitmap = (BYTE *)bmalloc(ysiz*xdim); + if (ourbitmap == NULL) + error(SYSTEM, "Out of memory in makemap"); + bzero((char *)ourbitmap, ysiz*xdim); } gettext(fp) /* get text from a file */ FILE *fp; { - char *fgets(); char buf[MAXLINE]; register LINE *curl; int len; @@ -187,7 +237,14 @@ FILE *fp; maxline = len; strncpy(curl->s, buf, len); curl->s[len] = '\0'; -len = uniftext(curl->sp, curl->s, ourfont); + if (spacing < -1./256.) + len = squeeztext(curl->sp, curl->s, ourfont, + (int)(spacing*-256.)); + else if (spacing > 1./256.) + len = proptext(curl->sp, curl->s, ourfont, + (int)(spacing*256.), 3); + else + len = uniftext(curl->sp, curl->s, ourfont); if (len > maxwidth) maxwidth = len; curl->next = ourtext; @@ -196,8 +253,7 @@ len = uniftext(curl->sp, curl->s, ourfont); } return; memerr: - fprintf(stderr, "out of memory in gettext\n"); - exit(1); + error(SYSTEM, "Out of memory in gettext"); } @@ -224,12 +280,18 @@ char *av[]; ourtext->sp = (short *)malloc(sizeof(short)*(maxline+1)); if (ourtext->sp == NULL) goto memerr; -maxwidth = uniftext(ourtext->sp, ourtext->s, ourfont); + if (spacing < -1./256.) + maxwidth = squeeztext(ourtext->sp, ourtext->s, ourfont, + (int)(spacing*-256.)); + else if (spacing > 1./256.) + maxwidth = proptext(ourtext->sp, ourtext->s, ourfont, + (int)(spacing*256.), 3); + else + maxwidth = uniftext(ourtext->sp, ourtext->s, ourfont); nlines = 1; return; memerr: - fprintf(stderr, "out of memory in arg_text\n"); - exit(1); + error(SYSTEM, "Out of memory in arg_text"); } @@ -339,29 +401,45 @@ int run, rise; writemap(fp) /* write out bitmap */ FILE *fp; { + COLR pixval[SSS*SSS+1]; /* possible pixel values */ + COLOR ctmp0, ctmp1; + double d; COLR *scanout; - int y; - register int x; + int x, y; + register int i, j; + int cnt; register int inglyph; - fprintf(fp, "-Y %d +X %d\n", ysiz, xsiz); + fprintf(fp, "-Y %d +X %d\n", ysiz/SSS, xsiz/SSS); - scanout = (COLR *)malloc(xsiz*sizeof(COLR)); - if (scanout == NULL) { - fprintf(stderr, "out of memory in writemap\n"); - exit(1); + scanout = (COLR *)malloc(xsiz/SSS*sizeof(COLR)); + if (scanout == NULL) + error(SYSTEM, "Out of memory in writemap"); + for (i = 0; i <= SSS*SSS; i++) { /* compute possible values */ + copycolor(ctmp0, fgcolor); + d = (double)i/(SSS*SSS); + scalecolor(ctmp0, d); + copycolor(ctmp1, bgcolor); + d = 1.0 - d; + scalecolor(ctmp1, d); + addcolor(ctmp0, ctmp1); + setcolr(pixval[i], colval(ctmp0,RED), + colval(ctmp0,GRN), colval(ctmp0,BLU)); } - for (y = ysiz-1; y >= 0; y--) { + for (y = ysiz/SSS-1; y >= 0; y--) { inglyph = 0; - for (x = 0; x < xsiz; x++) { - if (tstbit(x, y)) - inglyph ^= 1; - if (inglyph) - copycolr(scanout[x], fgcolr); - else - copycolr(scanout[x], bgcolr); + for (x = 0; x < xsiz/SSS; x++) { + cnt = 0; + for (j = 0; j < SSS; j++) + for (i = 0; i < SSS; i++) { + if (tstbit(x*SSS+i, y*SSS+j)) + inglyph ^= 1<