===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.71
retrieving revision 1.74
diff -u -p -r1.71 -r1.74
--- mandoc/man_validate.c	2011/07/24 18:15:14	1.71
+++ mandoc/man_validate.c	2011/09/04 09:58:40	1.74
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.71 2011/07/24 18:15:14 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.74 2011/09/04 09:58:40 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -46,42 +46,43 @@ struct	man_valid {
 
 static	int	  check_bline(CHKARGS);
 static	int	  check_eq0(CHKARGS);
-static	int	  check_ft(CHKARGS);
 static	int	  check_le1(CHKARGS);
 static	int	  check_ge2(CHKARGS);
 static	int	  check_le5(CHKARGS);
 static	int	  check_par(CHKARGS);
 static	int	  check_part(CHKARGS);
 static	int	  check_root(CHKARGS);
-static	int	  check_sec(CHKARGS);
-static	void	  check_text(CHKARGS);
 
 static	int	  post_AT(CHKARGS);
 static	int	  post_vs(CHKARGS);
 static	int	  post_fi(CHKARGS);
+static	int	  post_ft(CHKARGS);
 static	int	  post_nf(CHKARGS);
+static	int	  post_sec(CHKARGS);
 static	int	  post_TH(CHKARGS);
 static	int	  post_UC(CHKARGS);
+static	int	  pre_sec(CHKARGS);
 
 static	v_check	  posts_at[] = { post_AT, NULL };
 static	v_check	  posts_br[] = { post_vs, check_eq0, NULL };
 static	v_check	  posts_eq0[] = { check_eq0, NULL };
 static	v_check	  posts_fi[] = { check_eq0, post_fi, NULL };
-static	v_check	  posts_ft[] = { check_ft, NULL };
+static	v_check	  posts_ft[] = { post_ft, NULL };
 static	v_check	  posts_nf[] = { check_eq0, post_nf, NULL };
 static	v_check	  posts_par[] = { check_par, NULL };
 static	v_check	  posts_part[] = { check_part, NULL };
-static	v_check	  posts_sec[] = { check_sec, NULL };
+static	v_check	  posts_sec[] = { post_sec, NULL };
 static	v_check	  posts_sp[] = { post_vs, check_le1, NULL };
 static	v_check	  posts_th[] = { check_ge2, check_le5, post_TH, NULL };
 static	v_check	  posts_uc[] = { post_UC, NULL };
 static	v_check	  pres_bline[] = { check_bline, NULL };
+static	v_check	  pres_sec[] = { check_bline, pre_sec, NULL};
 
 static	const struct man_valid man_valids[MAN_MAX] = {
 	{ NULL, posts_br }, /* br */
 	{ pres_bline, posts_th }, /* TH */
-	{ pres_bline, posts_sec }, /* SH */
-	{ pres_bline, posts_sec }, /* SS */
+	{ pres_sec, posts_sec }, /* SH */
+	{ pres_sec, posts_sec }, /* SS */
 	{ pres_bline, NULL }, /* TP */
 	{ pres_bline, posts_par }, /* LP */
 	{ pres_bline, posts_par }, /* PP */
@@ -151,11 +152,10 @@ man_valid_post(struct man *m)
 	m->last->flags |= MAN_VALID;
 
 	switch (m->last->type) {
-	case (MAN_TEXT): 
-		check_text(m, m->last);
-		return(1);
 	case (MAN_ROOT):
 		return(check_root(m, m->last));
+	case (MAN_TEXT): 
+		/* FALLTHROUGH */
 	case (MAN_EQN):
 		/* FALLTHROUGH */
 	case (MAN_TBL):
@@ -206,49 +206,6 @@ check_root(CHKARGS) 
 	return(1);
 }
 
-static void
-check_text(CHKARGS) 
-{
-	char		*p, *pp, *cpp;
-	int		 pos;
-	size_t		 sz;
-
-	p = n->string;
-	pos = n->pos + 1;
-
-	while ('\0' != *p) {
-		sz = strcspn(p, "\t\\");
-
-		p += (int)sz;
-		pos += (int)sz;
-
-		if ('\t' == *p) {
-			if ( ! (MAN_LITERAL & m->flags))
-				man_pmsg(m, n->line, pos, MANDOCERR_BADTAB);
-			p++;
-			pos++;
-			continue;
-		} else if ('\0' == *p)
-			break;
-
-		pos++;
-		pp = ++p;
-
-		if (ESCAPE_ERROR == mandoc_escape
-				((const char **)&pp, NULL, NULL)) {
-			man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);
-			break;
-		}
-
-		cpp = p;
-		while (NULL != (cpp = memchr(cpp, ASCII_HYPH, pp - cpp)))
-			*cpp = '-';
-
-		pos += pp - p;
-		p = pp;
-	}
-}
-
 #define	INEQ_DEFINE(x, ineq, name) \
 static int \
 check_##name(CHKARGS) \
@@ -267,7 +224,7 @@ INEQ_DEFINE(2, >=, ge2)
 INEQ_DEFINE(5, <=, le5)
 
 static int
-check_ft(CHKARGS)
+post_ft(CHKARGS)
 {
 	char	*cp;
 	int	 ok;
@@ -323,16 +280,24 @@ check_ft(CHKARGS)
 }
 
 static int
-check_sec(CHKARGS)
+pre_sec(CHKARGS)
 {
 
+	if (MAN_BLOCK == n->type)
+		m->flags &= ~MAN_LITERAL;
+	return(1);
+}
+
+static int
+post_sec(CHKARGS)
+{
+
 	if ( ! (MAN_HEAD == n->type && 0 == n->nchild)) 
 		return(1);
 
 	man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
 	return(0);
 }
-
 
 static int
 check_part(CHKARGS)