===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/mandoc/term.c	2009/09/21 20:57:57	1.13
--- src/usr.bin/mandoc/term.c	2009/10/18 21:03:31	1.14
***************
*** 1,4 ****
! /*	$Id: term.c,v 1.13 2009/09/21 20:57:57 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: term.c,v 1.14 2009/10/18 21:03:31 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 39,46 ****
  				const char *, size_t);
  static	void		  buffer(struct termp *, char);
  static	void		  encode(struct termp *, char);
- static	int		  isopendelim(const char *);
- static	int		  isclosedelim(const char *);
  
  
  void *
--- 39,44 ----
***************
*** 112,173 ****
  }
  
  
- static int
- isclosedelim(const char *p)
- {
- 
- 	if ( ! (*p && 0 == *(p + 1)))
- 		return(0);
- 
- 	switch (*p) {
- 	case('.'):
- 		/* FALLTHROUGH */
- 	case(','):
- 		/* FALLTHROUGH */
- 	case(';'):
- 		/* FALLTHROUGH */
- 	case(':'):
- 		/* FALLTHROUGH */
- 	case('?'):
- 		/* FALLTHROUGH */
- 	case('!'):
- 		/* FALLTHROUGH */
- 	case(')'):
- 		/* FALLTHROUGH */
- 	case(']'):
- 		/* FALLTHROUGH */
- 	case('}'):
- 		return(1);
- 	default:
- 		break;
- 	}
- 
- 	return(0);
- }
- 
- 
- static int
- isopendelim(const char *p)
- {
- 
- 	if ( ! (*p && 0 == *(p + 1)))
- 		return(0);
- 
- 	switch (*p) {
- 	case('('):
- 		/* FALLTHROUGH */
- 	case('['):
- 		/* FALLTHROUGH */
- 	case('{'):
- 		return(1);
- 	default:
- 		break;
- 	}
- 
- 	return(0);
- }
- 
- 
  /*
   * Flush a line of text.  A "line" is loosely defined as being something
   * that should be followed by a newline, regardless of whether it's
--- 110,115 ----
***************
*** 542,565 ****
  {
  	const char	 *sv;
  
! 	if (isclosedelim(word))
! 		if ( ! (TERMP_IGNDELIM & p->flags))
! 			p->flags |= TERMP_NOSPACE;
  
  	if ( ! (TERMP_NOSPACE & p->flags))
  		buffer(p, ' ');
  
  	if ( ! (p->flags & TERMP_NONOSPACE))
  		p->flags &= ~TERMP_NOSPACE;
  
! 	for (sv = word; *word; word++)
  		if ('\\' != *word)
  			encode(p, *word);
  		else
  			do_escaped(p, &word);
  
! 	if (isopendelim(sv))
! 		p->flags |= TERMP_NOSPACE;
  }
  
  
--- 484,541 ----
  {
  	const char	 *sv;
  
! 	sv = word;
  
+ 	if (word[0] && 0 == word[1])
+ 		switch (word[0]) {
+ 		case('.'):
+ 			/* FALLTHROUGH */
+ 		case(','):
+ 			/* FALLTHROUGH */
+ 		case(';'):
+ 			/* FALLTHROUGH */
+ 		case(':'):
+ 			/* FALLTHROUGH */
+ 		case('?'):
+ 			/* FALLTHROUGH */
+ 		case('!'):
+ 			/* FALLTHROUGH */
+ 		case(')'):
+ 			/* FALLTHROUGH */
+ 		case(']'):
+ 			/* FALLTHROUGH */
+ 		case('}'):
+ 			if ( ! (TERMP_IGNDELIM & p->flags))
+ 				p->flags |= TERMP_NOSPACE;
+ 			break;
+ 		default:
+ 			break;
+ 		}
+ 
  	if ( ! (TERMP_NOSPACE & p->flags))
  		buffer(p, ' ');
  
  	if ( ! (p->flags & TERMP_NONOSPACE))
  		p->flags &= ~TERMP_NOSPACE;
  
! 	for ( ; *word; word++)
  		if ('\\' != *word)
  			encode(p, *word);
  		else
  			do_escaped(p, &word);
  
! 	if (sv[0] && 0 == sv[1])
! 		switch (sv[0]) {
! 		case('('):
! 			/* FALLTHROUGH */
! 		case('['):
! 			/* FALLTHROUGH */
! 		case('{'):
! 			p->flags |= TERMP_NOSPACE;
! 			break;
! 		default:
! 			break;
! 		}
  }