===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.61
retrieving revision 1.64
diff -u -p -r1.61 -r1.64
--- mandoc/term_ps.c	2014/07/27 21:53:17	1.61
+++ mandoc/term_ps.c	2014/08/13 20:34:29	1.64
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.61 2014/07/27 21:53:17 schwarze Exp $ */
+/*	$Id: term_ps.c,v 1.64 2014/08/13 20:34:29 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -1117,30 +1115,40 @@ ps_hspan(const struct termp *p, const struct roffsu *s
 	 * All of these measurements are derived by converting from the
 	 * native measurement to AFM units.
 	 */
-
 	switch (su->unit) {
+	case SCALE_BU:
+		/*
+		 * Traditionally, the default unit is fixed to the
+		 * output media.  So this would refer to the point.  In
+		 * mandoc(1), however, we stick to the default terminal
+		 * scaling unit so that output is the same regardless
+		 * the media.
+		 */
+		r = PNT2AFM(p, su->scale * 72.0 / 240.0);
+		break;
 	case SCALE_CM:
-		r = PNT2AFM(p, su->scale * 28.34);
+		r = PNT2AFM(p, su->scale * 72.0 / 2.54);
 		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_IN:
+		r = PNT2AFM(p, su->scale * 72.0);
+		break;
+	case SCALE_MM:
+		r = su->scale *
+		    fonts[(int)TERMFONT_NONE].gly[109 - 32].wx / 100.0;
+		break;
+	case SCALE_PC:
+		r = PNT2AFM(p, su->scale * 12.0);
+		break;
+	case SCALE_PT:
+		r = PNT2AFM(p, su->scale * 1.0);
 		break;
 	case SCALE_VS:
 		r = su->scale * p->ps->lineheight;