===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -p -r1.10 -r1.14
--- mandoc/mdoc_validate.c	2009/06/16 19:45:51	1.10
+++ mandoc/mdoc_validate.c	2009/06/17 14:08:47	1.14
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.10 2009/06/16 19:45:51 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.14 2009/06/17 14:08:47 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -42,9 +42,11 @@ enum	merr {
 	ELISTTYPE,
 	EDISPTYPE,
 	EMULTIDISP,
+	ESECNAME,
 	EMULTILIST,
 	EARGREP,
 	EBOOL,
+	ECOLMIS,
 	ENESTDISP
 };
 
@@ -53,6 +55,7 @@ enum	mwarn {
 	WNOWIDTH,
 	WMISSWIDTH,
 	WESCAPE,
+	WDEPESC,
 	WDEPCOL,
 	WWRONGMSEC,
 	WSECOOO,
@@ -115,7 +118,6 @@ static	int	pre_fd(PRE_ARGS);
 static	int	pre_it(PRE_ARGS);
 static	int	pre_lb(PRE_ARGS);
 static	int	pre_os(PRE_ARGS);
-static	int	pre_prologue(PRE_ARGS);
 static	int	pre_rv(PRE_ARGS);
 static	int	pre_sh(PRE_ARGS);
 static	int	pre_ss(PRE_ARGS);
@@ -137,6 +139,7 @@ static	int	post_args(POST_ARGS);
 static	int	post_at(POST_ARGS);
 static	int	post_bf(POST_ARGS);
 static	int	post_bl(POST_ARGS);
+static	int	post_bl_head(POST_ARGS);
 static	int	post_it(POST_ARGS);
 static	int	post_nm(POST_ARGS);
 static	int	post_root(POST_ARGS);
@@ -154,15 +157,15 @@ static	v_pre	pres_an[] = { pre_an, NULL };
 static	v_pre	pres_bd[] = { pre_display, pre_bd, NULL };
 static	v_pre	pres_bl[] = { pre_bl, NULL };
 static	v_pre	pres_cd[] = { pre_cd, NULL };
-static	v_pre	pres_dd[] = { pre_prologue, pre_dd, NULL };
+static	v_pre	pres_dd[] = { pre_dd, NULL };
 static	v_pre	pres_d1[] = { pre_display, NULL };
-static	v_pre	pres_dt[] = { pre_prologue, pre_dt, NULL };
+static	v_pre	pres_dt[] = { pre_dt, NULL };
 static	v_pre	pres_er[] = { pre_er, NULL };
 static	v_pre	pres_ex[] = { pre_ex, NULL };
 static	v_pre	pres_fd[] = { pre_fd, NULL };
 static	v_pre	pres_it[] = { pre_it, NULL };
 static	v_pre	pres_lb[] = { pre_lb, NULL };
-static	v_pre	pres_os[] = { pre_prologue, pre_os, NULL };
+static	v_pre	pres_os[] = { pre_os, NULL };
 static	v_pre	pres_rv[] = { pre_rv, NULL };
 static	v_pre	pres_sh[] = { pre_sh, NULL };
 static	v_pre	pres_ss[] = { pre_ss, NULL };
@@ -173,7 +176,7 @@ static	v_post	posts_wtext[] = { ewarn_ge1, NULL };
 static	v_post	posts_notext[] = { eerr_eq0, NULL };
 static	v_post	posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static	v_post	posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
-static	v_post	posts_bl[] = { herr_eq0, bwarn_ge1, post_bl, NULL };
+static	v_post	posts_bl[] = { bwarn_ge1, post_bl, NULL };
 static	v_post	posts_it[] = { post_it, NULL };
 static	v_post	posts_in[] = { ewarn_eq1, NULL };
 static	v_post	posts_ss[] = { herr_ge1, NULL };
@@ -412,6 +415,9 @@ perr(struct mdoc *m, int line, int pos, enum merr type
 	case (EDISPTYPE):
 		p = "missing display type";
 		break;
+	case (ESECNAME):
+		p = "the NAME section must come first";
+		break;
 	case (ELINE):
 		p = "expected line arguments";
 		break;
@@ -421,6 +427,9 @@ perr(struct mdoc *m, int line, int pos, enum merr type
 	case (ENODATA):
 		p = "document has no data";
 		break;
+	case (ECOLMIS):
+		p = "column syntax style mismatch";
+		break;
 	case (EATT):
 		p = "expected valid AT&T symbol";
 		break;
@@ -478,6 +487,9 @@ pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
 	case (WESCAPE):
 		p = "invalid escape sequence";
 		break;
+	case (WDEPESC):
+		p = "deprecated special-character escape";
+		break;
 	case (WNOLINE):
 		p = "suggested no line arguments";
 		break;
@@ -717,8 +729,6 @@ check_text(struct mdoc *mdoc, int line, int pos, const
 {
 	size_t		 c;
 
-	/* FIXME: indicate deprecated escapes \*(xx and \*x. */
-
 	for ( ; *p; p++) {
 		if ('\t' == *p) {
 			if ( ! (MDOC_LITERAL & mdoc->flags))
@@ -733,6 +743,10 @@ check_text(struct mdoc *mdoc, int line, int pos, const
 
 		c = mdoc_isescape(p);
 		if (c) {
+			/* See if form is deprecated. */
+			if ('*' == p[1]) 
+				if ( ! pwarn(mdoc, line, pos, WDEPESC))
+					return(0);
 			p += (int)c - 1;
 			continue;
 		}
@@ -870,22 +884,6 @@ pre_bl(PRE_ARGS)
 		break;
 	}
 
-	/*
-	 * General validation of fields.
-	 */
-
-	switch (type) {
-	case (MDOC_Column):
-		assert(col >= 0);
-		if (0 == n->args->argv[col].sz)
-			break;
-		if ( ! nwarn(mdoc, n, WDEPCOL))
-			return(0);
-		break;
-	default:
-		break;
-	}
-
 	return(1);
 }
 
@@ -1013,14 +1011,6 @@ pre_cd(PRE_ARGS)
 
 
 static int
-pre_prologue(PRE_ARGS)
-{
-
-	return(check_sec(mdoc, n, SEC_PROLOGUE, SEC_CUSTOM));
-}
-
-
-static int
 pre_dt(PRE_ARGS)
 {
 
@@ -1073,25 +1063,24 @@ post_bf(POST_ARGS)
 
 	head = mdoc->last->head;
 
-	if (NULL == mdoc->last->args) {
-		if (NULL == head->child || 
-				MDOC_TEXT != head->child->type)
-			return(mdoc_err(mdoc, "text argument expected"));
+	if (mdoc->last->args && head->child)
+		return(mdoc_err(mdoc, "one argument expected"));
+	else if (mdoc->last->args)
+		return(1);
 
-		p = head->child->string;
-		if (0 == strcmp(p, "Em"))
-			return(1);
-		else if (0 == strcmp(p, "Li"))
-			return(1);
-		else if (0 == strcmp(p, "Sm"))
-			return(1);
-		return(mdoc_nerr(mdoc, head->child, "invalid font"));
-	}
+	if (NULL == head->child || MDOC_TEXT != head->child->type)
+		return(mdoc_err(mdoc, "text argument expected"));
 
-	if (head->child)
-		return(mdoc_err(mdoc, "one argument expected"));
+	p = head->child->string;
 
-	return(1);
+	if (0 == strcmp(p, "Em"))
+		return(1);
+	else if (0 == strcmp(p, "Li"))
+		return(1);
+	else if (0 == strcmp(p, "Sm"))
+		return(1);
+
+	return(mdoc_nerr(mdoc, head->child, "invalid font mode"));
 }
 
 
@@ -1257,10 +1246,35 @@ post_it(POST_ARGS)
 
 
 static int
+post_bl_head(POST_ARGS) 
+{
+	int			i;
+	const struct mdoc_node *n;
+
+	n = mdoc->last->parent;
+	assert(n->args);
+
+	for (i = 0; i < (int)n->args->argc; i++)
+		if (n->args->argv[i].arg == MDOC_Column)
+			break;
+
+	if (i == (int)n->args->argc)
+		return(1);
+
+	if (n->args->argv[i].sz && mdoc->last->child)
+		return(nerr(mdoc, n, ECOLMIS));
+
+	return(1);
+}
+
+
+static int
 post_bl(POST_ARGS)
 {
 	struct mdoc_node	*n;
 
+	if (MDOC_HEAD == mdoc->last->type) 
+		return(post_bl_head(mdoc));
 	if (MDOC_BODY != mdoc->last->type)
 		return(1);
 	if (NULL == mdoc->last->child)
@@ -1307,7 +1321,7 @@ post_root(POST_ARGS)
 
 	if (NULL == mdoc->first->child)
 		return(verr(mdoc, ENODATA));
-	if (SEC_PROLOGUE == mdoc->lastnamed)
+	if ( ! (MDOC_PBODY & mdoc->flags))
 		return(verr(mdoc, ENOPROLOGUE));
 
 	if (MDOC_BLOCK != mdoc->first->child->type)
@@ -1388,13 +1402,12 @@ post_sh_head(POST_ARGS)
 	 * certain manual sections.
 	 */
 
-	assert(MDOC_Sh == mdoc->last->tok);
-
-	/* This is just concat() inlined, which is irritating. */
-
 	buf[0] = 0;
+
 	for (n = mdoc->last->child; n; n = n->next) {
+		/* XXX - copied from compact(). */
 		assert(MDOC_TEXT == n->type);
+
 		if (strlcat(buf, n->string, 64) >= 64)
 			return(nerr(mdoc, n, ETOOLONG));
 		if (NULL == n->next)
@@ -1405,21 +1418,24 @@ post_sh_head(POST_ARGS)
 
 	sec = mdoc_atosec(buf);
 
-	/* The NAME section should always be first. */
+	/* 
+	 * Check: NAME should always be first, CUSTOM has no roles,
+	 * non-CUSTOM has a conventional order to be followed.
+	 */
 
-	if (SEC_BODY == mdoc->lastnamed && SEC_NAME != sec)
-		return(vwarn(mdoc, WSECOOO));
+	if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
+		return(verr(mdoc, ESECNAME));
 	if (SEC_CUSTOM == sec)
 		return(1);
-
-	/* Check for repeated or out-of-order sections. */
-
 	if (sec == mdoc->lastnamed)
 		return(vwarn(mdoc, WSECREP));
 	if (sec < mdoc->lastnamed)
 		return(vwarn(mdoc, WSECOOO));
 
-	/* Check particular section/manual section conventions. */
+	/* 
+	 * Check particular section/manual conventions.  LIBRARY can
+	 * only occur in msec 2, 3 (TODO: are there more of these?).
+	 */
 
 	switch (sec) {
 	case (SEC_LIBRARY):