===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/mandoc/main.c	2010/07/13 01:09:12	1.42
--- src/usr.bin/mandoc/main.c	2010/07/25 18:05:54	1.43
***************
*** 1,4 ****
! /*	$Id: main.c,v 1.42 2010/07/13 01:09:12 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: main.c,v 1.43 2010/07/25 18:05:54 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 20,25 ****
--- 20,26 ----
  #include <sys/stat.h>
  
  #include <assert.h>
+ #include <ctype.h>
  #include <fcntl.h>
  #include <stdio.h>
  #include <stdint.h>
***************
*** 56,62 ****
  	OUTT_HTML,
  	OUTT_XHTML,
  	OUTT_LINT,
! 	OUTT_PS
  };
  
  struct	curparse {
--- 57,64 ----
  	OUTT_HTML,
  	OUTT_XHTML,
  	OUTT_LINT,
! 	OUTT_PS,
! 	OUTT_PDF
  };
  
  struct	curparse {
***************
*** 99,104 ****
--- 101,107 ----
  	"list type must come first",
  	"bad standard",
  	"bad library",
+ 	"tab in non-literal context",
  	"bad escape sequence",
  	"unterminated quoted string",
  	"argument requires the width argument",
***************
*** 480,485 ****
--- 483,508 ----
  				++lnn;
  				break;
  			}
+ 
+ 			/* 
+ 			 * Warn about bogus characters.  If you're using
+ 			 * non-ASCII encoding, you're screwing your
+ 			 * readers.  Since I'd rather this not happen,
+ 			 * I'll be helpful and drop these characters so
+ 			 * we don't display gibberish.  Note to manual
+ 			 * writers: use special characters.
+ 			 */
+ 
+ 			if ( ! isgraph((u_char)blk.buf[i]) &&
+ 					! isblank((u_char)blk.buf[i])) {
+ 				if ( ! mmsg(MANDOCERR_BADCHAR, curp, 
+ 						lnn_start, pos, 
+ 						"ignoring byte"))
+ 					goto bailout;
+ 				i++;
+ 				continue;
+ 			}
+ 
  			/* Trailing backslash is like a plain character. */
  			if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
  				if (pos >= (int)ln.sz)
***************
*** 597,605 ****
  			curp->outdata = ascii_alloc(curp->outopts);
  			curp->outfree = ascii_free;
  			break;
  		case (OUTT_PS):
  			curp->outdata = ps_alloc(curp->outopts);
! 			curp->outfree = ps_free;
  			break;
  		default:
  			break;
--- 620,632 ----
  			curp->outdata = ascii_alloc(curp->outopts);
  			curp->outfree = ascii_free;
  			break;
+ 		case (OUTT_PDF):
+ 			curp->outdata = pdf_alloc(curp->outopts);
+ 			curp->outfree = pspdf_free;
+ 			break;
  		case (OUTT_PS):
  			curp->outdata = ps_alloc(curp->outopts);
! 			curp->outfree = pspdf_free;
  			break;
  		default:
  			break;
***************
*** 617,622 ****
--- 644,651 ----
  			curp->outman = tree_man;
  			curp->outmdoc = tree_mdoc;
  			break;
+ 		case (OUTT_PDF):
+ 			/* FALLTHROUGH */
  		case (OUTT_ASCII):
  			/* FALLTHROUGH */
  		case (OUTT_PS):
***************
*** 751,756 ****
--- 780,787 ----
  		curp->outtype = OUTT_XHTML;
  	else if (0 == strcmp(arg, "ps"))
  		curp->outtype = OUTT_PS;
+ 	else if (0 == strcmp(arg, "pdf"))
+ 		curp->outtype = OUTT_PDF;
  	else {
  		fprintf(stderr, "%s: Bad argument\n", arg);
  		return(0);