===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_html.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -c -r1.131 -r1.132
*** src/usr.bin/mandoc/man_html.c	2020/04/04 20:23:06	1.131
--- src/usr.bin/mandoc/man_html.c	2020/10/16 17:22:39	1.132
***************
*** 1,4 ****
! /* $OpenBSD: man_html.c,v 1.131 2020/04/04 20:23:06 schwarze Exp $ */
  /*
   * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
--- 1,4 ----
! /* $OpenBSD: man_html.c,v 1.132 2020/10/16 17:22:39 schwarze Exp $ */
  /*
   * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
***************
*** 167,173 ****
  	if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
  		return;
  
! 	html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi);
  
  	child = 1;
  	switch (n->type) {
--- 167,178 ----
  	if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
  		return;
  
! 	if ((n->flags & NODE_NOFILL) == 0)
! 		html_fillmode(h, ROFF_fi);
! 	else if (html_fillmode(h, ROFF_nf) == ROFF_nf &&
! 	    n->tok != ROFF_fi && n->flags & NODE_LINE &&
! 	    (n->prev == NULL || n->prev->tok != MAN_YS))
! 		print_endline(h);
  
  	child = 1;
  	switch (n->type) {
***************
*** 251,263 ****
  	}
  	if (t != NULL)
  		print_stagq(h, t);
- 
- 	if (n->flags & NODE_NOFILL && n->tok != MAN_YS &&
- 	    (n->next != NULL && n->next->flags & NODE_LINE)) {
- 		/* In .nf = <pre>, print even empty lines. */
- 		h->col++;
- 		print_endline(h);
- 	}
  }
  
  static void
--- 256,261 ----