===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -c -r1.131 -r1.132
*** src/usr.bin/mandoc/roff.c	2015/01/30 00:19:26	1.131
--- src/usr.bin/mandoc/roff.c	2015/02/06 16:05:51	1.132
***************
*** 1,4 ****
! /*	$OpenBSD: roff.c,v 1.131 2015/01/30 00:19:26 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: roff.c,v 1.132 2015/02/06 16:05:51 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 2536,2542 ****
  		r->control = 0;
  
  	if (*p != '\0')
! 		mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
  
  	return(ROFF_IGN);
  }
--- 2536,2543 ----
  		r->control = 0;
  
  	if (*p != '\0')
! 		mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
! 		    ln, p - buf->buf, "cc ... %s", p);
  
  	return(ROFF_IGN);
  }
***************
*** 2551,2557 ****
  	p = buf->buf + pos;
  
  	if (*p == '\0') {
! 		mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
  		return(ROFF_IGN);
  	}
  
--- 2552,2558 ----
  	p = buf->buf + pos;
  
  	if (*p == '\0') {
! 		mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, ln, ppos, "tr");
  		return(ROFF_IGN);
  	}
  
***************
*** 2579,2586 ****
  			}
  			ssz = (size_t)(p - second);
  		} else if (*second == '\0') {
! 			mandoc_msg(MANDOCERR_ARGCOUNT, r->parse,
! 			    ln, (int)(p - buf->buf), NULL);
  			second = " ";
  			p--;
  		}
--- 2580,2587 ----
  			}
  			ssz = (size_t)(p - second);
  		} else if (*second == '\0') {
! 			mandoc_vmsg(MANDOCERR_TR_ODD, r->parse,
! 			    ln, first - buf->buf, "tr %s", first);
  			second = " ";
  			p--;
  		}