=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.13 retrieving revision 1.19 diff -u -p -r1.13 -r1.19 --- mandoc/term_ps.c 2010/06/28 13:45:28 1.13 +++ mandoc/term_ps.c 2010/06/30 12:27:55 1.19 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.13 2010/06/28 13:45:28 kristaps Exp $ */ +/* $Id: term_ps.c,v 1.19 2010/06/30 12:27:55 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -35,10 +36,9 @@ struct glyph { int wx; /* WX in AFM */ }; -#define MAXCHAR 95 - struct font { const char *name; /* FontName in AFM */ +#define MAXCHAR 95 /* total characters we can handle */ struct glyph gly[MAXCHAR]; /* glyph metrics */ }; @@ -48,7 +48,7 @@ struct font { * ASCII, i.e., 32--127. */ -static const struct font fonts[3] = { +static const struct font fonts[TERMFONT__MAX] = { { "Courier", { { 600 }, { 600 }, @@ -342,13 +342,7 @@ static const struct font fonts[3] = { } }, }; -#define PS_CHAR_HEIGHT 12 -#define PS_CHAR_TOPMARG (792 - 24) -#define PS_CHAR_TOP (PS_CHAR_TOPMARG - 36) -#define PS_CHAR_LEFT 36 -#define PS_CHAR_BOTMARG 24 -#define PS_CHAR_BOT (PS_CHAR_BOTMARG + 36) - +/* These work the buffer used by the header and footer. */ #define PS_BUFSLOP 128 #define PS_GROWBUF(p, sz) \ do if ((p)->engine.ps.psmargcur + (sz) > \ @@ -365,13 +359,15 @@ static const struct font fonts[3] = { } while (/* CONSTCOND */ 0) -static void ps_letter(struct termp *, char); +static size_t ps_hspan(const struct termp *, + const struct roffsu *); +static size_t ps_width(const struct termp *, char); +static void ps_advance(struct termp *, size_t); static void ps_begin(struct termp *); static void ps_end(struct termp *); -static void ps_advance(struct termp *, size_t); static void ps_endline(struct termp *); static void ps_fclose(struct termp *); -static size_t ps_width(const struct termp *, char); +static void ps_letter(struct termp *, char); static void ps_pclose(struct termp *); static void ps_pletter(struct termp *, int); static void ps_printf(struct termp *, const char *, ...); @@ -380,23 +376,64 @@ static void ps_setfont(struct termp *, enum termfon void * -ps_alloc(void) +ps_alloc(char *outopts) { struct termp *p; + size_t pagex, pagey, margin, lineheight; + const char *toks[2]; + const char *paper; + char *v; if (NULL == (p = term_alloc(TERMENC_ASCII))) return(NULL); - p->defrmargin = 78; - p->tabwidth = 5; - - p->type = TERMTYPE_PS; - p->letter = ps_letter; + p->advance = ps_advance; p->begin = ps_begin; p->end = ps_end; - p->advance = ps_advance; p->endline = ps_endline; + p->hspan = ps_hspan; + p->letter = ps_letter; + p->type = TERMTYPE_PS; p->width = ps_width; + + toks[0] = "paper"; + toks[1] = NULL; + + paper = "letter"; + + while (outopts && *outopts) + switch (getsubopt(&outopts, UNCONST(toks), &v)) { + case (0): + paper = v; + break; + default: + break; + } + + if (0 == strcasecmp(paper, "a4")) { + pagex = 595 * 100; + pagey = 842 * 100; + } else { + pagex = 612 * 100; + pagey = 792 * 100; + } + + margin = 72 * 100; + lineheight = 12 * 100; + + assert(margin * 2 < pagex); + assert(margin * 2 < pagey); + + p->engine.ps.width = pagex; + p->engine.ps.height = pagey; + p->engine.ps.header = pagey - (margin / 2); + p->engine.ps.top = pagey - margin; + p->engine.ps.footer = (margin / 2); + p->engine.ps.bottom = margin; + p->engine.ps.left = margin; + p->engine.ps.lineheight = lineheight; + + p->defrmargin = pagex - (margin * 2); return(p); } @@ -486,8 +523,12 @@ ps_end(struct termp *p) assert('\0' == p->engine.ps.last); assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]); printf("%s", p->engine.ps.psmarg); + p->engine.ps.pages++; printf("showpage\n"); - printf("%s\n", "%%EOF"); + + printf("%%%%Trailer\n"); + printf("%%%%Pages: %zu\n", p->engine.ps.pages); + printf("%%%%EOF\n"); } @@ -495,6 +536,7 @@ static void ps_begin(struct termp *p) { time_t t; + int i; /* * Print margins into margin buffer. Nothing gets output to the @@ -508,16 +550,16 @@ ps_begin(struct termp *p) p->engine.ps.psmargcur = 0; p->engine.ps.psstate = PS_MARGINS; - p->engine.ps.pscol = PS_CHAR_LEFT; - p->engine.ps.psrow = PS_CHAR_TOPMARG; + p->engine.ps.pscol = p->engine.ps.left; + p->engine.ps.psrow = p->engine.ps.header; ps_setfont(p, TERMFONT_NONE); (*p->headf)(p, p->argf); (*p->endline)(p); - p->engine.ps.pscol = PS_CHAR_LEFT; - p->engine.ps.psrow = PS_CHAR_BOTMARG; + p->engine.ps.pscol = p->engine.ps.left; + p->engine.ps.psrow = p->engine.ps.footer; (*p->footf)(p, p->argf); (*p->endline)(p); @@ -535,22 +577,36 @@ ps_begin(struct termp *p) t = time(NULL); - printf("%%!PS\n"); + printf("%%!PS-Adobe-3.0\n"); printf("%%%%Creator: mandoc-%s\n", VERSION); printf("%%%%CreationDate: %s", ctime(&t)); + printf("%%%%DocumentData: Clean7Bit\n"); + printf("%%%%Orientation: Portrait\n"); + printf("%%%%Pages: (atend)\n"); printf("%%%%PageOrder: Ascend\n"); printf("%%%%Orientation: Portrait\n"); - printf("%%%%EndComments\n"); + printf("%%%%DocumentMedia: Default %zu %zu 0 () ()\n", + p->engine.ps.width, + p->engine.ps.height); + printf("%%%%DocumentNeededResources: font"); + for (i = 0; i < (int)TERMFONT__MAX; i++) + printf(" %s", fonts[i].name); + printf("\n%%%%EndComments\n"); + printf("%%%%Page: %zu %zu\n", + p->engine.ps.pages + 1, + p->engine.ps.pages + 1); + ps_setfont(p, TERMFONT_NONE); - p->engine.ps.pscol = PS_CHAR_LEFT; - p->engine.ps.psrow = PS_CHAR_TOP; + p->engine.ps.pscol = p->engine.ps.left; + p->engine.ps.psrow = p->engine.ps.top; } static void ps_pletter(struct termp *p, int c) { + int f; /* * If we're not in a PostScript "word" context, then open one @@ -559,8 +615,8 @@ ps_pletter(struct termp *p, int c) if ( ! (PS_INLINE & p->engine.ps.psstate)) { ps_printf(p, "%zu %zu moveto\n(", - p->engine.ps.pscol, - p->engine.ps.psrow); + (size_t)(p->engine.ps.pscol / 100), + (size_t)(p->engine.ps.psrow / 100)); p->engine.ps.psstate |= PS_INLINE; } @@ -585,21 +641,17 @@ ps_pletter(struct termp *p, int c) /* Write the character and adjust where we are on the page. */ - /* - * FIXME: at this time we emit only blacnks on non-ASCII - * letters. - */ + f = (int)p->engine.ps.lastf; - if (c < 32 || (c - 32 > MAXCHAR)) { + if (c <= 32 || (c - 32 > MAXCHAR)) { ps_putchar(p, ' '); - p->engine.ps.pscol += - (fonts[p->engine.ps.lastf].gly[32].wx / 100); + p->engine.ps.pscol += fonts[f].gly[0].wx; return; } ps_putchar(p, c); - p->engine.ps.pscol += - (fonts[p->engine.ps.lastf].gly[(int)c - 32].wx / 100); + c -= 32; + p->engine.ps.pscol += fonts[f].gly[c].wx; } @@ -709,8 +761,7 @@ ps_advance(struct termp *p, size_t len) */ ps_fclose(p); - p->engine.ps.pscol += 0 == len ? 0 : - len * (fonts[p->engine.ps.lastf].gly[0].wx / 100); + p->engine.ps.pscol += len; } @@ -736,16 +787,21 @@ ps_endline(struct termp *p) * showpage and restart our row. */ - p->engine.ps.pscol = PS_CHAR_LEFT; - if (p->engine.ps.psrow >= PS_CHAR_HEIGHT + PS_CHAR_BOT) { - p->engine.ps.psrow -= PS_CHAR_HEIGHT; + p->engine.ps.pscol = p->engine.ps.left; + if (p->engine.ps.psrow >= p->engine.ps.lineheight + + p->engine.ps.bottom) { + p->engine.ps.psrow -= p->engine.ps.lineheight; return; } assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]); printf("%s", p->engine.ps.psmarg); + printf("%%%%Page: %zu %zu\n", + p->engine.ps.pages + 1, + p->engine.ps.pages + 1); printf("showpage\n"); - p->engine.ps.psrow = PS_CHAR_TOP; + p->engine.ps.pages++; + p->engine.ps.psrow = p->engine.ps.top; } @@ -753,6 +809,7 @@ static void ps_setfont(struct termp *p, enum termfont f) { + assert(f < TERMFONT__MAX); ps_printf(p, "/%s 10 selectfont\n", fonts[(int)f].name); p->engine.ps.lastf = f; } @@ -763,5 +820,63 @@ static size_t ps_width(const struct termp *p, char c) { - return(1); + if (c <= 32 || c - 32 >= MAXCHAR) + return(fonts[(int)TERMFONT_NONE].gly[0].wx); + + c -= 32; + return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx); } + + +static size_t +ps_hspan(const struct termp *p, const struct roffsu *su) +{ + double r; + + /* + * All of these measurements are derived by converting from the + * native measurement to AFM units, which are (scalesize/1000). + * Since scalesize is 10 for us, we can just skip to (x/100). + */ + + switch (su->unit) { + case (SCALE_CM): + r = su->scale * 28.34 * 100; + break; + case (SCALE_IN): + r = su->scale * 72 * 100; + break; + case (SCALE_PC): + r = su->scale * 12 * 100; + break; + case (SCALE_PT): + r = su->scale * 100; + break; + case (SCALE_EM): + r = su->scale * + fonts[(int)TERMFONT_NONE].gly[109 - 32].wx; + break; + case (SCALE_MM): + r = su->scale * 2.834 * 100; + break; + case (SCALE_EN): + r = su->scale * + fonts[(int)TERMFONT_NONE].gly[110 - 32].wx; + break; + case (SCALE_VS): + r = su->scale * p->engine.ps.lineheight; + break; + default: + r = su->scale; + break; + } + + /* Explicitly disallow negative values. */ + + if (r < 0.0) + r = 0.0; + + return((size_t)/* LINTED */ + r); +} +