===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandoc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/mandoc/mandoc.c	2009/12/23 22:30:17	1.5
--- src/usr.bin/mandoc/mandoc.c	2009/12/24 02:08:14	1.6
***************
*** 1,4 ****
! /*	$Id: mandoc.c,v 1.5 2009/12/23 22:30:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mandoc.c,v 1.6 2009/12/24 02:08:14 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 31,37 ****
  int
  mandoc_special(const char *p)
  {
! 	int		 c;
  	
  	if ('\\' != *p++)
  		return(0);
--- 31,39 ----
  int
  mandoc_special(const char *p)
  {
! 	int		 terminator;	/* Terminator for \s. */
! 	int		 lim;		/* Limit for N in \s. */
! 	int		 c, i;
  	
  	if ('\\' != *p++)
  		return(0);
***************
*** 70,78 ****
  	case ('e'):
  		return(2);
  	case ('f'):
! 		if (0 == *++p || ! isgraph((u_char)*p))
  			return(0);
  		return(3);
  	case ('*'):
  		if (0 == *++p || ! isgraph((u_char)*p))
  			return(0);
--- 72,155 ----
  	case ('e'):
  		return(2);
  	case ('f'):
! 		if ('\0' == *++p || ! isgraph((u_char)*p))
  			return(0);
  		return(3);
+ 	case ('s'):
+ 		if ('\0' == *++p)
+ 			return(2);
+ 
+ 		c = 2;
+ 		terminator = 0;
+ 		lim = 1;
+ 
+ 		if (*p == '\'') {
+ 			lim = 0;
+ 			terminator = 1;
+ 			++p;
+ 			++c;
+ 		} else if (*p == '[') {
+ 			lim = 0;
+ 			terminator = 2;
+ 			++p;
+ 			++c;
+ 		} else if (*p == '(') {
+ 			lim = 2;
+ 			terminator = 3;
+ 			++p;
+ 			++c;
+ 		}
+ 
+ 		if (*p == '+' || *p == '-') {
+ 			++p;
+ 			++c;
+ 		}
+ 
+ 		if (*p == '\'') {
+ 			if (terminator)
+ 				return(0);
+ 			lim = 0;
+ 			terminator = 1;
+ 			++p;
+ 			++c;
+ 		} else if (*p == '[') {
+ 			if (terminator)
+ 				return(0);
+ 			lim = 0;
+ 			terminator = 2;
+ 			++p;
+ 			++c;
+ 		} else if (*p == '(') {
+ 			if (terminator)
+ 				return(0);
+ 			lim = 2;
+ 			terminator = 3;
+ 			++p;
+ 			++c;
+ 		}
+ 
+ 		/* TODO: needs to handle floating point. */
+ 
+ 		if ( ! isdigit((u_char)*p))
+ 			return(0);
+ 
+ 		for (i = 0; isdigit((u_char)*p); i++) {
+ 			if (lim && i >= lim)
+ 				break;
+ 			++p;
+ 			++c;
+ 		}
+ 
+ 		if (terminator && terminator < 3) {
+ 			if (1 == terminator && *p != '\'')
+ 				return(0);
+ 			if (2 == terminator && *p != ']')
+ 				return(0);
+ 			++p;
+ 			++c;
+ 		}
+ 
+ 		return(c);
  	case ('*'):
  		if (0 == *++p || ! isgraph((u_char)*p))
  			return(0);