===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.59
retrieving revision 1.64
diff -u -p -r1.59 -r1.64
--- mandoc/Attic/macro.c	2009/03/08 18:02:36	1.59
+++ mandoc/Attic/macro.c	2009/03/09 14:19:59	1.64
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.59 2009/03/08 18:02:36 kristaps Exp $ */
+/* $Id: macro.c,v 1.64 2009/03/09 14:19:59 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,18 +21,15 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef	__linux__
-#include <time.h>
-#endif
 
+#include "private.h"
+
 /*
  * This has scanning/parsing routines, each of which extract a macro and
  * its arguments and parameters, then know how to progress to the next
  * macro. 
  */
 
-#include "private.h"
-
 static int	  macro_obsolete(MACRO_PROT_ARGS);
 static int	  macro_constant(MACRO_PROT_ARGS);
 static int	  macro_constant_scoped(MACRO_PROT_ARGS);
@@ -181,6 +178,10 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_obsolete, 0 }, /* Fr */
 	{ macro_constant, 0 }, /* Ud */
 	{ macro_constant, 0 }, /* Lb */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */
+	{ macro_text, 0 }, /* Lp */ 
+	{ macro_text, MDOC_PARSED }, /* Lk */ 
+	{ macro_text, MDOC_PARSED }, /* Mt */ 
 };
 
 const	struct mdoc_macro * const mdoc_macros = __mdoc_macros;
@@ -238,7 +239,7 @@ scopewarn(struct mdoc *mdoc, enum mdoc_type type, 
 	n = t = "<root>";
 	tt = "block";
 
-	switch (p->type) {
+	switch (type) {
 	case (MDOC_BODY):
 		tt = "multi-line";
 		break;
@@ -1204,6 +1205,8 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 	 */
 
 	switch (tok) {
+	case (MDOC_Ap):
+		/* FALLTHROUGH */
 	case (MDOC_No):
 		/* FALLTHROUGH */
 	case (MDOC_Ns):