===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.79
retrieving revision 1.82
diff -u -p -r1.79 -r1.82
--- mandoc/mdoc_validate.c	2010/05/17 22:11:42	1.79
+++ mandoc/mdoc_validate.c	2010/05/25 12:44:53	1.82
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.79 2010/05/17 22:11:42 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.82 2010/05/25 12:44:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -23,6 +23,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -462,7 +463,7 @@ check_text(struct mdoc *mdoc, int line, int pos, const
 			if ( ! (MDOC_LITERAL & mdoc->flags))
 				if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))
 					return(0);
-		} else if ( ! isprint((u_char)*p))
+		} else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p)
 			if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))
 				return(0);
 
@@ -568,27 +569,19 @@ pre_bl(PRE_ARGS)
 		case (MDOC_Inset):
 			/* FALLTHROUGH */
 		case (MDOC_Column):
-			/*
-			 * Note that if a duplicate is detected, we
-			 * remove the duplicate instead of passing it
-			 * over.  If we don't do this, mdoc_action will
-			 * become confused when it scans over multiple
-			 * types whilst setting its bitmasks.
-			 *
-			 * FIXME: this should occur in mdoc_action.c.
-			 */
-			if (type >= 0) {
-				if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))
-					return(0);
-				mdoc_argn_free(n->args, pos);
+			if (type < 0) {
+				type = n->args->argv[pos].arg;
 				break;
 			}
-			type = n->args->argv[pos].arg;
-			break;
+			if (mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))
+				break;
+			return(0);
 		case (MDOC_Compact):
-			if (type < 0 && ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))
-				return(0);
-			break;
+			if (type >= 0)
+				break;
+			if (mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))
+				break;
+			return(0);
 		case (MDOC_Width):
 			if (width >= 0)
 				if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))
@@ -1232,7 +1225,7 @@ post_sh_body(POST_ARGS)
 static int
 post_sh_head(POST_ARGS)
 {
-	char		        buf[64];
+	char		        buf[BUFSIZ];
 	enum mdoc_sec	        sec;
 	const struct mdoc_node *n;
 
@@ -1254,13 +1247,13 @@ post_sh_head(POST_ARGS)
 		/* XXX - copied from compact(). */
 		assert(MDOC_TEXT == n->type);
 
-		if (strlcat(buf, n->string, 64) >= 64) {
+		if (strlcat(buf, n->string, BUFSIZ) >= BUFSIZ) {
 			mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
 			return(0);
 		}
 		if (NULL == n->next)
 			continue;
-		if (strlcat(buf, " ", 64) >= 64) {
+		if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {
 			mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
 			return(0);
 		}