===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.17
retrieving revision 1.19
diff -u -p -r1.17 -r1.19
--- mandoc/mdoc_validate.c	2009/06/27 09:03:03	1.17
+++ mandoc/mdoc_validate.c	2009/07/04 10:41:29	1.19
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.17 2009/06/27 09:03:03 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.19 2009/07/04 10:41:29 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "libmdoc.h"
+#include "libmandoc.h"
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 /* TODO: ignoring Pp (it's superfluous in some invocations). */
@@ -55,7 +56,6 @@ enum	mwarn {
 	WNOWIDTH,
 	WMISSWIDTH,
 	WESCAPE,
-	WDEPCOL,
 	WWRONGMSEC,
 	WSECOOO,
 	WSECREP,
@@ -469,10 +469,6 @@ pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
 		p = "prologue macros out-of-order";
 		c = WARN_COMPAT;
 		break;
-	case (WDEPCOL):
-		p = "deprecated column argument syntax";
-		c = WARN_COMPAT;
-		break;
 	case (WNOWIDTH):
 		p = "superfluous width argument";
 		break;
@@ -708,9 +704,9 @@ check_argv(struct mdoc *m, const struct mdoc_node *n, 
 static int
 check_text(struct mdoc *mdoc, int line, int pos, const char *p)
 {
-	size_t		 c;
+	int		 c;
 
-	for ( ; *p; p++) {
+	for ( ; *p; p++, pos++) {
 		if ('\t' == *p) {
 			if ( ! (MDOC_LITERAL & mdoc->flags))
 				if ( ! warn_print(mdoc, line, pos))
@@ -722,9 +718,10 @@ check_text(struct mdoc *mdoc, int line, int pos, const
 		if ('\\' != *p)
 			continue;
 
-		c = mdoc_isescape(p);
+		c = mandoc_special(p);
 		if (c) {
-			p += (int)c - 1;
+			p += c - 1;
+			pos += c - 1;
 			continue;
 		}
 		if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags))