===================================================================
RCS file: /cvs/mandoc/Attic/mlg.c,v
retrieving revision 1.20
retrieving revision 1.29
diff -u -p -r1.20 -r1.29
--- mandoc/Attic/mlg.c	2008/12/07 22:40:18	1.20
+++ mandoc/Attic/mlg.c	2008/12/10 17:31:57	1.29
@@ -1,4 +1,4 @@
-/* $Id: mlg.c,v 1.20 2008/12/07 22:40:18 kristaps Exp $ */
+/* $Id: mlg.c,v 1.29 2008/12/10 17:31:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -24,29 +24,20 @@
 #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,
 	MD_INLINE_OUT,
 	MD_BLK_IN,
-	MD_BLK_OUT,
+	MD_BLK_OUT
 };
 
 struct	md_mlg {
-	const struct md_args	*args;
-	const struct md_rbuf	*rbuf;
-
-	struct md_mbuf	 *mbuf;
+	struct ml_args	  args;
 	struct rofftree	 *tree;
 	size_t		  indent;
 	size_t		  pos;
@@ -56,16 +47,17 @@ struct	md_mlg {
 	int		  flags;
 #define	ML_OVERRIDE_ONE	 (1 << 0)
 #define	ML_OVERRIDE_ALL	 (1 << 1)
-	void		 *data;
 };
 
-static	void		 mlg_roffmsg(void *arg, 
+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 *);
-static	int		 mlg_rofftail(void *);
+				enum roffmsec, enum roffvol);
+static	int		 mlg_rofftail(void *, const struct tm *, 
+				const char *, const char *, 
+				enum roffmsec, enum roffvol);
 static	int		 mlg_roffin(void *, int, 
 				int *, const char **);
 static	int		 mlg_roffdata(void *, int, 
@@ -87,7 +79,7 @@ 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 *, 
+				int, const char *, const int *, 
 				const char **, const char **);
 static	int		 mlg_literal_special(struct md_mlg *, 
 				int,  const char *, const int *, 
@@ -96,6 +88,10 @@ 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_link_special(struct md_mlg *, int,
+				const char *, const char **);
+static	int		 mlg_anchor_special(struct md_mlg *, 
+				int, const char **);
 
 static	int		 mlg_begintag(struct md_mlg *, enum md_ns, 
 				int, int *, const char **);
@@ -109,12 +105,12 @@ static	int		 mlg_string(struct md_mlg *,
 				const char *, const char *);
 static	int		 mlg_data(struct md_mlg *, int, 
 				const char *, const char *);
-static	void		 mlg_err(struct md_mlg *, const char *, 
+static	int		 mlg_err(struct md_mlg *, const char *, 
 				const char *, const char *, ...);
-static	void		 mlg_msg(struct md_mlg *, 
+static	int		 mlg_msg(struct md_mlg *, 
 				enum roffmsg, const char *, 
 				const char *, const char *);
-static	void		 mlg_vmsg(struct md_mlg *, enum roffmsg, 
+static	int		 mlg_vmsg(struct md_mlg *, enum roffmsg, 
 				const char *, const char *, 
 				const char *, va_list);
 
@@ -143,7 +139,7 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
 					MD_INLINE_OUT == p->last)
 				&& ! (ML_OVERRIDE_ONE & p->flags)
 				&& ! (ML_OVERRIDE_ALL & p->flags))
-			if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
+			if ( ! ml_nputs(p->args.mbuf, " ", 1, &p->pos))
 				return(0);
 		if (0 == p->pos && ! mlg_indent(p))
 			return(0);
@@ -162,18 +158,17 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
 		break;
 	}
 
-	if ( ! ml_nputs(p->mbuf, "<", 1, &p->pos))
+	if ( ! ml_nputs(p->args.mbuf, "<", 1, &p->pos))
 		return(0);
 
-	res = (*p->cbs.ml_begintag)(p->mbuf, p->data, 
-			p->args, ns, tok, argc, argv);
+	res = (*p->cbs.ml_begintag)(&p->args, ns, tok, argc, argv);
 	if (-1 == res)
 		return(0);
 
 	assert(res >= 0);
 	p->pos += (size_t)res;
 
-	if ( ! ml_nputs(p->mbuf, ">", 1, &p->pos))
+	if ( ! ml_nputs(p->args.mbuf, ">", 1, &p->pos))
 		return(0);
 
 	switch (ns) {
@@ -211,17 +206,17 @@ mlg_endtag(struct md_mlg *p, enum md_ns ns, int tok)
 		break;
 	}
 
-	if ( ! ml_nputs(p->mbuf, "</", 2, &p->pos))
+	if ( ! ml_nputs(p->args.mbuf, "</", 2, &p->pos))
 		return(0);
 
-	res = (*p->cbs.ml_endtag)(p->mbuf, p->data, p->args, ns, tok);
+	res = (*p->cbs.ml_endtag)(&p->args, ns, tok);
 	if (-1 == res)
 		return(0);
 
 	assert(res >= 0);
 	p->pos += (size_t)res;
 
-	if ( ! ml_nputs(p->mbuf, ">", 1, &p->pos))
+	if ( ! ml_nputs(p->args.mbuf, ">", 1, &p->pos))
 		return(0);
 	
 	switch (ns) {
@@ -240,14 +235,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->args.mbuf, ' ', INDENT_SZ * 
+				INDENT(p->indent), &p->pos));
 }
 
 
@@ -256,7 +247,7 @@ mlg_newline(struct md_mlg *p)
 {
 
 	p->pos = 0;
-	return(ml_nputs(p->mbuf, "\n", 1, NULL));
+	return(ml_nputs(p->args.mbuf, "\n", 1, NULL));
 }
 
 
@@ -284,21 +275,20 @@ mlg_nstring(struct md_mlg *p, const char *start, 
 	int		 c;
 	ssize_t		 res;
 
-	assert(p->mbuf);
+	assert(p->args.mbuf);
 	assert(0 != p->indent);
 
-	res = (*p->cbs.ml_beginstring)(p->mbuf, p->args, buf, sz);
+	res = (*p->cbs.ml_beginstring)(&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);
+	if (0 == (c = ml_nputstring(p->args.mbuf, buf, sz, &p->pos)))
+		return(mlg_err(p, start, buf, "bad string "
+					"encoding: `%s'", buf));
+	else if (-1 == c)
 		return(0);
-	} else if (-1 == c)
-		return(0);
 
-	res = (*p->cbs.ml_endstring)(p->mbuf, p->args, buf, sz);
+	res = (*p->cbs.ml_endstring)(&p->args, buf, sz);
 	if (-1 == res) 
 		return(0);
 
@@ -312,7 +302,7 @@ mlg_data(struct md_mlg *p, int space, 
 {
 	size_t		 sz;
 
-	assert(p->mbuf);
+	assert(p->args.mbuf);
 	assert(0 != p->indent);
 
 	if (ML_OVERRIDE_ONE & p->flags || 
@@ -327,7 +317,7 @@ mlg_data(struct md_mlg *p, int space, 
 		if ( ! mlg_nstring(p, start, buf, sz))
 			return(0);
 
-		if (p->indent * INDENT + sz >= COLUMNS)
+		if (INDENT(p->indent) * INDENT_SZ + sz >= COLUMNS)
 			if ( ! mlg_newline(p))
 				return(0);
 
@@ -340,7 +330,7 @@ mlg_data(struct md_mlg *p, int space, 
 		if ( ! mlg_indent(p))
 			return(0);
 	} else if (space) {
-		if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
+		if ( ! ml_nputs(p->args.mbuf, " ", 1, &p->pos))
 			return(0);
 	}
 
@@ -362,10 +352,10 @@ mlg_exit(struct md_mlg *p, int flush)
 	int		 c;
 
 	c = roff_free(p->tree, flush);
+	(*p->cbs.ml_free)(p->args.data);
+
 	free(p);
 
-	(*p->cbs.ml_free)(p->data);
-
 	return(c);
 }
 
@@ -396,15 +386,15 @@ mlg_alloc(const struct md_args *args, 
 	if (NULL == (p = calloc(1, sizeof(struct md_mlg))))
 		err(1, "calloc");
 
-	p->args = args;
-	p->mbuf = mbuf;
-	p->rbuf = rbuf;
+	p->args.args = args;
+	p->args.mbuf = mbuf;
+	p->args.rbuf = rbuf;
 
 	(void)memcpy(&p->cbs, cbs, sizeof(struct ml_cbs));
 
 	if (NULL == (p->tree = roff_alloc(&cb, p))) 
 		free(p);
-	else if ( ! (*p->cbs.ml_alloc)(&p->data))
+	else if ( ! (*p->cbs.ml_alloc)(&p->args.data))
 		free(p);
 	else
 		return(p);
@@ -415,7 +405,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;
 
@@ -424,7 +414,7 @@ mlg_roffhead(void *arg, const struct tm *tm, const cha
 
 	mlg_mode(p, MD_BLK_IN);
 
-	if ( ! (*p->cbs.ml_begin)(p->mbuf, p->args, tm, os, title, sec, vol))
+	if ( ! (*p->cbs.ml_begin)(&p->args, tm, os, title, sec, vol))
 		return(0);
 
 	p->indent++;
@@ -433,7 +423,8 @@ mlg_roffhead(void *arg, const struct tm *tm, const cha
 
 
 static int
-mlg_rofftail(void *arg)
+mlg_rofftail(void *arg, const struct tm *tm, const char *os, 
+		const char *title, enum roffmsec sec, enum roffvol vol)
 {
 	struct md_mlg	*p;
 
@@ -444,11 +435,10 @@ mlg_rofftail(void *arg)
 		if ( ! mlg_newline(p))
 			return(0);
 
-	if ( ! (*p->cbs.ml_end)(p->mbuf, p->args))
+	if ( ! (*p->cbs.ml_end)(&p->args, tm, os, title, sec, vol))
 		return(0);
 
 	mlg_mode(p, MD_BLK_OUT);
-
 	return(mlg_newline(p));
 }
 
@@ -462,13 +452,14 @@ mlg_literal_special(struct md_mlg *p, int tok, const c
 	if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more))
 		return(0);
 
-	lit = ml_literal(tok, argc, argv, more);
+	lit = roff_literal(tok, argc, argv, more);
 	assert(lit);
 
-	if ( ! ml_puts(p->mbuf, lit, &p->pos))
+	if ( ! mlg_string(p, start, lit))
 		return(0);
+
 	while (*more) { 
-		if ( ! ml_nputs(p->mbuf, " ", 1, &p->pos))
+		if ( ! ml_nputs(p->args.mbuf, " ", 1, &p->pos))
 			return(0);
 		if ( ! mlg_string(p, start, *more++))
 			return(0);
@@ -487,15 +478,15 @@ mlg_ref_special(struct md_mlg *p, int tok,
 		return(0);
 
 	assert(*more);
-	if ( ! ml_puts(p->mbuf, *more++, &p->pos))
+	if ( ! ml_puts(p->args.mbuf, *more++, &p->pos))
 		return(0);
 
 	if (*more) {
-		if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos))
+		if ( ! ml_nputs(p->args.mbuf, "(", 1, &p->pos))
 			return(0);
 		if ( ! mlg_string(p, start, *more++))
 			return(0);
-		if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos))
+		if ( ! ml_nputs(p->args.mbuf, ")", 1, &p->pos))
 			return(0);
 	}
 
@@ -504,24 +495,24 @@ mlg_ref_special(struct md_mlg *p, int tok,
 }
 
 
+/* ARGSUSED */
 static int
-mlg_formatted_special(struct md_mlg *p, int tok, 
+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;
 
-	/* 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);
+	lit = roff_fmtstring(tok);
+
 	assert(lit);
 	assert(*more);
 	(void)snprintf(buf, sizeof(buf), lit, *more++);
 	assert(NULL == *more);
 
-	if ( ! ml_puts(p->mbuf, buf, &p->pos))
+	if ( ! mlg_string(p, start, buf))
 		return(0);
 
 	return(mlg_endtag(p, MD_NS_INLINE, tok));
@@ -533,6 +524,13 @@ mlg_atom_special(struct md_mlg *p, int tok,
 		const char *start, const char **more)
 {
 
+	if (ROFFSec_SYNOP == p->args.section) {
+		if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Pp, NULL, more))
+			return(0);
+		if ( ! mlg_endtag(p, MD_NS_INLINE, ROFF_Pp))
+			return(0);
+	}
+
 	if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more))
 		return(0);
 
@@ -540,7 +538,6 @@ mlg_atom_special(struct md_mlg *p, int tok,
 	if ( ! mlg_string(p, start, *more++))
 		return(0);
 
-	assert(NULL == *more);
 	return(mlg_endtag(p, MD_NS_INLINE, tok));
 }
 
@@ -562,7 +559,7 @@ mlg_function_special(struct md_mlg *p, 
 	if (NULL == *more)
 		return(1);
 
-	if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos))
+	if ( ! ml_nputs(p->args.mbuf, "(", 1, &p->pos))
 		return(0);
 
 	p->flags |= ML_OVERRIDE_ONE;
@@ -575,7 +572,7 @@ mlg_function_special(struct md_mlg *p, 
 		return(0);
 
 	while (*more) {
-		if ( ! ml_nputs(p->mbuf, ", ", 2, &p->pos))
+		if ( ! ml_nputs(p->args.mbuf, ", ", 2, &p->pos))
 			return(0);
 		if ( ! mlg_begintag(p, MD_NS_INLINE, ROFF_Fa, NULL, more))
 			return(0);
@@ -585,10 +582,38 @@ mlg_function_special(struct md_mlg *p, 
 			return(0);
 	}
 
-	return(ml_nputs(p->mbuf, ")", 1, &p->pos));
+	return(ml_nputs(p->args.mbuf, ")", 1, &p->pos));
 }
 
 
+static int
+mlg_anchor_special(struct md_mlg *p, int tok, const char **more)
+{
+	if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, more))
+		return(0);
+	return(mlg_endtag(p, MD_NS_INLINE, tok));
+}
+
+
+static int
+mlg_link_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);
+	if ( ! mlg_string(p, start, *more++))
+		return(0);
+	while (*more) {
+		if ( ! mlg_string(p, start, " "))
+			return(0);
+		if ( ! mlg_string(p, start, *more++))
+			return(0);
+	}
+	return(mlg_endtag(p, MD_NS_INLINE, tok));
+}
+
+
 /* ARGSUSED */
 static int
 mlg_roffspecial(void *arg, int tok, const char *start, 
@@ -617,9 +642,14 @@ mlg_roffspecial(void *arg, int tok, const char *start,
 
 	case (ROFF_Xr):
 		return(mlg_ref_special(p, tok, start, more));
+
+	case (ROFF_Sh):
+		p->args.section = roff_sec(more);
+		return(mlg_anchor_special(p, tok, more));
  
-	case (ROFF_Sx): /* FIXME */
-		/* FALLTHROUGH */
+	case (ROFF_Sx):
+		return(mlg_link_special(p, tok, start, more));
+
 	case (ROFF_Nm):
 		return(mlg_atom_special(p, tok, start, more));
 	
@@ -628,7 +658,7 @@ mlg_roffspecial(void *arg, int tok, const char *start,
 	case (ROFF_Ex):
 		/* NOTREACHED */
 	case (ROFF_Rv):
-		return(mlg_formatted_special(p, tok, 
+		return(mlg_formatted_special(p, tok, start,
 					argc, argv, more));
 
 	case (ROFF_At):
@@ -656,9 +686,8 @@ mlg_roffspecial(void *arg, int tok, const char *start,
 		break;
 	}
 
-	mlg_err(p, start, start, "`%s' not yet supported", 
-			toknames[tok]);
-	return(0);
+	return(mlg_err(p, start, start, "`%s' not yet supported", 
+				toknames[tok]));
 }
 
 
@@ -733,12 +762,12 @@ mlg_roffout(void *arg, int tok)
 }
 
 
-static void
+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));
 }
 
 
@@ -759,53 +788,81 @@ mlg_roffdata(void *arg, int space, 
 }
 
 
-static void
+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];
 
 	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
-	mlg_msg(p, lvl, start, pos, buf);
+	return(mlg_msg(p, lvl, start, pos, buf));
 }
 
 
-static void
+static int
 mlg_err(struct md_mlg *p, const char *start, 
 		const char *pos, const char *fmt, ...)
 {
 	va_list		 ap;
+	int		 c;
 
 	va_start(ap, fmt);
-	mlg_vmsg(p, ROFF_ERROR, start, pos, fmt, ap);
+	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, const char *msg)
 {
-	char		*level;
+	char		*level, b[256];
+	size_t		 sz;
+	int		 i;
 
+	sz = sizeof(b);
+
 	switch (lvl) {
 	case (ROFF_WARN):
-		if ( ! (MD_WARN_ALL & p->args->warnings))
-			return;
 		level = "warning";
+		if ( ! (MD_WARN_ALL & p->args.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", 
-				p->rbuf->name, level, msg);
+
+	if (pos) {
+		assert(pos >= buf);
+		if (0 < p->args.args->verbosity) {
+			(void)snprintf(b, sz, "%s:%zu: %s: %s\n",
+					p->args.rbuf->name, 
+					p->args.rbuf->line, 
+					level, msg);
+
+			(void)strlcat(b, "Error at: ", sz);
+			(void)strlcat(b, p->args.rbuf->linebuf, sz);
+			(void)strlcat(b, "\n          ", sz);
+
+			for (i = 0; i < pos - buf; i++)
+				(void)strlcat(b, " ", sz);
+
+			(void)strlcat(b, "^", sz);
+		} else
+			(void)snprintf(b, sz, "%s:%zu: %s: %s (%zu)", 
+					p->args.rbuf->name, 
+					p->args.rbuf->line, 
+					level, msg, pos - buf);
+	} else 
+		(void)snprintf(b, sz, "%s: %s: %s", 
+				p->args.rbuf->name, level, msg);
+
+	(void)fprintf(stderr, "%s\n", b);
+	return(lvl == ROFF_WARN ? 1 : 0);
 }
+