===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.3
retrieving revision 1.15
diff -u -p -r1.3 -r1.15
--- mandoc/man.c	2009/03/23 15:41:09	1.3
+++ mandoc/man.c	2009/04/03 11:08:39	1.15
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.3 2009/03/23 15:41:09 kristaps Exp $ */
+/* $Id: man.c,v 1.15 2009/04/03 11:08:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -31,7 +31,8 @@ const	char *const __man_macronames[MAN_MAX] = {		 
 	"TP", 		"LP",		"PP",		"P",
 	"IP",		"HP",		"SM",		"SB",
 	"BI",		"IB",		"BR",		"RB",
-	"R",		"B",		"I",		"IR"
+	"R",		"B",		"I",		"IR",
+	"RI",		"br",		"na"
 	};
 
 const	char * const *man_macronames = __man_macronames;
@@ -61,12 +62,14 @@ man_meta(const struct man *m)
 }
 
 
-void
+int
 man_reset(struct man *man)
 {
 
 	man_free1(man);
 	man_alloc1(man);
+	/* TODO */
+	return(1);
 }
 
 
@@ -83,7 +86,7 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(void)
+man_alloc(void *data, int pflags, const struct man_cb *cb)
 {
 	struct man	*p;
 
@@ -93,7 +96,13 @@ man_alloc(void)
 
 	man_alloc1(p);
 
+	if (cb)
+		(void)memcpy(&p->cb, cb, sizeof(struct man_cb));
+
 	p->htab = man_hash_alloc();
+	p->data = data;
+	p->pflags = pflags;
+
 	return(p);
 }
 
@@ -129,8 +138,8 @@ man_free1(struct man *man)
 		man_node_freelist(man->first);
 	if (man->meta.title)
 		free(man->meta.title);
-	if (man->meta.os)
-		free(man->meta.os);
+	if (man->meta.source)
+		free(man->meta.source);
 	if (man->meta.vol)
 		free(man->meta.vol);
 }
@@ -174,23 +183,14 @@ man_node_append(struct man *man, struct man_node *p)
 		/* NOTREACHED */
 	}
 
-#if 0
-	if ( ! man_valid_pre(man, p))
-		return(0);
-	if ( ! man_action_pre(man, p))
-		return(0);
-#endif
-
 	man->last = p;
 
 	switch (p->type) {
 	case (MAN_TEXT):
-#if 0
 		if ( ! man_valid_post(man))
 			return(0);
 		if ( ! man_action_post(man))
 			return(0);
-#endif
 		break;
 	default:
 		break;
@@ -271,6 +271,25 @@ man_ptext(struct man *m, int line, char *buf)
 	if ( ! man_word_alloc(m, line, 0, buf))
 		return(0);
 	m->next = MAN_NEXT_SIBLING;
+
+	/*
+	 * If this is one of the zany NLINE macros that consumes the
+	 * next line of input as being influenced, then close out the
+	 * existing macro "scope" and continue processing.
+	 */
+
+	if ( ! (MAN_NLINE & m->flags))
+		return(1);
+
+	m->flags &= ~MAN_NLINE;
+	m->last = m->last->parent;
+
+	assert(MAN_ROOT != m->last->type);
+	if ( ! man_valid_post(m))
+		return(0);
+	if ( ! man_action_post(m))
+		return(0);
+
 	return(1);
 }
 
@@ -278,47 +297,67 @@ man_ptext(struct man *m, int line, char *buf)
 int
 man_pmacro(struct man *m, int ln, char *buf)
 {
-	int		  i, c;
+	int		  i, j, c, ppos, fl;
 	char		  mac[5];
+	struct man_node	 *n;
 
 	/* Comments and empties are quickly ignored. */
 
+	n = m->last;
+	fl = MAN_NLINE & m->flags;
+
 	if (0 == buf[1])
-		return(1);
+		goto out;
 
-	if (' ' == buf[1]) {
-		i = 2;
+	i = 1;
+
+	if (' ' == buf[i]) {
+		i++;
 		while (buf[i] && ' ' == buf[i])
 			i++;
 		if (0 == buf[i])
-			return(1);
-		warnx("invalid syntax");
-		return(0);
+			goto out;
 	}
 
-	if (buf[1] && '\\' == buf[1])
-		if (buf[2] && '\"' == buf[2])
-			return(1);
+	ppos = i;
 
+	if (buf[i] && '\\' == buf[i])
+		if (buf[i + 1] && '\"' == buf[i + 1])
+			goto out;
+
 	/* Copy the first word into a nil-terminated buffer. */
 
-	for (i = 1; i < 5; i++) {
-		if (0 == (mac[i - 1] = buf[i]))
+	for (j = 0; j < 4; j++, i++) {
+		if (0 == (mac[j] = buf[i]))
 			break;
 		else if (' ' == buf[i])
 			break;
 	}
 
-	mac[i - 1] = 0;
+	mac[j] = 0;
 
-	if (i == 5 || i <= 1) {
-		warnx("unknown macro: %s", mac);
-		goto err;
-	} 
+	if (j == 4 || j < 1) {
+		if ( ! (MAN_IGN_MACRO & m->pflags)) {
+			(void)man_verr(m, ln, ppos, 
+				"ill-formed macro: %s", mac);
+			goto err;
+		} 
+		if ( ! man_vwarn(m, ln, ppos, 
+				"ill-formed macro: %s", mac))
+			goto err;
+		return(1);
+	}
 	
 	if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
-		warnx("unknown macro: %s", mac);
-		goto err;
+		if ( ! (MAN_IGN_MACRO & m->pflags)) {
+			(void)man_verr(m, ln, ppos, 
+				"unknown macro: %s", mac);
+			goto err;
+		} 
+		if ( ! man_vwarn(m, ln, ppos, 
+				"unknown macro: %s", mac))
+			goto err;
+		return(1);
 	}
 
 	/* The macro is sane.  Jump to the next word. */
@@ -328,9 +367,31 @@ man_pmacro(struct man *m, int ln, char *buf)
 
 	/* Begin recursive parse sequence. */
 
-	if ( ! man_macro(m, c, ln, 1, &i, buf))
+	if ( ! man_macro(m, c, ln, ppos, &i, buf))
 		goto err;
 
+out:
+	if (fl) {
+		/*
+		 * A NLINE macro has been immediately followed with
+		 * another.  Close out the preceeding macro's scope, and
+		 * continue.
+		 */
+		assert(MAN_ROOT != m->last->type);
+		assert(m->last->parent);
+		assert(MAN_ROOT != m->last->parent->type);
+
+		if (n != m->last)
+			m->last = m->last->parent;
+
+		if ( ! man_valid_post(m))
+			return(0);
+		if ( ! man_action_post(m))
+			return(0);
+		m->next = MAN_NEXT_SIBLING;
+		m->flags &= ~MAN_NLINE;
+	} 
+
 	return(1);
 
 err:	/* Error out. */
@@ -338,4 +399,37 @@ err:	/* Error out. */
 	m->flags |= MAN_HALT;
 	return(0);
 }
+
+
+int
+man_verr(struct man *man, int ln, int pos, const char *fmt, ...)
+{
+	char		 buf[256];
+	va_list		 ap;
+
+	if (NULL == man->cb.man_err)
+		return(0);
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	va_end(ap);
+	return((*man->cb.man_err)(man->data, ln, pos, buf));
+}
+
+
+int
+man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...)
+{
+	char		 buf[256];
+	va_list		 ap;
+
+	if (NULL == man->cb.man_warn)
+		return(0);
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	va_end(ap);
+	return((*man->cb.man_warn)(man->data, ln, pos, buf));
+}
+