===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -p -r1.12 -r1.15
--- mandoc/mdoc_macro.c	2009/06/12 09:18:00	1.12
+++ mandoc/mdoc_macro.c	2009/07/06 09:21:24	1.15
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.12 2009/06/12 09:18:00 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.15 2009/07/06 09:21:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -22,8 +22,6 @@
 
 #include "libmdoc.h"
 
-/* FIXME: .Fl, .Ar, .Cd handling of `|'. */
-
 enum	mwarn {
 	WIGNE,
 	WIMPBRK,
@@ -74,7 +72,7 @@ static	int	  swarn(struct mdoc *, enum mdoc_type, int,
 /* Central table of library: who gets parsed how. */
 
 const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
-	{ NULL, 0 }, /* \" */
+	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */
 	{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */
 	{ in_line_eoln, MDOC_PROLOGUE }, /* Dt */
 	{ in_line_eoln, MDOC_PROLOGUE }, /* Os */
@@ -181,7 +179,6 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ obsolete, 0 }, /* Fr */
 	{ in_line_eoln, 0 }, /* Ud */
 	{ in_line_eoln, 0 }, /* Lb */
-	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */
 	{ in_line, 0 }, /* Lp */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */ 
@@ -244,7 +241,7 @@ pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn
 		break;
 	}
 	assert(p);
-	return(mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, p));
+	return(mdoc_pwarn(mdoc, line, pos, p));
 }
 
 
@@ -289,7 +286,7 @@ swarn(struct mdoc *mdoc, enum mdoc_type type, 
 		return(mdoc_perr(mdoc, line, pos, 
 				"%s scope breaks %s scope of %s", 
 				tt, t, n));
-	return(mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX,
+	return(mdoc_pwarn(mdoc, line, pos, 
 				"%s scope breaks %s scope of %s", 
 				tt, t, n));
 }