===================================================================
RCS file: /cvs/mandoc/Attic/mlg.c,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- mandoc/Attic/mlg.c	2008/12/04 23:10:51	1.8
+++ mandoc/Attic/mlg.c	2008/12/05 19:45:15	1.11
@@ -1,4 +1,4 @@
-/* $Id: mlg.c,v 1.8 2008/12/04 23:10:51 kristaps Exp $ */
+/* $Id: mlg.c,v 1.11 2008/12/05 19:45:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -51,13 +51,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;
 };
 
 
@@ -82,7 +80,6 @@ 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);
@@ -105,27 +102,6 @@ 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)
 {
@@ -137,7 +113,7 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
 	case (MD_NS_INLINE):
 		if ( ! (ML_OVERRIDE_ONE & p->flags) && 
 				! (ML_OVERRIDE_ALL & p->flags) && 
-				p->pos + 11 > COLUMNS) 
+				p->pos + 11 >= COLUMNS)
 			if ( ! mlg_newline(p))
 				return(0);
 		if (0 != p->pos && (MD_TEXT == p->last || 
@@ -166,7 +142,7 @@ mlg_begintag(struct md_mlg *p, enum md_ns ns, int tok,
 	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);
@@ -195,21 +171,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);
 }
 
 
@@ -218,7 +219,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);
@@ -229,12 +231,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));
 }
 
 
@@ -324,6 +323,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);
 }
 
@@ -332,8 +334,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;
@@ -358,17 +359,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);
 }
 
 
@@ -382,7 +383,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++;
@@ -398,18 +400,19 @@ 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, const char *start, char **more)
 {
@@ -421,8 +424,7 @@ mlg_roffspecial(void *arg, int tok, const char *start,
 	switch (tok) {
 	case (ROFF_Xr):
 		if ( ! *more) {
-			mlg_err(p, start, start,
-					"missing required argument");
+			mlg_err(p, start, start, "missing argument");
 			return(0);
 		}
 		if ( ! mlg_begintag(p, MD_NS_INLINE, tok, NULL, NULL))
@@ -432,7 +434,7 @@ mlg_roffspecial(void *arg, int tok, const char *start,
 		if (*more) {
 			if ( ! ml_nputs(p->mbuf, "(", 1, &p->pos))
 				return(0);
-			if ( ! mlg_data(p, 0, start, *more++))
+			if ( ! ml_puts(p->mbuf, *more++, &p->pos))
 				return(0);
 			if ( ! ml_nputs(p->mbuf, ")", 1, &p->pos))
 				return(0);
@@ -443,7 +445,6 @@ mlg_roffspecial(void *arg, int tok, const char *start,
 		}
 		if ( ! mlg_endtag(p, MD_NS_INLINE, tok))
 			return(0);
-		mlg_mode(p, MD_INLINE_OUT);
 		break;
 	case (ROFF_Fn):
 		break;
@@ -478,7 +479,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));
 }
 
 
@@ -495,7 +496,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));
 }
 
 
@@ -512,7 +513,7 @@ 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));
 }
 
 
@@ -528,16 +529,8 @@ mlg_roffin(void *arg, int tok, int *argc, char **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));
 }
 
 
@@ -562,6 +555,7 @@ mlg_roffdata(void *arg, int space, const char *start, 
 		return(0);
 
 	mlg_mode(p, MD_TEXT);
+
 	return(1);
 }