===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/out.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/mandoc/out.c	2010/07/25 18:05:54	1.6
--- src/usr.bin/mandoc/out.c	2010/08/18 02:38:40	1.7
***************
*** 1,4 ****
! /*	$Id: out.c,v 1.6 2010/07/25 18:05:54 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: out.c,v 1.7 2010/08/18 02:38:40 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 236,247 ****
  			break;
  		}
  		break;
  	case ('s'):
! 		if ('+' == wp[i] || '-' == wp[i])
  			i++;
  
- 		j = ('s' != wp[i - 1]);
- 
  		switch (wp[i++]) {
  		case ('('):
  			lim = 2;
--- 236,252 ----
  			break;
  		}
  		break;
+ 	case ('h'):
+ 		/* FALLTHROUGH */
+ 	case ('v'):
+ 		/* FALLTHROUGH */
  	case ('s'):
! 		j = 0;
! 		if ('+' == wp[i] || '-' == wp[i]) {
  			i++;
+ 			j = 1;
+ 		}
  
  		switch (wp[i++]) {
  		case ('('):
  			lim = 2;
***************
*** 253,259 ****
  			term = '\'';
  			break;
  		case ('0'):
! 			j++;
  			/* FALLTHROUGH */
  		default:
  			i--;
--- 258,264 ----
  			term = '\'';
  			break;
  		case ('0'):
! 			j = 1;
  			/* FALLTHROUGH */
  		default:
  			i--;
***************
*** 262,274 ****
  		}
  
  		if ('+' == wp[i] || '-' == wp[i]) {
! 			if (j++)
  				return(i);
  			i++;
  		} 
  		
- 		if (0 == j)
- 			return(i);
  		break;
  	case ('['):
  		*d = DECO_SPECIAL;
--- 267,277 ----
  		}
  
  		if ('+' == wp[i] || '-' == wp[i]) {
! 			if (j)
  				return(i);
  			i++;
  		} 
  		
  		break;
  	case ('['):
  		*d = DECO_SPECIAL;