=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.24 retrieving revision 1.33 diff -u -p -r1.24 -r1.33 --- mandoc/term_ps.c 2010/06/30 20:57:41 1.24 +++ mandoc/term_ps.c 2010/07/05 08:46:09 1.33 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.24 2010/06/30 20:57:41 kristaps Exp $ */ +/* $Id: term_ps.c,v 1.33 2010/07/05 08:46:09 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -27,21 +27,22 @@ #include #include #include +#include #include "out.h" #include "main.h" #include "term.h" /* Convert PostScript point "x" to an AFM unit. */ -#define PNT2AFM(p, x) \ +#define PNT2AFM(p, x) /* LINTED */ \ (size_t)((double)(x) * (1000.0 / (double)(p)->engine.ps.scale)) /* Convert an AFM unit "x" to a PostScript points */ -#define AFM2PNT(p, x) \ +#define AFM2PNT(p, x) /* LINTED */ \ (size_t)((double)(x) / (1000.0 / (double)(p)->engine.ps.scale)) struct glyph { - int wx; /* WX in AFM */ + size_t wx; /* WX in AFM */ }; struct font { @@ -387,9 +388,9 @@ void * ps_alloc(char *outopts) { struct termp *p; - size_t pagex, pagey, margin, lineheight; + size_t pagex, pagey, marginx, marginy, lineheight; const char *toks[2]; - const char *paper; + const char *pp; char *v; if (NULL == (p = term_alloc(TERMENC_ASCII))) @@ -404,46 +405,83 @@ ps_alloc(char *outopts) p->type = TERMTYPE_PS; p->width = ps_width; - p->engine.ps.scale = 10; - toks[0] = "paper"; toks[1] = NULL; - paper = "letter"; + pp = NULL; while (outopts && *outopts) switch (getsubopt(&outopts, UNCONST(toks), &v)) { case (0): - paper = v; + pp = v; break; default: break; } - margin = PNT2AFM(p, 72); - lineheight = PNT2AFM(p, 12); + /* Default to US letter (millimetres). */ - if (0 == strcasecmp(paper, "a4")) { - pagex = PNT2AFM(p, 595); - pagey = PNT2AFM(p, 842); - } else { - pagex = PNT2AFM(p, 612); - pagey = PNT2AFM(p, 792); - } + pagex = 216; + pagey = 279; - assert(margin * 2 < pagex); - assert(margin * 2 < pagey); + /* + * The ISO-269 paper sizes can be calculated automatically, but + * it would require bringing in -lm for pow() and I'd rather not + * do that. So just do it the easy way for now. Since this + * only happens once, I'm not terribly concerned. + */ + if (pp && strcasecmp(pp, "letter")) { + if (0 == strcasecmp(pp, "a3")) { + pagex = 297; + pagey = 420; + } else if (0 == strcasecmp(pp, "a4")) { + pagex = 210; + pagey = 297; + } else if (0 == strcasecmp(pp, "a5")) { + pagex = 148; + pagey = 210; + } else if (0 == strcasecmp(pp, "legal")) { + pagex = 216; + pagey = 356; + } else if (2 != sscanf(pp, "%zux%zu", &pagex, &pagey)) + fprintf(stderr, "%s: Unknown paper\n", pp); + } else if (NULL == pp) + pp = "letter"; + + /* + * This MUST be defined before any PNT2AFM or AFM2PNT + * calculations occur. + */ + + p->engine.ps.scale = 11; + + /* Remember millimetres -> AFM units. */ + + pagex = PNT2AFM(p, ((double)pagex * 2.834)); + pagey = PNT2AFM(p, ((double)pagey * 2.834)); + + /* Margins are 1/9 the page x and y. */ + + marginx = /* LINTED */ + (size_t)((double)pagex / 9.0); + marginy = /* LINTED */ + (size_t)((double)pagey / 9.0); + + /* Line-height is 1.4em. */ + + lineheight = PNT2AFM(p, ((double)p->engine.ps.scale * 1.4)); + 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.header = pagey - (marginy / 2) - (lineheight / 2); + p->engine.ps.top = pagey - marginy; + p->engine.ps.footer = (marginy / 2) - (lineheight / 2); + p->engine.ps.bottom = marginy; + p->engine.ps.left = marginx; p->engine.ps.lineheight = lineheight; - p->defrmargin = pagex - (margin * 2); + p->defrmargin = pagex - (marginx * 2); return(p); } @@ -476,7 +514,7 @@ ps_printf(struct termp *p, const char *fmt, ...) * into our growable margin buffer. */ - if ( ! (PS_MARGINS & p->engine.ps.psstate)) { + if ( ! (PS_MARGINS & p->engine.ps.flags)) { vprintf(fmt, ap); va_end(ap); return; @@ -505,7 +543,7 @@ ps_putchar(struct termp *p, char c) /* See ps_printf(). */ - if ( ! (PS_MARGINS & p->engine.ps.psstate)) { + if ( ! (PS_MARGINS & p->engine.ps.flags)) { putchar(c); return; } @@ -529,12 +567,14 @@ ps_end(struct termp *p) * well as just one. */ - assert(0 == p->engine.ps.psstate); - 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"); + if ( ! (PS_NEWPAGE & p->engine.ps.flags)) { + assert(0 == p->engine.ps.flags); + 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("%%%%Trailer\n"); printf("%%%%Pages: %zu\n", p->engine.ps.pages); @@ -559,7 +599,7 @@ ps_begin(struct termp *p) } p->engine.ps.psmargcur = 0; - p->engine.ps.psstate = PS_MARGINS; + p->engine.ps.flags = PS_MARGINS; p->engine.ps.pscol = p->engine.ps.left; p->engine.ps.psrow = p->engine.ps.header; @@ -574,9 +614,9 @@ ps_begin(struct termp *p) (*p->footf)(p, p->argf); (*p->endline)(p); - p->engine.ps.psstate &= ~PS_MARGINS; + p->engine.ps.flags &= ~PS_MARGINS; - assert(0 == p->engine.ps.psstate); + assert(0 == p->engine.ps.flags); assert(p->engine.ps.psmarg); assert('\0' != p->engine.ps.psmarg[0]); @@ -602,13 +642,10 @@ ps_begin(struct termp *p) 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 = p->engine.ps.left; p->engine.ps.psrow = p->engine.ps.top; + p->engine.ps.flags |= PS_NEWPAGE; + ps_setfont(p, TERMFONT_NONE); } @@ -616,19 +653,36 @@ static void ps_pletter(struct termp *p, int c) { int f; + + /* + * If we haven't opened a page context, then output that we're + * in a new page and make sure the font is correctly set. + */ + + if (PS_NEWPAGE & p->engine.ps.flags) { + printf("%%%%Page: %zu %zu\n", + p->engine.ps.pages + 1, + p->engine.ps.pages + 1); + ps_printf(p, "/%s %zu selectfont\n", + fonts[(int)p->engine.ps.lastf].name, + p->engine.ps.scale); + p->engine.ps.flags &= ~PS_NEWPAGE; + } /* * If we're not in a PostScript "word" context, then open one * now at the current cursor. */ - if ( ! (PS_INLINE & p->engine.ps.psstate)) { + if ( ! (PS_INLINE & p->engine.ps.flags)) { ps_printf(p, "%zu %zu moveto\n(", AFM2PNT(p, p->engine.ps.pscol), AFM2PNT(p, p->engine.ps.psrow)); - p->engine.ps.psstate |= PS_INLINE; + p->engine.ps.flags |= PS_INLINE; } + assert( ! (PS_NEWPAGE & p->engine.ps.flags)); + /* * We need to escape these characters as per the PostScript * specification. We would also escape non-graphable characters @@ -658,7 +712,7 @@ ps_pletter(struct termp *p, int c) return; } - ps_putchar(p, c); + ps_putchar(p, (char)c); c -= 32; p->engine.ps.pscol += fonts[f].gly[c].wx; } @@ -674,11 +728,11 @@ ps_pclose(struct termp *p) * or anything). */ - if ( ! (PS_INLINE & p->engine.ps.psstate)) + if ( ! (PS_INLINE & p->engine.ps.flags)) return; ps_printf(p, ") show\n"); - p->engine.ps.psstate &= ~PS_INLINE; + p->engine.ps.flags &= ~PS_INLINE; } @@ -703,7 +757,7 @@ ps_fclose(struct termp *p) p->engine.ps.last = '\0'; } - if ( ! (PS_INLINE & p->engine.ps.psstate)) + if ( ! (PS_INLINE & p->engine.ps.flags)) return; ps_pclose(p); @@ -788,15 +842,23 @@ ps_endline(struct termp *p) * lines, we'll do nasty stuff. */ - if (PS_MARGINS & p->engine.ps.psstate) + if (PS_MARGINS & p->engine.ps.flags) return; + /* Left-justify. */ + + p->engine.ps.pscol = p->engine.ps.left; + + /* If we haven't printed anything, return. */ + + if (PS_NEWPAGE & p->engine.ps.flags) + return; + /* * Put us down a line. If we're at the page bottom, spit out a * showpage and restart our row. */ - 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; @@ -807,10 +869,9 @@ ps_endline(struct termp *p) printf("%s", p->engine.ps.psmarg); printf("showpage\n"); p->engine.ps.pages++; - printf("%%%%Page: %zu %zu\n", - p->engine.ps.pages + 1, - p->engine.ps.pages + 1); p->engine.ps.psrow = p->engine.ps.top; + assert( ! (PS_NEWPAGE & p->engine.ps.flags)); + p->engine.ps.flags |= PS_NEWPAGE; } @@ -819,9 +880,18 @@ ps_setfont(struct termp *p, enum termfont f) { assert(f < TERMFONT__MAX); + p->engine.ps.lastf = f; + + /* + * If we're still at the top of the page, let the font-setting + * be delayed until we actually have stuff to print. + */ + + if (PS_NEWPAGE & p->engine.ps.flags) + return; + ps_printf(p, "/%s %zu selectfont\n", fonts[(int)f].name, p->engine.ps.scale); - p->engine.ps.lastf = f; }