===================================================================
RCS file: /cvs/mandoc/Attic/action.c,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- mandoc/Attic/action.c	2009/01/17 16:15:27	1.10
+++ mandoc/Attic/action.c	2009/01/20 12:51:28	1.13
@@ -1,4 +1,4 @@
-/* $Id: action.c,v 1.10 2009/01/17 16:15:27 kristaps Exp $ */
+/* $Id: action.c,v 1.13 2009/01/20 12:51:28 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,13 +27,18 @@ struct	actions {
 	int	(*post)(struct mdoc *);
 };
 
+/* Per-macro action routines. */
 
-static int	 post_sh(struct mdoc *);
-static int	 post_os(struct mdoc *);
-static int	 post_dt(struct mdoc *);
-static int	 post_dd(struct mdoc *);
-static int	 post_nm(struct mdoc *);
+static	int	 post_sh(struct mdoc *);
+static	int	 post_os(struct mdoc *);
+static	int	 post_dt(struct mdoc *);
+static	int	 post_dd(struct mdoc *);
+static	int	 post_nm(struct mdoc *);
 
+static	int	 post_prologue(struct mdoc *);
+
+/* Array of macro action routines. */
+
 const	struct actions mdoc_actions[MDOC_MAX] = {
 	{ NULL }, /* \" */
 	{ post_dd }, /* Dd */ 
@@ -155,12 +160,12 @@ post_nm(struct mdoc *mdoc)
 	if (mdoc->meta.name)
 		return(1);
 
-	if ( ! xstrlcats(buf, mdoc->last->child, 64))
-		return(mdoc_err(mdoc, "macro parameters too long"));
+	if (xstrlcats(buf, mdoc->last->child, 64)) {
+		mdoc->meta.name = xstrdup(buf);
+		return(1);
+	}
 
-	mdoc->meta.name = xstrdup(buf);
-	mdoc_msg(mdoc, "parsed name: %s", mdoc->meta.name);
-	return(1);
+	return(mdoc_err(mdoc, "macro parameters too long"));
 }
 
 
@@ -172,14 +177,14 @@ post_sh(struct mdoc *mdoc)
 
 	if (MDOC_HEAD != mdoc->last->type)
 		return(1);
-	if ( ! xstrlcats(buf, mdoc->last->child, 64))
-		return(mdoc_err(mdoc, "macro parameters too long"));
+	if (xstrlcats(buf, mdoc->last->child, 64)) {
+		if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
+			mdoc->sec_lastn = sec;
+		mdoc->sec_last = sec;
+		return(1);
+	}
 
-	if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
-		mdoc->sec_lastn = sec;
-	mdoc->sec_last = sec;
-
-	return(1);
+	return(mdoc_err(mdoc, "macro parameters too long"));
 }
 
 
@@ -224,9 +229,7 @@ post_dt(struct mdoc *mdoc)
 	if (NULL == mdoc->meta.title)
 		mdoc->meta.title = xstrdup("untitled");
 
-	mdoc_msg(mdoc, "parsed title: %s", mdoc->meta.title);
-	/* TODO: print vol2a functions. */
-	return(1);
+	return(post_prologue(mdoc));
 }
 
 
@@ -243,9 +246,10 @@ post_os(struct mdoc *mdoc)
 		return(mdoc_err(mdoc, "macro parameters too long")); 
 
 	mdoc->meta.os = xstrdup(buf[0] ? buf : "local");
-	mdoc_msg(mdoc, "parsed operating system: %s", mdoc->meta.os);
 	mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
-	return(1);
+	mdoc->flags |= MDOC_BODYPARSE;
+
+	return(post_prologue(mdoc));
 }
 
 
@@ -270,7 +274,7 @@ post_dd(struct mdoc *mdoc)
 		assert(MDOC_TEXT == n->type);
 		p = n->data.text.string;
 
-		if (xstrcmp(p, "$Mdocdate: January 17 2009 $")) {
+		if (xstrcmp(p, "$Mdocdate: January 20 2009 $")) {
 			mdoc->meta.date = time(NULL);
 			continue;
 		} else if (xstrcmp(p, "$")) {
@@ -285,26 +289,49 @@ post_dd(struct mdoc *mdoc)
 			return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
 	}
 
-	if (mdoc->meta.date && NULL == n) {
-		mdoc_msg(mdoc, "parsed time: %u since epoch", 
-				mdoc->meta.date);
-		return(1);
-	} else if (n)
+	if (mdoc->meta.date && NULL == n)
+		return(post_prologue(mdoc));
+	else if (n)
 		return(mdoc_err(mdoc, "invalid parameter syntax"));
+	if ((mdoc->meta.date = mdoc_atotime(date)))
+		return(post_prologue(mdoc));
+	return(mdoc_err(mdoc, "invalid parameter syntax"));
+}
 
-	if ((mdoc->meta.date = mdoc_atotime(date))) {
-		mdoc_msg(mdoc, "parsed time: %u since epoch", 
-				mdoc->meta.date);
-		return(1);
+
+static int
+post_prologue(struct mdoc *mdoc)
+{
+	struct mdoc_node *n;
+
+	if (mdoc->last->parent->child == mdoc->last)
+		mdoc->last->parent->child = mdoc->last->prev;
+	if (mdoc->last->prev)
+		mdoc->last->prev->next = NULL;
+
+	n = mdoc->last;
+	assert(NULL == mdoc->last->next);
+
+	if (mdoc->last->prev) {
+		mdoc->last = mdoc->last->prev;
+		mdoc->next = MDOC_NEXT_SIBLING;
+	} else {
+		mdoc->last = mdoc->last->parent;
+		mdoc->next = MDOC_NEXT_CHILD;
 	}
 
-	return(mdoc_err(mdoc, "invalid parameter syntax"));
+	mdoc_node_freelist(n);
+	return(1);
 }
 
 
 int
 mdoc_action_post(struct mdoc *mdoc)
 {
+
+	if (MDOC_ACTED & mdoc->last->flags)
+		return(1);
+	mdoc->last->flags |= MDOC_ACTED;
 
 	if (MDOC_TEXT == mdoc->last->type)
 		return(1);