===================================================================
RCS file: /cvs/mandoc/Attic/mlg.c,v
retrieving revision 1.12
retrieving revision 1.25
diff -u -p -r1.12 -r1.25
--- mandoc/Attic/mlg.c	2008/12/05 22:34:30	1.12
+++ mandoc/Attic/mlg.c	2008/12/10 10:43:57	1.25
@@ -1,4 +1,4 @@
-/* $Id: mlg.c,v 1.12 2008/12/05 22:34:30 kristaps Exp $ */
+/* $Id: mlg.c,v 1.25 2008/12/10 10:43:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,20 +19,15 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "libmdocml.h"
-#include "private.h"
 #include "ml.h"
 
 /* TODO: literal tokens. */
 
-#define	COLUMNS		  72
-#define	INDENT		  4
-#define	MAXINDENT	  10
-
 enum	md_tok {
 	MD_TEXT,
 	MD_INLINE_IN,
@@ -58,42 +53,64 @@ struct	md_mlg {
 	void		 *data;
 };
 
-
-static	void		 mlg_roffmsg(void *arg, enum roffmsg, 
-				const char *, const char *, char *);
+static	int		 mlg_roffmsg(void *arg, 
+				enum roffmsg, const char *, 
+				const char *, const char *);
 static	int		 mlg_roffhead(void *, const struct tm *, 
 				const char *, const char *, 
-				const char *, const char *);
+				enum roffmsec, enum roffvol);
 static	int		 mlg_rofftail(void *);
-static	int		 mlg_roffin(void *, int, int *, char **);
+static	int		 mlg_roffin(void *, int, 
+				int *, const char **);
 static	int		 mlg_roffdata(void *, int, 
-				const char *, char *);
+				const char *, const char *);
 static	int		 mlg_roffout(void *, int);
-static	int		 mlg_roffblkin(void *, int, int *, char **);
+static	int		 mlg_roffblkin(void *, int, int *, 
+				const char **);
 static	int		 mlg_roffblkout(void *, int);
 static	int		 mlg_roffspecial(void *, int, 
-				const char *, char **);
+				const char *, const int *,
+				const char **, const char **);
 static	int		 mlg_roffblkheadin(void *, int, 
-				int *, char **);
+				int *, const char **);
 static	int		 mlg_roffblkheadout(void *, int);
 static	int		 mlg_roffblkbodyin(void *, int, 
-				int *, char **);
+				int *, const char **);
 static	int		 mlg_roffblkbodyout(void *, int);
 
+static	int		 mlg_ref_special(struct md_mlg *, int,
+				const char *, const char **);
+static	int		 mlg_formatted_special(struct md_mlg *, 
+				int, const char *, const int *, 
+				const char **, const char **);
+static	int		 mlg_literal_special(struct md_mlg *, 
+				int,  const char *, const int *, 
+				const char **, const char **);
+static	int		 mlg_function_special(struct md_mlg *, 
+				const char *, const char **);
+static	int		 mlg_atom_special(struct md_mlg *, int,
+				const char *, const char **);
+
 static	int		 mlg_begintag(struct md_mlg *, enum md_ns, 
-				int, int *, char **);
+				int, int *, const char **);
 static	int		 mlg_endtag(struct md_mlg *, enum md_ns, int);
 static	int	  	 mlg_indent(struct md_mlg *);
 static	int		 mlg_newline(struct md_mlg *);
 static	void		 mlg_mode(struct md_mlg *, enum md_tok);
+static	int		 mlg_nstring(struct md_mlg *, 
+				const char *, const char *, size_t);
+static	int		 mlg_string(struct md_mlg *,
+				const char *, const char *);
 static	int		 mlg_data(struct md_mlg *, int, 
-				const char *, char *);
-static	void		 mlg_err(struct md_mlg *, const char *, 
-				const char *, char *);
-static	void		 mlg_warn(struct md_mlg *, const char *, 
-				const char *, char *);
-static	void		 mlg_msg(struct md_mlg *, enum roffmsg, 
-				const char *, const char *, char *);
+				const char *, const char *);
+static	int		 mlg_err(struct md_mlg *, const char *, 
+				const char *, const char *, ...);
+static	int		 mlg_msg(struct md_mlg *, 
+				enum roffmsg, const char *, 
+				const char *, const char *);
+static	int		 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);
@@ -103,7 +120,7 @@ extern	size_t		 strlcpy(char *, const char *, size_t);
 
 static int
 mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
-		int *argc, char **argv)
+		int *argc, const char **argv)
 {
 	ssize_t		 res;
 
@@ -142,8 +159,8 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
 	if ( ! ml_nputs(p->mbuf, "<", 1, &p->pos))
 		return(0);
 
-	res = (*p->cbs.ml_begintag)(p->mbuf, p->data, p->args, ns, tok,
-			argc, (const char **)argv);
+	res = (*p->cbs.ml_begintag)(p->mbuf, p->data, 
+			p->args, ns, tok, argc, argv);
 	if (-1 == res)
 		return(0);
 
@@ -217,14 +234,10 @@ mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok)
 static int
 mlg_indent(struct md_mlg *p)
 {
-	size_t		 count;
 
-	count = p->indent > MAXINDENT ? 
-		(size_t)MAXINDENT : p->indent;
-	count *= INDENT;
-
 	assert(0 == p->pos);
-	return(ml_putchars(p->mbuf, ' ', count, &p->pos));
+	return(ml_putchars(p->mbuf, ' ', INDENT_SZ * 
+				INDENT(p->indent), &p->pos));
 }
 
 
@@ -247,14 +260,50 @@ mlg_mode(struct md_mlg *p, enum md_tok ns)
 
 
 static int
-mlg_data(struct md_mlg *p, int space, const char *start, char *buf)
+mlg_string(struct md_mlg *p, const char *start, const char *buf)
 {
-	size_t		 sz;
+	
+	return(mlg_nstring(p, start, buf, strlen(buf)));
+}
+
+
+static int
+mlg_nstring(struct md_mlg *p, const char *start, 
+		const char *buf, size_t sz)
+{
 	int		 c;
+	ssize_t		 res;
 
 	assert(p->mbuf);
 	assert(0 != p->indent);
 
+	res = (*p->cbs.ml_beginstring)(p->mbuf, p->args, buf, sz);
+	if (-1 == res) 
+		return(0);
+
+	if (0 == (c = ml_nputstring(p->mbuf, buf, sz, &p->pos)))
+		return(mlg_err(p, start, buf, "bad string "
+					"encoding: `%s'", buf));
+	else if (-1 == c)
+		return(0);
+
+	res = (*p->cbs.ml_endstring)(p->mbuf, p->args, buf, sz);
+	if (-1 == res) 
+		return(0);
+
+	return(1);
+}
+
+
+static int
+mlg_data(struct md_mlg *p, int space, 
+		const char *start, const char *buf)
+{
+	size_t		 sz;
+
+	assert(p->mbuf);
+	assert(0 != p->indent);
+
 	if (ML_OVERRIDE_ONE & p->flags || 
 			ML_OVERRIDE_ALL & p->flags)
 		space = 0;
@@ -264,19 +313,10 @@ mlg_data(struct md_mlg *p, int space, const char *star
 	if (0 == p->pos) {
 		if ( ! mlg_indent(p))
 			return(0);
-
-		c = ml_nputstring(p->mbuf, buf, sz, &p->pos);
-
-		if (0 == c) {
-			mlg_err(p, start, buf, "bad char sequence");
+		if ( ! mlg_nstring(p, start, buf, sz))
 			return(0);
-		} else if (c > 1) {
-			mlg_warn(p, start, buf, "bogus char sequence");
-			return(0);
-		} else if (-1 == c)
-			return(0);
 
-		if (p->indent * INDENT + sz >= COLUMNS)
+		if (INDENT(p->indent) * INDENT_SZ + sz >= COLUMNS)
 			if ( ! mlg_newline(p))
 				return(0);
 
@@ -293,18 +333,7 @@ mlg_data(struct md_mlg *p, int space, const char *star
 			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);
+	return(mlg_nstring(p, start, buf, sz));
 }
 
 
@@ -322,10 +351,10 @@ mlg_exit(struct md_mlg *p, int flush)
 	int		 c;
 
 	c = roff_free(p->tree, flush);
-	free(p);
-
 	(*p->cbs.ml_free)(p->data);
 
+	free(p);
+
 	return(c);
 }
 
@@ -375,7 +404,7 @@ mlg_alloc(const struct md_args *args, 
 
 static int
 mlg_roffhead(void *arg, const struct tm *tm, const char *os, 
-		const char *title, const char *sec, const char *vol)
+		const char *title, enum roffmsec sec, enum roffvol vol)
 {
 	struct md_mlg	*p;
 
@@ -414,71 +443,216 @@ mlg_rofftail(void *arg)
 
 
 static int
-mlg_roffspecial(void *arg, int tok, const char *start, char **more)
+mlg_literal_special(struct md_mlg *p, int tok, const char *start,
+		const int *argc, const char **argv, const char **more)
 {
-	struct md_mlg	*p;
+	char		 *lit;
 
-	assert(arg);
-	p = (struct md_mlg *)arg;
+	if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more))
+		return(0);
 
-	switch (tok) {
-	case (ROFF_Xr):
-		if ( ! *more) {
-			mlg_err(p, start, start, "missing argument");
+	lit = roff_literal(tok, argc, argv, more);
+	assert(lit);
+
+	if ( ! mlg_string(p, start, lit))
+		return(0);
+
+	while (*more) { 
+		if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
 			return(0);
-		}
-		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+		if ( ! mlg_string(p, start, *more++))
 			return(0);
-		if ( ! ml_puts(p->mbuf, *more++, &p->pos))
+	}
+
+	return(mlg_endtag(p, MD_NS_INLINE, tok));
+}
+
+
+static int
+mlg_ref_special(struct md_mlg *p, int tok,
+		const char *start, const char **more)
+{
+
+	if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more))
+		return(0);
+
+	assert(*more);
+	if ( ! ml_puts(p->mbuf, *more++, &p->pos))
+		return(0);
+
+	if (*more) {
+		if ( ! ml_nputs(p->mbuf, "(", 1, &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");
+		if ( ! mlg_string(p, start, *more++))
 			return(0);
-		}
-		if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+		if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos))
 			return(0);
-		break;
-	case (ROFF_Fn):
-		abort(); /* TODO */
-		break;
-	case (ROFF_Nm):
-		assert(*more);
-		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+	}
+
+	assert(NULL == *more);
+	return(mlg_endtag(p, MD_NS_INLINE, tok));
+}
+
+
+static int
+mlg_formatted_special(struct md_mlg *p, int tok, const char *start,
+		const int *argc, const char **argv, const char **more)
+{
+	char		 buf[256], *lit;
+
+	if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more))
+		return(0);
+
+	lit = roff_fmtstring(tok);
+
+	assert(lit);
+	assert(*more);
+	(void)snprintf(buf, sizeof(buf), lit, *more++);
+	assert(NULL == *more);
+
+	if ( ! mlg_string(p, start, buf))
+		return(0);
+
+	return(mlg_endtag(p, MD_NS_INLINE, tok));
+}
+
+
+static int
+mlg_atom_special(struct md_mlg *p, int tok,
+		const char *start, const char **more)
+{
+
+	if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more))
+		return(0);
+
+	assert(*more);
+	if ( ! mlg_string(p, start, *more++))
+		return(0);
+
+	/*assert(NULL == *more);*/ /* FIXME: ROFF_Sx */
+	return(mlg_endtag(p, MD_NS_INLINE, tok));
+}
+
+
+static int
+mlg_function_special(struct md_mlg *p, 
+		const char *start, const char **more)
+{
+
+	assert(*more);
+
+	if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fn, NULL, more))
+		return(0);
+	if ( ! mlg_string(p, start, *more++))
+		return(0);
+	if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fn))
+		return(0);
+
+	if (NULL == *more)
+		return(1);
+
+	if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos))
+		return(0);
+
+	p->flags |= ML_OVERRIDE_ONE;
+
+	if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more))
+		return(0);
+	if ( ! mlg_string(p, start, *more++))
+		return(0);
+	if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fa))
+		return(0);
+
+	while (*more) {
+		if ( ! ml_nputs(p->mbuf, ", ", 2, &p->pos))
 			return(0);
-		if ( ! ml_puts(p->mbuf, *more++, &p->pos))
+		if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more))
 			return(0);
-		assert(NULL == *more);
-		if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
+		if ( ! mlg_string(p, start, *more++))
 			return(0);
-		break;
+		if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Fa))
+			return(0);
+	}
+
+	return(ml_nputs(p->mbuf, ")", 1, &p->pos));
+}
+
+
+/* ARGSUSED */
+static int
+mlg_roffspecial(void *arg, int tok, const char *start, 
+		const int *argc, const char **argv, const char **more)
+{
+	struct md_mlg	*p;
+
+	assert(arg);
+	p = (struct md_mlg *)arg;
+
+	switch (tok) {
 	case (ROFF_Ns):
 		p->flags |= ML_OVERRIDE_ONE;
-		break;
+		return(1);
+
 	case (ROFF_Sm):
 		assert(*more);
 		if (0 == strcmp(*more, "on"))
 			p->flags |= ML_OVERRIDE_ALL;
 		else
 			p->flags &= ~ML_OVERRIDE_ALL;
-		break;
+		return(1);
+
+	case (ROFF_Fn):
+		return(mlg_function_special(p, start, more));
+
+	case (ROFF_Xr):
+		return(mlg_ref_special(p, tok, start, more));
+ 
+	case (ROFF_Sx): /* FIXME */
+		/* FALLTHROUGH */
+	case (ROFF_Nm):
+		return(mlg_atom_special(p, tok, start, more));
+	
+	case (ROFF_In):
+		/* NOTREACHED */
+	case (ROFF_Ex):
+		/* NOTREACHED */
+	case (ROFF_Rv):
+		return(mlg_formatted_special(p, tok, start,
+					argc, argv, more));
+
+	case (ROFF_At):
+		/* FALLTHROUGH */
+	case (ROFF_Bt):
+		/* FALLTHROUGH */
+	case (ROFF_Ud):
+		/* FALLTHROUGH */
+	case (ROFF_Ux):
+		/* FALLTHROUGH */
+	case (ROFF_Bx):
+		/* FALLTHROUGH */
+	case (ROFF_Bsx):
+		/* FALLTHROUGH */
+	case (ROFF_Fx):
+		/* FALLTHROUGH */
+	case (ROFF_Nx):
+		/* FALLTHROUGH */
+	case (ROFF_St):
+		/* FALLTHROUGH */
+	case (ROFF_Ox):
+		return(mlg_literal_special(p, tok, start, 
+					argc, argv, more));
 	default:
 		break;
 	}
 
-	return(1);
+	return(mlg_err(p, start, start, "`%s' not yet supported", 
+				toknames[tok]));
 }
 
 
 static int
-mlg_roffblkin(void *arg, int tok, int *argc, char **argv)
+mlg_roffblkin(void *arg, int tok, 
+		int *argc, const char **argv)
 {
 
 	return(mlg_begintag((struct md_mlg *)arg, 
@@ -495,7 +669,8 @@ mlg_roffblkout(void *arg, int tok)
 
 
 static int
-mlg_roffblkbodyin(void *arg, int tok, int *argc, char **argv)
+mlg_roffblkbodyin(void *arg, int tok, 
+		int *argc, const char **argv)
 {
 
 	return(mlg_begintag((struct md_mlg *)arg, 
@@ -512,7 +687,8 @@ mlg_roffblkbodyout(void *arg, int tok)
 
 
 static int
-mlg_roffblkheadin(void *arg, int tok, int *argc, char **argv)
+mlg_roffblkheadin(void *arg, int tok, 
+		int *argc, const char **argv)
 {
 
 	return(mlg_begintag((struct md_mlg *)arg, 
@@ -529,7 +705,7 @@ mlg_roffblkheadout(void *arg, int tok)
 
 
 static int
-mlg_roffin(void *arg, int tok, int *argc, char **argv)
+mlg_roffin(void *arg, int tok, int *argc, const char **argv)
 {
 
 	return(mlg_begintag((struct md_mlg *)arg, 
@@ -545,17 +721,18 @@ mlg_roffout(void *arg, int tok)
 }
 
 
-static void
-mlg_roffmsg(void *arg, enum roffmsg lvl, 
-		const char *buf, const char *pos, char *msg)
+static int
+mlg_roffmsg(void *arg, enum roffmsg lvl, const char *buf, 
+		const char *pos, const char *msg)
 {
 
-	mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg);
+	return(mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg));
 }
 
 
 static int
-mlg_roffdata(void *arg, int space, const char *start, char *buf)
+mlg_roffdata(void *arg, int space, 
+		const char *start, const char *buf)
 {
 	struct md_mlg	*p;
 
@@ -566,52 +743,82 @@ 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)
+static int
+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);
+	return(mlg_msg(p, lvl, start, pos, buf));
 }
 
 
-static void
-mlg_warn(struct md_mlg *p, const char *buf, const char *pos, char *msg)
+static int
+mlg_err(struct md_mlg *p, const char *start, 
+		const char *pos, const char *fmt, ...)
 {
+	va_list		 ap;
+	int		 c;
 
-	mlg_msg(p, ROFF_WARN, buf, pos, msg);
+	va_start(ap, fmt);
+	c = mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap);
+	va_end(ap);
+	return(c);
 }
 
 
-static void
+static int
 mlg_msg(struct md_mlg *p, enum roffmsg lvl, 
-		const char *buf, const char *pos, char *msg)
+		const char *buf, const char *pos, const char *msg)
 {
 	char		*level;
+	char		 b[256];
+	int		 i;
 
 	switch (lvl) {
 	case (ROFF_WARN):
-		if ( ! (MD_WARN_ALL & p->args->warnings))
-			return;
 		level = "warning";
+		if ( ! (MD_WARN_ALL & p->args->warnings))
+			return(1);
 		break;
 	case (ROFF_ERROR):
 		level = "error";
 		break;
 	default:
 		abort();
+		/* NOTREACHED */
 	}
-	
-	if (pos)
-		(void)fprintf(stderr, "%s:%zu: %s: %s (column %zu)\n", 
-				p->rbuf->name, p->rbuf->line, level, 
-				msg, pos - buf);
-	else
-		(void)fprintf(stderr, "%s: %s: %s\n", 
+
+	if (pos) {
+		assert(pos >= buf);
+		if (0 < p->args->verbosity) {
+			(void)snprintf(b, sizeof(b), 
+					"%s:%zu: %s: %s\n",
+					p->rbuf->name, p->rbuf->line, 
+					level, msg);
+			(void)strlcat(b, "Error at: ", sizeof(b));
+			(void)strlcat(b, p->rbuf->linebuf, sizeof(b));
+
+			(void)strlcat(b, "\n          ", sizeof(b));
+			for (i = 0; i < pos - buf; i++)
+				(void)strlcat(b, " ", sizeof(b));
+			(void)strlcat(b, "^", sizeof(b));
+
+		} else
+			(void)snprintf(b, sizeof(b), 
+					"%s:%zu: %s: %s (col %zu)", 
+					p->rbuf->name, p->rbuf->line, 
+					level, msg, pos - buf);
+	} else 
+		(void)snprintf(b, sizeof(b), "%s: %s: %s", 
 				p->rbuf->name, level, msg);
 
+	(void)fprintf(stderr, "%s\n", b);
+	return(lvl == ROFF_WARN ? 1 : 0);
 }
+