Rounding rules for horizontal scaling widths are more complicated.

There is a first rounding to basic units on the input side.
After that, rounding rules differ between requests and macros.
Requests round to the nearest possible character position.
Macros round to the next character position to the left.

Implement that by changing the return value of term_hspan()
to basic units and leaving the second scaling and rounding stage
to the formatters instead of doing it in the terminal handler.

Improves for example argtable2(3).

1 files changed, 8 insertions, 8 deletions

diff --git a/term_ps.c b/term_ps.c
index 961de1b0..bd86d791 100644
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,4 +1,4 @@
-/*	$Id: term_ps.c,v 1.73 2015/03/27 21:33:20 schwarze Exp $ */
+/*	$Id: term_ps.c,v 1.74 2015/04/04 17:47:18 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -87,7 +87,7 @@ struct	termp_ps {
 	size_t		  pdfobjsz;	/* size of pdfobjs */
 };
 
-static	double		  ps_hspan(const struct termp *,
+static	int		  ps_hspan(const struct termp *,
 				const struct roffsu *);
 static	size_t		  ps_width(const struct termp *, int);
 static	void		  ps_advance(struct termp *, size_t);
@@ -106,7 +106,7 @@ __attribute__((__format__ (__printf__, 2, 3)))
 static	void		  ps_printf(struct termp *, const char *, ...);
 static	void		  ps_putchar(struct termp *, char);
 static	void		  ps_setfont(struct termp *, enum termfont);
-static	void		  ps_setwidth(struct termp *, int, size_t);
+static	void		  ps_setwidth(struct termp *, int, int);
 static	struct termp	 *pspdf_alloc(const struct mchars *,
 				const struct manoutput *);
 static	void		  pdf_obj(struct termp *, size_t);
@@ -620,7 +620,7 @@ pspdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 }
 
 static void
-ps_setwidth(struct termp *p, int iop, size_t width)
+ps_setwidth(struct termp *p, int iop, int width)
 {
 	size_t	 lastwidth;
 
@@ -628,8 +628,8 @@ ps_setwidth(struct termp *p, int iop, size_t width)
 	if (iop > 0)
 		p->ps->width += width;
 	else if (iop == 0)
-		p->ps->width = width ? width : p->ps->lastwidth;
-	else if (p->ps->width > width)
+		p->ps->width = width ? (size_t)width : p->ps->lastwidth;
+	else if (p->ps->width > (size_t)width)
 		p->ps->width -= width;
 	else
 		p->ps->width = 0;
@@ -1273,7 +1273,7 @@ ps_width(const struct termp *p, int c)
 	return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
 }
 
-static double
+static int
 ps_hspan(const struct termp *p, const struct roffsu *su)
 {
 	double		 r;
@@ -1325,7 +1325,7 @@ ps_hspan(const struct termp *p, const struct roffsu *su)
 		break;
 	}
 
-	return(r);
+	return(r * 24.0);
 }
 
 static void