===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -c -r1.213 -r1.214
*** src/usr.bin/mandoc/mdoc_term.c	2015/04/02 21:03:18	1.213
--- src/usr.bin/mandoc/mdoc_term.c	2015/04/02 22:06:17	1.214
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_term.c,v 1.213 2015/04/02 21:03:18 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_term.c,v 1.214 2015/04/02 22:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 42,48 ****
  #define	DECL_ARGS struct termp *p, \
  		  struct termpair *pair, \
  		  const struct mdoc_meta *meta, \
! 		  struct mdoc_node *n
  
  struct	termact {
  	int	(*pre)(DECL_ARGS);
--- 42,48 ----
  #define	DECL_ARGS struct termp *p, \
  		  struct termpair *pair, \
  		  const struct mdoc_meta *meta, \
! 		  struct roff_node *n
  
  struct	termact {
  	int	(*pre)(DECL_ARGS);
***************
*** 52,65 ****
  static	int	  a2width(const struct termp *, const char *);
  
  static	void	  print_bvspace(struct termp *,
! 			const struct mdoc_node *,
! 			const struct mdoc_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	  synopsis_pre(struct termp *,
! 			const struct mdoc_node *);
  
  static	void	  termp____post(DECL_ARGS);
  static	void	  termp__t_post(DECL_ARGS);
--- 52,65 ----
  static	int	  a2width(const struct termp *, const char *);
  
  static	void	  print_bvspace(struct termp *,
! 			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	  synopsis_pre(struct termp *,
! 			const struct roff_node *);
  
  static	void	  termp____post(DECL_ARGS);
  static	void	  termp__t_post(DECL_ARGS);
***************
*** 252,258 ****
  terminal_mdoc(void *arg, const struct mdoc *mdoc)
  {
  	const struct mdoc_meta	*meta;
! 	struct mdoc_node	*n;
  	struct termp		*p;
  
  	p = (struct termp *)arg;
--- 252,258 ----
  terminal_mdoc(void *arg, const struct mdoc *mdoc)
  {
  	const struct mdoc_meta	*meta;
! 	struct roff_node	*n;
  	struct termp		*p;
  
  	p = (struct termp *)arg;
***************
*** 547,556 ****
   */
  static void
  print_bvspace(struct termp *p,
! 	const struct mdoc_node *bl,
! 	const struct mdoc_node *n)
  {
! 	const struct mdoc_node	*nn;
  
  	assert(n);
  
--- 547,556 ----
   */
  static void
  print_bvspace(struct termp *p,
! 	const struct roff_node *bl,
! 	const struct roff_node *n)
  {
! 	const struct roff_node	*nn;
  
  	assert(n);
  
***************
*** 608,614 ****
  termp_it_pre(DECL_ARGS)
  {
  	char			buf[24];
! 	const struct mdoc_node *bl, *nn;
  	size_t			ncols, dcol;
  	int			i, offset, width;
  	enum mdoc_list		type;
--- 608,614 ----
  termp_it_pre(DECL_ARGS)
  {
  	char			buf[24];
! 	const struct roff_node *bl, *nn;
  	size_t			ncols, dcol;
  	int			i, offset, width;
  	enum mdoc_list		type;
***************
*** 1265,1271 ****
   * macro combos).
   */
  static void
! synopsis_pre(struct termp *p, const struct mdoc_node *n)
  {
  	/*
  	 * Obviously, if we're not in a SYNOPSIS or no prior macros
--- 1265,1271 ----
   * macro combos).
   */
  static void
! synopsis_pre(struct termp *p, const struct roff_node *n)
  {
  	/*
  	 * Obviously, if we're not in a SYNOPSIS or no prior macros
***************
*** 1513,1519 ****
  static int
  termp_fa_pre(DECL_ARGS)
  {
! 	const struct mdoc_node	*nn;
  
  	if (n->parent->tok != MDOC_Fo) {
  		term_fontpush(p, TERMFONT_UNDER);
--- 1513,1519 ----
  static int
  termp_fa_pre(DECL_ARGS)
  {
! 	const struct roff_node	*nn;
  
  	if (n->parent->tok != MDOC_Fo) {
  		term_fontpush(p, TERMFONT_UNDER);
***************
*** 1539,1545 ****
  termp_bd_pre(DECL_ARGS)
  {
  	size_t			 tabwidth, lm, len, rm, rmax;
! 	struct mdoc_node	*nn;
  	int			 offset;
  
  	if (n->type == ROFFT_BLOCK) {
--- 1539,1545 ----
  termp_bd_pre(DECL_ARGS)
  {
  	size_t			 tabwidth, lm, len, rm, rmax;
! 	struct roff_node	*nn;
  	int			 offset;
  
  	if (n->type == ROFFT_BLOCK) {
***************
*** 2168,2174 ****
  static int
  termp_lk_pre(DECL_ARGS)
  {
! 	const struct mdoc_node *link, *descr;
  
  	if (NULL == (link = n->child))
  		return(0);
--- 2168,2174 ----
  static int
  termp_lk_pre(DECL_ARGS)
  {
! 	const struct roff_node *link, *descr;
  
  	if (NULL == (link = n->child))
  		return(0);