===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_html.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -c -r1.66 -r1.67
*** src/usr.bin/mandoc/man_html.c	2015/04/02 21:03:18	1.66
--- src/usr.bin/mandoc/man_html.c	2015/04/02 22:06:17	1.67
***************
*** 1,4 ****
! /*	$OpenBSD: man_html.c,v 1.66 2015/04/02 21:03:18 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man_html.c,v 1.67 2015/04/02 22:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 36,42 ****
  #define	INDENT		  5
  
  #define	MAN_ARGS	  const struct man_meta *man, \
! 			  const struct man_node *n, \
  			  struct mhtml *mh, \
  			  struct html *h
  
--- 36,42 ----
  #define	INDENT		  5
  
  #define	MAN_ARGS	  const struct man_meta *man, \
! 			  const struct roff_node *n, \
  			  struct mhtml *mh, \
  			  struct html *h
  
***************
*** 51,62 ****
  };
  
  static	void		  print_bvspace(struct html *,
! 				const struct man_node *);
  static	void		  print_man(MAN_ARGS);
  static	void		  print_man_head(MAN_ARGS);
  static	void		  print_man_nodelist(MAN_ARGS);
  static	void		  print_man_node(MAN_ARGS);
! static	int		  a2width(const struct man_node *,
  				struct roffsu *);
  static	int		  man_B_pre(MAN_ARGS);
  static	int		  man_HP_pre(MAN_ARGS);
--- 51,62 ----
  };
  
  static	void		  print_bvspace(struct html *,
! 				const struct roff_node *);
  static	void		  print_man(MAN_ARGS);
  static	void		  print_man_head(MAN_ARGS);
  static	void		  print_man_nodelist(MAN_ARGS);
  static	void		  print_man_node(MAN_ARGS);
! static	int		  a2width(const struct roff_node *,
  				struct roffsu *);
  static	int		  man_B_pre(MAN_ARGS);
  static	int		  man_HP_pre(MAN_ARGS);
***************
*** 128,134 ****
   * first, print it.
   */
  static void
! print_bvspace(struct html *h, const struct man_node *n)
  {
  
  	if (n->body && n->body->child)
--- 128,134 ----
   * first, print it.
   */
  static void
! print_bvspace(struct html *h, const struct roff_node *n)
  {
  
  	if (n->body && n->body->child)
***************
*** 278,284 ****
  }
  
  static int
! a2width(const struct man_node *n, struct roffsu *su)
  {
  
  	if (n->type != ROFFT_TEXT)
--- 278,284 ----
  }
  
  static int
! a2width(const struct roff_node *n, struct roffsu *su)
  {
  
  	if (n->type != ROFFT_TEXT)
***************
*** 398,404 ****
  static int
  man_alt_pre(MAN_ARGS)
  {
! 	const struct man_node	*nn;
  	int		 i, savelit;
  	enum htmltag	 fp;
  	struct tag	*t;
--- 398,404 ----
  static int
  man_alt_pre(MAN_ARGS)
  {
! 	const struct roff_node	*nn;
  	int		 i, savelit;
  	enum htmltag	 fp;
  	struct tag	*t;
***************
*** 494,500 ****
  static int
  man_IP_pre(MAN_ARGS)
  {
! 	const struct man_node	*nn;
  
  	if (n->type == ROFFT_BODY) {
  		print_otag(h, TAG_DD, 0, NULL);
--- 494,500 ----
  static int
  man_IP_pre(MAN_ARGS)
  {
! 	const struct roff_node	*nn;
  
  	if (n->type == ROFFT_BODY) {
  		print_otag(h, TAG_DD, 0, NULL);
***************
*** 533,539 ****
  {
  	struct htmlpair	 tag[2];
  	struct roffsu	 su;
! 	const struct man_node *np;
  
  	if (n->type == ROFFT_HEAD)
  		return(0);
--- 533,539 ----
  {
  	struct htmlpair	 tag[2];
  	struct roffsu	 su;
! 	const struct roff_node *np;
  
  	if (n->type == ROFFT_HEAD)
  		return(0);