===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -p -r1.4 -r1.6
--- mandoc/mdoc.c	2008/12/23 05:30:49	1.4
+++ mandoc/mdoc.c	2008/12/28 21:25:09	1.6
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.4 2008/12/23 05:30:49 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.6 2008/12/28 21:25:09 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -89,11 +89,11 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_prologue_os, 0 }, /* Os */
 	{ macro_scoped_implicit, 0 }, /* Sh */
 	{ macro_scoped_implicit, 0 }, /* Ss */ 
-	{ NULL, 0 }, /* Pp */ 
-	{ NULL, 0 }, /* D1 */
-	{ NULL, 0 }, /* Dl */
-	{ NULL, 0 }, /* Bd */
-	{ NULL, 0 }, /* Ed */
+	{ macro_text, 0 }, /* Pp */ 
+	{ 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 */
 	{ macro_scoped_explicit, 0 }, /* El */
 	{ NULL, 0 }, /* It */
@@ -166,7 +166,7 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ NULL, 0 }, /* Qc */
 	{ NULL, 0 }, /* Ql */
 	{ NULL, 0 }, /* Qo */
-	{ NULL, 0 }, /* Qq */
+	{ macro_scoped_pline, MDOC_CALLABLE }, /* Qq */
 	{ NULL, 0 }, /* Re */
 	{ NULL, 0 }, /* Rs */
 	{ NULL, 0 }, /* Sc */
@@ -252,9 +252,9 @@ mdoc_parseln(struct mdoc *mdoc, char *buf)
 	int		  c, i;
 	char		  tmp[5];
 
-	if ('.' != *buf)  {
-		/* TODO. */
-		return(1); 
+	if ('.' != *buf) {
+		mdoc_word_alloc(mdoc, 0, buf);
+		return(1);
 	}
 
 	if (buf[1] && '\\' == buf[1])
@@ -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));
 }
 
@@ -347,7 +349,7 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md
 
 	switch (p->type) {
 	case (MDOC_TEXT):
-		nn = "<text>";
+		nn = p->data.text.string;
 		nt = "text";
 		break;
 	case (MDOC_BODY):
@@ -407,39 +409,31 @@ 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;
-			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;
 		default:
 			p->parent = mdoc->last->parent;
+			p->prev = mdoc->last;
 			mdoc->last->next = p;
 			act = "sibling";
 			break;
@@ -453,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)