===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.18
retrieving revision 1.21
diff -u -p -r1.18 -r1.21
--- mandoc/term_ps.c	2010/06/30 11:45:21	1.18
+++ mandoc/term_ps.c	2010/06/30 13:00:00	1.21
@@ -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.21 2010/06/30 13:00:00 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -32,6 +32,14 @@
 #include "main.h"
 #include "term.h"
 
+/* Convert PostScript point "x" to an AFM unit. */
+#define	PNT2AFM(p, x) \
+	(size_t)((double)(x) * (1000.0 / (double)(p)->engine.ps.scale))
+
+/* Convert an AFM unit "x" to a PostScript points */
+#define	AFM2PNT(p, x) \
+	(size_t)((double)(x) / (1000.0 / (double)(p)->engine.ps.scale))
+
 struct	glyph {
 	int		  wx; /* WX in AFM */
 };
@@ -359,13 +367,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 *, ...);
@@ -385,17 +395,22 @@ ps_alloc(char *outopts)
 	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;
+	
+	p->engine.ps.scale = 10;
 
 	toks[0] = "paper";
 	toks[1] = NULL;
 
+	paper = "letter";
+
 	while (outopts && *outopts)
 		switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 		case (0):
@@ -405,17 +420,17 @@ ps_alloc(char *outopts)
 			break;
 		}
 
+	margin = PNT2AFM(p, 72);
+	lineheight = PNT2AFM(p, 12);
+
 	if (0 == strcasecmp(paper, "a4")) {
-		pagex = 595 * 100;
-		pagey = 842 * 100;
+		pagex = PNT2AFM(p, 595);
+		pagey = PNT2AFM(p, 842);
 	} else {
-		pagex = 612 * 100;
-		pagey = 792 * 100;
+		pagex = PNT2AFM(p, 612);
+		pagey = PNT2AFM(p, 792);
 	}
 
-	margin = 72 * 100;
-	lineheight = 12 * 100;
-
 	assert(margin * 2 < pagex);
 	assert(margin * 2 < pagey);
 
@@ -610,8 +625,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;
 	}
 
@@ -805,7 +820,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 +837,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);
+}
+