===================================================================
RCS file: /cvs/mandoc/Attic/mlg.c,v
retrieving revision 1.7
retrieving revision 1.14
diff -u -p -r1.7 -r1.14
--- mandoc/Attic/mlg.c	2008/12/04 19:31:57	1.7
+++ mandoc/Attic/mlg.c	2008/12/06 16:50:18	1.14
@@ -1,4 +1,4 @@
-/* $Id: mlg.c,v 1.7 2008/12/04 19:31:57 kristaps Exp $ */
+/* $Id: mlg.c,v 1.14 2008/12/06 16:50:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -51,13 +52,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;
 };
 
 
@@ -73,8 +72,8 @@ static	int		 mlg_roffdata(void *, int, 
 static	int		 mlg_roffout(void *, int);
 static	int		 mlg_roffblkin(void *, int, int *, char **);
 static	int		 mlg_roffblkout(void *, int);
-static	int		 mlg_roffspecial(void *, int, int *, 
-				char **, char **);
+static	int		 mlg_roffspecial(void *, int, 
+				const char *, char **);
 static	int		 mlg_roffblkheadin(void *, int, 
 				int *, char **);
 static	int		 mlg_roffblkheadout(void *, int);
@@ -82,9 +81,6 @@ static	int		 mlg_roffblkbodyin(void *, int, 
 				int *, char **);
 static	int		 mlg_roffblkbodyout(void *, int);
 
-static	int		 mlg_beginblk(struct md_mlg *, enum md_ns, int, 
-				int *, char **);
-static	int		 mlg_endblk(struct md_mlg *, enum md_ns, int);
 static	int		 mlg_begintag(struct md_mlg *, enum md_ns, 
 				int, int *, char **);
 static	int		 mlg_endtag(struct md_mlg *, enum md_ns, int);
@@ -94,11 +90,14 @@ static	void		 mlg_mode(struct md_mlg *, enum md_tok);
 static	int		 mlg_data(struct md_mlg *, int, 
 				const char *, char *);
 static	void		 mlg_err(struct md_mlg *, const char *, 
-				const char *, char *);
+				const char *, const char *, ...);
 static	void		 mlg_warn(struct md_mlg *, const char *, 
-				const char *, char *);
+				const char *, const char *, ...);
 static	void		 mlg_msg(struct md_mlg *, enum roffmsg, 
 				const char *, const char *, char *);
+static	void		 mlg_vmsg(struct md_mlg *, enum roffmsg, 
+				const char *, const char *, 
+				const char *, va_list);
 
 #ifdef __linux__
 extern	size_t		 strlcat(char *, const char *, size_t);
@@ -107,59 +106,47 @@ extern	size_t		 strlcpy(char *, const char *, size_t);
 
 
 static int
-mlg_beginblk(struct md_mlg *p, enum md_ns ns, int tok, 
+mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
 		int *argc, char **argv)
 {
-	if (0 != p->pos) {
-		if ( ! mlg_newline(p))
-			return(0);
-		if ( ! mlg_indent(p))
-			return(0);
-	} else if ( ! mlg_indent(p))
-		return(0);
+	ssize_t		 res;
 
-	p->indent++;
-	mlg_mode(p, MD_BLK_IN);
+	assert(MD_NS_DEFAULT != ns);
 
-	if ( ! mlg_begintag(p, ns, tok, argc, argv))
-		return(0);
-	return(mlg_newline(p));
-}
-
-
-static int
-mlg_endblk(struct md_mlg *p, enum md_ns ns, int tok)
-{
-
-	p->indent--;
-
-	if (0 != p->pos) {
-		if ( ! mlg_newline(p))
+	switch (ns) {
+	case (MD_NS_INLINE):
+		if ( ! (ML_OVERRIDE_ONE & p->flags) && 
+				! (ML_OVERRIDE_ALL & p->flags) && 
+				p->pos + 11 >= COLUMNS)
+			if ( ! mlg_newline(p))
+				return(0);
+		if (0 != p->pos && (MD_TEXT == p->last || 
+					MD_INLINE_OUT == p->last)
+				&& ! (ML_OVERRIDE_ONE & p->flags)
+				&& ! (ML_OVERRIDE_ALL & p->flags))
+			if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
+				return(0);
+		if (0 == p->pos && ! mlg_indent(p))
 			return(0);
-		if ( ! mlg_indent(p))
+		mlg_mode(p, MD_INLINE_IN);
+		break;
+	default:
+		if (0 != p->pos) {
+			if ( ! mlg_newline(p))
+				return(0);
+			if ( ! mlg_indent(p))
+				return(0);
+		} else if ( ! mlg_indent(p))
 			return(0);
-	} else if ( ! mlg_indent(p))
-		return(0);
+		p->indent++;
+		mlg_mode(p, MD_BLK_IN);
+		break;
+	}
 
-	mlg_mode(p, MD_BLK_OUT);
-	if ( ! mlg_endtag(p, ns, tok))
-		return(0);
-	return(mlg_newline(p));
-}
-
-
-static int
-mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
-		int *argc, char **argv)
-{
-	ssize_t		 res;
-
-	/* TODO: extra rules for block/inline. */
-
 	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);
@@ -167,9 +154,19 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
 	assert(res >= 0);
 	p->pos += (size_t)res;
 
-	/* TODO: extra rules for block/inline. */
+	if ( ! ml_nputs(p->mbuf, ">", 1, &p->pos))
+		return(0);
 
-	return(ml_nputs(p->mbuf, ">", 1, &p->pos));
+	switch (ns) {
+	case (MD_NS_INLINE):
+		break;
+	default:
+		if ( ! mlg_newline(p))
+			return(0);
+		break;
+	}
+
+	return(1);
 }
 
 
@@ -178,21 +175,46 @@ mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok)
 {
 	ssize_t		 res;
 
-	/* TODO: extra rules for block/inline. */
+	assert(MD_NS_DEFAULT != ns);
 
+	switch (ns) {
+	case (MD_NS_INLINE):
+		break;
+	default:
+		p->indent--;
+		if (0 != p->pos) {
+			if ( ! mlg_newline(p))
+				return(0);
+			if ( ! mlg_indent(p))
+				return(0);
+		} else if ( ! mlg_indent(p))
+			return(0);
+		break;
+	}
+
 	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);
 
 	assert(res >= 0);
 	p->pos += (size_t)res;
 
-	/* TODO: extra rules for block/inline. */
+	if ( ! ml_nputs(p->mbuf, ">", 1, &p->pos))
+		return(0);
+	
+	switch (ns) {
+	case (MD_NS_INLINE):
+		mlg_mode(p, MD_INLINE_OUT);
+		break;
+	default:
+		mlg_mode(p, MD_BLK_OUT);
+		break;
+	}
 
-	return(ml_nputs(p->mbuf, ">", 1, &p->pos));
+	return(1);
 }
 
 
@@ -201,7 +223,8 @@ mlg_indent(struct md_mlg *p)
 {
 	size_t		 count;
 
-	count = p->indent > MAXINDENT ? (size_t)MAXINDENT : p->indent;
+	count = p->indent > MAXINDENT ? 
+		(size_t)MAXINDENT : p->indent;
 	count *= INDENT;
 
 	assert(0 == p->pos);
@@ -212,12 +235,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));
 }
 
 
@@ -234,7 +254,6 @@ static int
 mlg_data(struct md_mlg *p, int space, const char *start, char *buf)
 {
 	size_t		 sz;
-	char		*bufp;
 	int		 c;
 
 	assert(p->mbuf);
@@ -244,72 +263,51 @@ mlg_data(struct md_mlg *p, int space, const char *star
 			ML_OVERRIDE_ALL & p->flags)
 		space = 0;
 
-	while (*buf) {
-		while (*buf && isspace(*buf))
-			buf++;
+	sz = strlen(buf);
 
-		if (0 == *buf)
-			break;
+	if (0 == p->pos) {
+		if ( ! mlg_indent(p))
+			return(0);
 
-		bufp = buf;
-		while (*buf && ! isspace(*buf))
-			buf++;
+		c = ml_nputstring(p->mbuf, buf, sz, &p->pos);
 
-		if (0 != *buf)
-			*buf++ = 0;
-
-		sz = strlen(bufp);
-
-		if (0 == p->pos) {
-			if ( ! mlg_indent(p))
-				return(0);
-
-			c = ml_nputstring(p->mbuf, bufp, sz, &p->pos);
-			if (0 == c) {
-				mlg_err(p, start, bufp, "invalid "
-						"character sequence");
-				return(0);
-			} else if (c > 1) {
-				mlg_warn(p, start, bufp, "bogus "
-						"character sequence");
-				return(0);
-			} else if (-1 == c)
-				return(0);
-
-			if (p->indent * INDENT + sz >= COLUMNS)
-				if ( ! mlg_newline(p))
-					return(0);
-			if ( ! (ML_OVERRIDE_ALL & p->flags))
-				space = 1;
-			continue;
-		}
-
-		if (space && sz + p->pos >= COLUMNS) {
-			if ( ! mlg_newline(p))
-				return(0);
-			if ( ! mlg_indent(p))
-				return(0);
-		} else if (space) {
-			if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
-				return(0);
-		}
-
-		c = ml_nputstring(p->mbuf, bufp, sz, &p->pos);
 		if (0 == c) {
-			mlg_err(p, start, bufp, "invalid "
-					"character sequence");
+			mlg_err(p, start, buf, "bad char sequence");
 			return(0);
 		} else if (c > 1) {
-			mlg_warn(p, start, bufp, "bogus "
-					"character sequence");
+			mlg_warn(p, start, buf, "bogus char sequence");
 			return(0);
 		} else if (-1 == c)
 			return(0);
 
-		if ( ! (ML_OVERRIDE_ALL & p->flags))
-			space = 1;
+		if (p->indent * INDENT + sz >= COLUMNS)
+			if ( ! mlg_newline(p))
+				return(0);
+
+		return(1);
 	}
 
+	if (space && sz + p->pos >= COLUMNS) {
+		if ( ! mlg_newline(p))
+			return(0);
+		if ( ! mlg_indent(p))
+			return(0);
+	} else if (space) {
+		if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
+			return(0);
+	}
+
+	c = ml_nputstring(p->mbuf, buf, sz, &p->pos);
+
+	if (0 == c) {
+		mlg_err(p, start, buf, "bad char sequence");
+		return(0);
+	} else if (c > 1) {
+		mlg_warn(p, start, buf, "bogus char sequence");
+		return(0);
+	} else if (-1 == c)
+		return(0);
+
 	return(1);
 }
 
@@ -329,6 +327,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);
 }
 
@@ -337,8 +338,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;
@@ -363,17 +363,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);
 }
 
 
@@ -387,7 +387,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++;
@@ -403,20 +404,21 @@ 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));
 }
 
 
-/* ARGSUSED */
 static int
-mlg_roffspecial(void *arg, int tok, int *argc, char **argv, char **more)
+mlg_roffspecial(void *arg, int tok, const char *start, char **more)
 {
 	struct md_mlg	*p;
 
@@ -424,9 +426,57 @@ mlg_roffspecial(void *arg, int tok, int *argc, char **
 	p = (struct md_mlg *)arg;
 
 	switch (tok) {
+	case (ROFF_Bt):
+		assert(NULL == *more);
+		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+			return(0);
+		if ( ! ml_puts(p->mbuf, "is currently in beta "
+					"test.", &p->pos))
+			return(0);
+		if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+			return(0);
+		break;
+
+	case (ROFF_Xr):
+		if ( ! *more) {
+			mlg_err(p, start, start, "missing argument");
+			return(0);
+		}
+		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+			return(0);
+		if ( ! ml_puts(p->mbuf, *more++, &p->pos))
+			return(0);
+		if (*more) {
+			if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos))
+				return(0);
+			if ( ! ml_puts(p->mbuf, *more++, &p->pos))
+				return(0);
+			if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos))
+				return(0);
+		}
+		if (*more) {
+			mlg_err(p, start, start, "too many arguments");
+			return(0);
+		}
+		if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+			return(0);
+		break;
+
+	case (ROFF_Nm):
+		assert(*more);
+		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+			return(0);
+		if ( ! ml_puts(p->mbuf, *more++, &p->pos))
+			return(0);
+		assert(NULL == *more);
+		if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+			return(0);
+		break;
+
 	case (ROFF_Ns):
 		p->flags |= ML_OVERRIDE_ONE;
 		break;
+
 	case (ROFF_Sm):
 		assert(*more);
 		if (0 == strcmp(*more, "on"))
@@ -434,8 +484,43 @@ mlg_roffspecial(void *arg, int tok, int *argc, char **
 		else
 			p->flags &= ~ML_OVERRIDE_ALL;
 		break;
-	default:
+
+	case (ROFF_Ex):
+		assert(*more);
+		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+			return(0);
+		if ( ! ml_puts(p->mbuf, "The ", &p->pos))
+			return(0);
+		if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Xr, NULL, NULL))
+			return(0);
+		if ( ! ml_puts(p->mbuf, *more++, &p->pos))
+			return(0);
+		if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Xr))
+			return(0);
+		if ( ! ml_puts(p->mbuf, " utility exits 0 on success, "
+					"and &gt;0 if an error "
+					"occurs.", &p->pos))
+			return(0);
+		assert(NULL == *more);
+		if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+			return(0);
 		break;
+
+	case (ROFF_Ud):
+		assert(NULL == *more);
+		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+			return(0);
+		if ( ! ml_puts(p->mbuf, "currently under "
+					"development.", &p->pos))
+			return(0);
+		if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+			return(0);
+		break;
+
+	default:
+		mlg_err(p, start, start, "`%s' not yet supported",
+				toknames[tok]);
+		return(0);
 	}
 
 	return(1);
@@ -446,7 +531,7 @@ static int
 mlg_roffblkin(void *arg, int tok, int *argc, char **argv)
 {
 
-	return(mlg_beginblk((struct md_mlg *)arg, 
+	return(mlg_begintag((struct md_mlg *)arg, 
 				MD_NS_BLOCK, tok, argc, argv));
 }
 
@@ -455,7 +540,7 @@ static int
 mlg_roffblkout(void *arg, int tok)
 {
 
-	return(mlg_endblk((struct md_mlg *)arg, MD_NS_BLOCK, tok));
+	return(mlg_endtag((struct md_mlg *)arg, MD_NS_BLOCK, tok));
 }
 
 
@@ -463,7 +548,7 @@ static int
 mlg_roffblkbodyin(void *arg, int tok, int *argc, char **argv)
 {
 
-	return(mlg_beginblk((struct md_mlg *)arg, 
+	return(mlg_begintag((struct md_mlg *)arg, 
 				MD_NS_BODY, tok, argc, argv));
 }
 
@@ -472,7 +557,7 @@ static int
 mlg_roffblkbodyout(void *arg, int tok)
 {
 
-	return(mlg_endblk((struct md_mlg *)arg, MD_NS_BODY, tok));
+	return(mlg_endtag((struct md_mlg *)arg, MD_NS_BODY, tok));
 }
 
 
@@ -480,7 +565,7 @@ static int
 mlg_roffblkheadin(void *arg, int tok, int *argc, char **argv)
 {
 
-	return(mlg_beginblk((struct md_mlg *)arg, 
+	return(mlg_begintag((struct md_mlg *)arg, 
 				MD_NS_HEAD, tok, argc, argv));
 }
 
@@ -489,54 +574,24 @@ static int
 mlg_roffblkheadout(void *arg, int tok)
 {
 
-	return(mlg_endblk((struct md_mlg *)arg, MD_NS_HEAD, tok));
+	return(mlg_endtag((struct md_mlg *)arg, MD_NS_HEAD, tok));
 }
 
 
 static int
 mlg_roffin(void *arg, int tok, int *argc, char **argv)
 {
-	struct md_mlg	*p;
 
-	assert(arg);
-	p = (struct md_mlg *)arg;
-
-	/* FIXME: this part. */
-
-	if ( ! (ML_OVERRIDE_ONE & p->flags) && 
-			! (ML_OVERRIDE_ALL & p->flags) && 
-			p->pos + 11 > COLUMNS) 
-		if ( ! mlg_newline(p))
-			return(0);
-
-	if (0 != p->pos && (MD_TEXT == p->last || 
-				MD_INLINE_OUT == p->last)
-			&& ! (ML_OVERRIDE_ONE & p->flags)
-			&& ! (ML_OVERRIDE_ALL & p->flags))
-		if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
-			return(0);
-
-	if (0 == p->pos && ! mlg_indent(p))
-		return(0);
-
-	mlg_mode(p, MD_INLINE_IN);
-	return(mlg_begintag(p, MD_NS_INLINE, tok, argc, argv));
+	return(mlg_begintag((struct md_mlg *)arg, 
+				MD_NS_INLINE, tok, argc, argv));
 }
 
 
 static int
 mlg_roffout(void *arg, int tok)
 {
-	struct md_mlg	*p;
 
-	assert(arg);
-	p = (struct md_mlg *)arg;
-
-	if (0 == p->pos && ! mlg_indent(p))
-		return(0);
-
-	mlg_mode(p, MD_INLINE_OUT);
-	return(mlg_endtag(p, MD_NS_INLINE, tok));
+	return(mlg_endtag((struct md_mlg *)arg, MD_NS_INLINE, tok));
 }
 
 
@@ -561,27 +616,47 @@ mlg_roffdata(void *arg, int space, const char *start, 
 		return(0);
 
 	mlg_mode(p, MD_TEXT);
+
 	return(1);
 }
 
 
 static void
-mlg_err(struct md_mlg *p, const char *buf, const char *pos, char *msg)
+mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const char *start, 
+		const char *pos, const char *fmt, va_list ap)
 {
+	char		 buf[128];
 
-	mlg_msg(p, ROFF_ERROR, buf, pos, msg);
+	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
+	mlg_msg(p, lvl, start, pos, buf);
 }
 
 
 static void
-mlg_warn(struct md_mlg *p, const char *buf, const char *pos, char *msg)
+mlg_warn(struct md_mlg *p, const char *start, 
+		const char *pos, const char *fmt, ...)
 {
+	va_list		 ap;
 
-	mlg_msg(p, ROFF_WARN, buf, pos, msg);
+	va_start(ap, fmt);
+	mlg_vmsg(p, ROFF_WARN, start, pos, fmt, ap);
+	va_end(ap);
 }
 
 
 static void
+mlg_err(struct md_mlg *p, const char *start, 
+		const char *pos, const char *fmt, ...)
+{
+	va_list		 ap;
+
+	va_start(ap, fmt);
+	mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap);
+	va_end(ap);
+}
+
+
+static void
 mlg_msg(struct md_mlg *p, enum roffmsg lvl, 
 		const char *buf, const char *pos, char *msg)
 {
@@ -607,5 +682,4 @@ mlg_msg(struct md_mlg *p, enum roffmsg lvl, 
 	else
 		(void)fprintf(stderr, "%s: %s: %s\n", 
 				p->rbuf->name, level, msg);
-
 }