===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_term.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/mandoc/man_term.c	2010/06/06 18:08:41	1.40
--- src/usr.bin/mandoc/man_term.c	2010/06/10 22:50:10	1.41
***************
*** 1,4 ****
! /*	$Id: man_term.c,v 1.40 2010/06/06 18:08:41 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: man_term.c,v 1.41 2010/06/10 22:50:10 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 69,80 ****
  static	int		  a2width(const struct man_node *);
  static	int		  a2height(const struct man_node *);
  
- static	void		  print_man_head(struct termp *, 
- 				const struct man_meta *);
  static	void		  print_man_nodelist(DECL_ARGS);
  static	void		  print_man_node(DECL_ARGS);
! static	void		  print_man_foot(struct termp *, 
! 				const struct man_meta *);
  static	void		  print_bvspace(struct termp *, 
  				const struct man_node *);
  
--- 69,78 ----
  static	int		  a2width(const struct man_node *);
  static	int		  a2height(const struct man_node *);
  
  static	void		  print_man_nodelist(DECL_ARGS);
  static	void		  print_man_node(DECL_ARGS);
! 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 *);
  
***************
*** 171,177 ****
  	n = man_node(man);
  	m = man_meta(man);
  
! 	print_man_head(p, m);
  	p->flags |= TERMP_NOSPACE;
  
  	mt.fl = 0;
--- 169,175 ----
  	n = man_node(man);
  	m = man_meta(man);
  
! 	term_begin(p, print_man_head, print_man_foot, m);
  	p->flags |= TERMP_NOSPACE;
  
  	mt.fl = 0;
***************
*** 180,186 ****
  
  	if (n->child)
  		print_man_nodelist(p, &mt, n->child, m);
! 	print_man_foot(p, m);
  }
  
  
--- 178,185 ----
  
  	if (n->child)
  		print_man_nodelist(p, &mt, n->child, m);
! 
! 	term_end(p);
  }
  
  
***************
*** 855,864 ****
  
  
  static void
! print_man_foot(struct termp *p, const struct man_meta *meta)
  {
  	char		buf[DATESIZ];
  
  	term_fontrepl(p, TERMFONT_NONE);
  
  	if (meta->rawdate)
--- 854,866 ----
  
  
  static void
! print_man_foot(struct termp *p, const void *arg)
  {
  	char		buf[DATESIZ];
+ 	const struct man_meta *meta;
  
+ 	meta = (const struct man_meta *)arg;
+ 
  	term_fontrepl(p, TERMFONT_NONE);
  
  	if (meta->rawdate)
***************
*** 891,900 ****
  
  
  static void
! print_man_head(struct termp *p, const struct man_meta *m)
  {
  	char		buf[BUFSIZ], title[BUFSIZ];
  	size_t		buflen, titlen;
  
  	/*
  	 * Note that old groff would spit out some spaces before the
--- 893,905 ----
  
  
  static void
! print_man_head(struct termp *p, const void *arg)
  {
  	char		buf[BUFSIZ], title[BUFSIZ];
  	size_t		buflen, titlen;
+ 	const struct man_meta *m;
+ 
+ 	m = (const struct man_meta *)arg;
  
  	/*
  	 * Note that old groff would spit out some spaces before the