===================================================================
RCS file: /cvs/mandoc/term_ps.c,v
retrieving revision 1.73
retrieving revision 1.81
diff -u -p -r1.73 -r1.81
--- mandoc/term_ps.c	2015/03/27 21:33:20	1.73
+++ mandoc/term_ps.c	2016/07/19 13:36:13	1.81
@@ -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.81 2016/07/19 13:36:13 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,6 +20,9 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#if HAVE_ERR
+#include <err.h>
+#endif
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -87,7 +90,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);
@@ -100,15 +103,12 @@ static	void		  ps_growbuf(struct termp *, size_t);
 static	void		  ps_letter(struct termp *, int);
 static	void		  ps_pclose(struct termp *);
 static	void		  ps_pletter(struct termp *, int);
-#if __GNUC__ - 0 >= 4
-__attribute__((__format__ (__printf__, 2, 3)))
-#endif
-static	void		  ps_printf(struct termp *, const char *, ...);
+static	void		  ps_printf(struct termp *, const char *, ...)
+				__attribute__((__format__ (printf, 2, 3)));
 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	struct termp	 *pspdf_alloc(const struct mchars *,
-				const struct manoutput *);
+static	void		  ps_setwidth(struct termp *, int, int);
+static	struct termp	 *pspdf_alloc(const struct manoutput *);
 static	void		  pdf_obj(struct termp *, size_t);
 
 /*
@@ -509,29 +509,29 @@ static	const struct font fonts[TERMFONT__MAX] = {
 };
 
 void *
-pdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+pdf_alloc(const struct manoutput *outopts)
 {
 	struct termp	*p;
 
-	if (NULL != (p = pspdf_alloc(mchars, outopts)))
+	if (NULL != (p = pspdf_alloc(outopts)))
 		p->type = TERMTYPE_PDF;
 
-	return(p);
+	return p;
 }
 
 void *
-ps_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+ps_alloc(const struct manoutput *outopts)
 {
 	struct termp	*p;
 
-	if (NULL != (p = pspdf_alloc(mchars, outopts)))
+	if (NULL != (p = pspdf_alloc(outopts)))
 		p->type = TERMTYPE_PS;
 
-	return(p);
+	return p;
 }
 
 static struct termp *
-pspdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+pspdf_alloc(const struct manoutput *outopts)
 {
 	struct termp	*p;
 	unsigned int	 pagex, pagey;
@@ -539,7 +539,6 @@ pspdf_alloc(const struct mchars *mchars, const struct 
 	const char	*pp;
 
 	p = mandoc_calloc(1, sizeof(struct termp));
-	p->symtab = mchars;
 	p->enc = TERMENC_ASCII;
 	p->fontq = mandoc_reallocarray(NULL,
 	    (p->fontsz = 8), sizeof(enum termfont));
@@ -582,7 +581,7 @@ pspdf_alloc(const struct mchars *mchars, const struct 
 			pagex = 216;
 			pagey = 356;
 		} else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey))
-			fprintf(stderr, "%s: Unknown paper\n", pp);
+			warnx("%s: Unknown paper", pp);
 	}
 
 	/*
@@ -616,11 +615,11 @@ pspdf_alloc(const struct mchars *mchars, const struct 
 	p->ps->lineheight = lineheight;
 
 	p->defrmargin = pagex - (marginx * 2);
-	return(p);
+	return p;
 }
 
 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 +627,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;
@@ -643,10 +642,8 @@ pspdf_free(void *arg)
 
 	p = (struct termp *)arg;
 
-	if (p->ps->psmarg)
-		free(p->ps->psmarg);
-	if (p->ps->pdfobjs)
-		free(p->ps->pdfobjs);
+	free(p->ps->psmarg);
+	free(p->ps->pdfobjs);
 
 	free(p->ps);
 	term_free(p);
@@ -985,9 +982,7 @@ ps_pletter(struct termp *p, int c)
 
 	switch (c) {
 	case '(':
-		/* FALLTHROUGH */
 	case ')':
-		/* FALLTHROUGH */
 	case '\\':
 		ps_putchar(p, '\\');
 		break;
@@ -1270,10 +1265,10 @@ ps_width(const struct termp *p, int c)
 	else
 		c -= 32;
 
-	return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
+	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 +1320,7 @@ ps_hspan(const struct termp *p, const struct roffsu *s
 		break;
 	}
 
-	return(r);
+	return r * 24.0;
 }
 
 static void