===================================================================
RCS file: /cvs/mandoc/Attic/mlg.c,v
retrieving revision 1.9
retrieving revision 1.11
diff -u -p -r1.9 -r1.11
--- mandoc/Attic/mlg.c	2008/12/05 11:28:17	1.9
+++ mandoc/Attic/mlg.c	2008/12/05 19:45:15	1.11
@@ -1,4 +1,4 @@
-/* $Id: mlg.c,v 1.9 2008/12/05 11:28:17 kristaps Exp $ */
+/* $Id: mlg.c,v 1.11 2008/12/05 19:45:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -51,13 +51,11 @@ struct	md_mlg {
 	size_t		  pos;
 	enum md_tok	  last;
 	void		 *arg;
-	ml_begintag	  begintag;
-	ml_endtag	  endtag;
-	ml_begin	  begin;
-	ml_end		  end;
+	struct ml_cbs	  cbs;
 	int		  flags;
 #define	ML_OVERRIDE_ONE	 (1 << 0)
 #define	ML_OVERRIDE_ALL	 (1 << 1)
+	void		 *data;
 };
 
 
@@ -144,7 +142,7 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
 	if ( ! ml_nputs(p->mbuf, "<", 1, &p->pos))
 		return(0);
 
-	res = (*p->begintag)(p->mbuf, p->args, ns, tok,
+	res = (*p->cbs.ml_begintag)(p->mbuf, p->data, p->args, ns, tok,
 			argc, (const char **)argv);
 	if (-1 == res)
 		return(0);
@@ -193,7 +191,7 @@ mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok)
 	if ( ! ml_nputs(p->mbuf, "</", 2, &p->pos))
 		return(0);
 
-	res = (*p->endtag)(p->mbuf, p->args, ns, tok);
+	res = (*p->cbs.ml_endtag)(p->mbuf, p->data, p->args, ns, tok);
 	if (-1 == res)
 		return(0);
 
@@ -233,12 +231,9 @@ mlg_indent(struct md_mlg *p)
 static int
 mlg_newline(struct md_mlg *p)
 {
-	size_t		 dummy;
 
-	if ( ! ml_nputs(p->mbuf, "\n", 1, &dummy))
-		return(0);
 	p->pos = 0;
-	return(1);
+	return(ml_nputs(p->mbuf, "\n", 1, NULL));
 }
 
 
@@ -328,6 +323,9 @@ mlg_exit(struct md_mlg *p, int flush)
 
 	c = roff_free(p->tree, flush);
 	free(p);
+
+	(*p->cbs.ml_free)(p->data);
+
 	return(c);
 }
 
@@ -336,8 +334,7 @@ struct md_mlg *
 mlg_alloc(const struct md_args *args, 
 		const struct md_rbuf *rbuf,
 		struct md_mbuf *mbuf, 
-		ml_begintag begintag, ml_endtag endtag,
-		ml_begin begin, ml_end end)
+		const struct ml_cbs *cbs)
 {
 	struct roffcb	 cb;
 	struct md_mlg	*p;
@@ -362,17 +359,17 @@ mlg_alloc(const struct md_args *args, 
 	p->args = args;
 	p->mbuf = mbuf;
 	p->rbuf = rbuf;
-	p->begintag = begintag;
-	p->endtag = endtag;
-	p->begin = begin;
-	p->end = end;
 
-	if (NULL == (p->tree = roff_alloc(&cb, p))) {
+	(void)memcpy(&p->cbs, cbs, sizeof(struct ml_cbs));
+
+	if (NULL == (p->tree = roff_alloc(&cb, p))) 
 		free(p);
-		return(NULL);
-	}
+	else if ( ! (*p->cbs.ml_alloc)(&p->data))
+		free(p);
+	else
+		return(p);
 
-	return(p);
+	return(NULL);
 }
 
 
@@ -386,7 +383,8 @@ mlg_roffhead(void *arg, const struct tm *tm, const cha
 	p = (struct md_mlg *)arg;
 
 	mlg_mode(p, MD_BLK_IN);
-	if ( ! (*p->begin)(p->mbuf, p->args, tm, os, title, sec, vol))
+
+	if ( ! (*p->cbs.ml_begin)(p->mbuf, p->args, tm, os, title, sec, vol))
 		return(0);
 
 	p->indent++;
@@ -402,12 +400,14 @@ mlg_rofftail(void *arg)
 	assert(arg);
 	p = (struct md_mlg *)arg;
 
-	if (0 != p->pos && ! mlg_newline(p))
+	if (0 != p->pos)
+		if ( ! mlg_newline(p))
+			return(0);
+
+	if ( ! (*p->cbs.ml_end)(p->mbuf, p->args))
 		return(0);
 
 	mlg_mode(p, MD_BLK_OUT);
-	if ( ! (*p->end)(p->mbuf, p->args))
-		return(0);
 
 	return(mlg_newline(p));
 }
@@ -555,6 +555,7 @@ mlg_roffdata(void *arg, int space, const char *start, 
 		return(0);
 
 	mlg_mode(p, MD_TEXT);
+
 	return(1);
 }