===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -c -r1.110 -r1.111
*** src/usr.bin/mandoc/mdoc_macro.c	2014/11/29 04:31:33	1.110
--- src/usr.bin/mandoc/mdoc_macro.c	2014/11/30 02:31:32	1.111
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.110 2014/11/29 04:31:33 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.111 2014/11/30 02:31:32 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 51,57 ****
  static	void		dword(struct mdoc *, int, int, const char *,
  				 enum mdelim, int);
  static	void		append_delims(struct mdoc *, int, int *, char *);
! static	enum mdoct	lookup(enum mdoct, const char *);
  static	int		macro_or_word(MACRO_PROT_ARGS, int);
  static	int		make_pending(struct mdoc_node *, enum mdoct,
  				struct mdoc *, int, int);
--- 51,58 ----
  static	void		dword(struct mdoc *, int, int, const char *,
  				 enum mdelim, int);
  static	void		append_delims(struct mdoc *, int, int *, char *);
! static	enum mdoct	lookup(struct mdoc *, enum mdoct,
! 				int, int, const char *);
  static	int		macro_or_word(MACRO_PROT_ARGS, int);
  static	int		make_pending(struct mdoc_node *, enum mdoct,
  				struct mdoc *, int, int);
***************
*** 243,256 ****
   * or as a line macro if from == MDOC_MAX.
   */
  static enum mdoct
! lookup(enum mdoct from, const char *p)
  {
  	enum mdoct	 res;
  
  	if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) {
  		res = mdoc_hash_find(p);
! 		if (res != MDOC_MAX && mdoc_macros[res].flags & MDOC_CALLABLE)
! 			return(res);
  	}
  	return(MDOC_MAX);
  }
--- 244,262 ----
   * or as a line macro if from == MDOC_MAX.
   */
  static enum mdoct
! lookup(struct mdoc *mdoc, enum mdoct from, int line, int ppos, const char *p)
  {
  	enum mdoct	 res;
  
  	if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) {
  		res = mdoc_hash_find(p);
! 		if (res != MDOC_MAX) {
! 			if (mdoc_macros[res].flags & MDOC_CALLABLE)
! 				return(res);
! 			if (res != MDOC_br && res != MDOC_sp && res != MDOC_ll)
! 				mandoc_msg(MANDOCERR_MACRO_CALL,
! 				    mdoc->parse, line, ppos, p);
! 		}
  	}
  	return(MDOC_MAX);
  }
***************
*** 669,675 ****
  	else if (*p == '"')
  		p++;
  	else if (parsed)
! 		ntok = lookup(tok, p);
  
  	if (ntok == MDOC_MAX) {
  		dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX ||
--- 675,681 ----
  	else if (*p == '"')
  		p++;
  	else if (parsed)
! 		ntok = lookup(mdoc, tok, line, ppos, p);
  
  	if (ntok == MDOC_MAX) {
  		dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX ||
***************
*** 830,836 ****
  		if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
  			break;
  
! 		ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p);
  
  		if (ntok == MDOC_MAX) {
  			dword(mdoc, line, lastarg, p, DELIM_MAX,
--- 836,843 ----
  		if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
  			break;
  
! 		ntok = ac == ARGS_QWORD ? MDOC_MAX :
! 		    lookup(mdoc, tok, line, lastarg, p);
  
  		if (ntok == MDOC_MAX) {
  			dword(mdoc, line, lastarg, p, DELIM_MAX,
***************
*** 931,937 ****
  		}
  
  		ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ?
! 		    MDOC_MAX : lookup(tok, p);
  
  		/*
  		 * In this case, we've located a submacro and must
--- 938,944 ----
  		}
  
  		ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ?
! 		    MDOC_MAX : lookup(mdoc, tok, line, la, p);
  
  		/*
  		 * In this case, we've located a submacro and must
***************
*** 1438,1444 ****
  			flushed = 1;
  		}
  
! 		ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p);
  
  		if (ntok != MDOC_MAX) {
  			if ( ! flushed)
--- 1445,1452 ----
  			flushed = 1;
  		}
  
! 		ntok = ac == ARGS_QWORD ? MDOC_MAX :
! 		    lookup(mdoc, tok, line, la, p);
  
  		if (ntok != MDOC_MAX) {
  			if ( ! flushed)