===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/mandoc/man.c	2010/04/02 11:37:07	1.24
--- src/usr.bin/mandoc/man.c	2010/04/25 16:32:19	1.25
***************
*** 1,4 ****
! /*	$Id: man.c,v 1.24 2010/04/02 11:37:07 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: man.c,v 1.25 2010/04/25 16:32:19 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 62,68 ****
  	"RS",		"DT",		"UC",		"PD",
  	"Sp",		"Vb",		"Ve",		"de",
  	"dei",		"am",		"ami",		"ig",
! 	".",
  	};
  
  const	char * const *man_macronames = __man_macronames;
--- 62,68 ----
  	"RS",		"DT",		"UC",		"PD",
  	"Sp",		"Vb",		"Ve",		"de",
  	"dei",		"am",		"ami",		"ig",
! 	".",		"if",		"ie",		"el",
  	};
  
  const	char * const *man_macronames = __man_macronames;
***************
*** 152,161 ****
  int
  man_parseln(struct man *m, int ln, char *buf)
  {
  
! 	return('.' == *buf || '\'' == *buf ? 
! 			man_pmacro(m, ln, buf) : 
! 			man_ptext(m, ln, buf));
  }
  
  
--- 152,178 ----
  int
  man_parseln(struct man *m, int ln, char *buf)
  {
+ 	char		*p;
+ 	size_t		 len;
+ 	int		 brace_close = 0;
  
! 	if ((len = strlen(buf)) > 1) {
! 		p = buf + (len - 2);
! 		if (p[0] == '\\' && p[1] == '}') {
! 			brace_close = 1;
! 			*p = '\0';
! 		}
! 	}
! 
! 	if ('.' == *buf || '\'' == *buf) {
! 		if ( ! man_pmacro(m, ln, buf))
! 			return(0);
! 	} else {
! 		if ( ! man_ptext(m, ln, buf))
! 			return(0);
! 	}
! 
! 	return(brace_close ? man_brace_close(m, ln, len-2) : 1);
  }