===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff_html.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/mandoc/roff_html.c	2017/06/04 22:43:50	1.6
--- src/usr.bin/mandoc/roff_html.c	2017/06/06 15:00:56	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: roff_html.c,v 1.6 2017/06/04 22:43:50 schwarze Exp $ */
  /*
   * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: roff_html.c,v 1.7 2017/06/06 15:00:56 schwarze Exp $ */
  /*
   * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 29,38 ****
--- 29,40 ----
  typedef	void	(*roff_html_pre_fp)(ROFF_HTML_ARGS);
  
  static	void	  roff_html_pre_br(ROFF_HTML_ARGS);
+ static	void	  roff_html_pre_ce(ROFF_HTML_ARGS);
  static	void	  roff_html_pre_sp(ROFF_HTML_ARGS);
  
  static	const roff_html_pre_fp roff_html_pre_acts[ROFF_MAX] = {
  	roff_html_pre_br,  /* br */
+ 	roff_html_pre_ce,  /* ce */
  	NULL,  /* ft */
  	NULL,  /* ll */
  	NULL,  /* mc */
***************
*** 53,60 ****
  static void
  roff_html_pre_br(ROFF_HTML_ARGS)
  {
! 	print_otag(h, TAG_DIV, "");
  	print_text(h, "\\~");  /* So the div isn't empty. */
  }
  
  static void
--- 55,79 ----
  static void
  roff_html_pre_br(ROFF_HTML_ARGS)
  {
! 	struct tag	*t;
! 
! 	t = print_otag(h, TAG_DIV, "");
  	print_text(h, "\\~");  /* So the div isn't empty. */
+ 	print_tagq(h, t);
+ }
+ 
+ static void
+ roff_html_pre_ce(ROFF_HTML_ARGS)
+ {
+ 	for (n = n->child->next; n != NULL; n = n->next) {
+ 		if (n->type == ROFFT_TEXT) {
+ 			if (n->flags & NODE_LINE)
+ 				roff_html_pre_br(h, n);
+ 			print_text(h, n->string);
+ 		} else
+ 			roff_html_pre(h, n);
+ 	}
+ 	roff_html_pre_br(h, n);
  }
  
  static void