===================================================================
RCS file: /cvs/mandoc/Attic/dummy.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- mandoc/Attic/dummy.c	2008/11/24 18:32:39	1.4
+++ mandoc/Attic/dummy.c	2008/11/26 16:50:34	1.7
@@ -1,4 +1,4 @@
-/* $Id: dummy.c,v 1.4 2008/11/24 18:32:39 kristaps Exp $ */
+/* $Id: dummy.c,v 1.7 2008/11/26 16:50:34 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -25,38 +25,45 @@
 #include "libmdocml.h"
 #include "private.h"
 
+#ifdef	__linux__
+#define	strlcat		strncat
+#endif
 
-static roffin		in[ROFF_MAX];
-static roffout		out[ROFF_MAX];
-static roffblkin	blkin[ROFF_MAX];
-static roffblkout	blkout[ROFF_MAX];
+static	int		md_dummy_blk_in(int);
+static	int		md_dummy_blk_out(int);
+static 	int		md_dummy_text_in(int, int *, char **);
+static	int		md_dummy_text_out(int);
 
-static int		md_dummy_blk_in(int);
-static int		md_dummy_blk_out(int);
-static int		md_dummy_text_in(int, int *, char **);
-static int		md_dummy_text_out(int);
+static	void		dbg_prologue(const char *);
+static	void		dbg_epilogue(void);
 
-static void		dbg_indent(void);
+static	int		dbg_lvl = 0;
+static	char		dbg_line[72];
 
-static int		dbg_lvl = 0;
-
 struct	md_dummy {
 	struct rofftree	*tree;
+	struct roffcb	 cb;
 };
 
-
 static void
-dbg_indent(void)
+dbg_prologue(const char *p)
 {
-	char		buf[128];
-	int		i;
+	int		 i;
 
-	*buf = 0;
-	assert(dbg_lvl >= 0);
+	(void)snprintf(dbg_line, sizeof(dbg_line) - 1, "%6s", p);
+	(void)strlcat(dbg_line, ": ", sizeof(dbg_line) - 1);
+	/* LINTED */
 	for (i = 0; i < dbg_lvl; i++)
-		(void)strncat(buf, "  ", sizeof(buf) - 1);
+		(void)strlcat(dbg_line, "    ", sizeof(dbg_line) - 1);
+}
 
-	(void)printf("%s", buf);
+
+static void
+dbg_epilogue(void)
+{
+
+	assert(0 != dbg_line[0]);
+	(void)printf("%s\n", dbg_line);
 }
 
 
@@ -64,8 +71,10 @@ static int
 md_dummy_blk_in(int tok)
 {
 
-	dbg_indent();
-	(void)printf("+++blk\n");
+	dbg_prologue("blk");
+	(void)strlcat(dbg_line, toknames[tok], sizeof(dbg_line) - 1);
+	dbg_epilogue();
+
 	dbg_lvl++;
 	return(1);
 }
@@ -75,20 +84,36 @@ static int
 md_dummy_blk_out(int tok)
 {
 
-	assert(dbg_lvl > 0);
 	dbg_lvl--;
-	dbg_indent();
-	(void)printf("---blk\n");
 	return(1);
 }
 
 
+/* ARGSUSED */
 static int
 md_dummy_text_in(int tok, int *argcp, char **argvp)
 {
 
-	dbg_indent();
-	(void)printf("in: text\n");
+	dbg_prologue("text");
+	(void)strlcat(dbg_line, toknames[tok], sizeof(dbg_line) - 1);
+	(void)strlcat(dbg_line, " ", sizeof(dbg_line) - 1);
+	while (ROFF_ARGMAX != *argcp) {
+		(void)strlcat(dbg_line, "[", sizeof(dbg_line) - 1);
+		(void)strlcat(dbg_line, tokargnames[*argcp], 
+				sizeof(dbg_line) - 1);
+		if (*argvp) {
+			(void)strlcat(dbg_line, " [", 
+					sizeof(dbg_line) - 1);
+			(void)strlcat(dbg_line, *argvp,
+					sizeof(dbg_line) - 1);
+			(void)strlcat(dbg_line, "]", 
+					sizeof(dbg_line) - 1);
+		}
+		(void)strlcat(dbg_line, "]", sizeof(dbg_line) - 1);
+		argcp++;
+		argvp++;
+	}
+	dbg_epilogue();
 	return(1);
 }
 
@@ -97,8 +122,6 @@ static int
 md_dummy_text_out(int tok)
 {
 
-	dbg_indent();
-	(void)printf("out: text\n");
 	return(1);
 }
 
@@ -132,22 +155,20 @@ md_init_dummy(const struct md_args *args,
 		struct md_mbuf *mbuf, const struct md_rbuf *rbuf)
 {
 	struct md_dummy	*p;
-	int		 i;
 
-	for (i = 0; i < ROFF_MAX; i++) {
-		in[i] = md_dummy_text_in;
-		out[i] = md_dummy_text_out;
-		blkin[i] = md_dummy_blk_in;
-		blkout[i] = md_dummy_blk_out;
-	}
-
 	if (NULL == (p = malloc(sizeof(struct md_dummy)))) {
 		warn("malloc");
 		return(NULL);
 	}
 
-	p->tree = roff_alloc
-		(args, mbuf, rbuf, in, out, blkin, blkout);
+	p->cb.roffhead = NULL;
+	p->cb.rofftail = NULL;
+	p->cb.roffin = md_dummy_text_in;
+	p->cb.roffout = md_dummy_text_out;
+	p->cb.roffblkin = md_dummy_blk_in;
+	p->cb.roffblkout = md_dummy_blk_out;
+
+	p->tree = roff_alloc(args, mbuf, rbuf, &p->cb);
 
 	if (NULL == p->tree) {
 		free(p);