===================================================================
RCS file: /cvs/mandoc/term_ascii.c,v
retrieving revision 1.24
retrieving revision 1.30
diff -u -p -r1.24 -r1.30
--- mandoc/term_ascii.c	2014/03/30 21:28:01	1.24
+++ mandoc/term_ascii.c	2014/08/14 22:33:10	1.30
@@ -1,4 +1,4 @@
-/*	$Id: term_ascii.c,v 1.24 2014/03/30 21:28:01 schwarze Exp $ */
+/*	$Id: term_ascii.c,v 1.30 2014/08/14 22:33:10 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,21 +15,19 @@
  * 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>
 
 #ifdef USE_WCHAR
-# include <locale.h>
+#include <locale.h>
 #endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #ifdef USE_WCHAR
-# include <wchar.h>
+#include <wchar.h>
 #endif
 
 #include "mandoc.h"
@@ -67,6 +65,7 @@ static	void		  locale_letter(struct termp *, int);
 static	size_t		  locale_width(const struct termp *, int);
 #endif
 
+
 static struct termp *
 ascii_init(enum termenc enc, char *outopts)
 {
@@ -94,8 +93,8 @@ ascii_init(enum termenc enc, char *outopts)
 #ifdef	USE_WCHAR
 	if (TERMENC_ASCII != enc) {
 		v = TERMENC_LOCALE == enc ?
-			setlocale(LC_ALL, "") :
-			setlocale(LC_CTYPE, "en_US.UTF-8");
+		    setlocale(LC_ALL, "") :
+		    setlocale(LC_CTYPE, "en_US.UTF-8");
 		if (NULL != v && MB_CUR_MAX > 1) {
 			p->enc = enc;
 			p->advance = locale_advance;
@@ -113,13 +112,13 @@ ascii_init(enum termenc enc, char *outopts)
 
 	while (outopts && *outopts)
 		switch (getsubopt(&outopts, UNCONST(toks), &v)) {
-		case (0):
+		case 0:
 			p->defindent = (size_t)atoi(v);
 			break;
-		case (1):
+		case 1:
 			p->defrmargin = (size_t)atoi(v);
 			break;
-		case (2):
+		case 2:
 			/*
 			 * Temporary, undocumented mode
 			 * to imitate mdoc(7) output style.
@@ -152,7 +151,6 @@ utf8_alloc(char *outopts)
 	return(ascii_init(TERMENC_UTF8, outopts));
 }
 
-
 void *
 locale_alloc(char *outopts)
 {
@@ -175,7 +173,6 @@ ascii_setwidth(struct termp *p, int iop, size_t width)
 	p->rmargin = p->maxrmargin = p->defrmargin;
 }
 
-/* ARGSUSED */
 static size_t
 ascii_width(const struct termp *p, int c)
 {
@@ -190,11 +187,10 @@ ascii_free(void *arg)
 	term_free((struct termp *)arg);
 }
 
-/* ARGSUSED */
 static void
 ascii_letter(struct termp *p, int c)
 {
-	
+
 	putchar(c);
 }
 
@@ -212,7 +208,6 @@ ascii_end(struct termp *p)
 	(*p->footf)(p, p->argf);
 }
 
-/* ARGSUSED */
 static void
 ascii_endline(struct termp *p)
 {
@@ -220,75 +215,86 @@ ascii_endline(struct termp *p)
 	putchar('\n');
 }
 
-/* ARGSUSED */
 static void
 ascii_advance(struct termp *p, size_t len)
 {
-	size_t	 	i;
+	size_t		i;
 
 	for (i = 0; i < len; i++)
 		putchar(' ');
 }
 
-/* ARGSUSED */
 static double
 ascii_hspan(const struct termp *p, const struct roffsu *su)
 {
 	double		 r;
 
 	/*
-	 * Approximate based on character width.  These are generated
-	 * entirely by eyeballing the screen, but appear to be correct.
+	 * Approximate based on character width.
+	 * None of these will be actually correct given that an inch on
+	 * the screen depends on character size, terminal, etc., etc.
 	 */
-
 	switch (su->unit) {
-	case (SCALE_CM):
-		r = 4 * su->scale;
+	case SCALE_BU:
+		r = su->scale * 10.0 / 240.0;
 		break;
-	case (SCALE_IN):
-		r = 10 * su->scale;
+	case SCALE_CM:
+		r = su->scale * 10.0 / 2.54;
 		break;
-	case (SCALE_PC):
-		r = (10 * su->scale) / 6;
+	case SCALE_FS:
+		r = su->scale * 2730.666;
 		break;
-	case (SCALE_PT):
-		r = (10 * su->scale) / 72;
+	case SCALE_IN:
+		r = su->scale * 10.0;
 		break;
-	case (SCALE_MM):
-		r = su->scale / 1000;
+	case SCALE_MM:
+		r = su->scale / 100.0;
 		break;
-	case (SCALE_VS):
-		r = su->scale * 2 - 1;
+	case SCALE_PC:
+		r = su->scale * 10.0 / 6.0;
 		break;
-	default:
+	case SCALE_PT:
+		r = su->scale * 10.0 / 72.0;
+		break;
+	case SCALE_VS:
+		r = su->scale * 2.0 - 1.0;
+		break;
+	case SCALE_EN:
+		/* FALLTHROUGH */
+	case SCALE_EM:
 		r = su->scale;
 		break;
+	case SCALE_MAX:
+		abort();
+		/* NOTREACHED */
 	}
 
 	return(r);
 }
 
 #ifdef USE_WCHAR
-/* ARGSUSED */
 static size_t
 locale_width(const struct termp *p, int c)
 {
 	int		rc;
 
-	return((rc = wcwidth(c)) < 0 ? 0 : rc);
+	if (c == ASCII_NBRSP)
+		c = ' ';
+	rc = wcwidth(c);
+	if (rc < 0)
+		rc = 0;
+	return(rc);
 }
 
-/* ARGSUSED */
 static void
 locale_advance(struct termp *p, size_t len)
 {
-	size_t	 	i;
+	size_t		i;
 
 	for (i = 0; i < len; i++)
 		putwchar(L' ');
 }
 
-/* ARGSUSED */
 static void
 locale_endline(struct termp *p)
 {
@@ -296,11 +302,10 @@ locale_endline(struct termp *p)
 	putwchar(L'\n');
 }
 
-/* ARGSUSED */
 static void
 locale_letter(struct termp *p, int c)
 {
-	
+
 	putwchar(c);
 }
 #endif