===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -c -r1.23 -r1.24
*** src/usr.bin/mandoc/main.c	2010/04/13 06:52:12	1.23
--- src/usr.bin/mandoc/main.c	2010/05/13 20:34:29	1.24
***************
*** 1,4 ****
! /*	$Id: main.c,v 1.23 2010/04/13 06:52:12 jmc Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: main.c,v 1.24 2010/05/13 20:34:29 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 63,69 ****
  #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_NIGN_CHARS	 (1 << 3)	/* Don't ignore bad chars. */
  #define	FL_IGN_ERRORS	 (1 << 4)	/* Ignore failed parse. */
  	enum intt	  inttype;	/* Input parsers... */
  	struct man	 *man;
--- 63,68 ----
***************
*** 79,86 ****
  };
  
  #define	FL_STRICT	  FL_NIGN_ESCAPE | \
! 			  FL_NIGN_MACRO | \
!  			  FL_NIGN_CHARS
  
  static	int		  foptions(int *, char *);
  static	int		  toptions(struct curparse *, char *);
--- 78,84 ----
  };
  
  #define	FL_STRICT	  FL_NIGN_ESCAPE | \
! 			  FL_NIGN_MACRO
  
  static	int		  foptions(int *, char *);
  static	int		  toptions(struct curparse *, char *);
***************
*** 234,245 ****
  
  	/* Defaults from mandoc.1. */
  
! 	pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS;
  
  	if (curp->fflags & FL_NIGN_MACRO)
  		pflags &= ~MAN_IGN_MACRO;
- 	if (curp->fflags & FL_NIGN_CHARS)
- 		pflags &= ~MAN_IGN_CHARS;
  	if (curp->fflags & FL_NIGN_ESCAPE)
  		pflags &= ~MAN_IGN_ESCAPE;
  
--- 232,241 ----
  
  	/* Defaults from mandoc.1. */
  
! 	pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE;
  
  	if (curp->fflags & FL_NIGN_MACRO)
  		pflags &= ~MAN_IGN_MACRO;
  	if (curp->fflags & FL_NIGN_ESCAPE)
  		pflags &= ~MAN_IGN_ESCAPE;
  
***************
*** 258,264 ****
  
  	/* Defaults from mandoc.1. */
  
! 	pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS;
  
  	if (curp->fflags & FL_IGN_SCOPE)
  		pflags |= MDOC_IGN_SCOPE;
--- 254,260 ----
  
  	/* Defaults from mandoc.1. */
  
! 	pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE;
  
  	if (curp->fflags & FL_IGN_SCOPE)
  		pflags |= MDOC_IGN_SCOPE;
***************
*** 266,273 ****
  		pflags &= ~MDOC_IGN_ESCAPE;
  	if (curp->fflags & FL_NIGN_MACRO)
  		pflags &= ~MDOC_IGN_MACRO;
- 	if (curp->fflags & FL_NIGN_CHARS)
- 		pflags &= ~MDOC_IGN_CHARS;
  
  	return(mdoc_alloc(curp, pflags, &mdoccb));
  }
--- 262,267 ----
***************
*** 572,582 ****
  	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;
  
  	while (*arg) {
  		o = arg;
--- 566,575 ----
  	toks[0] = "ign-scope";
  	toks[1] = "no-ign-escape";
  	toks[2] = "no-ign-macro";
! 	toks[3] = "ign-errors";
! 	toks[4] = "strict";
! 	toks[5] = "ign-escape";
! 	toks[6] = NULL;
  
  	while (*arg) {
  		o = arg;
***************
*** 591,605 ****
  			*fflags |= FL_NIGN_MACRO;
  			break;
  		case (3):
- 			*fflags |= FL_NIGN_CHARS;
- 			break;
- 		case (4):
  			*fflags |= FL_IGN_ERRORS;
  			break;
! 		case (5):
  			*fflags |= FL_STRICT;
  			break;
! 		case (6):
  			*fflags &= ~FL_NIGN_ESCAPE;
  			break;
  		default:
--- 584,595 ----
  			*fflags |= FL_NIGN_MACRO;
  			break;
  		case (3):
  			*fflags |= FL_IGN_ERRORS;
  			break;
! 		case (4):
  			*fflags |= FL_STRICT;
  			break;
! 		case (5):
  			*fflags &= ~FL_NIGN_ESCAPE;
  			break;
  		default: