===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.18
retrieving revision 1.28
diff -u -p -r1.18 -r1.28
--- mandoc/term_ps.c	2010/06/30 11:45:21	1.18
+++ mandoc/term_ps.c	2010/07/04 19:24:00	1.28
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.18 2010/06/30 11:45:21 kristaps Exp $ */
+/*	$Id: term_ps.c,v 1.28 2010/07/04 19:24:00 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -27,13 +27,27 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "out.h"
 #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))
+
 struct	glyph {
-	int		  wx; /* WX in AFM */
+	size_t		  wx; /* WX in AFM */
 };
 
 struct	font {
@@ -49,296 +63,296 @@ struct	font {
  */
 
 static	const struct font fonts[TERMFONT__MAX] = {
-	{ "Courier", {
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
+	{ "Times-Roman", {
+		{ 250 },
+		{ 333 },
+		{ 408 },
+		{ 500 },
+		{ 500 },
+		{ 833 },
+		{ 778 },
+		{ 333 },
+		{ 333 },
+		{ 333 },
+		{ 500 },
+		{ 564 },
+		{ 250 },
+		{ 333 },
+		{ 250 },
+		{ 278 },
+		{ 500 },
+		{ 500 },
+		{ 500 },
+		{ 500 },
+		{ 500 },
+		{ 500 },
+		{ 500 },
+		{ 500 },
+		{ 500 },
+		{ 500 },
+		{ 278 },
+		{ 278 },
+		{ 564 },
+		{ 564 },
+		{ 564 },
+		{ 444 },
+		{ 921 },
+		{ 722 },
+		{ 667 },
+		{ 667 },
+		{ 722 },
+		{ 611 },
+		{ 556 },
+		{ 722 },
+		{ 722 },
+		{ 333 },
+		{ 389 },
+		{ 722 },
+		{ 611 },
+		{ 889 },
+		{ 722 },
+		{ 722 },
+		{ 556 },
+		{ 722 },
+		{ 667 },
+		{ 556 },
+		{ 611 },
+		{ 722 },
+		{ 722 },
+		{ 944 },
+		{ 722 },
+		{ 722 },
+		{ 611 },
+		{ 333 },
+		{ 278 },
+		{ 333 },
+		{ 469 },
+		{ 500 },
+		{ 333 },
+		{ 444 },
+		{ 500 },
+		{ 444 },
+		{  500},
+		{  444},
+		{  333},
+		{  500},
+		{  500},
+		{  278},
+		{  278},
+		{  500},
+		{  278},
+		{  778},
+		{  500},
+		{  500},
+		{  500},
+		{  500},
+		{  333},
+		{  389},
+		{  278},
+		{  500},
+		{  500},
+		{  722},
+		{  500},
+		{  500},
+		{  444},
+		{  480},
+		{  200},
+		{  480},
+		{  541},
 	} },
-	{ "Courier-Bold", {
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
+	{ "Times-Bold", {
+		{ 250  },
+		{ 333  },
+		{ 555  },
+		{ 500  },
+		{ 500  },
+		{ 1000 },
+		{ 833  },
+		{ 333  },
+		{ 333  },
+		{ 333  },
+		{ 500  },
+		{ 570  },
+		{ 250  },
+		{ 333  },
+		{ 250  },
+		{ 278  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 333  },
+		{ 333  },
+		{ 570  },
+		{ 570  },
+		{ 570  },
+		{ 500  },
+		{ 930  },
+		{ 722  },
+		{ 667  },
+		{ 722  },
+		{ 722  },
+		{ 667  },
+		{ 611  },
+		{ 778  },
+		{ 778  },
+		{ 389  },
+		{ 500  },
+		{ 778  },
+		{ 667  },
+		{ 944  },
+		{ 722  },
+		{ 778  },
+		{ 611  },
+		{ 778  },
+		{ 722  },
+		{ 556  },
+		{ 667  },
+		{ 722  },
+		{ 722  },
+		{ 1000 },
+		{ 722  },
+		{ 722  },
+		{ 667  },
+		{ 333  },
+		{ 278  },
+		{ 333  },
+		{ 581  },
+		{ 500  },
+		{ 333  },
+		{ 500  },
+		{ 556  },
+		{ 444  },
+		{  556 },
+		{  444 },
+		{  333 },
+		{  500 },
+		{  556 },
+		{  278 },
+		{  333 },
+		{  556 },
+		{  278 },
+		{  833 },
+		{  556 },
+		{  500 },
+		{  556 },
+		{  556 },
+		{  444 },
+		{  389 },
+		{  333 },
+		{  556 },
+		{  500 },
+		{  722 },
+		{  500 },
+		{  500 },
+		{  444 },
+		{  394 },
+		{  220 },
+		{  394 },
+		{  520 },
 	} },
-	{ "Courier-Oblique", {
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
-		{ 600 },
+	{ "Times-Italic", {
+		{ 250  },
+		{ 333  },
+		{ 420  },
+		{ 500  },
+		{ 500  },
+		{ 833  },
+		{ 778  },
+		{ 333  },
+		{ 333  },
+		{ 333  },
+		{ 500  },
+		{ 675  },
+		{ 250  },
+		{ 333  },
+		{ 250  },
+		{ 278  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 500  },
+		{ 333  },
+		{ 333  },
+		{ 675  },
+		{ 675  },
+		{ 675  },
+		{ 500  },
+		{ 920  },
+		{ 611  },
+		{ 611  },
+		{ 667  },
+		{ 722  },
+		{ 611  },
+		{ 611  },
+		{ 722  },
+		{ 722  },
+		{ 333  },
+		{ 444  },
+		{ 667  },
+		{ 556  },
+		{ 833  },
+		{ 667  },
+		{ 722  },
+		{ 611  },
+		{ 722  },
+		{ 611  },
+		{ 500  },
+		{ 556  },
+		{ 722  },
+		{ 611  },
+		{ 833  },
+		{ 611  },
+		{ 556  },
+		{ 556  },
+		{ 389  },
+		{ 278  },
+		{ 389  },
+		{ 422  },
+		{ 500  },
+		{ 333  },
+		{ 500  },
+		{ 500  },
+		{ 444  },
+		{  500 },
+		{  444 },
+		{  278 },
+		{  500 },
+		{  500 },
+		{  278 },
+		{  278 },
+		{  444 },
+		{  278 },
+		{  722 },
+		{  500 },
+		{  500 },
+		{  500 },
+		{  500 },
+		{  389 },
+		{  389 },
+		{  278 },
+		{  500 },
+		{  444 },
+		{  667 },
+		{  444 },
+		{  444 },
+		{  389 },
+		{  400 },
+		{  275 },
+		{  400 },
+		{  541 },
 	} },
 };
 
@@ -359,13 +373,15 @@ static	const struct font fonts[TERMFONT__MAX] = {
 	} while (/* CONSTCOND */ 0)
 
 
-static	void		  ps_letter(struct termp *, char);
+static	double		  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 *, ...);
@@ -377,58 +393,106 @@ 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)))
 		return(NULL);
 
-	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;
 
+	pp = NULL;
+
 	while (outopts && *outopts)
 		switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 		case (0):
-			paper = v;
+			pp = v;
 			break;
 		default:
 			break;
 		}
 
-	if (0 == strcasecmp(paper, "a4")) {
-		pagex = 595 * 100;
-		pagey = 842 * 100;
-	} else {
-		pagex = 612 * 100;
-		pagey = 792 * 100;
+	/* Default to US letter (millimetres). */
+
+	pagex = DEFPAGEX_MM;
+	pagey = DEFPAGEY_MM;
+
+	/*
+	 * 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";
+
+	/* 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;
 	}
 
-	margin = 72 * 100;
-	lineheight = 12 * 100;
+	/* 
+	 * This MUST be defined before any PNT2AFM or AFM2PNT
+	 * calculations occur.
+	 */
 
-	assert(margin * 2 < pagex);
-	assert(margin * 2 < pagey);
+	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 = (size_t)((double)pagex / 9.0);
+	marginy = (size_t)((double)pagey / 9.0);
+
+	lineheight = PNT2AFM(p, 16);
+
 	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);
 }
 
@@ -579,10 +643,9 @@ ps_begin(struct termp *p)
 	printf("%%%%Orientation: Portrait\n");
 	printf("%%%%Pages: (atend)\n");
 	printf("%%%%PageOrder: Ascend\n");
-	printf("%%%%Orientation: Portrait\n");
 	printf("%%%%DocumentMedia: Default %zu %zu 0 () ()\n",
-			p->engine.ps.width,
-			p->engine.ps.height);
+			AFM2PNT(p, p->engine.ps.width),
+			AFM2PNT(p, p->engine.ps.height));
 	printf("%%%%DocumentNeededResources: font");
 	for (i = 0; i < (int)TERMFONT__MAX; i++)
 		printf(" %s", fonts[i].name);
@@ -610,8 +673,8 @@ ps_pletter(struct termp *p, int c)
 
 	if ( ! (PS_INLINE & p->engine.ps.psstate)) {
 		ps_printf(p, "%zu %zu moveto\n(", 
-				(size_t)(p->engine.ps.pscol / 100), 
-				(size_t)(p->engine.ps.psrow / 100));
+				AFM2PNT(p, p->engine.ps.pscol),
+				AFM2PNT(p, p->engine.ps.psrow));
 		p->engine.ps.psstate |= PS_INLINE;
 	}
 
@@ -644,7 +707,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;
 }
@@ -791,11 +854,11 @@ ps_endline(struct termp *p)
 
 	assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
 	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);
-	printf("showpage\n");
-	p->engine.ps.pages++;
 	p->engine.ps.psrow = p->engine.ps.top;
 }
 
@@ -805,7 +868,8 @@ ps_setfont(struct termp *p, enum termfont f)
 {
 
 	assert(f < TERMFONT__MAX);
-	ps_printf(p, "/%s 10 selectfont\n", fonts[(int)f].name);
+	ps_printf(p, "/%s %zu selectfont\n", 
+			fonts[(int)f].name, p->engine.ps.scale);
 	p->engine.ps.lastf = f;
 }
 
@@ -821,3 +885,50 @@ ps_width(const struct termp *p, char c)
 	c -= 32;
 	return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx);
 }
+
+
+static double
+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.
+	 */
+
+	switch (su->unit) {
+	case (SCALE_CM):
+		r = PNT2AFM(p, su->scale * 28.34);
+		break;
+	case (SCALE_IN):
+		r = PNT2AFM(p, su->scale * 72);
+		break;
+	case (SCALE_PC):
+		r = PNT2AFM(p, su->scale * 12);
+		break;
+	case (SCALE_PT):
+		r = PNT2AFM(p, su->scale * 100);
+		break;
+	case (SCALE_EM):
+		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 * 
+			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;
+	}
+
+	return(r);
+}
+