===================================================================
RCS file: /cvs/mandoc/term_ascii.c,v
retrieving revision 1.44
retrieving revision 1.50
diff -u -p -r1.44 -r1.50
--- mandoc/term_ascii.c	2015/03/27 21:33:20	1.44
+++ mandoc/term_ascii.c	2015/10/12 00:08:16	1.50
@@ -1,4 +1,4 @@
-/*	$Id: term_ascii.c,v 1.44 2015/03/27 21:33:20 schwarze Exp $ */
+/*	$Id: term_ascii.c,v 1.50 2015/10/12 00:08:16 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -40,7 +40,7 @@
 
 static	struct termp	 *ascii_init(enum termenc, const struct mchars *,
 				const struct manoutput *);
-static	double		  ascii_hspan(const struct termp *,
+static	int		  ascii_hspan(const struct termp *,
 				const struct roffsu *);
 static	size_t		  ascii_width(const struct termp *, int);
 static	void		  ascii_advance(struct termp *, size_t);
@@ -48,7 +48,7 @@ static	void		  ascii_begin(struct termp *);
 static	void		  ascii_end(struct termp *);
 static	void		  ascii_endline(struct termp *);
 static	void		  ascii_letter(struct termp *, int);
-static	void		  ascii_setwidth(struct termp *, int, size_t);
+static	void		  ascii_setwidth(struct termp *, int, int);
 
 #if HAVE_WCHAR
 static	void		  locale_advance(struct termp *, size_t);
@@ -62,12 +62,15 @@ static struct termp *
 ascii_init(enum termenc enc, const struct mchars *mchars,
 	const struct manoutput *outopts)
 {
+#if HAVE_WCHAR
 	char		*v;
+#endif
 	struct termp	*p;
 
 	p = mandoc_calloc(1, sizeof(struct termp));
 
 	p->symtab = mchars;
+	p->line = 1;
 	p->tabwidth = 5;
 	p->defrmargin = p->lastrmargin = 78;
 	p->fontq = mandoc_reallocarray(NULL,
@@ -112,40 +115,41 @@ ascii_init(enum termenc enc, const struct mchars *mcha
 	if (outopts->synopsisonly)
 		p->synopsisonly = 1;
 
-	return(p);
+	return p;
 }
 
 void *
 ascii_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {
 
-	return(ascii_init(TERMENC_ASCII, mchars, outopts));
+	return ascii_init(TERMENC_ASCII, mchars, outopts);
 }
 
 void *
 utf8_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {
 
-	return(ascii_init(TERMENC_UTF8, mchars, outopts));
+	return ascii_init(TERMENC_UTF8, mchars, outopts);
 }
 
 void *
 locale_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {
 
-	return(ascii_init(TERMENC_LOCALE, mchars, outopts));
+	return ascii_init(TERMENC_LOCALE, mchars, outopts);
 }
 
 static void
-ascii_setwidth(struct termp *p, int iop, size_t width)
+ascii_setwidth(struct termp *p, int iop, int width)
 {
 
+	width /= 24;
 	p->rmargin = p->defrmargin;
 	if (iop > 0)
 		p->defrmargin += width;
 	else if (iop == 0)
-		p->defrmargin = width ? width : p->lastrmargin;
-	else if (p->defrmargin > width)
+		p->defrmargin = width ? (size_t)width : p->lastrmargin;
+	else if (p->defrmargin > (size_t)width)
 		p->defrmargin -= width;
 	else
 		p->defrmargin = 0;
@@ -160,6 +164,7 @@ ascii_sepline(void *arg)
 	size_t		 i;
 
 	p = (struct termp *)arg;
+	p->line += 3;
 	putchar('\n');
 	for (i = 0; i < p->defrmargin; i++)
 		putchar('-');
@@ -171,7 +176,7 @@ static size_t
 ascii_width(const struct termp *p, int c)
 {
 
-	return(1);
+	return 1;
 }
 
 void
@@ -206,6 +211,7 @@ static void
 ascii_endline(struct termp *p)
 {
 
+	p->line++;
 	putchar('\n');
 }
 
@@ -218,52 +224,42 @@ ascii_advance(struct termp *p, size_t len)
 		putchar(' ');
 }
 
-static double
+static int
 ascii_hspan(const struct termp *p, const struct roffsu *su)
 {
 	double		 r;
 
-	/*
-	 * 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_BU:
-		r = su->scale * 10.0 / 240.0;
+		r = su->scale;
 		break;
 	case SCALE_CM:
-		r = su->scale * 10.0 / 2.54;
+		r = su->scale * 240.0 / 2.54;
 		break;
 	case SCALE_FS:
-		r = su->scale * 2730.666;
+		r = su->scale * 65536.0;
 		break;
 	case SCALE_IN:
-		r = su->scale * 10.0;
+		r = su->scale * 240.0;
 		break;
 	case SCALE_MM:
-		r = su->scale / 100.0;
+		r = su->scale * 0.24;
 		break;
+	case SCALE_VS:
 	case SCALE_PC:
-		r = su->scale * 10.0 / 6.0;
+		r = su->scale * 40.0;
 		break;
 	case SCALE_PT:
-		r = su->scale * 10.0 / 72.0;
+		r = su->scale * 10.0 / 3.0;
 		break;
-	case SCALE_VS:
-		r = su->scale * 2.0 - 1.0;
-		break;
 	case SCALE_EN:
-		/* FALLTHROUGH */
 	case SCALE_EM:
-		r = su->scale;
+		r = su->scale * 24.0;
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
-
-	return(r);
+	return r > 0.0 ? r + 0.01 : r - 0.01;
 }
 
 const char *
@@ -338,8 +334,8 @@ ascii_uc2str(int uc)
 
 	assert(uc >= 0);
 	if ((size_t)uc < sizeof(tab)/sizeof(tab[0]))
-		return(tab[uc]);
-	return(mchars_uc2str(uc));
+		return tab[uc];
+	return mchars_uc2str(uc);
 }
 
 #if HAVE_WCHAR
@@ -353,7 +349,7 @@ locale_width(const struct termp *p, int c)
 	rc = wcwidth(c);
 	if (rc < 0)
 		rc = 0;
-	return(rc);
+	return rc;
 }
 
 static void
@@ -369,6 +365,7 @@ static void
 locale_endline(struct termp *p)
 {
 
+	p->line++;
 	putwchar(L'\n');
 }