===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.59
retrieving revision 1.62
diff -u -p -r1.59 -r1.62
--- mandoc/main.c	2010/01/29 14:39:38	1.59
+++ mandoc/main.c	2010/05/09 21:19:42	1.62
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.59 2010/01/29 14:39:38 kristaps Exp $ */
+/*	$Id: main.c,v 1.62 2010/05/09 21:19:42 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -72,11 +72,10 @@ struct	curparse {
 #define	WARN_WALL	 (1 << 0)	/* All-warnings mask. */
 #define	WARN_WERR	 (1 << 2)	/* Warnings->errors. */
 	int		  fflags;
-#define	IGN_SCOPE	 (1 << 0) 	/* Ignore scope errors. */
-#define	NO_IGN_ESCAPE	 (1 << 1) 	/* Don't ignore bad escapes. */
-#define	NO_IGN_MACRO	 (1 << 2) 	/* Don't ignore bad macros. */
-#define	NO_IGN_CHARS	 (1 << 3)	/* Don't ignore bad chars. */
-#define	IGN_ERRORS	 (1 << 4)	/* Ignore failed parse. */
+#define	FL_IGN_SCOPE	 (1 << 0) 	/* Ignore scope errors. */
+#define	FL_NIGN_ESCAPE	 (1 << 1) 	/* Don't ignore bad escapes. */
+#define	FL_NIGN_MACRO	 (1 << 2) 	/* Don't ignore bad macros. */
+#define	FL_IGN_ERRORS	 (1 << 4)	/* Ignore failed parse. */
 	enum intt	  inttype;	/* Input parsers... */
 	struct man	 *man;
 	struct man	 *lastman;
@@ -90,8 +89,11 @@ struct	curparse {
 	char		  outopts[BUFSIZ];
 };
 
+#define	FL_STRICT	  FL_NIGN_ESCAPE | \
+			  FL_NIGN_MACRO
+
 static	int		  foptions(int *, char *);
-static	int		  toptions(enum outt *, char *);
+static	int		  toptions(struct curparse *, char *);
 static	int		  moptions(enum intt *, char *);
 static	int		  woptions(int *, char *);
 static	int		  merr(void *, int, int, const char *);
@@ -144,7 +146,7 @@ main(int argc, char *argv[])
 			(void)strlcat(curp.outopts, ",", BUFSIZ);
 			break;
 		case ('T'):
-			if ( ! toptions(&curp.outtype, optarg))
+			if ( ! toptions(&curp, optarg))
 				return(EXIT_FAILURE);
 			break;
 		case ('W'):
@@ -172,7 +174,7 @@ main(int argc, char *argv[])
 		curp.fd = STDIN_FILENO;
 
 		c = fdesc(&blk, &ln, &curp);
-		if ( ! (IGN_ERRORS & curp.fflags)) 
+		if ( ! (FL_IGN_ERRORS & curp.fflags)) 
 			rc = 1 == c ? 1 : 0;
 		else
 			rc = -1 == c ? 0 : 1;
@@ -180,7 +182,7 @@ main(int argc, char *argv[])
 
 	while (rc && *argv) {
 		c = ffile(&blk, &ln, *argv, &curp);
-		if ( ! (IGN_ERRORS & curp.fflags)) 
+		if ( ! (FL_IGN_ERRORS & curp.fflags)) 
 			rc = 1 == c ? 1 : 0;
 		else
 			rc = -1 == c ? 0 : 1;
@@ -224,9 +226,9 @@ static void
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: %s [-V] [-foption...] "
+	(void)fprintf(stderr, "usage: %s [-V] [-foption] "
 			"[-mformat] [-Ooption] [-Toutput] "
-			"[-Werr...]\n", progname);
+			"[-Werr] [file...]\n", progname);
 	exit(EXIT_FAILURE);
 }
 
@@ -242,13 +244,11 @@ man_init(struct curparse *curp)
 
 	/* Defaults from mandoc.1. */
 
-	pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS;
+	pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE;
 
-	if (curp->fflags & NO_IGN_MACRO)
+	if (curp->fflags & FL_NIGN_MACRO)
 		pflags &= ~MAN_IGN_MACRO;
-	if (curp->fflags & NO_IGN_CHARS)
-		pflags &= ~MAN_IGN_CHARS;
-	if (curp->fflags & NO_IGN_ESCAPE)
+	if (curp->fflags & FL_NIGN_ESCAPE)
 		pflags &= ~MAN_IGN_ESCAPE;
 
 	return(man_alloc(curp, pflags, &mancb));
@@ -266,16 +266,14 @@ mdoc_init(struct curparse *curp)
 
 	/* Defaults from mandoc.1. */
 
-	pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS;
+	pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE;
 
-	if (curp->fflags & IGN_SCOPE)
+	if (curp->fflags & FL_IGN_SCOPE)
 		pflags |= MDOC_IGN_SCOPE;
-	if (curp->fflags & NO_IGN_ESCAPE)
+	if (curp->fflags & FL_NIGN_ESCAPE)
 		pflags &= ~MDOC_IGN_ESCAPE;
-	if (curp->fflags & NO_IGN_MACRO)
+	if (curp->fflags & FL_NIGN_MACRO)
 		pflags &= ~MDOC_IGN_MACRO;
-	if (curp->fflags & NO_IGN_CHARS)
-		pflags &= ~MDOC_IGN_CHARS;
 
 	return(mdoc_alloc(curp, pflags, &mdoccb));
 }
@@ -376,6 +374,12 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 
 				comment = 1;
 				pos -= 2;
+				for (; pos > 0; --pos) {
+					if (ln->buf[pos] != ' ')
+						break;
+					if (ln->buf[pos - 1] == '\\')
+						break;
+				}
 				continue;
 			} 
 
@@ -546,19 +550,22 @@ moptions(enum intt *tflags, char *arg)
 
 
 static int
-toptions(enum outt *tflags, char *arg)
+toptions(struct curparse *curp, char *arg)
 {
 
 	if (0 == strcmp(arg, "ascii"))
-		*tflags = OUTT_ASCII;
-	else if (0 == strcmp(arg, "lint"))
-		*tflags = OUTT_LINT;
+		curp->outtype = OUTT_ASCII;
+	else if (0 == strcmp(arg, "lint")) {
+		curp->outtype = OUTT_LINT;
+		curp->wflags |= WARN_WALL;
+		curp->fflags |= FL_STRICT;
+	}
 	else if (0 == strcmp(arg, "tree"))
-		*tflags = OUTT_TREE;
+		curp->outtype = OUTT_TREE;
 	else if (0 == strcmp(arg, "html"))
-		*tflags = OUTT_HTML;
+		curp->outtype = OUTT_HTML;
 	else if (0 == strcmp(arg, "xhtml"))
-		*tflags = OUTT_XHTML;
+		curp->outtype = OUTT_XHTML;
 	else {
 		fprintf(stderr, "%s: Bad argument\n", arg);
 		return(0);
@@ -577,36 +584,31 @@ foptions(int *fflags, char *arg)
 	toks[0] = "ign-scope";
 	toks[1] = "no-ign-escape";
 	toks[2] = "no-ign-macro";
-	toks[3] = "no-ign-chars";
-	toks[4] = "ign-errors";
-	toks[5] = "strict";
-	toks[6] = "ign-escape";
-	toks[7] = NULL;
+	toks[3] = "ign-errors";
+	toks[4] = "strict";
+	toks[5] = "ign-escape";
+	toks[6] = NULL;
 
 	while (*arg) {
 		o = arg;
 		switch (getsubopt(&arg, UNCONST(toks), &v)) {
 		case (0):
-			*fflags |= IGN_SCOPE;
+			*fflags |= FL_IGN_SCOPE;
 			break;
 		case (1):
-			*fflags |= NO_IGN_ESCAPE;
+			*fflags |= FL_NIGN_ESCAPE;
 			break;
 		case (2):
-			*fflags |= NO_IGN_MACRO;
+			*fflags |= FL_NIGN_MACRO;
 			break;
 		case (3):
-			*fflags |= NO_IGN_CHARS;
+			*fflags |= FL_IGN_ERRORS;
 			break;
 		case (4):
-			*fflags |= IGN_ERRORS;
+			*fflags |= FL_STRICT;
 			break;
 		case (5):
-			*fflags |= NO_IGN_ESCAPE | 
-			 	   NO_IGN_MACRO | NO_IGN_CHARS;
-			break;
-		case (6):
-			*fflags &= ~NO_IGN_ESCAPE;
+			*fflags &= ~FL_NIGN_ESCAPE;
 			break;
 		default:
 			fprintf(stderr, "%s: Bad argument\n", o);