===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_html.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/mandoc/man_html.c	2010/11/29 00:12:02	1.20
--- src/usr.bin/mandoc/man_html.c	2010/11/29 02:26:45	1.21
***************
*** 1,4 ****
! /*	$Id: man_html.c,v 1.20 2010/11/29 00:12:02 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: man_html.c,v 1.21 2010/11/29 02:26:45 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 110,118 ****
  	{ man_ign_pre, NULL }, /* DT */
  	{ man_ign_pre, NULL }, /* UC */
  	{ man_ign_pre, NULL }, /* PD */
- 	{ man_br_pre, NULL }, /* Sp */
- 	{ man_literal_pre, NULL }, /* Vb */
- 	{ man_literal_pre, NULL }, /* Ve */
  	{ man_ign_pre, NULL }, /* AT */
  	{ man_in_pre, NULL }, /* in */
  	{ NULL, NULL }, /* TS */
--- 110,115 ----
***************
*** 366,383 ****
  
  	SCALE_VS_INIT(&su, 1);
  
! 	switch (n->tok) {
! 	case (MAN_Sp):
! 		SCALE_VS_INIT(&su, 0.5);
! 		break;
! 	case (MAN_sp):
  		if (n->child)
  			a2roffsu(n->child->string, &su, SCALE_VS);
! 		break;
! 	default:
  		su.scale = 0;
- 		break;
- 	}
  
  	bufcat_su(h, "height", &su);
  	PAIR_STYLE_INIT(&tag, h);
--- 363,373 ----
  
  	SCALE_VS_INIT(&su, 1);
  
! 	if (MAN_sp == n->tok) {
  		if (n->child)
  			a2roffsu(n->child->string, &su, SCALE_VS);
! 	} else
  		su.scale = 0;
  
  	bufcat_su(h, "height", &su);
  	PAIR_STYLE_INIT(&tag, h);
***************
*** 779,795 ****
  man_literal_pre(MAN_ARGS)
  {
  
! 	switch (n->tok) {
! 	case (MAN_nf):
! 		/* FALLTHROUGH */
! 	case (MAN_Vb):
  		print_otag(h, TAG_BR, 0, NULL);
  		mh->fl |= MANH_LITERAL;
! 		return(MAN_Vb != n->tok);
! 	default:
  		mh->fl &= ~MANH_LITERAL;
- 		break;
- 	}
  
  	return(1);
  }
--- 769,779 ----
  man_literal_pre(MAN_ARGS)
  {
  
! 	if (MAN_nf == n->tok) {
  		print_otag(h, TAG_BR, 0, NULL);
  		mh->fl |= MANH_LITERAL;
! 	} else
  		mh->fl &= ~MANH_LITERAL;
  
  	return(1);
  }