===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_html.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -c -r1.159 -r1.160
*** src/usr.bin/mandoc/mdoc_html.c	2017/05/05 13:17:04	1.159
--- src/usr.bin/mandoc/mdoc_html.c	2017/05/05 15:16:25	1.160
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_html.c,v 1.159 2017/05/05 13:17:04 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.160 2017/05/05 15:16:25 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 106,112 ****
  static	int		  mdoc_sh_pre(MDOC_ARGS);
  static	int		  mdoc_skip_pre(MDOC_ARGS);
  static	int		  mdoc_sm_pre(MDOC_ARGS);
- static	int		  mdoc_sp_pre(MDOC_ARGS);
  static	int		  mdoc_ss_pre(MDOC_ARGS);
  static	int		  mdoc_st_pre(MDOC_ARGS);
  static	int		  mdoc_sx_pre(MDOC_ARGS);
--- 106,111 ----
***************
*** 235,241 ****
  	{mdoc_quote_pre, mdoc_quote_post}, /* En */
  	{mdoc_xx_pre, NULL}, /* Dx */
  	{mdoc__x_pre, mdoc__x_post}, /* %Q */
- 	{mdoc_sp_pre, NULL}, /* sp */
  	{mdoc__x_pre, mdoc__x_post}, /* %U */
  	{NULL, NULL}, /* Ta */
  };
--- 234,239 ----
***************
*** 1007,1015 ****
  		 * anyway, so don't sweat it.
  		 */
  		switch (nn->tok) {
- 		case MDOC_Sm:
  		case ROFF_br:
! 		case MDOC_sp:
  		case MDOC_Bl:
  		case MDOC_D1:
  		case MDOC_Dl:
--- 1005,1013 ----
  		 * anyway, so don't sweat it.
  		 */
  		switch (nn->tok) {
  		case ROFF_br:
! 		case ROFF_sp:
! 		case MDOC_Sm:
  		case MDOC_Bl:
  		case MDOC_D1:
  		case MDOC_Dl:
***************
*** 1321,1348 ****
  
  	print_paragraph(h);
  	return 0;
- }
- 
- static int
- mdoc_sp_pre(MDOC_ARGS)
- {
- 	struct roffsu	 su;
- 
- 	SCALE_VS_INIT(&su, 1);
- 	if (NULL != (n = n->child)) {
- 		if ( ! a2roffsu(n->string, &su, SCALE_VS))
- 			su.scale = 1.0;
- 		else if (su.scale < 0.0)
- 			su.scale = 0.0;
- 	}
- 
- 	print_otag(h, TAG_DIV, "suh", &su);
- 
- 	/* So the div isn't empty: */
- 	print_text(h, "\\~");
- 
- 	return 0;
- 
  }
  
  static int
--- 1319,1324 ----