===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -c -r1.106 -r1.107
*** src/usr.bin/mandoc/roff.c	2014/10/20 19:21:31	1.106
--- src/usr.bin/mandoc/roff.c	2014/10/25 14:32:07	1.107
***************
*** 1,4 ****
! /*	$OpenBSD: roff.c,v 1.106 2014/10/20 19:21:31 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: roff.c,v 1.107 2014/10/25 14:32:07 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 205,212 ****
  static	enum rofferr	 roff_it(ROFF_ARGS);
  static	enum rofferr	 roff_line_ignore(ROFF_ARGS);
  static	enum rofferr	 roff_nr(ROFF_ARGS);
- static	void		 roff_openeqn(struct roff *, const char *,
- 				int, int, const char *);
  static	enum rofft	 roff_parse(struct roff *, char *, int *,
  				int, int);
  static	enum rofferr	 roff_parsetext(char **, size_t *, int, int *);
--- 205,210 ----
***************
*** 1926,1940 ****
  	return(ROFF_REPARSE);
  }
  
! static void
! roff_openeqn(struct roff *r, const char *name, int line,
! 		int offs, const char *buf)
  {
  	struct eqn_node *e;
- 	int		 poff;
  
  	assert(NULL == r->eqn);
! 	e = eqn_alloc(name, offs, line, r->parse);
  
  	if (r->last_eqn) {
  		r->last_eqn->next = e;
--- 1924,1936 ----
  	return(ROFF_REPARSE);
  }
  
! static enum rofferr
! roff_EQ(ROFF_ARGS)
  {
  	struct eqn_node *e;
  
  	assert(NULL == r->eqn);
! 	e = eqn_alloc(ppos, ln, r->parse);
  
  	if (r->last_eqn) {
  		r->last_eqn->next = e;
***************
*** 1946,1962 ****
  
  	r->eqn = r->last_eqn = e;
  
! 	if (buf) {
! 		poff = 0;
! 		eqn_read(&r->eqn, line, buf, offs, &poff);
! 	}
! }
  
- static enum rofferr
- roff_EQ(ROFF_ARGS)
- {
- 
- 	roff_openeqn(r, *bufp + pos, ln, ppos, NULL);
  	return(ROFF_IGN);
  }
  
--- 1942,1951 ----
  
  	r->eqn = r->last_eqn = e;
  
! 	if ((*bufp)[pos])
! 		mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,
! 		    ".EQ %s", *bufp + pos);
  
  	return(ROFF_IGN);
  }