===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.61
retrieving revision 1.63
diff -u -p -r1.61 -r1.63
--- mandoc/roff.c	2008/12/10 13:15:55	1.61
+++ mandoc/roff.c	2008/12/10 16:03:12	1.63
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.61 2008/12/10 13:15:55 kristaps Exp $ */
+/* $Id: roff.c,v 1.63 2008/12/10 16:03:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -38,7 +38,6 @@
 /* TODO: (warn) some sections need specific elements. */
 /* TODO: (warn) NAME section has particular order. */
 /* TODO: macros with a set number of arguments? */
-/* TODO: validate Dt macro arguments. */
 /* FIXME: Bl -diag supposed to ignore callable children. */
 
 struct	roffnode {
@@ -1166,7 +1165,7 @@ static int
 roff_layout(ROFFCALL_ARGS) 
 {
 	int		 i, c, argcp[ROFF_MAXLINEARG];
-	char		*argvp[ROFF_MAXLINEARG];
+	char		*argvp[ROFF_MAXLINEARG], *p;
 
 	/*
 	 * The roff_layout function is for multi-line macros.  A layout
@@ -1182,7 +1181,7 @@ roff_layout(ROFFCALL_ARGS) 
 
 	assert( ! (ROFF_CALLABLE & tokens[tok].flags));
 
-	if ( ! ROFFSec_NAME & tree->asec)
+	if ( ! (ROFFSec_PR_Os & tree->asec))
 		return(roff_errp(tree, *argv, tok, ERR_NOT_PR));
 
 	if (ROFF_EXIT == type) {
@@ -1192,7 +1191,7 @@ roff_layout(ROFFCALL_ARGS) 
 		return((*tree->cb.roffblkout)(tree->arg, tok));
 	} 
 
-	argv++;
+	p = *argv++;
 	assert( ! (ROFF_CALLABLE & tokens[tok].flags));
 
 	if ( ! roffparseopts(tree, tok, &argv, argcp, argvp))
@@ -1249,6 +1248,10 @@ roff_layout(ROFFCALL_ARGS) 
 			return(0);
 
 		tree->asec |= tree->csec;
+
+		if ( ! roffspecial(tree, tok, p, argcp, 
+					(const char **)argvp, 0, argv))
+			return(0);
 		break;
 	default:
 		break;
@@ -1346,7 +1349,7 @@ roff_ordered(ROFFCALL_ARGS) 
 	 * .Xr arg1 arg2 punctuation
 	 */
 
-	if ( ! ROFFSec_NAME & tree->asec)
+	if ( ! (ROFFSec_PR_Os & tree->asec))
 		return(roff_errp(tree, *argv, tok, ERR_NOT_PR));
 
 	first = (*argv == tree->cur);
@@ -1418,7 +1421,7 @@ roff_text(ROFFCALL_ARGS) 
 	 * <fl> v W f </fl> ;
 	 */
 
-	if ( ! ROFFSec_NAME & tree->asec)
+	if ( ! (ROFFSec_PR_Os & tree->asec))
 		return(roff_errp(tree, *argv, tok, ERR_NOT_PR));
 
 	first = (*argv == tree->cur);