===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_term.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -c -r1.124 -r1.125
*** src/usr.bin/mandoc/man_term.c	2015/04/02 21:03:18	1.124
--- src/usr.bin/mandoc/man_term.c	2015/04/02 22:06:17	1.125
***************
*** 1,4 ****
! /*	$OpenBSD: man_term.c,v 1.124 2015/04/02 21:03:18 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man_term.c,v 1.125 2015/04/02 22:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 46,52 ****
  
  #define	DECL_ARGS	  struct termp *p, \
  			  struct mtermp *mt, \
! 			  struct man_node *n, \
  			  const struct man_meta *meta
  
  struct	termact {
--- 46,52 ----
  
  #define	DECL_ARGS	  struct termp *p, \
  			  struct mtermp *mt, \
! 			  struct roff_node *n, \
  			  const struct man_meta *meta
  
  struct	termact {
***************
*** 61,67 ****
  static	void		  print_man_head(struct termp *, const void *);
  static	void		  print_man_foot(struct termp *, const void *);
  static	void		  print_bvspace(struct termp *,
! 				const struct man_node *, int);
  
  static	int		  pre_B(DECL_ARGS);
  static	int		  pre_HP(DECL_ARGS);
--- 61,67 ----
  static	void		  print_man_head(struct termp *, const void *);
  static	void		  print_man_foot(struct termp *, const void *);
  static	void		  print_bvspace(struct termp *,
! 				const struct roff_node *, int);
  
  static	int		  pre_B(DECL_ARGS);
  static	int		  pre_HP(DECL_ARGS);
***************
*** 138,144 ****
  {
  	struct termp		*p;
  	const struct man_meta	*meta;
! 	struct man_node		*n;
  	struct mtermp		 mt;
  
  	p = (struct termp *)arg;
--- 138,144 ----
  {
  	struct termp		*p;
  	const struct man_meta	*meta;
! 	struct roff_node	*n;
  	struct mtermp		 mt;
  
  	p = (struct termp *)arg;
***************
*** 189,195 ****
   * first, print it.
   */
  static void
! print_bvspace(struct termp *p, const struct man_node *n, int pardist)
  {
  	int	 i;
  
--- 189,195 ----
   * first, print it.
   */
  static void
! print_bvspace(struct termp *p, const struct roff_node *n, int pardist)
  {
  	int	 i;
  
***************
*** 278,284 ****
  pre_alternate(DECL_ARGS)
  {
  	enum termfont		 font[2];
! 	struct man_node		*nn;
  	int			 savelit, i;
  
  	switch (n->tok) {
--- 278,284 ----
  pre_alternate(DECL_ARGS)
  {
  	enum termfont		 font[2];
! 	struct roff_node	*nn;
  	int			 savelit, i;
  
  	switch (n->tok) {
***************
*** 486,492 ****
  pre_HP(DECL_ARGS)
  {
  	struct roffsu		 su;
! 	const struct man_node	*nn;
  	int			 len;
  
  	switch (n->type) {
--- 486,492 ----
  pre_HP(DECL_ARGS)
  {
  	struct roffsu		 su;
! 	const struct roff_node	*nn;
  	int			 len;
  
  	switch (n->type) {
***************
*** 560,566 ****
  pre_IP(DECL_ARGS)
  {
  	struct roffsu		 su;
! 	const struct man_node	*nn;
  	int			 len, savelit;
  
  	switch (n->type) {
--- 560,566 ----
  pre_IP(DECL_ARGS)
  {
  	struct roffsu		 su;
! 	const struct roff_node	*nn;
  	int			 len, savelit;
  
  	switch (n->type) {
***************
*** 641,647 ****
  pre_TP(DECL_ARGS)
  {
  	struct roffsu		 su;
! 	struct man_node		*nn;
  	int			 len, savelit;
  
  	switch (n->type) {
--- 641,647 ----
  pre_TP(DECL_ARGS)
  {
  	struct roffsu		 su;
! 	struct roff_node	*nn;
  	int			 len, savelit;
  
  	switch (n->type) {