===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.62
retrieving revision 1.66
diff -u -p -r1.62 -r1.66
--- mandoc/Attic/macro.c	2009/03/08 20:57:35	1.62
+++ mandoc/Attic/macro.c	2009/03/11 00:39:58	1.66
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.62 2009/03/08 20:57:35 kristaps Exp $ */
+/* $Id: macro.c,v 1.66 2009/03/11 00:39:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,17 +21,16 @@
 #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"
+/* FIXME: .Fl, .Ar, .Cd handling of `|'. */
 
 static int	  macro_obsolete(MACRO_PROT_ARGS);
 static int	  macro_constant(MACRO_PROT_ARGS);
@@ -183,6 +182,11 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ 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 */ 
+	{ macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */
+	{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */
+	{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */
 };
 
 const	struct mdoc_macro * const mdoc_macros = __mdoc_macros;
@@ -325,6 +329,8 @@ rewind_alt(int tok)
 		return(MDOC_Ao);
 	case (MDOC_Bc):
 		return(MDOC_Bo);
+	case (MDOC_Brc):
+		return(MDOC_Bro);
 	case (MDOC_Dc):
 		return(MDOC_Do);
 	case (MDOC_Ec):
@@ -374,6 +380,8 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru
 		/* FALLTHROUGH */
 	case (MDOC_Bq):
 		/* FALLTHROUGH */
+	case (MDOC_Brq):
+		/* FALLTHROUGH */
 	case (MDOC_D1):
 		/* FALLTHROUGH */
 	case (MDOC_Dl):
@@ -428,6 +436,8 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru
 		/* FALLTHROUGH */
 	case (MDOC_Bo):
 		/* FALLTHROUGH */
+	case (MDOC_Bro):
+		/* FALLTHROUGH */
 	case (MDOC_Do):
 		/* FALLTHROUGH */
 	case (MDOC_Eo):
@@ -454,6 +464,8 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru
 		/* FALLTHROUGH */
 	case (MDOC_Bc):
 		/* FALLTHROUGH */
+	case (MDOC_Brc):
+		/* FALLTHROUGH */
 	case (MDOC_Dc):
 		/* FALLTHROUGH */
 	case (MDOC_Ec):
@@ -799,7 +811,7 @@ macro_text(MACRO_PROT_ARGS)
 	for (;;) {
 		la = *pos;
 		w = mdoc_args(mdoc, line, pos, buf, tok, &p);
-		assert(ARGS_PHRASE != c);
+		assert(ARGS_PHRASE != w);
 
 		if (ARGS_ERROR == w)
 			return(0);
@@ -808,9 +820,13 @@ macro_text(MACRO_PROT_ARGS)
 		if (ARGS_PUNCT == w)
 			break;
 
+		/* Quoted words shouldn't be looked-up. */
+
 		c = ARGS_QWORD == w ? MDOC_MAX :
 			lookup(mdoc, line, la, tok, p);
 
+		/* MDOC_MAX (not a macro) or -1 (error). */
+
 		if (MDOC_MAX != c && -1 != c) {
 			if (0 == lastpunct && ! rewind_elem(mdoc, tok))
 				return(0);
@@ -823,7 +839,7 @@ macro_text(MACRO_PROT_ARGS)
 		} else if (-1 == c)
 			return(0);
 
-		/* FIXME: .Fl and .Ar handling of `|'. */
+		/* Non-quote-enclosed punctuation. */
 
 		if (ARGS_QWORD != w && mdoc_isdelim(p)) {
 			if (0 == lastpunct && ! rewind_elem(mdoc, tok))