===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.5
retrieving revision 1.12
diff -u -p -r1.5 -r1.12
--- mandoc/mdoc.c	2008/12/28 00:34:20	1.5
+++ mandoc/mdoc.c	2008/12/30 19:06:03	1.12
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.5 2008/12/28 00:34:20 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.12 2008/12/30 19:06:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -90,8 +90,8 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_scoped_implicit, 0 }, /* Sh */
 	{ macro_scoped_implicit, 0 }, /* Ss */ 
 	{ macro_text, 0 }, /* Pp */ 
-	{ NULL, 0 }, /* D1 */
-	{ NULL, 0 }, /* Dl */
+	{ macro_scoped_line, 0 }, /* D1 */
+	{ macro_scoped_line, 0 }, /* Dl */
 	{ macro_scoped_explicit, MDOC_EXPLICIT }, /* Bd */
 	{ macro_scoped_explicit, 0 }, /* Ed */
 	{ macro_scoped_explicit, MDOC_EXPLICIT }, /* Bl */
@@ -100,26 +100,26 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_text, MDOC_CALLABLE }, /* Ad */ 
 	{ NULL, 0 }, /* An */ 
 	{ macro_text, MDOC_CALLABLE }, /* Ar */
-	{ NULL, 0 }, /* Cd */
+	{ macro_constant, MDOC_QUOTABLE }, /* Cd */
 	{ macro_text, MDOC_CALLABLE }, /* Cm */
 	{ macro_text, MDOC_CALLABLE }, /* Dv */ 
 	{ macro_text, MDOC_CALLABLE }, /* Er */ 
 	{ macro_text, MDOC_CALLABLE }, /* Ev */ 
-	{ NULL, 0 }, /* Ex */
+	{ macro_constant_argv, 0 }, /* Ex */
 	{ macro_text, MDOC_CALLABLE }, /* Fa */ 
 	{ NULL, 0 }, /* Fd */ 
 	{ macro_text, MDOC_CALLABLE }, /* Fl */
-	{ NULL, 0 }, /* Fn */ 
+	{ macro_text, MDOC_CALLABLE | MDOC_QUOTABLE }, /* Fn */ 
 	{ macro_text, 0 }, /* Ft */ 
 	{ macro_text, MDOC_CALLABLE }, /* Ic */ 
 	{ NULL, 0 }, /* In */ 
 	{ macro_text, MDOC_CALLABLE }, /* Li */
-	{ NULL, 0 }, /* Nd */ 
+	{ macro_constant, 0 }, /* Nd */ 
 	{ NULL, 0 }, /* Nm */ 
 	{ NULL, 0 }, /* Op */
 	{ NULL, 0 }, /* Ot */
 	{ macro_text, MDOC_CALLABLE }, /* Pa */
-	{ NULL, 0 }, /* Rv */
+	{ macro_constant_argv, 0 }, /* Rv */
 	{ NULL, 0 }, /* St */
 	{ macro_text, MDOC_CALLABLE }, /* Va */
 	{ macro_text, MDOC_CALLABLE }, /* Vt */ 
@@ -137,46 +137,46 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ NULL, 0 }, /* %V */
 	{ NULL, 0 }, /* Ac */
 	{ NULL, 0 }, /* Ao */
-	{ NULL, 0 }, /* Aq */
-	{ NULL, 0 }, /* At */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Aq */
+	{ macro_constant, 0 }, /* At */
 	{ NULL, 0 }, /* Bc */
 	{ NULL, 0 }, /* Bf */ 
 	{ NULL, 0 }, /* Bo */
-	{ NULL, 0 }, /* Bq */
-	{ NULL, 0 }, /* Bsx */
-	{ NULL, 0 }, /* Bx */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Bq */
+	{ macro_constant_delimited, 0 }, /* Bsx */
+	{ macro_constant_delimited, 0 }, /* Bx */
 	{ NULL, 0 }, /* Db */
 	{ NULL, 0 }, /* Dc */
 	{ NULL, 0 }, /* Do */
-	{ NULL, 0 }, /* Dq */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Dq */
 	{ NULL, 0 }, /* Ec */
 	{ NULL, 0 }, /* Ef */
 	{ macro_text, MDOC_CALLABLE }, /* Em */ 
 	{ NULL, 0 }, /* Eo */
-	{ NULL, 0 }, /* Fx */
+	{ macro_constant_delimited, 0 }, /* Fx */
 	{ macro_text, 0 }, /* Ms */
 	{ NULL, 0 }, /* No */
 	{ NULL, 0 }, /* Ns */
-	{ NULL, 0 }, /* Nx */
-	{ NULL, 0 }, /* Ox */
+	{ macro_constant_delimited, 0 }, /* Nx */
+	{ macro_constant_delimited, 0 }, /* Ox */
 	{ NULL, 0 }, /* Pc */
 	{ NULL, 0 }, /* Pf */
 	{ NULL, 0 }, /* Po */
-	{ NULL, 0 }, /* Pq */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Pq */
 	{ NULL, 0 }, /* Qc */
-	{ NULL, 0 }, /* Ql */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Ql */
 	{ NULL, 0 }, /* Qo */
-	{ NULL, 0 }, /* Qq */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Qq */
 	{ NULL, 0 }, /* Re */
 	{ NULL, 0 }, /* Rs */
 	{ NULL, 0 }, /* Sc */
 	{ NULL, 0 }, /* So */
-	{ NULL, 0 }, /* Sq */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Sq */
 	{ NULL, 0 }, /* Sm */
-	{ NULL, 0 }, /* Sx */
-	{ NULL, 0 }, /* Sy */
+	{ macro_text, MDOC_CALLABLE }, /* Sx */
+	{ macro_text, MDOC_CALLABLE }, /* Sy */
 	{ macro_text, MDOC_CALLABLE }, /* Tn */
-	{ NULL, 0 }, /* Ux */
+	{ macro_constant_delimited, 0 }, /* Ux */
 	{ NULL, 0 }, /* Xc */
 	{ NULL, 0 }, /* Xo */
 	{ NULL, 0 }, /* Fo */ 
@@ -185,10 +185,10 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ NULL, 0 }, /* Oc */
 	{ NULL, 0 }, /* Bk */
 	{ NULL, 0 }, /* Ek */
-	{ NULL, 0 }, /* Bt */
-	{ NULL, 0 }, /* Hf */
-	{ NULL, 0 }, /* Fr */
-	{ NULL, 0 }, /* Ud */
+	{ macro_constant, 0 }, /* Bt */
+	{ macro_constant, 0 }, /* Hf */
+	{ macro_obsolete, 0 }, /* Fr */
+	{ macro_constant, 0 }, /* Ud */
 };
 
 const	char * const *mdoc_macronames = __mdoc_macronames;
@@ -336,6 +336,8 @@ mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int *
 		return(0);
 	}
 
+	/*mdoc_msg(mdoc, ppos, "calling `%s'", mdoc_macronames[tok]);*/
+
 	return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf));
 }
 
@@ -407,35 +409,25 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md
 
 	switch (p->type) {
 	case (MDOC_BODY):
-		switch (mdoc->last->type) {
-		case (MDOC_BLOCK):
-			p->parent = mdoc->last;
-			mdoc->last->child = p;
-			act = "child";
-			break;
-		case (MDOC_HEAD):
-			p->parent = mdoc->last->parent;
-			mdoc->last->next = p;
-			p->prev = mdoc->last;
-			act = "sibling";
-			break;
-		default:
-			abort();
-			/* NOTREACHED */
-		}
+		p->parent = mdoc->last->parent;
+		mdoc->last->next = p;
+		p->prev = mdoc->last;
+		act = "sibling";
 		break;
+
 	case (MDOC_HEAD):
 		assert(mdoc->last->type == MDOC_BLOCK);
 		p->parent = mdoc->last;
 		mdoc->last->child = p;
 		act = "child";
 		break;
+
 	default:
 		switch (mdoc->last->type) {
 		case (MDOC_BODY):
 			/* FALLTHROUGH */
 		case (MDOC_HEAD):
-			p->parent = mdoc->last->parent;
+			p->parent = mdoc->last;
 			mdoc->last->child = p;
 			act = "child";
 			break;
@@ -455,6 +447,7 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md
 }
 
 
+/* FIXME: deprecate paramsz, params. */
 void
 mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok, 
 		size_t paramsz, const char **params)