===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.29
retrieving revision 1.33
diff -u -p -r1.29 -r1.33
--- mandoc/term_ps.c	2010/07/04 19:42:25	1.29
+++ mandoc/term_ps.c	2010/07/05 08:46:09	1.33
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.29 2010/07/04 19:42:25 kristaps Exp $ */
+/*	$Id: term_ps.c,v 1.33 2010/07/05 08:46:09 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -33,11 +33,6 @@
 #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))
@@ -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);
@@ -653,14 +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);
 }
 
 
@@ -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
@@ -679,7 +679,6 @@ ps_pletter(struct termp *p, int c)
 				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));
@@ -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;
 }