===================================================================
RCS file: /cvs/mandoc/Attic/mdocml.c,v
retrieving revision 1.41
retrieving revision 1.43
diff -u -p -r1.41 -r1.43
--- mandoc/Attic/mdocml.c	2009/01/12 16:39:57	1.41
+++ mandoc/Attic/mdocml.c	2009/01/15 15:59:19	1.43
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.41 2009/01/12 16:39:57 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.43 2009/01/15 15:59:19 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -42,8 +42,6 @@ struct	md_parse {
 	u_long		 bufsz;
 	char		*name;
 	int		 fd;
-	int		 lnn;
-	char		*line;
 };
 
 static	void		 usage(void);
@@ -192,40 +190,34 @@ print_node(const struct mdoc_node *n, int indent)
 	params = NULL;
 	sz = 0;
 
-	/* FIXME: put parts of this in util.c. */
+	t = mdoc_type2a(n->type);
+
 	switch (n->type) {
 	case (MDOC_TEXT):
 		assert(NULL == n->child);
 		p = n->data.text.string;
-		t = "text";
 		break;
 	case (MDOC_BODY):
 		p = mdoc_macronames[n->tok];
-		t = "block-body";
 		break;
 	case (MDOC_HEAD):
 		p = mdoc_macronames[n->tok];
-		t = "block-head";
 		break;
 	case (MDOC_TAIL):
 		p = mdoc_macronames[n->tok];
-		t = "block-tail";
 		break;
 	case (MDOC_ELEM):
 		p = mdoc_macronames[n->tok];
-		t = "element";
 		argv = n->data.elem.argv;
 		argc = n->data.elem.argc;
 		break;
 	case (MDOC_BLOCK):
 		p = mdoc_macronames[n->tok];
-		t = "block";
 		argv = n->data.block.argv;
 		argc = n->data.block.argc;
 		break;
 	case (MDOC_ROOT):
 		p = "root";
-		t = "root";
 		break;
 	default:
 		abort();
@@ -238,11 +230,11 @@ print_node(const struct mdoc_node *n, int indent)
 
 	for (i = 0; i < (int)argc; i++) {
 		(void)printf(" -%s", mdoc_argnames[argv[i].arg]);
-		if (j > 0)
+		if (argv[i].sz > 0)
 			(void)printf(" [");
 		for (j = 0; j < (int)argv[i].sz; j++)
 			(void)printf(" [%s]", argv[i].value[j]);
-		if (j > 0)
+		if (argv[i].sz > 0)
 			(void)printf(" ]");
 	}
 
@@ -284,6 +276,7 @@ parse_begin(struct md_parse *p)
 	size_t		 pos;
 	char		 line[256], sv[256];
 	struct mdoc_cb	 cb;
+	int		 lnn;
 
 	cb.mdoc_err = msg_err;
 	cb.mdoc_warn = msg_warn;
@@ -292,10 +285,7 @@ parse_begin(struct md_parse *p)
 	if (NULL == (p->mdoc = mdoc_alloc(p, &cb)))
 		return(parse_leave(p, 0));
 
-	p->lnn = 1;
-	p->line = sv;
-
-	for (pos = 0; ; ) {
+	for (lnn = 1, pos = 0; ; ) {
 		if (-1 == (sz = read(p->fd, p->buf, p->bufsz))) {
 			warn("%s", p->name);
 			return(parse_leave(p, 0));
@@ -311,15 +301,15 @@ parse_begin(struct md_parse *p)
 					continue;
 				}
 				warnx("%s: line %d too long", 
-						p->name, p->lnn);
+						p->name, lnn);
 				return(parse_leave(p, 0));
 			}
 	
 			line[(int)pos] = sv[(int)pos] = 0;
-			if ( ! mdoc_parseln(p->mdoc, p->lnn, line))
+			if ( ! mdoc_parseln(p->mdoc, lnn, line))
 				return(parse_leave(p, 0));
 
-			p->lnn++;
+			lnn++;
 			pos = 0;
 		}
 	}
@@ -361,8 +351,7 @@ msg_err(void *arg, int line, int col, enum mdoc_err ty
 		lit = "syntax: unknown argument for macro";
 		break;
 	case (ERR_SCOPE_BREAK):
-		/* Which scope is broken? */
-		lit = "scope: macro breaks prior explicit scope";
+		lit = "scope: macro breaks prior scope";
 		break;
 	case (ERR_SCOPE_NOCTX):
 		lit = "scope: closure macro has no context";