===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- mandoc/man.c	2009/03/25 15:36:05	1.5
+++ mandoc/man.c	2009/03/26 09:55:39	1.9
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.5 2009/03/25 15:36:05 kristaps Exp $ */
+/* $Id: man.c,v 1.9 2009/03/26 09:55:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -83,7 +83,7 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(void *data, const struct man_cb *cb)
+man_alloc(void *data, int pflags, const struct man_cb *cb)
 {
 	struct man	*p;
 
@@ -98,6 +98,8 @@ man_alloc(void *data, const struct man_cb *cb)
 
 	p->htab = man_hash_alloc();
 	p->data = data;
+	p->pflags = pflags;
+
 	return(p);
 }
 
@@ -133,8 +135,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);
 }
@@ -273,7 +275,7 @@ 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;
 	char		  mac[5];
 
 	/* Comments and empties are quickly ignored. */
@@ -281,39 +283,51 @@ man_pmacro(struct man *m, int ln, char *buf)
 	if (0 == buf[1])
 		return(1);
 
-	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);
 	}
 
-	if (buf[1] && '\\' == buf[1])
-		if (buf[2] && '\"' == buf[2])
+	if (buf[i] && '\\' == buf[i])
+		if (buf[i + 1] && '\"' == buf[i + 1])
 			return(1);
 
 	/* 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++) {
+		if (0 == (mac[j] = buf[j + i]))
 			break;
-		else if (' ' == buf[i])
+		else if (' ' == buf[j + 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, i, 
+				"ill-formed macro: %s", mac);
+			goto err;
+		} 
+		if ( ! man_vwarn(m, ln, 0, "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, i, 
+				"unknown macro: %s", mac);
+			goto err;
+		} 
+		if ( ! man_vwarn(m, ln, i, "unknown macro: %s", mac))
+			goto err;
+		return(1);
 	}
 
 	/* The macro is sane.  Jump to the next word. */