===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.7
retrieving revision 1.14
diff -u -p -r1.7 -r1.14
--- mandoc/term_ps.c	2010/06/11 07:23:04	1.7
+++ mandoc/term_ps.c	2010/06/28 22:46:21	1.14
@@ -1,6 +1,6 @@
-/*	$Id: term_ps.c,v 1.7 2010/06/11 07:23:04 kristaps Exp $ */
+/*	$Id: term_ps.c,v 1.14 2010/06/28 22:46:21 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -25,12 +25,323 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "out.h"
 #include "main.h"
 #include "term.h"
 
-#define	PS_CHAR_WIDTH	  6
+struct	glyph {
+	int		  wx; /* WX in AFM */
+};
+
+#define	MAXCHAR		  95
+
+struct	font {
+	const char	 *name; /* FontName in AFM */
+	struct glyph	  gly[MAXCHAR]; /* glyph metrics */
+};
+
+/*
+ * We define, for the time being, three fonts: bold, oblique/italic, and
+ * normal (roman).  The following table hard-codes the font metrics for
+ * ASCII, i.e., 32--127.
+ */
+
+static	const struct font fonts[3] = {
+	{ "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 },
+	} },
+	{ "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 },
+	} },
+	{ "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 },
+	} },
+};
+
 #define	PS_CHAR_HEIGHT	  12
 #define	PS_CHAR_TOPMARG	 (792 - 24)
 #define	PS_CHAR_TOP	 (PS_CHAR_TOPMARG - 36)
@@ -53,13 +364,19 @@
 		} \
 	} while (/* CONSTCOND */ 0)
 
+
 static	void		  ps_letter(struct termp *, char);
 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_pclose(struct termp *);
+static	void		  ps_pletter(struct termp *, int);
 static	void		  ps_printf(struct termp *, const char *, ...);
 static	void		  ps_putchar(struct termp *, char);
+static	void		  ps_setfont(struct termp *, enum termfont);
 
 
 void *
@@ -70,12 +387,14 @@ ps_alloc(void)
 	if (NULL == (p = term_alloc(TERMENC_ASCII)))
 		return(NULL);
 
+	p->defrmargin = 612 - (PS_CHAR_LEFT * 2);
 	p->type = TERMTYPE_PS;
 	p->letter = ps_letter;
 	p->begin = ps_begin;
 	p->end = ps_end;
 	p->advance = ps_advance;
 	p->endline = ps_endline;
+	p->width = ps_width;
 	return(p);
 }
 
@@ -161,6 +480,8 @@ 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);
 	printf("showpage\n");
@@ -171,94 +492,77 @@ ps_end(struct termp *p)
 static void
 ps_begin(struct termp *p)
 {
+	time_t		 t;
 
-	/*
-	 * Emit the standard PostScript prologue, set our initial page
-	 * position, then run pageopen() on the initial page.
+	/* 
+	 * Print margins into margin buffer.  Nothing gets output to the
+	 * screen yet, so we don't need to initialise the primary state.
 	 */
 
-	printf("%s\n", "%!PS");
-	printf("%s\n", "/Courier");
-	printf("%s\n", "10 selectfont");
-
-	p->engine.ps.psstate = 0;
-
 	if (p->engine.ps.psmarg) {
 		assert(p->engine.ps.psmargsz);
 		p->engine.ps.psmarg[0] = '\0';
 	}
 
 	p->engine.ps.psmargcur = 0;
-
-	/*
-	 * Now dump the margins into our margin buffer.  If we don't do
-	 * this, we'd break any current state to run the header and
-	 * footer with each and evern new page.
-	 */
-
+	p->engine.ps.psstate = PS_MARGINS;
 	p->engine.ps.pscol = PS_CHAR_LEFT;
 	p->engine.ps.psrow = PS_CHAR_TOPMARG;
 
-	p->engine.ps.psstate |= PS_MARGINS;
+	ps_setfont(p, TERMFONT_NONE);
 
 	(*p->headf)(p, p->argf);
 	(*p->endline)(p);
 
-	p->engine.ps.psstate &= ~PS_MARGINS;
-	assert(0 == p->engine.ps.psstate);
-
 	p->engine.ps.pscol = PS_CHAR_LEFT;
 	p->engine.ps.psrow = PS_CHAR_BOTMARG;
-	p->engine.ps.psstate |= PS_MARGINS;
 
 	(*p->footf)(p, p->argf);
 	(*p->endline)(p);
 
 	p->engine.ps.psstate &= ~PS_MARGINS;
+
 	assert(0 == p->engine.ps.psstate);
+	assert(p->engine.ps.psmarg);
+	assert('\0' != p->engine.ps.psmarg[0]);
 
+	/* 
+	 * Print header and initialise page state.  Following this,
+	 * stuff gets printed to the screen, so make sure we're sane.
+	 */
+
+	t = time(NULL);
+
+	printf("%%!PS\n");
+	printf("%%%%Creator: mandoc-%s\n", VERSION);
+	printf("%%%%CreationDate: %s", ctime(&t));
+	printf("%%%%PageOrder: Ascend\n");
+	printf("%%%%Orientation: Portrait\n");
+	printf("%%%%EndComments\n");
+
+	ps_setfont(p, TERMFONT_NONE);
 	p->engine.ps.pscol = PS_CHAR_LEFT;
 	p->engine.ps.psrow = PS_CHAR_TOP;
-
-	assert(p->engine.ps.psmarg);
-	assert('\0' != p->engine.ps.psmarg[0]);
 }
 
 
 static void
-ps_letter(struct termp *p, char c)
+ps_pletter(struct termp *p, int c)
 {
-	char		cc;
+	int		 f;
 	
+	/*
+	 * 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 we're not in a PostScript "word" context, then
-		 * open one now at the current cursor.
-		 */
 		ps_printf(p, "%zu %zu moveto\n(", 
 				p->engine.ps.pscol, 
 				p->engine.ps.psrow);
 		p->engine.ps.psstate |= PS_INLINE;
 	}
 
-	if ('\0' == p->engine.ps.last) {
-		assert(8 != c);
-		p->engine.ps.last = c;
-		return;
-	} else if (8 == p->engine.ps.last) {
-		assert(8 != c);
-		p->engine.ps.last = c;
-		return;
-	} else if (8 == c) {
-		assert(8 != p->engine.ps.last);
-		p->engine.ps.last = c;
-		return;
-	} else {
-		cc = p->engine.ps.last;
-		p->engine.ps.last = c;
-		c = cc;
-	}
-
 	/*
 	 * We need to escape these characters as per the PostScript
 	 * specification.  We would also escape non-graphable characters
@@ -279,48 +583,153 @@ ps_letter(struct termp *p, char c)
 	}
 
 	/* Write the character and adjust where we are on the page. */
+
+	f = (int)p->engine.ps.lastf;
+
+	if (c <= 32 || (c - 32 > MAXCHAR)) {
+		ps_putchar(p, ' ');
+		p->engine.ps.pscol += (fonts[f].gly[0].wx / 100);
+		return;
+	} 
+
 	ps_putchar(p, c);
-	p->engine.ps.pscol += PS_CHAR_WIDTH;
+	c -= 32;
+	p->engine.ps.pscol += (fonts[f].gly[c].wx / 100);
 }
 
 
 static void
-ps_advance(struct termp *p, size_t len)
+ps_pclose(struct termp *p)
 {
-	size_t		 i;
 
-	if (PS_INLINE & p->engine.ps.psstate) {
-		assert(8 != p->engine.ps.last);
-		if (p->engine.ps.last)
-			ps_letter(p, p->engine.ps.last);
+	/* 
+	 * Spit out that we're exiting a word context (this is a
+	 * "partial close" because we don't check the last-char buffer
+	 * or anything).
+	 */
+
+	if ( ! (PS_INLINE & p->engine.ps.psstate))
+		return;
+	
+	ps_printf(p, ") show\n");
+	p->engine.ps.psstate &= ~PS_INLINE;
+}
+
+
+static void
+ps_fclose(struct termp *p)
+{
+
+	/*
+	 * Strong closure: if we have a last-char, spit it out after
+	 * checking that we're in the right font mode.  This will of
+	 * course open a new scope, if applicable.
+	 *
+	 * Following this, close out any scope that's open.
+	 */
+
+	if ('\0' != p->engine.ps.last) {
+		if (p->engine.ps.lastf != TERMFONT_NONE) {
+			ps_pclose(p);
+			ps_setfont(p, TERMFONT_NONE);
+		}
+		ps_pletter(p, p->engine.ps.last);
 		p->engine.ps.last = '\0';
-		for (i = 0; i < len; i++) 
-			ps_letter(p, ' ');
+	}
+
+	if ( ! (PS_INLINE & p->engine.ps.psstate))
 		return;
+
+	ps_pclose(p);
+}
+
+
+static void
+ps_letter(struct termp *p, char c)
+{
+	char		cc;
+
+	/*
+	 * State machine dictates whether to buffer the last character
+	 * or not.  Basically, encoded words are detected by checking if
+	 * we're an "8" and switching on the buffer.  Then we put "8" in
+	 * our buffer, and on the next charater, flush both character
+	 * and buffer.  Thus, "regular" words are detected by having a
+	 * regular character and a regular buffer character.
+	 */
+
+	if ('\0' == p->engine.ps.last) {
+		assert(8 != c);
+		p->engine.ps.last = c;
+		return;
+	} else if (8 == p->engine.ps.last) {
+		assert(8 != c);
+		p->engine.ps.last = '\0';
+	} else if (8 == c) {
+		assert(8 != p->engine.ps.last);
+		if ('_' == p->engine.ps.last) {
+			if (p->engine.ps.lastf != TERMFONT_UNDER) {
+				ps_pclose(p);
+				ps_setfont(p, TERMFONT_UNDER);
+			}
+		} else if (p->engine.ps.lastf != TERMFONT_BOLD) {
+			ps_pclose(p);
+			ps_setfont(p, TERMFONT_BOLD);
+		}
+		p->engine.ps.last = c;
+		return;
+	} else {
+		if (p->engine.ps.lastf != TERMFONT_NONE) {
+			ps_pclose(p);
+			ps_setfont(p, TERMFONT_NONE);
+		}
+		cc = p->engine.ps.last;
+		p->engine.ps.last = c;
+		c = cc;
 	}
 
-	assert('\0' == p->engine.ps.last);
-	p->engine.ps.pscol += len ? len * PS_CHAR_WIDTH : 0;
+	ps_pletter(p, c);
 }
 
 
 static void
+ps_advance(struct termp *p, size_t len)
+{
+
+	/*
+	 * Advance some spaces.  This can probably be made smarter,
+	 * i.e., to have multiple space-separated words in the same
+	 * scope, but this is easier:  just close out the current scope
+	 * and readjust our column settings.
+	 */
+
+	ps_fclose(p);
+	p->engine.ps.pscol += len;
+}
+
+
+static void
 ps_endline(struct termp *p)
 {
 
-	if (PS_INLINE & p->engine.ps.psstate) {
-		assert(8 != p->engine.ps.last);
-		if (p->engine.ps.last)
-			ps_letter(p, p->engine.ps.last);
-		p->engine.ps.last = '\0';
-		ps_printf(p, ") show\n");
-		p->engine.ps.psstate &= ~PS_INLINE;
-	} else
-		assert('\0' == p->engine.ps.last);
+	/* Close out any scopes we have open: we're at eoln. */
 
+	ps_fclose(p);
+
+	/*
+	 * If we're in the margin, don't try to recalculate our current
+	 * row.  XXX: if the column tries to be fancy with multiple
+	 * lines, we'll do nasty stuff. 
+	 */
+
 	if (PS_MARGINS & p->engine.ps.psstate)
 		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 = PS_CHAR_LEFT;
 	if (p->engine.ps.psrow >= PS_CHAR_HEIGHT + PS_CHAR_BOT) {
 		p->engine.ps.psrow -= PS_CHAR_HEIGHT;
@@ -331,4 +740,26 @@ ps_endline(struct termp *p)
 	printf("%s", p->engine.ps.psmarg);
 	printf("showpage\n");
 	p->engine.ps.psrow = PS_CHAR_TOP;
+}
+
+
+static void
+ps_setfont(struct termp *p, enum termfont f)
+{
+
+	ps_printf(p, "/%s 10 selectfont\n", fonts[(int)f].name);
+	p->engine.ps.lastf = f;
+}
+
+
+/* ARGSUSED */
+static size_t
+ps_width(const struct termp *p, char c)
+{
+
+	if (c <= 32 || c - 32 >= MAXCHAR)
+		return(fonts[(int)TERMFONT_NONE].gly[0].wx / 100);
+
+	c -= 32;
+	return(fonts[(int)TERMFONT_NONE].gly[(int)c].wx / 100);
 }