===================================================================
RCS file: /cvs/mandoc/Attic/mlg.c,v
retrieving revision 1.14
retrieving revision 1.20
diff -u -p -r1.14 -r1.20
--- mandoc/Attic/mlg.c	2008/12/06 16:50:18	1.14
+++ mandoc/Attic/mlg.c	2008/12/07 22:40:18	1.20
@@ -1,4 +1,4 @@
-/* $Id: mlg.c,v 1.14 2008/12/06 16:50:18 kristaps Exp $ */
+/* $Id: mlg.c,v 1.20 2008/12/07 22:40:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -59,42 +59,61 @@ struct	md_mlg {
 	void		 *data;
 };
 
-
-static	void		 mlg_roffmsg(void *arg, enum roffmsg, 
-				const char *, const char *, char *);
+static	void		 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 *);
 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 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 *);
+				const char *, const char *);
 static	void		 mlg_err(struct md_mlg *, const char *, 
 				const char *, const char *, ...);
-static	void		 mlg_warn(struct md_mlg *, const char *, 
-				const char *, const char *, ...);
-static	void		 mlg_msg(struct md_mlg *, enum roffmsg, 
-				const char *, const char *, char *);
+static	void		 mlg_msg(struct md_mlg *, 
+				enum roffmsg, const char *, 
+				const char *, const char *);
 static	void		 mlg_vmsg(struct md_mlg *, enum roffmsg, 
 				const char *, const char *, 
 				const char *, va_list);
@@ -107,7 +126,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;
 
@@ -146,8 +165,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);
 
@@ -251,14 +270,51 @@ 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))) {
+		mlg_err(p, start, buf, "bad string "
+				"encoding: `%s'", buf);
+		return(0);
+	} 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;
@@ -268,17 +324,8 @@ 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 ( ! mlg_newline(p))
@@ -297,18 +344,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));
 }
 
 
@@ -418,64 +454,155 @@ 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_Bt):
-		assert(NULL == *more);
-		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
+	lit = ml_literal(tok, argc, argv, more);
+	assert(lit);
+
+	if ( ! ml_puts(p->mbuf, lit, &p->pos))
+		return(0);
+	while (*more) { 
+		if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
 			return(0);
-		if ( ! ml_puts(p->mbuf, "is currently in beta "
-					"test.", &p->pos))
+		if ( ! mlg_string(p, start, *more++))
 			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(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 ( ! 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))
+		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");
-			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))
+	assert(NULL == *more);
+	return(mlg_endtag(p, MD_NS_INLINE, tok));
+}
+
+
+static int
+mlg_formatted_special(struct md_mlg *p, int tok, 
+		const int *argc, const char **argv, const char **more)
+{
+	char		 buf[256], *lit;
+
+	/* FIXME: *more must be ml-filtered. */
+
+	if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more))
+		return(0);
+
+	lit = ml_literal(tok, argc, argv, more);
+	assert(lit);
+	assert(*more);
+	(void)snprintf(buf, sizeof(buf), lit, *more++);
+	assert(NULL == *more);
+
+	if ( ! ml_puts(p->mbuf, buf, &p->pos))
+		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);
+	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);
@@ -483,52 +610,61 @@ mlg_roffspecial(void *arg, int tok, const char *start,
 			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):
-		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;
+		/* NOTREACHED */
+	case (ROFF_Rv):
+		return(mlg_formatted_special(p, tok, 
+					argc, argv, more));
 
+	case (ROFF_At):
+		/* FALLTHROUGH */
+	case (ROFF_Bt):
+		/* FALLTHROUGH */
 	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;
-
+		/* 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:
-		mlg_err(p, start, start, "`%s' not yet supported",
-				toknames[tok]);
-		return(0);
+		break;
 	}
 
-	return(1);
+	mlg_err(p, start, start, "`%s' not yet supported", 
+			toknames[tok]);
+	return(0);
 }
 
 
 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, 
@@ -545,7 +681,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, 
@@ -562,7 +699,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, 
@@ -579,7 +717,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, 
@@ -596,8 +734,8 @@ mlg_roffout(void *arg, int tok)
 
 
 static void
-mlg_roffmsg(void *arg, enum roffmsg lvl, 
-		const char *buf, const char *pos, char *msg)
+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);
@@ -605,7 +743,8 @@ mlg_roffmsg(void *arg, enum roffmsg lvl, 
 
 
 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;
 
@@ -616,7 +755,6 @@ mlg_roffdata(void *arg, int space, const char *start, 
 		return(0);
 
 	mlg_mode(p, MD_TEXT);
-
 	return(1);
 }
 
@@ -633,18 +771,6 @@ mlg_vmsg(struct md_mlg *p, enum roffmsg lvl, const cha
 
 
 static void
-mlg_warn(struct md_mlg *p, const char *start, 
-		const char *pos, const char *fmt, ...)
-{
-	va_list		 ap;
-
-	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, ...)
 {
@@ -658,7 +784,7 @@ mlg_err(struct md_mlg *p, const char *start, 
 
 static void
 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;