===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.314
retrieving revision 1.317
diff -u -p -r1.314 -r1.317
--- mandoc/mdoc_term.c	2015/04/02 21:36:50	1.314
+++ mandoc/mdoc_term.c	2015/04/04 17:47:18	1.317
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.314 2015/04/02 21:36:50 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.317 2015/04/04 17:47:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -43,8 +43,8 @@ struct	termpair {
 
 #define	DECL_ARGS struct termp *p, \
 		  struct termpair *pair, \
-		  const struct mdoc_meta *meta, \
-		  struct mdoc_node *n
+		  const struct roff_meta *meta, \
+		  struct roff_node *n
 
 struct	termact {
 	int	(*pre)(DECL_ARGS);
@@ -54,14 +54,14 @@ struct	termact {
 static	int	  a2width(const struct termp *, const char *);
 
 static	void	  print_bvspace(struct termp *,
-			const struct mdoc_node *,
-			const struct mdoc_node *);
+			const struct roff_node *,
+			const struct roff_node *);
 static	void	  print_mdoc_node(DECL_ARGS);
 static	void	  print_mdoc_nodelist(DECL_ARGS);
-static	void	  print_mdoc_head(struct termp *, const void *);
-static	void	  print_mdoc_foot(struct termp *, const void *);
+static	void	  print_mdoc_head(struct termp *, const struct roff_meta *);
+static	void	  print_mdoc_foot(struct termp *, const struct roff_meta *);
 static	void	  synopsis_pre(struct termp *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 
 static	void	  termp____post(DECL_ARGS);
 static	void	  termp__t_post(DECL_ARGS);
@@ -253,8 +253,8 @@ static	const struct termact termacts[MDOC_MAX] = {
 void
 terminal_mdoc(void *arg, const struct mdoc *mdoc)
 {
-	const struct mdoc_meta	*meta;
-	struct mdoc_node	*n;
+	const struct roff_meta	*meta;
+	struct roff_node	*n;
 	struct termp		*p;
 
 	p = (struct termp *)arg;
@@ -407,13 +407,10 @@ print_mdoc_node(DECL_ARGS)
 }
 
 static void
-print_mdoc_foot(struct termp *p, const void *arg)
+print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
 {
-	const struct mdoc_meta *meta;
 	size_t sz;
 
-	meta = (const struct mdoc_meta *)arg;
-
 	term_fontrepl(p, TERMFONT_NONE);
 
 	/*
@@ -459,14 +456,11 @@ print_mdoc_foot(struct termp *p, const void *arg)
 }
 
 static void
-print_mdoc_head(struct termp *p, const void *arg)
+print_mdoc_head(struct termp *p, const struct roff_meta *meta)
 {
-	const struct mdoc_meta	*meta;
 	char			*volume, *title;
 	size_t			 vollen, titlen;
 
-	meta = (const struct mdoc_meta *)arg;
-
 	/*
 	 * The header is strange.  It has three components, which are
 	 * really two with the first duplicated.  It goes like this:
@@ -539,7 +533,7 @@ a2width(const struct termp *p, const char *v)
 		SCALE_HS_INIT(&su, term_strlen(p, v));
 		su.scale /= term_strlen(p, "0");
 	}
-	return(term_hspan(p, &su));
+	return(term_hspan(p, &su) / 24);
 }
 
 /*
@@ -549,10 +543,10 @@ a2width(const struct termp *p, const char *v)
  */
 static void
 print_bvspace(struct termp *p,
-	const struct mdoc_node *bl,
-	const struct mdoc_node *n)
+	const struct roff_node *bl,
+	const struct roff_node *n)
 {
-	const struct mdoc_node	*nn;
+	const struct roff_node	*nn;
 
 	assert(n);
 
@@ -610,7 +604,7 @@ static int
 termp_it_pre(DECL_ARGS)
 {
 	char			buf[24];
-	const struct mdoc_node *bl, *nn;
+	const struct roff_node *bl, *nn;
 	size_t			ncols, dcol;
 	int			i, offset, width;
 	enum mdoc_list		type;
@@ -1267,7 +1261,7 @@ termp_xr_pre(DECL_ARGS)
  * macro combos).
  */
 static void
-synopsis_pre(struct termp *p, const struct mdoc_node *n)
+synopsis_pre(struct termp *p, const struct roff_node *n)
 {
 	/*
 	 * Obviously, if we're not in a SYNOPSIS or no prior macros
@@ -1515,7 +1509,7 @@ termp_fn_pre(DECL_ARGS)
 static int
 termp_fa_pre(DECL_ARGS)
 {
-	const struct mdoc_node	*nn;
+	const struct roff_node	*nn;
 
 	if (n->parent->tok != MDOC_Fo) {
 		term_fontpush(p, TERMFONT_UNDER);
@@ -1541,7 +1535,7 @@ static int
 termp_bd_pre(DECL_ARGS)
 {
 	size_t			 tabwidth, lm, len, rm, rmax;
-	struct mdoc_node	*nn;
+	struct roff_node	*nn;
 	int			 offset;
 
 	if (n->type == ROFFT_BLOCK) {
@@ -2170,7 +2164,7 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
-	const struct mdoc_node *link, *descr;
+	const struct roff_node *link, *descr;
 
 	if (NULL == (link = n->child))
 		return(0);