===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_html.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -c -r1.170 -r1.171
*** src/usr.bin/mandoc/mdoc_html.c	2018/04/11 17:10:35	1.170
--- src/usr.bin/mandoc/mdoc_html.c	2018/04/13 16:27:14	1.171
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_html.c,v 1.170 2018/04/11 17:10:35 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_html.c,v 1.171 2018/04/13 16:27:14 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 48,61 ****
  };
  
  static	char		 *cond_id(const struct roff_node *);
! static	void		  print_mdoc_head(MDOC_ARGS);
  static	void		  print_mdoc_node(MDOC_ARGS);
  static	void		  print_mdoc_nodelist(MDOC_ARGS);
  static	void		  synopsis_pre(struct html *,
  				const struct roff_node *);
  
! static	void		  mdoc_root_post(MDOC_ARGS);
! static	int		  mdoc_root_pre(MDOC_ARGS);
  
  static	void		  mdoc__x_post(MDOC_ARGS);
  static	int		  mdoc__x_pre(MDOC_ARGS);
--- 48,64 ----
  };
  
  static	char		 *cond_id(const struct roff_node *);
! static	void		  print_mdoc_head(const struct roff_meta *,
! 				struct html *);
  static	void		  print_mdoc_node(MDOC_ARGS);
  static	void		  print_mdoc_nodelist(MDOC_ARGS);
  static	void		  synopsis_pre(struct html *,
  				const struct roff_node *);
  
! static	void		  mdoc_root_post(const struct roff_meta *,
! 				struct html *);
! static	int		  mdoc_root_pre(const struct roff_meta *,
! 				struct html *);
  
  static	void		  mdoc__x_post(MDOC_ARGS);
  static	int		  mdoc__x_pre(MDOC_ARGS);
***************
*** 282,311 ****
  void
  html_mdoc(void *arg, const struct roff_man *mdoc)
  {
! 	struct html	*h;
! 	struct tag	*t;
  
  	h = (struct html *)arg;
  
  	if ((h->oflags & HTML_FRAGMENT) == 0) {
  		print_gen_decls(h);
  		print_otag(h, TAG_HTML, "");
  		t = print_otag(h, TAG_HEAD, "");
! 		print_mdoc_head(&mdoc->meta, mdoc->first->child, h);
  		print_tagq(h, t);
  		print_otag(h, TAG_BODY, "");
  	}
  
! 	mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);
  	t = print_otag(h, TAG_DIV, "c", "manual-text");
! 	print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);
  	print_tagq(h, t);
! 	mdoc_root_post(&mdoc->meta, mdoc->first->child, h);
  	print_tagq(h, NULL);
  }
  
  static void
! print_mdoc_head(MDOC_ARGS)
  {
  	char	*cp;
  
--- 285,318 ----
  void
  html_mdoc(void *arg, const struct roff_man *mdoc)
  {
! 	struct html		*h;
! 	struct roff_node	*n;
! 	struct tag		*t;
  
  	h = (struct html *)arg;
+ 	n = mdoc->first->child;
  
  	if ((h->oflags & HTML_FRAGMENT) == 0) {
  		print_gen_decls(h);
  		print_otag(h, TAG_HTML, "");
+ 		if (n->type == ROFFT_COMMENT)
+ 			print_gen_comment(h, n);
  		t = print_otag(h, TAG_HEAD, "");
! 		print_mdoc_head(&mdoc->meta, h);
  		print_tagq(h, t);
  		print_otag(h, TAG_BODY, "");
  	}
  
! 	mdoc_root_pre(&mdoc->meta, h);
  	t = print_otag(h, TAG_DIV, "c", "manual-text");
! 	print_mdoc_nodelist(&mdoc->meta, n, h);
  	print_tagq(h, t);
! 	mdoc_root_post(&mdoc->meta, h);
  	print_tagq(h, NULL);
  }
  
  static void
! print_mdoc_head(const struct roff_meta *meta, struct html *h)
  {
  	char	*cp;
  
***************
*** 427,433 ****
  }
  
  static void
! mdoc_root_post(MDOC_ARGS)
  {
  	struct tag	*t, *tt;
  
--- 434,440 ----
  }
  
  static void
! mdoc_root_post(const struct roff_meta *meta, struct html *h)
  {
  	struct tag	*t, *tt;
  
***************
*** 444,450 ****
  }
  
  static int
! mdoc_root_pre(MDOC_ARGS)
  {
  	struct tag	*t, *tt;
  	char		*volume, *title;
--- 451,457 ----
  }
  
  static int
! mdoc_root_pre(const struct roff_meta *meta, struct html *h)
  {
  	struct tag	*t, *tt;
  	char		*volume, *title;