===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.3
retrieving revision 1.12
diff -u -p -r1.3 -r1.12
--- mandoc/man_validate.c	2009/03/26 09:55:39	1.3
+++ mandoc/man_validate.c	2009/06/18 10:53:58	1.12
@@ -1,20 +1,18 @@
-/* $Id: man_validate.c,v 1.3 2009/03/26 09:55:39 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.12 2009/06/18 10:53:58 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/types.h>
 
@@ -25,8 +23,6 @@
 
 #include "libman.h"
 
-/* FIXME: validate text. */
-
 #define	POSTARGS  struct man *m, const struct man_node *n
 
 typedef	int	(*v_post)(POSTARGS);
@@ -35,13 +31,13 @@ struct	man_valid {
 	v_post	 *posts;
 };
 
-static	int	  count(const struct man_node *);
 static	int	  check_eq0(POSTARGS);
 static	int	  check_ge1(POSTARGS);
 static	int	  check_ge2(POSTARGS);
 static	int	  check_le1(POSTARGS);
 static	int	  check_le2(POSTARGS);
 static	int	  check_le5(POSTARGS);
+static	int	  check_text(POSTARGS);
 
 static	v_post	  posts_le1[] = { check_le1, NULL };
 static	v_post	  posts_le2[] = { check_le2, NULL };
@@ -50,11 +46,11 @@ static	v_post	  posts_eq0[] = { check_eq0, NULL };
 static	v_post	  posts_ge2_le5[] = { check_ge2, check_le5, NULL };
 
 static	const struct man_valid man_valids[MAN_MAX] = {
-	{ NULL }, /* __ */
+	{ posts_eq0 }, /* br */
 	{ posts_ge2_le5 }, /* TH */
 	{ posts_ge1 }, /* SH */
 	{ posts_ge1 }, /* SS */
-	{ posts_le1 }, /* TP */
+	{ NULL }, /* TP */
 	{ posts_eq0 }, /* LP */
 	{ posts_eq0 }, /* PP */
 	{ posts_eq0 }, /* P */
@@ -70,6 +66,9 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ NULL }, /* B */
 	{ NULL }, /* I */
 	{ NULL }, /* IR */
+	{ NULL }, /* RI */
+	{ posts_eq0 }, /* na */
+	{ NULL }, /* i */
 };
 
 
@@ -84,7 +83,7 @@ man_valid_post(struct man *m)
 
 	switch (m->last->type) {
 	case (MAN_TEXT): 
-		/* FALLTHROUGH */
+		return(check_text(m, m->last));
 	case (MAN_ROOT):
 		return(1);
 	default:
@@ -101,14 +100,24 @@ man_valid_post(struct man *m)
 }
 
 
-static inline int
-count(const struct man_node *n)
-{ 
-	int		 i;
+static int
+check_text(POSTARGS) 
+{
+	const char	*p;
+	int		 pos;
 
-	for (i = 0; n; n = n->next, i++) 
-		/* Loop. */ ;
-	return(i);
+	assert(n->string);
+
+	for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {
+		if ('\t' == *p || isprint((u_char)*p))
+			continue;
+
+		if (MAN_IGN_CHARS & m->pflags)
+			return(man_pwarn(m, n->line, pos, WNPRINT));
+		return(man_perr(m, n->line, pos, WNPRINT));
+	}
+
+	return(1);
 }
 
 
@@ -116,12 +125,11 @@ count(const struct man_node *n)
 static int \
 check_##name(POSTARGS) \
 { \
-	int		 c; \
-	if ((c = count(n->child)) ineq (x)) \
+	if (n->nchild ineq (x)) \
 		return(1); \
-	return(man_vwarn(m, n->line, n->pos, \
+	return(man_verr(m, n->line, n->pos, \
 			"expected line arguments %s %d, have %d", \
-			#ineq, (x), c)); \
+			#ineq, (x), n->nchild)); \
 }
 
 INEQ_DEFINE(0, ==, eq0)