===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.28
retrieving revision 1.33
diff -u -p -r1.28 -r1.33
--- mandoc/term_ps.c	2010/07/04 19:24:00	1.28
+++ mandoc/term_ps.c	2010/07/05 08:46:09	1.33
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.28 2010/07/04 19:24:00 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.
@@ -478,11 +463,15 @@ ps_alloc(char *outopts)
 
 	/* Margins are 1/9 the page x and y. */
 
-	marginx = (size_t)((double)pagex / 9.0);
-	marginy = (size_t)((double)pagey / 9.0);
+	marginx = /* LINTED */
+		(size_t)((double)pagex / 9.0);
+	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);
@@ -525,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;
@@ -554,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;
 	}
@@ -578,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);
@@ -608,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;
 
@@ -623,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]);
 
@@ -651,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);
 }
 
 
@@ -665,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
@@ -723,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;
 }
 
 
@@ -752,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);
@@ -837,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;
@@ -856,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;
 }
 
 
@@ -868,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;
 }