===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.25
retrieving revision 1.28
diff -u -p -r1.25 -r1.28
--- mandoc/mdoc_macro.c	2009/07/21 15:53:47	1.25
+++ mandoc/mdoc_macro.c	2009/07/29 08:46:06	1.28
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.25 2009/07/21 15:53:47 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.28 2009/07/29 08:46:06 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -47,7 +47,8 @@ static	int	  rew_subblock(enum mdoc_type, 
 			struct mdoc *, int, int, int);
 static	int	  rew_last(struct mdoc *, struct mdoc_node *);
 static	int	  append_delims(struct mdoc *, int, int *, char *);
-static	int	  lookup(struct mdoc *, int, int, int, const char *);
+static	int	  lookup(struct mdoc *, int, const char *);
+static	int	  lookup_raw(struct mdoc *, const char *);
 static	int	  swarn(struct mdoc *, enum mdoc_type, int, int, 
 			const struct mdoc_node *);
 
@@ -253,17 +254,24 @@ mdoc_macroend(struct mdoc *mdoc)
 }
 
 static int
-lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
+lookup(struct mdoc *mdoc, int from, const char *p)
 {
+
+	if ( ! (MDOC_PARSED & mdoc_macros[from].flags))
+		return(MDOC_MAX);
+	return(lookup_raw(mdoc, p));
+}
+
+
+static int
+lookup_raw(struct mdoc *mdoc, const char *p)
+{
 	int		 res;
 
-	res = mdoc_hash_find(mdoc->htab, p);
-	if (MDOC_PARSED & mdoc_macros[from].flags)
+	if (MDOC_MAX == (res = mdoc_hash_find(mdoc->htab, p)))
+		return(MDOC_MAX);
+	if (MDOC_CALLABLE & mdoc_macros[res].flags)
 		return(res);
-	if (MDOC_MAX == res)
-		return(res);
-	if ( ! mdoc_pwarn(mdoc, line, pos, EMACPARM))
-		return(-1);
 	return(MDOC_MAX);
 }
 
@@ -681,7 +689,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 		mdoc->next = MDOC_NEXT_CHILD;
 	}
 
-	for (lastarg = ppos, flushed = j = 0; ; j++) {
+	for (flushed = j = 0; ; j++) {
 		lastarg = *pos;
 
 		if (j == maxargs && ! flushed) {
@@ -699,7 +707,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 
-		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+		if (-1 == (c = lookup(mdoc, tok, p)))
 			return(0);
 		else if (MDOC_MAX != c) {
 			if ( ! flushed) {
@@ -742,15 +750,17 @@ in_line(MACRO_PROT_ARGS)
 	 * usually because of reserved words) to squeak by.
 	 */
 	switch (tok) {
-	case (MDOC_Nm):
+	case (MDOC_An):
 		/* FALLTHROUGH */
+	case (MDOC_Ar):
+		/* FALLTHROUGH */
 	case (MDOC_Fl):
 		/* FALLTHROUGH */
 	case (MDOC_Lk):
 		/* FALLTHROUGH */
-	case (MDOC_Pa):
+	case (MDOC_Nm):
 		/* FALLTHROUGH */
-	case (MDOC_Ar):
+	case (MDOC_Pa):
 		nc = 1;
 		break;
 	default:
@@ -758,7 +768,7 @@ in_line(MACRO_PROT_ARGS)
 		break;
 	}
 
-	for (la = ppos, arg = NULL;; ) {
+	for (arg = NULL;; ) {
 		la = *pos;
 		c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 
@@ -788,8 +798,7 @@ in_line(MACRO_PROT_ARGS)
 
 		/* Quoted words shouldn't be looked-up. */
 
-		c = ARGS_QWORD == w ? MDOC_MAX :
-			lookup(mdoc, line, la, tok, p);
+		c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, tok, p);
 
 		/* 
 		 * In this case, we've located a submacro and must
@@ -986,7 +995,7 @@ blk_full(MACRO_PROT_ARGS)
 			continue;
 		}
 
-		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+		if (-1 == (c = lookup(mdoc, tok, p)))
 			return(0);
 
 		if (MDOC_MAX == c) {
@@ -1044,7 +1053,7 @@ blk_part_imp(MACRO_PROT_ARGS)
 
 	/* XXX - no known argument macros. */
 
-	for (lastarg = ppos;; ) {
+	for (;;) {
 		lastarg = *pos;
 		c = mdoc_args(mdoc, line, pos, buf, tok, &p);
 		assert(ARGS_PHRASE != c);
@@ -1056,7 +1065,7 @@ blk_part_imp(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 
-		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+		if (-1 == (c = lookup(mdoc, tok, p)))
 			return(0);
 		else if (MDOC_MAX == c) {
 			if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
@@ -1105,7 +1114,6 @@ blk_part_exp(MACRO_PROT_ARGS)
 	int		  lastarg, flushed, j, c, maxargs;
 	char		 *p;
 
-	lastarg = ppos;
 	flushed = 0;
 
 	/*
@@ -1161,7 +1169,7 @@ blk_part_exp(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 
-		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+		if (-1 == (c = lookup(mdoc, tok, p)))
 			return(0);
 		else if (MDOC_MAX != c) {
 			if ( ! flushed) {
@@ -1241,7 +1249,7 @@ in_line_argn(MACRO_PROT_ARGS)
 		break;
 	}
 
-	for (lastarg = ppos, arg = NULL;; ) {
+	for (arg = NULL;; ) {
 		lastarg = *pos;
 		c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 
@@ -1281,7 +1289,7 @@ in_line_argn(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 
-		if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+		if (-1 == (c = lookup(mdoc, tok, p)))
 			return(0);
 		else if (MDOC_MAX != c) {
 			if ( ! flushed && ! rew_elem(mdoc, tok))
@@ -1359,8 +1367,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == w)
 			break;
 
-		c = ARGS_QWORD == w ? MDOC_MAX :
-			lookup(mdoc, line, la, tok, p);
+		c = ARGS_QWORD == w ? MDOC_MAX : lookup(mdoc, tok, p);
 
 		if (MDOC_MAX != c && -1 != c) {
 			if ( ! rew_elem(mdoc, tok))