===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -c -r1.159 -r1.160
*** src/usr.bin/mandoc/mdoc.c	2018/12/04 02:53:45	1.159
--- src/usr.bin/mandoc/mdoc.c	2018/12/14 05:17:45	1.160
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc.c,v 1.159 2018/12/04 02:53:45 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc.c,v 1.160 2018/12/14 05:17:45 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 225,232 ****
  	*end = '\0';
  
  	if (ws)
! 		mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
! 		    line, (int)(ws-buf), NULL);
  
  	/*
  	 * Blank lines are allowed in no-fill mode
--- 225,231 ----
  	*end = '\0';
  
  	if (ws)
! 		mandoc_msg(MANDOCERR_SPACE_EOL, line, (int)(ws - buf), NULL);
  
  	/*
  	 * Blank lines are allowed in no-fill mode
***************
*** 250,257 ****
  		default:
  			break;
  		}
! 		mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
! 		    line, (int)(c - buf), NULL);
  		roff_elem_alloc(mdoc, line, offs, ROFF_sp);
  		mdoc->last->flags |= NODE_VALID | NODE_ENDED;
  		mdoc->next = ROFF_NEXT_SIBLING;
--- 249,255 ----
  		default:
  			break;
  		}
! 		mandoc_msg(MANDOCERR_FI_BLANK, line, (int)(c - buf), NULL);
  		roff_elem_alloc(mdoc, line, offs, ROFF_sp);
  		mdoc->last->flags |= NODE_VALID | NODE_ENDED;
  		mdoc->next = ROFF_NEXT_SIBLING;
***************
*** 291,298 ****
  		if (*c == ' ')
  			c++;
  		if (isupper((unsigned char)(*c)))
! 			mandoc_msg(MANDOCERR_EOS, mdoc->parse,
! 			    line, (int)(c - buf), NULL);
  	}
  
  	return 1;
--- 289,295 ----
  		if (*c == ' ')
  			c++;
  		if (isupper((unsigned char)(*c)))
! 			mandoc_msg(MANDOCERR_EOS, line, (int)(c - buf), NULL);
  	}
  
  	return 1;
***************
*** 320,327 ****
  	if (sz == 2 || sz == 3)
  		tok = roffhash_find(mdoc->mdocmac, buf + sv, sz);
  	if (tok == TOKEN_NONE) {
! 		mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
! 		    ln, sv, buf + sv - 1);
  		return 1;
  	}
  
--- 317,323 ----
  	if (sz == 2 || sz == 3)
  		tok = roffhash_find(mdoc->mdocmac, buf + sv, sz);
  	if (tok == TOKEN_NONE) {
! 		mandoc_msg(MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);
  		return 1;
  	}
  
***************
*** 351,358 ****
  	 */
  
  	if ('\0' == buf[offs] && ' ' == buf[offs - 1])
! 		mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
! 		    ln, offs - 1, NULL);
  
  	/*
  	 * If an initial macro or a list invocation, divert directly
--- 347,353 ----
  	 */
  
  	if ('\0' == buf[offs] && ' ' == buf[offs - 1])
! 		mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL);
  
  	/*
  	 * If an initial macro or a list invocation, divert directly