===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.13
retrieving revision 1.22
diff -u -p -r1.13 -r1.22
--- mandoc/term_ps.c	2010/06/28 13:45:28	1.13
+++ mandoc/term_ps.c	2010/06/30 13:16:25	1.22
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.13 2010/06/28 13:45:28 kristaps Exp $ */
+/*	$Id: term_ps.c,v 1.22 2010/06/30 13:16:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,14 +32,21 @@
 #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 */
 };
 
-#define	MAXCHAR		  95
-
 struct	font {
 	const char	 *name; /* FontName in AFM */
+#define	MAXCHAR		  95 /* total characters we can handle */
 	struct glyph	  gly[MAXCHAR]; /* glyph metrics */
 };
 
@@ -48,307 +56,301 @@ struct	font {
  * 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 },
+static	const struct font fonts[TERMFONT__MAX] = {
+	{ "CharterBT-Roman", {
+		{  278 },
+		{  338 },
+		{  331 },
+		{  745 },
+		{  556 },
+		{  852 },
+		{  704 },
+		{  201 },
+		{  417 },
+		{  417 },
+		{  500 },
+		{  833 },
+		{  278 },
+		{  319 },
+		{  278 },
+		{  481 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  319 },
+		{  319 },
+		{  833 },
+		{  833 },
+		{  833 },
+		{  486 },
+		{  942 },
+		{  639 },
+		{  604 },
+		{  632 },
+		{  693 },
+		{  576 },
+		{  537 },
+		{  694 },
+		{  738 },
+		{  324 },
+		{  444 },
+		{  611 },
+		{  520 },
+		{  866 },
+		{  713 },
+		{  731 },
+		{  558 },
+		{  731 },
+		{  646 },
+		{  556 },
+		{  597 },
+		{  694 },
+		{  618 },
+		{  928 },
+		{  600 },
+		{  586 },
+		{  586 },
+		{  421 },
+		{  481 },
+		{  421 },
+		{ 1000 },
+		{  500 },
+		{  201 },
+		{  507 },
+		{  539 },
+		{  446 },
+		{  565 },
+		{  491 },
+		{  321 },
+		{  523 },
+		{  564 },
+		{  280 },
+		{  266 },
+		{  517 },
+		{  282 },
+		{  843 },
+		{  568 },
+		{  539 },
+		{  551 },
+		{  531 },
+		{  382 },
+		{  400 },
+		{  334 },
+		{  569 },
+		{  494 },
+		{  771 },
+		{  503 },
+		{  495 },
+		{  468 },
+		{  486 },
+		{  500 },
+		{  486 },
+		{  833 },
 	} },
-	{ "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 },
+	{ "CharterBT-Bold", {
+		{  291 },
+		{  340 },
+		{  339 },
+		{  736 },
+		{  581 },
+		{  888 },
+		{  741 },
+		{  255 },
+		{  428 },
+		{  428 },
+		{  500 },
+		{  833 },
+		{  289 },
+		{  326 },
+		{  289 },
+		{  491 },
+		{  581 },
+		{  581 },
+		{  581 },
+		{  581 },
+		{  581 },
+		{  581 },
+		{  581 },
+		{  581 },
+		{  581 },
+		{  581 },
+		{  340 },
+		{  340 },
+		{  833 },
+		{  833 },
+		{  833 },
+		{  487 },
+		{  917 },
+		{  651 },
+		{  628 },
+		{  638 },
+		{  716 },
+		{  596 },
+		{  552 },
+		{  710 },
+		{  760 },
+		{  354 },
+		{  465 },
+		{  650 },
+		{  543 },
+		{  883 },
+		{  727 },
+		{  752 },
+		{  587 },
+		{  752 },
+		{  671 },
+		{  568 },
+		{  603 },
+		{  705 },
+		{  635 },
+		{  946 },
+		{  637 },
+		{  610 },
+		{  592 },
+		{  443 },
+		{  491 },
+		{  443 },
+		{ 1000 },
+		{  500 },
+		{  255 },
+		{  544 },
+		{  577 },
+		{  476 },
+		{  596 },
+		{  524 },
+		{  341 },
+		{  551 },
+		{  597 },
+		{  305 },
+		{  297 },
+		{  553 },
+		{  304 },
+		{  892 },
+		{  605 },
+		{  577 },
+		{  591 },
+		{  575 },
+		{  421 },
+		{  447 },
+		{  358 },
+		{  600 },
+		{  513 },
+		{  799 },
+		{  531 },
+		{  515 },
+		{  495 },
+		{  493 },
+		{  500 },
+		{  493 },
+		{  833 },
 	} },
-	{ "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 },
+	{ "CharterBT-Italic", {
+		{  278 },
+		{  338 },
+		{  331 },
+		{  745 },
+		{  556 },
+		{  852 },
+		{  704 },
+		{  201 },
+		{  419 },
+		{  419 },
+		{  500 },
+		{  833 },
+		{  278 },
+		{  319 },
+		{  278 },
+		{  481 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  556 },
+		{  319 },
+		{  319 },
+		{  833 },
+		{  833 },
+		{  833 },
+		{  486 },
+		{  942 },
+		{  606 },
+		{  588 },
+		{  604 },
+		{  671 },
+		{  546 },
+		{  509 },
+		{  664 },
+		{  712 },
+		{  312 },
+		{  447 },
+		{  625 },
+		{  498 },
+		{  839 },
+		{  683 },
+		{  708 },
+		{  542 },
+		{  708 },
+		{  602 },
+		{  537 },
+		{  565 },
+		{  664 },
+		{  590 },
+		{  898 },
+		{  569 },
+		{  562 },
+		{  556 },
+		{  421 },
+		{  481 },
+		{  421 },
+		{ 1000 },
+		{  500 },
+		{  201 },
+		{  525 },
+		{  507 },
+		{  394 },
+		{  523 },
+		{  424 },
+		{  292 },
+		{  481 },
+		{  551 },
+		{  287 },
+		{  269 },
+		{  514 },
+		{  275 },
+		{  815 },
+		{  556 },
+		{  502 },
+		{  516 },
+		{  512 },
+		{  398 },
+		{  370 },
+		{  333 },
+		{  553 },
+		{  454 },
+		{  713 },
+		{  477 },
+		{  475 },
+		{  440 },
+		{  486 },
+		{  500 },
+		{  486 },
+		{  833 },
 	} },
 };
 
-#define	PS_CHAR_HEIGHT	  12
-#define	PS_CHAR_TOPMARG	 (792 - 24)
-#define	PS_CHAR_TOP	 (PS_CHAR_TOPMARG - 36)
-#define	PS_CHAR_LEFT	  36
-#define	PS_CHAR_BOTMARG	  24
-#define	PS_CHAR_BOT	 (PS_CHAR_BOTMARG + 36)
-
+/* These work the buffer used by the header and footer. */
 #define	PS_BUFSLOP	  128
 #define	PS_GROWBUF(p, sz) \
 	do if ((p)->engine.ps.psmargcur + (sz) > \
@@ -365,13 +367,15 @@ static	const struct font fonts[3] = {
 	} 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 *, ...);
@@ -380,23 +384,66 @@ static	void		  ps_setfont(struct termp *, enum termfon
 
 
 void *
-ps_alloc(void)
+ps_alloc(char *outopts)
 {
 	struct termp	*p;
+	size_t		 pagex, pagey, margin, lineheight;
+	const char	*toks[2];
+	const char	*paper;
+	char		*v;
 
 	if (NULL == (p = term_alloc(TERMENC_ASCII)))
 		return(NULL);
 
-	p->defrmargin = 78;
-	p->tabwidth = 5;
-
-	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):
+			paper = v;
+			break;
+		default:
+			break;
+		}
+
+	margin = PNT2AFM(p, 72);
+	lineheight = PNT2AFM(p, 12);
+
+	if (0 == strcasecmp(paper, "a4")) {
+		pagex = PNT2AFM(p, 595);
+		pagey = PNT2AFM(p, 842);
+	} else {
+		pagex = PNT2AFM(p, 612);
+		pagey = PNT2AFM(p, 792);
+	}
+
+	assert(margin * 2 < pagex);
+	assert(margin * 2 < pagey);
+
+	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.lineheight = lineheight;
+
+	p->defrmargin = pagex - (margin * 2);
 	return(p);
 }
 
@@ -486,8 +533,12 @@ ps_end(struct termp *p)
 	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("%s\n", "%%EOF");
+
+	printf("%%%%Trailer\n");
+	printf("%%%%Pages: %zu\n", p->engine.ps.pages);
+	printf("%%%%EOF\n");
 }
 
 
@@ -495,6 +546,7 @@ static void
 ps_begin(struct termp *p)
 {
 	time_t		 t;
+	int		 i;
 
 	/* 
 	 * Print margins into margin buffer.  Nothing gets output to the
@@ -508,16 +560,16 @@ ps_begin(struct termp *p)
 
 	p->engine.ps.psmargcur = 0;
 	p->engine.ps.psstate = PS_MARGINS;
-	p->engine.ps.pscol = PS_CHAR_LEFT;
-	p->engine.ps.psrow = PS_CHAR_TOPMARG;
+	p->engine.ps.pscol = p->engine.ps.left;
+	p->engine.ps.psrow = p->engine.ps.header;
 
 	ps_setfont(p, TERMFONT_NONE);
 
 	(*p->headf)(p, p->argf);
 	(*p->endline)(p);
 
-	p->engine.ps.pscol = PS_CHAR_LEFT;
-	p->engine.ps.psrow = PS_CHAR_BOTMARG;
+	p->engine.ps.pscol = p->engine.ps.left;
+	p->engine.ps.psrow = p->engine.ps.footer;
 
 	(*p->footf)(p, p->argf);
 	(*p->endline)(p);
@@ -535,22 +587,36 @@ ps_begin(struct termp *p)
 
 	t = time(NULL);
 
-	printf("%%!PS\n");
+	printf("%%!PS-Adobe-3.0\n");
 	printf("%%%%Creator: mandoc-%s\n", VERSION);
 	printf("%%%%CreationDate: %s", ctime(&t));
+	printf("%%%%DocumentData: Clean7Bit\n");
+	printf("%%%%Orientation: Portrait\n");
+	printf("%%%%Pages: (atend)\n");
 	printf("%%%%PageOrder: Ascend\n");
 	printf("%%%%Orientation: Portrait\n");
-	printf("%%%%EndComments\n");
+	printf("%%%%DocumentMedia: Default %zu %zu 0 () ()\n",
+			p->engine.ps.width,
+			p->engine.ps.height);
+	printf("%%%%DocumentNeededResources: font");
+	for (i = 0; i < (int)TERMFONT__MAX; i++)
+		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 = PS_CHAR_LEFT;
-	p->engine.ps.psrow = PS_CHAR_TOP;
+	p->engine.ps.pscol = p->engine.ps.left;
+	p->engine.ps.psrow = p->engine.ps.top;
 }
 
 
 static void
 ps_pletter(struct termp *p, int c)
 {
+	int		 f;
 	
 	/*
 	 * If we're not in a PostScript "word" context, then open one
@@ -559,8 +625,8 @@ ps_pletter(struct termp *p, int c)
 
 	if ( ! (PS_INLINE & p->engine.ps.psstate)) {
 		ps_printf(p, "%zu %zu moveto\n(", 
-				p->engine.ps.pscol, 
-				p->engine.ps.psrow);
+				AFM2PNT(p, p->engine.ps.pscol),
+				AFM2PNT(p, p->engine.ps.psrow));
 		p->engine.ps.psstate |= PS_INLINE;
 	}
 
@@ -585,21 +651,17 @@ ps_pletter(struct termp *p, int c)
 
 	/* Write the character and adjust where we are on the page. */
 
-	/* 
-	 * FIXME: at this time we emit only blacnks on non-ASCII
-	 * letters.
-	 */
+	f = (int)p->engine.ps.lastf;
 
-	if (c < 32 || (c - 32 > MAXCHAR)) {
+	if (c <= 32 || (c - 32 > MAXCHAR)) {
 		ps_putchar(p, ' ');
-		p->engine.ps.pscol += 
-			(fonts[p->engine.ps.lastf].gly[32].wx / 100);
+		p->engine.ps.pscol += fonts[f].gly[0].wx;
 		return;
 	} 
 
 	ps_putchar(p, c);
-	p->engine.ps.pscol += 
-		(fonts[p->engine.ps.lastf].gly[(int)c - 32].wx / 100);
+	c -= 32;
+	p->engine.ps.pscol += fonts[f].gly[c].wx;
 }
 
 
@@ -709,8 +771,7 @@ ps_advance(struct termp *p, size_t len)
 	 */
 
 	ps_fclose(p);
-	p->engine.ps.pscol += 0 == len ? 0 :
-		len * (fonts[p->engine.ps.lastf].gly[0].wx / 100);
+	p->engine.ps.pscol += len;
 }
 
 
@@ -736,16 +797,21 @@ ps_endline(struct termp *p)
 	 * 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;
+	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;
 		return;
 	}
 
 	assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
 	printf("%s", p->engine.ps.psmarg);
+	printf("%%%%Page: %zu %zu\n", 
+			p->engine.ps.pages + 1, 
+			p->engine.ps.pages + 1);
 	printf("showpage\n");
-	p->engine.ps.psrow = PS_CHAR_TOP;
+	p->engine.ps.pages++;
+	p->engine.ps.psrow = p->engine.ps.top;
 }
 
 
@@ -753,7 +819,9 @@ static void
 ps_setfont(struct termp *p, enum termfont f)
 {
 
-	ps_printf(p, "/%s 10 selectfont\n", fonts[(int)f].name);
+	assert(f < TERMFONT__MAX);
+	ps_printf(p, "/%s %zu selectfont\n", 
+			fonts[(int)f].name, p->engine.ps.scale);
 	p->engine.ps.lastf = f;
 }
 
@@ -763,5 +831,56 @@ static size_t
 ps_width(const struct termp *p, char c)
 {
 
-	return(1);
+	if (c <= 32 || c - 32 >= MAXCHAR)
+		return(fonts[(int)TERMFONT_NONE].gly[0].wx);
+
+	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);
+}
+