=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_html.c,v retrieving revision 1.196 retrieving revision 1.197 diff -c -r1.196 -r1.197 *** src/usr.bin/mandoc/mdoc_html.c 2018/12/30 00:48:47 1.196 --- src/usr.bin/mandoc/mdoc_html.c 2018/12/31 10:35:51 1.197 *************** *** 1,4 **** ! /* $OpenBSD: mdoc_html.c,v 1.196 2018/12/30 00:48:47 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * Copyright (c) 2014,2015,2016,2017,2018 Ingo Schwarze --- 1,4 ---- ! /* $OpenBSD: mdoc_html.c,v 1.197 2018/12/31 10:35:51 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * Copyright (c) 2014,2015,2016,2017,2018 Ingo Schwarze *************** *** 364,370 **** * (i.e., within a 
) don't print the newline.
  		 */
  		if (*n->string == ' ' && n->flags & NODE_LINE &&
! 		    (h->flags & (HTML_LITERAL | HTML_NONEWLINE)) == 0)
  			print_otag(h, TAG_BR, "");
  		if (NODE_DELIMC & n->flags)
  			h->flags |= HTML_NOSPACE;
--- 364,371 ----
  		 * (i.e., within a 
) don't print the newline.
  		 */
  		if (*n->string == ' ' && n->flags & NODE_LINE &&
! 		    (h->flags & HTML_NONEWLINE) == 0 &&
! 		    (n->flags & NODE_NOFILL) == 0)
  			print_otag(h, TAG_BR, "");
  		if (NODE_DELIMC & n->flags)
  			h->flags |= HTML_NOSPACE;
***************
*** 913,919 ****
  static int
  mdoc_bd_pre(MDOC_ARGS)
  {
! 	int			 comp, sv;
  	struct roff_node	*nn;
  
  	if (n->type == ROFFT_HEAD)
--- 914,920 ----
  static int
  mdoc_bd_pre(MDOC_ARGS)
  {
! 	int			 comp;
  	struct roff_node	*nn;
  
  	if (n->type == ROFFT_HEAD)
***************
*** 947,958 ****
  		return 1;
  
  	print_otag(h, TAG_PRE, "c", "Li");
- 
- 	/* This can be recursive: save & set our literal state. */
- 
- 	sv = h->flags & HTML_LITERAL;
- 	h->flags |= HTML_LITERAL;
- 
  	for (nn = n->child; nn; nn = nn->next) {
  		print_mdoc_node(meta, nn, h);
  		/*
--- 948,953 ----
***************
*** 981,990 ****
  
  		h->flags |= HTML_NOSPACE;
  	}
- 
- 	if (0 == sv)
- 		h->flags &= ~HTML_LITERAL;
- 
  	return 0;
  }
  
--- 976,981 ----