===================================================================
RCS file: /cvs/mandoc/Attic/mlg.c,v
retrieving revision 1.1
retrieving revision 1.8
diff -u -p -r1.1 -r1.8
--- mandoc/Attic/mlg.c	2008/12/03 14:39:59	1.1
+++ mandoc/Attic/mlg.c	2008/12/04 23:10:51	1.8
@@ -1,4 +1,4 @@
-/* $Id: mlg.c,v 1.1 2008/12/03 14:39:59 kristaps Exp $ */
+/* $Id: mlg.c,v 1.8 2008/12/04 23:10:51 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -31,7 +31,7 @@
 
 #define	COLUMNS		  72
 #define	INDENT		  4
-#define	MAXINDENT	  8
+#define	MAXINDENT	  10
 
 enum	md_tok {
 	MD_TEXT,
@@ -53,6 +53,8 @@ struct	md_mlg {
 	void		 *arg;
 	ml_begintag	  begintag;
 	ml_endtag	  endtag;
+	ml_begin	  begin;
+	ml_end		  end;
 	int		  flags;
 #define	ML_OVERRIDE_ONE	 (1 << 0)
 #define	ML_OVERRIDE_ALL	 (1 << 1)
@@ -61,21 +63,40 @@ struct	md_mlg {
 
 static	void		 mlg_roffmsg(void *arg, enum roffmsg, 
 				const char *, const char *, char *);
-static	int		 mlg_roffhead(void *);
+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_roffdata(void *, int, char *);
+static	int		 mlg_roffdata(void *, int, 
+				const char *, char *);
 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);
+static	int		 mlg_roffblkbodyin(void *, int, 
+				int *, char **);
+static	int		 mlg_roffblkbodyout(void *, int);
+
+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);
 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_data(struct md_mlg *, int, 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 *);
 
 #ifdef __linux__
 extern	size_t		 strlcat(char *, const char *, size_t);
@@ -84,13 +105,64 @@ extern	size_t		 strlcpy(char *, const char *, size_t);
 
 
 static int
+mlg_endblk(struct md_mlg *p, enum md_ns ns, int tok)
+{
+
+	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);
+
+	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. */
+	assert(MD_NS_DEFAULT != ns);
 
+	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);
+		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);
+		p->indent++;
+		mlg_mode(p, MD_BLK_IN);
+		break;
+	}
+
 	if ( ! ml_nputs(p->mbuf, "<", 1, &p->pos))
 		return(0);
 
@@ -102,9 +174,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);
 }
 
 
@@ -136,7 +218,7 @@ mlg_indent(struct md_mlg *p)
 {
 	size_t		 count;
 
-	count = p->indent > MAXINDENT ? MAXINDENT : p->indent;
+	count = p->indent > MAXINDENT ? (size_t)MAXINDENT : p->indent;
 	count *= INDENT;
 
 	assert(0 == p->pos);
@@ -159,16 +241,17 @@ mlg_newline(struct md_mlg *p)
 static void
 mlg_mode(struct md_mlg *p, enum md_tok ns)
 {
+
 	p->flags &= ~ML_OVERRIDE_ONE;
 	p->last = ns;
 }
 
 
 static int
-mlg_data(struct md_mlg *p, int space, char *buf)
+mlg_data(struct md_mlg *p, int space, const char *start, char *buf)
 {
 	size_t		 sz;
-	char		*bufp;
+	int		 c;
 
 	assert(p->mbuf);
 	assert(0 != p->indent);
@@ -177,53 +260,51 @@ mlg_data(struct md_mlg *p, int space, char *buf)
 			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;
+		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);
 
-		sz = strlen(bufp);
-
-		if (0 == p->pos) {
-			if ( ! mlg_indent(p))
-				return(0);
-			if ( ! ml_nputstring(p->mbuf, bufp, 
-						sz, &p->pos))
-				return(0);
-			if (p->indent * MAXINDENT + sz >= COLUMNS)
-				if ( ! mlg_newline(p))
-					return(0);
-			if ( ! (ML_OVERRIDE_ALL & p->flags))
-				space = 1;
-			continue;
-		}
-
-		if (space && sz + p->pos >= COLUMNS) {
+		if (p->indent * INDENT + sz >= 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);
-		}
 
-		if ( ! ml_nputstring(p->mbuf, bufp, sz, &p->pos))
-			return(0);
+		return(1);
+	}
 
-		if ( ! (ML_OVERRIDE_ALL & p->flags))
-			space = 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);
 }
 
@@ -251,7 +332,8 @@ 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_begintag begintag, ml_endtag endtag,
+		ml_begin begin, ml_end end)
 {
 	struct roffcb	 cb;
 	struct md_mlg	*p;
@@ -261,6 +343,10 @@ mlg_alloc(const struct md_args *args, 
 	cb.roffin = mlg_roffin;
 	cb.roffout = mlg_roffout;
 	cb.roffblkin = mlg_roffblkin;
+	cb.roffblkheadin = mlg_roffblkheadin;
+	cb.roffblkheadout = mlg_roffblkheadout;
+	cb.roffblkbodyin = mlg_roffblkbodyin;
+	cb.roffblkbodyout = mlg_roffblkbodyout;
 	cb.roffblkout = mlg_roffblkout;
 	cb.roffspecial = mlg_roffspecial;
 	cb.roffmsg = mlg_roffmsg;
@@ -274,6 +360,8 @@ mlg_alloc(const struct md_args *args, 
 	p->rbuf = rbuf;
 	p->begintag = begintag;
 	p->endtag = endtag;
+	p->begin = begin;
+	p->end = end;
 
 	if (NULL == (p->tree = roff_alloc(&cb, p))) {
 		free(p);
@@ -285,7 +373,8 @@ mlg_alloc(const struct md_args *args, 
 
 
 static int
-mlg_roffhead(void *arg)
+mlg_roffhead(void *arg, const struct tm *tm, const char *os, 
+		const char *title, const char *sec, const char *vol)
 {
 	struct md_mlg	*p;
 
@@ -293,7 +382,7 @@ mlg_roffhead(void *arg)
 	p = (struct md_mlg *)arg;
 
 	mlg_mode(p, MD_BLK_IN);
-	if ( ! mlg_begintag(p, MD_NS_DEFAULT, -1, NULL, NULL))
+	if ( ! (*p->begin)(p->mbuf, p->args, tm, os, title, sec, vol))
 		return(0);
 
 	p->indent++;
@@ -313,7 +402,7 @@ mlg_rofftail(void *arg)
 		return(0);
 
 	mlg_mode(p, MD_BLK_OUT);
-	if ( ! mlg_endtag(p, -1, MD_NS_DEFAULT))
+	if ( ! (*p->end)(p->mbuf, p->args))
 		return(0);
 
 	return(mlg_newline(p));
@@ -322,7 +411,7 @@ mlg_rofftail(void *arg)
 
 /* 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;
 
@@ -330,6 +419,34 @@ mlg_roffspecial(void *arg, int tok, int *argc, char **
 	p = (struct md_mlg *)arg;
 
 	switch (tok) {
+	case (ROFF_Xr):
+		if ( ! *more) {
+			mlg_err(p, start, start,
+					"missing required 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 ( ! mlg_data(p, 0, start, *more++))
+				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);
+		mlg_mode(p, MD_INLINE_OUT);
+		break;
+	case (ROFF_Fn):
+		break;
 	case (ROFF_Ns):
 		p->flags |= ML_OVERRIDE_ONE;
 		break;
@@ -351,81 +468,60 @@ mlg_roffspecial(void *arg, int tok, int *argc, char **
 static int
 mlg_roffblkin(void *arg, int tok, int *argc, char **argv)
 {
-	struct md_mlg	*p;
 
-	assert(arg);
-	p = (struct md_mlg *)arg;
+	return(mlg_begintag((struct md_mlg *)arg, 
+				MD_NS_BLOCK, tok, argc, argv));
+}
 
-	if (0 != p->pos) {
-		if ( ! mlg_newline(p))
-			return(0);
-		if ( ! mlg_indent(p))
-			return(0);
-	} else if ( ! mlg_indent(p))
-		return(0);
 
-	p->indent++;
-	mlg_mode(p, MD_BLK_IN);
+static int
+mlg_roffblkout(void *arg, int tok)
+{
 
-	if ( ! mlg_begintag(p, MD_NS_BLOCK, tok, argc, argv))
-		return(0);
-	return(mlg_newline(p));
+	return(mlg_endblk((struct md_mlg *)arg, MD_NS_BLOCK, tok));
 }
 
 
 static int
-mlg_roffblkout(void *arg, int tok)
+mlg_roffblkbodyin(void *arg, int tok, int *argc, char **argv)
 {
-	struct md_mlg	*p;
 
-	assert(arg);
-	p = (struct md_mlg *)arg;
+	return(mlg_begintag((struct md_mlg *)arg, 
+				MD_NS_BODY, tok, argc, argv));
+}
 
-	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);
+static int
+mlg_roffblkbodyout(void *arg, int tok)
+{
 
-	mlg_mode(p, MD_BLK_OUT);
-	if ( ! mlg_endtag(p, MD_NS_BLOCK, tok))
-		return(0);
-	return(mlg_newline(p));
+	return(mlg_endblk((struct md_mlg *)arg, MD_NS_BODY, tok));
 }
 
 
 static int
-mlg_roffin(void *arg, int tok, int *argc, char **argv)
+mlg_roffblkheadin(void *arg, int tok, int *argc, char **argv)
 {
-	struct md_mlg	*p;
 
-	assert(arg);
-	p = (struct md_mlg *)arg;
+	return(mlg_begintag((struct md_mlg *)arg, 
+				MD_NS_HEAD, tok, argc, argv));
+}
 
-	/* FIXME: this part. */
 
-	if ( ! (ML_OVERRIDE_ONE & p->flags) && 
-			! (ML_OVERRIDE_ALL & p->flags) && 
-			p->pos + 11 > COLUMNS) 
-		if ( ! mlg_newline(p))
-			return(0);
+static int
+mlg_roffblkheadout(void *arg, int tok)
+{
 
-	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);
+	return(mlg_endblk((struct md_mlg *)arg, MD_NS_HEAD, tok));
+}
 
-	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));
+static int
+mlg_roffin(void *arg, int tok, int *argc, char **argv)
+{
+
+	return(mlg_begintag((struct md_mlg *)arg, 
+				MD_NS_INLINE, tok, argc, argv));
 }
 
 
@@ -449,12 +545,49 @@ static void
 mlg_roffmsg(void *arg, enum roffmsg lvl, 
 		const char *buf, const char *pos, char *msg)
 {
-	char		*level;
+
+	mlg_msg((struct md_mlg *)arg, lvl, buf, pos, msg);
+}
+
+
+static int
+mlg_roffdata(void *arg, int space, const char *start, char *buf)
+{
 	struct md_mlg	*p;
 
 	assert(arg);
 	p = (struct md_mlg *)arg;
 
+	if ( ! mlg_data(p, space, start, buf))
+		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_msg(p, ROFF_ERROR, buf, pos, msg);
+}
+
+
+static void
+mlg_warn(struct md_mlg *p, const char *buf, const char *pos, char *msg)
+{
+
+	mlg_msg(p, ROFF_WARN, buf, pos, msg);
+}
+
+
+static void
+mlg_msg(struct md_mlg *p, enum roffmsg lvl, 
+		const char *buf, const char *pos, char *msg)
+{
+	char		*level;
+
 	switch (lvl) {
 	case (ROFF_WARN):
 		if ( ! (MD_WARN_ALL & p->args->warnings))
@@ -477,20 +610,3 @@ mlg_roffmsg(void *arg, enum roffmsg lvl, 
 				p->rbuf->name, level, msg);
 
 }
-
-
-static int
-mlg_roffdata(void *arg, int space, char *buf)
-{
-	struct md_mlg	*p;
-
-	assert(arg);
-	p = (struct md_mlg *)arg;
-
-	if ( ! mlg_data(p, space, buf))
-		return(0);
-
-	mlg_mode(p, MD_TEXT);
-	return(1);
-}
-