=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.29 retrieving revision 1.36 diff -u -p -r1.29 -r1.36 --- mandoc/term_ps.c 2010/07/04 19:42:25 1.29 +++ mandoc/term_ps.c 2010/07/21 08:24:39 1.36 @@ -1,6 +1,6 @@ -/* $Id: term_ps.c,v 1.29 2010/07/04 19:42:25 kristaps Exp $ */ +/* $Id: term_ps.c,v 1.36 2010/07/21 08:24:39 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -33,21 +33,16 @@ #include "main.h" #include "term.h" -#define MINMARGIN_MM 20 /* Minimum 2cm margins. */ -#define MINMARGIN_PNT 56.68 -#define DEFPAGEX_MM 216 /* Default page size is US-letter. */ -#define DEFPAGEY_MM 279 - /* Convert PostScript point "x" to an AFM unit. */ #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) /* LINTED */ \ - (size_t)((double)(x) / (1000.0 / (double)(p)->engine.ps.scale)) + ((double)(x) / (1000.0 / (double)(p)->engine.ps.scale)) struct glyph { - size_t wx; /* WX in AFM */ + unsigned short wx; /* WX in AFM */ }; struct font { @@ -426,8 +421,8 @@ ps_alloc(char *outopts) /* Default to US letter (millimetres). */ - pagex = DEFPAGEX_MM; - pagey = DEFPAGEY_MM; + pagex = 216; + pagey = 279; /* * The ISO-269 paper sizes can be calculated automatically, but @@ -454,16 +449,6 @@ ps_alloc(char *outopts) } else if (NULL == pp) pp = "letter"; - /* Enforce minimum page size >= (2 times) min-margin. */ - - if ((2 * MINMARGIN_MM) >= pagex) { - fprintf(stderr, "%s: Insufficient page width\n", pp); - pagex = DEFPAGEX_MM; - } else if ((2 * MINMARGIN_MM >= pagey)) { - fprintf(stderr, "%s: Insufficient page length\n", pp); - pagey = DEFPAGEY_MM; - } - /* * This MUST be defined before any PNT2AFM or AFM2PNT * calculations occur. @@ -483,8 +468,10 @@ ps_alloc(char *outopts) marginy = /* LINTED */ (size_t)((double)pagey / 9.0); - lineheight = PNT2AFM(p, 16); + /* 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 - (marginy / 2) - (lineheight / 2); @@ -580,12 +567,14 @@ ps_end(struct termp *p) * well as just one. */ - 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"); + 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); @@ -646,21 +635,17 @@ ps_begin(struct termp *p) printf("%%%%Pages: (atend)\n"); printf("%%%%PageOrder: Ascend\n"); printf("%%%%DocumentMedia: Default %zu %zu 0 () ()\n", - AFM2PNT(p, p->engine.ps.width), - AFM2PNT(p, p->engine.ps.height)); + (size_t)AFM2PNT(p, p->engine.ps.width), + (size_t)AFM2PNT(p, 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 = p->engine.ps.left; p->engine.ps.psrow = p->engine.ps.top; p->engine.ps.flags |= PS_NEWPAGE; + ps_setfont(p, TERMFONT_NONE); } @@ -668,6 +653,21 @@ 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 @@ -675,11 +675,10 @@ ps_pletter(struct termp *p, int c) */ if ( ! (PS_INLINE & p->engine.ps.flags)) { - ps_printf(p, "%zu %zu moveto\n(", + ps_printf(p, "%.3f %.3f moveto\n(", AFM2PNT(p, p->engine.ps.pscol), AFM2PNT(p, p->engine.ps.psrow)); p->engine.ps.flags |= PS_INLINE; - p->engine.ps.flags &= ~PS_NEWPAGE; } assert( ! (PS_NEWPAGE & p->engine.ps.flags)); @@ -709,13 +708,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; + p->engine.ps.pscol += (size_t)fonts[f].gly[0].wx; return; } ps_putchar(p, (char)c); c -= 32; - p->engine.ps.pscol += fonts[f].gly[c].wx; + p->engine.ps.pscol += (size_t)fonts[f].gly[c].wx; } @@ -870,9 +869,6 @@ 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; @@ -884,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; } @@ -896,10 +901,10 @@ ps_width(const struct termp *p, char c) { if (c <= 32 || c - 32 >= MAXCHAR) - return(fonts[(int)TERMFONT_NONE].gly[0].wx); + return((size_t)fonts[(int)TERMFONT_NONE].gly[0].wx); c -= 32; - return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx); + return((size_t)fonts[(int)TERMFONT_NONE].gly[(int)c].wx); } @@ -927,14 +932,14 @@ ps_hspan(const struct termp *p, const struct roffsu *s r = PNT2AFM(p, su->scale * 100); break; case (SCALE_EM): - r = su->scale * + r = su->scale * fonts[(int)TERMFONT_NONE].gly[109 - 32].wx; break; case (SCALE_MM): r = PNT2AFM(p, su->scale * 2.834); break; case (SCALE_EN): - r = su->scale * + r = su->scale * fonts[(int)TERMFONT_NONE].gly[110 - 32].wx; break; case (SCALE_VS):