===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mandoc/roff.c	2008/11/28 15:25:49	1.15
+++ mandoc/roff.c	2008/11/28 18:15:29	1.16
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.15 2008/11/28 15:25:49 kristaps Exp $ */
+/* $Id: roff.c,v 1.16 2008/11/28 18:15:29 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -357,23 +357,40 @@ const	char *const *tokargnames = tokargnamesp;
 int
 roff_free(struct rofftree *tree, int flush)
 {
-	int		 error;
+	int		 error, t;
 	struct roffnode	*n;
 
-	error = 0;
+	if ( ! flush)
+		goto end;
 
-	for (n = tree->last; n->parent; n = n->parent)
-		if (tokens[n->tok].ctx == 0) {
-			roff_warn(tree, NULL, "closing explicit scope "
-					"of `%s'", toknames[n->tok]);
-			error = 1;
-		}
+	error = 1;
 
-	if (0 == error && (ROFF_PRELUDE & tree->state)) {
+	if (ROFF_PRELUDE & tree->state) {
 		roff_warn(tree, NULL, "prelude never finished");
-		error = 1;
+		goto end;
+	} 
+
+	for (n = tree->last; n->parent; n = n->parent) {
+		if (0 != tokens[n->tok].ctx) 
+			break;
+		roff_warn(tree, NULL, "closing explicit scope `%s'", 
+				toknames[n->tok]);
+		goto end;
 	}
 
+	while (tree->last) {
+		t = tree->last->tok;
+		if ( ! (*tokens[t].cb)(t, tree, NULL, ROFF_EXIT))
+			goto end;
+	}
+
+	if ( ! (*tree->cb.roffhead)(tree->arg))
+		goto end;
+
+	error = 0;
+
+end:
+
 	while (tree->last) 
 		roffnode_free(tree);
 
@@ -394,6 +411,11 @@ roff_alloc(const struct roffcb *cb, void *args)
 	tree->arg = args;
 
 	(void)memcpy(&tree->cb, cb, sizeof(struct roffcb));
+
+	if ( ! (*tree->cb.roffhead)(args)) {
+		free(tree);
+		return(NULL);
+	}
 
 	return(tree);
 }