=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.15 retrieving revision 1.18 diff -u -p -r1.15 -r1.18 --- mandoc/term_ps.c 2010/06/28 23:26:09 1.15 +++ mandoc/term_ps.c 2010/06/30 11:45:21 1.18 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.15 2010/06/28 23:26:09 kristaps Exp $ */ +/* $Id: term_ps.c,v 1.18 2010/06/30 11:45:21 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -31,14 +32,6 @@ #include "main.h" #include "term.h" -/* TODO: all this will go away with different paper sizes. */ -#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) - struct glyph { int wx; /* WX in AFM */ }; @@ -55,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 }, @@ -381,15 +374,17 @@ 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 = 612 - (PS_CHAR_LEFT * 2); - p->type = TERMTYPE_PS; p->letter = ps_letter; p->begin = ps_begin; @@ -397,6 +392,43 @@ ps_alloc(void) p->advance = ps_advance; p->endline = ps_endline; p->width = ps_width; + + toks[0] = "paper"; + toks[1] = NULL; + + 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 +518,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 +531,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 +545,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,16 +572,29 @@ 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; } @@ -560,8 +610,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; } @@ -590,13 +640,13 @@ ps_pletter(struct termp *p, int c) if (c <= 32 || (c - 32 > MAXCHAR)) { ps_putchar(p, ' '); - p->engine.ps.pscol += (fonts[f].gly[0].wx / 100); + p->engine.ps.pscol += fonts[f].gly[0].wx; return; } ps_putchar(p, c); c -= 32; - p->engine.ps.pscol += (fonts[f].gly[c].wx / 100); + p->engine.ps.pscol += fonts[f].gly[c].wx; } @@ -732,16 +782,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; } @@ -749,6 +804,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; } @@ -760,8 +816,8 @@ ps_width(const struct termp *p, char c) { if (c <= 32 || c - 32 >= MAXCHAR) - return(fonts[(int)TERMFONT_NONE].gly[0].wx / 100); + return(fonts[(int)TERMFONT_NONE].gly[0].wx); c -= 32; - return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx / 100); + return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx); }