===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.66
retrieving revision 1.178
diff -u -p -r1.66 -r1.178
--- mandoc/main.c	2010/05/15 05:11:50	1.66
+++ mandoc/main.c	2014/08/10 23:54:41	1.178
@@ -1,6 +1,8 @@
-/*	$Id: main.c,v 1.66 2010/05/15 05:11:50 kristaps Exp $ */
+/*	$Id: main.c,v 1.178 2014/08/10 23:54:41 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,29 +16,23 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#include <sys/mman.h>
-#include <sys/stat.h>
+#include <sys/types.h>
 
 #include <assert.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc.h"
+#include "mandoc_aux.h"
+#include "main.h"
 #include "mdoc.h"
 #include "man.h"
-#include "main.h"
 
-#define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
-
-/* FIXME: Intel's compiler?  LLVM?  pcc?  */
-
 #if !defined(__GNUC__) || (__GNUC__ < 2)
 # if !defined(lint)
 #  define __attribute__(x)
@@ -47,73 +43,52 @@ typedef	void		(*out_mdoc)(void *, const struct mdoc *)
 typedef	void		(*out_man)(void *, const struct man *);
 typedef	void		(*out_free)(void *);
 
-struct	buf {
-	char	 	 *buf;
-	size_t		  sz;
-};
-
-enum	intt {
-	INTT_AUTO,
-	INTT_MDOC,
-	INTT_MAN
-};
-
 enum	outt {
-	OUTT_ASCII = 0,
-	OUTT_TREE,
-	OUTT_HTML,
-	OUTT_XHTML,
-	OUTT_LINT
+	OUTT_ASCII = 0,	/* -Tascii */
+	OUTT_LOCALE,	/* -Tlocale */
+	OUTT_UTF8,	/* -Tutf8 */
+	OUTT_TREE,	/* -Ttree */
+	OUTT_MAN,	/* -Tman */
+	OUTT_HTML,	/* -Thtml */
+	OUTT_XHTML,	/* -Txhtml */
+	OUTT_LINT,	/* -Tlint */
+	OUTT_PS,	/* -Tps */
+	OUTT_PDF	/* -Tpdf */
 };
 
 struct	curparse {
-	const char	 *file;		/* Current parse. */
-	int		  fd;		/* Current parse. */
-	int		  wflags;
-#define	WARN_WALL	 (1 << 0)	/* All-warnings mask. */
-#define	WARN_WERR	 (1 << 2)	/* Warnings->errors. */
-	int		  fflags;
-#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. */
-#define	FL_STRICT	  FL_NIGN_ESCAPE | \
-			  FL_NIGN_MACRO
-	enum intt	  inttype;	/* Input parsers... */
-	struct man	 *man;
-	struct mdoc	 *mdoc;
-	enum outt	  outtype;	/* Output devices... */
-	out_mdoc	  outmdoc;
-	out_man	  	  outman;
-	out_free	  outfree;
-	void		 *outdata;
-	char		  outopts[BUFSIZ];
+	struct mparse	 *mp;
+	enum mandoclevel  wlevel;	/* ignore messages below this */
+	int		  wstop;	/* stop after a file with a warning */
+	enum outt	  outtype;	/* which output to use */
+	out_mdoc	  outmdoc;	/* mdoc output ptr */
+	out_man		  outman;	/* man output ptr */
+	out_free	  outfree;	/* free output ptr */
+	void		 *outdata;	/* data for output */
+	char		  outopts[BUFSIZ]; /* buf of output opts */
 };
 
-static	void		  fdesc(struct curparse *);
-static	void		  ffile(const char *, struct curparse *);
-static	int		  foptions(int *, char *);
-static	struct man	 *man_init(struct curparse *);
-static	struct mdoc	 *mdoc_init(struct curparse *);
-static	int		  merr(void *, int, int, const char *);
-static	int		  moptions(enum intt *, char *);
-static	int		  mwarn(void *, int, int, const char *);
-static	int		  pset(const char *, int, struct curparse *,
-				struct man **, struct mdoc **);
+static	int		  moptions(int *, char *);
+static	void		  mmsg(enum mandocerr, enum mandoclevel,
+				const char *, int, int, const char *);
+static	void		  parse(struct curparse *, int,
+				const char *, enum mandoclevel *);
 static	int		  toptions(struct curparse *, char *);
 static	void		  usage(void) __attribute__((noreturn));
 static	void		  version(void) __attribute__((noreturn));
-static	int		  woptions(int *, char *);
+static	int		  woptions(struct curparse *, char *);
 
 static	const char	 *progname;
-static 	int		  with_error;
-static	int		  with_warning;
 
+
 int
 main(int argc, char *argv[])
 {
 	int		 c;
 	struct curparse	 curp;
+	int		 options;
+	enum mandoclevel rc;
+	char		*defos;
 
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
@@ -123,33 +98,45 @@ main(int argc, char *argv[])
 
 	memset(&curp, 0, sizeof(struct curparse));
 
-	curp.inttype = INTT_AUTO;
+	options = MPARSE_SO;
 	curp.outtype = OUTT_ASCII;
+	curp.wlevel  = MANDOCLEVEL_FATAL;
+	defos = NULL;
 
-	/* LINTED */
-	while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:")))
+	while (-1 != (c = getopt(argc, argv, "I:m:O:T:VW:")))
 		switch (c) {
-		case ('f'):
-			if ( ! foptions(&curp.fflags, optarg))
-				return(EXIT_FAILURE);
+		case 'I':
+			if (strncmp(optarg, "os=", 3)) {
+				fprintf(stderr,
+				    "%s: -I%s: Bad argument\n",
+				    progname, optarg);
+				return((int)MANDOCLEVEL_BADARG);
+			}
+			if (defos) {
+				fprintf(stderr,
+				    "%s: -I%s: Duplicate argument\n",
+				    progname, optarg);
+				return((int)MANDOCLEVEL_BADARG);
+			}
+			defos = mandoc_strdup(optarg + 3);
 			break;
-		case ('m'):
-			if ( ! moptions(&curp.inttype, optarg))
-				return(EXIT_FAILURE);
+		case 'm':
+			if ( ! moptions(&options, optarg))
+				return((int)MANDOCLEVEL_BADARG);
 			break;
-		case ('O'):
+		case 'O':
 			(void)strlcat(curp.outopts, optarg, BUFSIZ);
 			(void)strlcat(curp.outopts, ",", BUFSIZ);
 			break;
-		case ('T'):
+		case 'T':
 			if ( ! toptions(&curp, optarg))
-				return(EXIT_FAILURE);
+				return((int)MANDOCLEVEL_BADARG);
 			break;
-		case ('W'):
-			if ( ! woptions(&curp.wflags, optarg))
-				return(EXIT_FAILURE);
+		case 'W':
+			if ( ! woptions(&curp, optarg))
+				return((int)MANDOCLEVEL_BADARG);
 			break;
-		case ('V'):
+		case 'V':
 			version();
 			/* NOTREACHED */
 		default:
@@ -157,338 +144,161 @@ main(int argc, char *argv[])
 			/* NOTREACHED */
 		}
 
+	curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos);
+
+	/*
+	 * Conditionally start up the lookaside buffer before parsing.
+	 */
+	if (OUTT_MAN == curp.outtype)
+		mparse_keep(curp.mp);
+
 	argc -= optind;
 	argv += optind;
 
-	if (NULL == *argv) {
-		curp.file = "<stdin>";
-		curp.fd = STDIN_FILENO;
+	rc = MANDOCLEVEL_OK;
 
-		fdesc(&curp);
-	}
+	if (NULL == *argv)
+		parse(&curp, STDIN_FILENO, "<stdin>", &rc);
 
 	while (*argv) {
-		ffile(*argv, &curp);
-
-		if (with_error && !(curp.fflags & FL_IGN_ERRORS))
+		parse(&curp, -1, *argv, &rc);
+		if (MANDOCLEVEL_OK != rc && curp.wstop)
 			break;
 		++argv;
 	}
 
 	if (curp.outfree)
 		(*curp.outfree)(curp.outdata);
+	if (curp.mp)
+		mparse_free(curp.mp);
+	free(defos);
 
-	return((with_warning || with_error) ? 
-			EXIT_FAILURE :  EXIT_SUCCESS);
+	return((int)rc);
 }
 
-
 static void
 version(void)
 {
 
-	(void)printf("%s %s\n", progname, VERSION);
-	exit(EXIT_SUCCESS);
+	printf("%s %s\n", progname, VERSION);
+	exit((int)MANDOCLEVEL_OK);
 }
 
-
 static void
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: %s [-V] [-foption] "
-			"[-mformat] [-Ooption] [-Toutput] "
-			"[-Werr] [file...]\n", progname);
-	exit(EXIT_FAILURE);
-}
+	fprintf(stderr, "usage: %s "
+			"[-V] "
+			"[-Ios=name] "
+			"[-mformat] "
+			"[-Ooption] "
+			"[-Toutput] "
+			"[-Wlevel]\n"
+			"\t      [file ...]\n",
+			progname);
 
-
-static struct man *
-man_init(struct curparse *curp)
-{
-	int		 pflags;
-	struct man_cb	 mancb;
-
-	mancb.man_err = merr;
-	mancb.man_warn = mwarn;
-
-	/* 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;
-
-	return(man_alloc(curp, pflags, &mancb));
+	exit((int)MANDOCLEVEL_BADARG);
 }
 
-
-static struct mdoc *
-mdoc_init(struct curparse *curp)
-{
-	int		 pflags;
-	struct mdoc_cb	 mdoccb;
-
-	mdoccb.mdoc_err = merr;
-	mdoccb.mdoc_warn = mwarn;
-
-	/* Defaults from mandoc.1. */
-
-	pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE;
-
-	if (curp->fflags & FL_IGN_SCOPE)
-		pflags |= MDOC_IGN_SCOPE;
-	if (curp->fflags & FL_NIGN_ESCAPE)
-		pflags &= ~MDOC_IGN_ESCAPE;
-	if (curp->fflags & FL_NIGN_MACRO)
-		pflags &= ~MDOC_IGN_MACRO;
-
-	return(mdoc_alloc(curp, pflags, &mdoccb));
-}
-
-
 static void
-ffile(const char *file, struct curparse *curp)
+parse(struct curparse *curp, int fd, const char *file,
+	enum mandoclevel *level)
 {
+	enum mandoclevel  rc;
+	struct mdoc	 *mdoc;
+	struct man	 *man;
 
-	curp->file = file;
-	if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
-		perror(curp->file);
-		with_error = 1;
-		return;
-	}
+	/* Begin by parsing the file itself. */
 
-	fdesc(curp);
+	assert(file);
+	assert(fd >= -1);
 
-	if (-1 == close(curp->fd))
-		perror(curp->file);
-}
+	rc = mparse_readfd(curp->mp, fd, file);
 
+	/* Stop immediately if the parse has failed. */
 
-static int
-read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
-{
-	struct stat	 st;
-	char		*buf;
-	size_t		 sz, off;
-	ssize_t		 ssz;
+	if (MANDOCLEVEL_FATAL <= rc)
+		goto cleanup;
 
-	if (-1 == fstat(curp->fd, &st)) {
-		perror(curp->file);
-		with_error = 1;
-		return(0);
-	}
-
 	/*
-	 * If we're a regular file, try just reading in the whole entry
-	 * via mmap().  This is faster than reading it into blocks, and
-	 * since each file is only a few bytes to begin with, I'm not
-	 * concerned that this is going to tank any machines.
+	 * With -Wstop and warnings or errors of at least the requested
+	 * level, do not produce output.
 	 */
 
-	if (S_ISREG(st.st_mode)) {
-		if (st.st_size >= (1U << 31)) {
-			fprintf(stderr, "%s: input too large\n", 
-					curp->file);
-			with_error = 1;
-			return(0);
-		}
-		*with_mmap = 1;
-		fb->sz = st.st_size;
-		fb->buf = mmap(NULL, fb->sz, PROT_READ, 
-				MAP_FILE, curp->fd, 0);
-		if (fb->buf != MAP_FAILED)
-			return(1);
-	}
+	if (MANDOCLEVEL_OK != rc && curp->wstop)
+		goto cleanup;
 
-	/*
-	 * If this isn't a regular file (like, say, stdin), then we must
-	 * go the old way and just read things in bit by bit.
-	 */
-
-	*with_mmap = 0;
-	off = 0;
-	fb->sz = 0;
-	fb->buf = NULL;
-	for (;;) {
-		if (off == fb->sz) {
-			if (fb->sz == (1U << 31)) {
-				fprintf(stderr, "%s: input too large\n", 
-						curp->file);
-				break;
-			}
-			if (fb->sz == 0)
-				sz = 65536;
-			else
-				sz = 2 * fb->sz;
-			buf = realloc(fb->buf, sz);
-			if (NULL == buf) {
-				perror(NULL);
-				break;
-			}
-			fb->buf = buf;
-			fb->sz = sz;
-		}
-		ssz = read(curp->fd, fb->buf + off, fb->sz - off);
-		if (ssz == 0) {
-			fb->sz = off;
-			return(1);
-		}
-		if (ssz == -1) {
-			perror(curp->file);
-			break;
-		}
-		off += ssz;
-	}
-
-	free(fb->buf);
-	fb->buf = NULL;
-	with_error = 1;
-	return(0);
-}
-
-
-static void
-fdesc(struct curparse *curp)
-{
-	size_t		 sz;
-	struct buf	 ln, blk;
-	int		 j, i, pos, lnn, comment, with_mmap;
-	struct man	*man;
-	struct mdoc	*mdoc;
-
-	sz = BUFSIZ;
-	man = NULL;
-	mdoc = NULL;
-	memset(&ln, 0, sizeof(struct buf));
-
-	/*
-	 * Two buffers: ln and buf.  buf is the input buffer optimised
-	 * here for each file's block size.  ln is a line buffer.  Both
-	 * growable, hence passed in by ptr-ptr.
-	 */
-
-	if (!read_whole_file(curp, &blk, &with_mmap))
-		return;
-
-	/* Fill buf with file blocksize. */
-
-	for (i = lnn = pos = comment = 0; i < (int)blk.sz; ++i) {
-			if (pos >= (int)ln.sz) {
-				ln.sz += 256; /* Step-size. */
-				ln.buf = realloc(ln.buf, ln.sz);
-				if (NULL == ln.buf) {
-					perror(NULL);
-					goto bailout;
-				}
-			}
-
-			if ('\n' != blk.buf[i]) {
-				if (comment)
-					continue;
-				ln.buf[pos++] = blk.buf[i];
-
-				/* Handle in-line `\"' comments. */
-
-				if (1 == pos || '\"' != ln.buf[pos - 1])
-					continue;
-
-				for (j = pos - 2; j >= 0; j--)
-					if ('\\' != ln.buf[j])
-						break;
-
-				if ( ! ((pos - 2 - j) % 2))
-					continue;
-
-				comment = 1;
-				pos -= 2;
-				for (; pos > 0; --pos) {
-					if (ln.buf[pos - 1] != ' ')
-						break;
-					if (pos > 2 && ln.buf[pos - 2] == '\\')
-						break;
-				}
-				continue;
-			} 
-
-			/* Handle escaped `\\n' newlines. */
-
-			if (pos > 0 && 0 == comment && 
-					'\\' == ln.buf[pos - 1]) {
-				for (j = pos - 1; j >= 0; j--)
-					if ('\\' != ln.buf[j])
-						break;
-				if ( ! ((pos - j) % 2)) {
-					pos--;
-					lnn++;
-					continue;
-				}
-			}
-
-			ln.buf[pos] = 0;
-			lnn++;
-
-			/* If unset, assign parser in pset(). */
-
-			if ( ! (man || mdoc) && ! pset(ln.buf, 
-						pos, curp, &man, &mdoc))
-				goto bailout;
-
-			pos = comment = 0;
-
-			/* Pass down into parsers. */
-
-			if (man && ! man_parseln(man, lnn, ln.buf))
-				goto bailout;
-			if (mdoc && ! mdoc_parseln(mdoc, lnn, ln.buf))
-				goto bailout;
-	}
-
-	/* NOTE a parser may not have been assigned, yet. */
-
-	if ( ! (man || mdoc)) {
-		fprintf(stderr, "%s: Not a manual\n", curp->file);
-		goto bailout;
-	}
-
-	if (mdoc && ! mdoc_endparse(mdoc))
-		goto bailout;
-	if (man && ! man_endparse(man))
-		goto bailout;
-
 	/* If unset, allocate output dev now (if applicable). */
 
 	if ( ! (curp->outman && curp->outmdoc)) {
 		switch (curp->outtype) {
-		case (OUTT_XHTML):
+		case OUTT_XHTML:
 			curp->outdata = xhtml_alloc(curp->outopts);
-			curp->outman = html_man;
-			curp->outmdoc = html_mdoc;
 			curp->outfree = html_free;
 			break;
-		case (OUTT_HTML):
+		case OUTT_HTML:
 			curp->outdata = html_alloc(curp->outopts);
+			curp->outfree = html_free;
+			break;
+		case OUTT_UTF8:
+			curp->outdata = utf8_alloc(curp->outopts);
+			curp->outfree = ascii_free;
+			break;
+		case OUTT_LOCALE:
+			curp->outdata = locale_alloc(curp->outopts);
+			curp->outfree = ascii_free;
+			break;
+		case OUTT_ASCII:
+			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;
+		}
+
+		switch (curp->outtype) {
+		case OUTT_HTML:
+			/* FALLTHROUGH */
+		case OUTT_XHTML:
 			curp->outman = html_man;
 			curp->outmdoc = html_mdoc;
-			curp->outfree = html_free;
 			break;
-		case (OUTT_TREE):
+		case OUTT_TREE:
 			curp->outman = tree_man;
 			curp->outmdoc = tree_mdoc;
 			break;
-		case (OUTT_LINT):
+		case OUTT_MAN:
+			curp->outmdoc = man_mdoc;
+			curp->outman = man_man;
 			break;
-		default:
-			curp->outdata = ascii_alloc();
+		case OUTT_PDF:
+			/* FALLTHROUGH */
+		case OUTT_ASCII:
+			/* FALLTHROUGH */
+		case OUTT_UTF8:
+			/* FALLTHROUGH */
+		case OUTT_LOCALE:
+			/* FALLTHROUGH */
+		case OUTT_PS:
 			curp->outman = terminal_man;
 			curp->outmdoc = terminal_mdoc;
-			curp->outfree = terminal_free;
 			break;
+		default:
+			break;
 		}
 	}
 
+	mparse_result(curp->mp, &mdoc, &man, NULL);
+
 	/* Execute the out device, if it exists. */
 
 	if (man && curp->outman)
@@ -497,102 +307,32 @@ fdesc(struct curparse *curp)
 		(*curp->outmdoc)(curp->outdata, mdoc);
 
  cleanup:
-	if (curp->mdoc) {
-		mdoc_free(curp->mdoc);
-		curp->mdoc = NULL;
-	}
-	if (curp->man) {
-		man_free(curp->man);
-		curp->man = NULL;
-	}
-	if (ln.buf)
-		free(ln.buf);
-	if (with_mmap)
-		munmap(blk.buf, blk.sz);
-	else
-		free(blk.buf);
-	return;
 
- bailout:
-	with_error = 1;
-	goto cleanup;
-}
+	mparse_reset(curp->mp);
 
-
-static int
-pset(const char *buf, int pos, struct curparse *curp,
-		struct man **man, struct mdoc **mdoc)
-{
-	int		 i;
-
-	/*
-	 * Try to intuit which kind of manual parser should be used.  If
-	 * passed in by command-line (-man, -mdoc), then use that
-	 * explicitly.  If passed as -mandoc, then try to guess from the
-	 * line: either skip dot-lines, use -mdoc when finding `.Dt', or
-	 * default to -man, which is more lenient.
-	 */
-
-	if (buf[0] == '.') {
-		for (i = 1; buf[i]; i++)
-			if (' ' != buf[i] && '\t' != buf[i])
-				break;
-		if (0 == buf[i])
-			return(1);
-	}
-
-	switch (curp->inttype) {
-	case (INTT_MDOC):
-		if (NULL == curp->mdoc) 
-			curp->mdoc = mdoc_init(curp);
-		if (NULL == (*mdoc = curp->mdoc))
-			return(0);
-		return(1);
-	case (INTT_MAN):
-		if (NULL == curp->man) 
-			curp->man = man_init(curp);
-		if (NULL == (*man = curp->man))
-			return(0);
-		return(1);
-	default:
-		break;
-	}
-
-	if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3))  {
-		if (NULL == curp->mdoc) 
-			curp->mdoc = mdoc_init(curp);
-		if (NULL == (*mdoc = curp->mdoc))
-			return(0);
-		return(1);
-	} 
-
-	if (NULL == curp->man) 
-		curp->man = man_init(curp);
-	if (NULL == (*man = curp->man))
-		return(0);
-	return(1);
+	if (*level < rc)
+		*level = rc;
 }
 
-
 static int
-moptions(enum intt *tflags, char *arg)
+moptions(int *options, char *arg)
 {
 
 	if (0 == strcmp(arg, "doc"))
-		*tflags = INTT_MDOC;
+		*options |= MPARSE_MDOC;
 	else if (0 == strcmp(arg, "andoc"))
-		*tflags = INTT_AUTO;
+		/* nothing to do */;
 	else if (0 == strcmp(arg, "an"))
-		*tflags = INTT_MAN;
+		*options |= MPARSE_MAN;
 	else {
-		fprintf(stderr, "%s: Bad argument\n", arg);
+		fprintf(stderr, "%s: -m%s: Bad argument\n",
+		    progname, arg);
 		return(0);
 	}
 
 	return(1);
 }
 
-
 static int
 toptions(struct curparse *curp, char *arg)
 {
@@ -601,61 +341,65 @@ toptions(struct curparse *curp, char *arg)
 		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"))
+		curp->wlevel  = MANDOCLEVEL_WARNING;
+	} else if (0 == strcmp(arg, "tree"))
 		curp->outtype = OUTT_TREE;
+	else if (0 == strcmp(arg, "man"))
+		curp->outtype = OUTT_MAN;
 	else if (0 == strcmp(arg, "html"))
 		curp->outtype = OUTT_HTML;
+	else if (0 == strcmp(arg, "utf8"))
+		curp->outtype = OUTT_UTF8;
+	else if (0 == strcmp(arg, "locale"))
+		curp->outtype = OUTT_LOCALE;
 	else if (0 == strcmp(arg, "xhtml"))
 		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);
+		fprintf(stderr, "%s: -T%s: Bad argument\n",
+		    progname, arg);
 		return(0);
 	}
 
 	return(1);
 }
 
-
 static int
-foptions(int *fflags, char *arg)
+woptions(struct curparse *curp, char *arg)
 {
 	char		*v, *o;
-	const char	*toks[8];
+	const char	*toks[6];
 
-	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;
+	toks[0] = "stop";
+	toks[1] = "all";
+	toks[2] = "warning";
+	toks[3] = "error";
+	toks[4] = "fatal";
+	toks[5] = NULL;
 
 	while (*arg) {
 		o = arg;
 		switch (getsubopt(&arg, UNCONST(toks), &v)) {
-		case (0):
-			*fflags |= FL_IGN_SCOPE;
+		case 0:
+			curp->wstop = 1;
 			break;
-		case (1):
-			*fflags |= FL_NIGN_ESCAPE;
+		case 1:
+			/* FALLTHROUGH */
+		case 2:
+			curp->wlevel = MANDOCLEVEL_WARNING;
 			break;
-		case (2):
-			*fflags |= FL_NIGN_MACRO;
+		case 3:
+			curp->wlevel = MANDOCLEVEL_ERROR;
 			break;
-		case (3):
-			*fflags |= FL_IGN_ERRORS;
+		case 4:
+			curp->wlevel = MANDOCLEVEL_FATAL;
 			break;
-		case (4):
-			*fflags |= FL_STRICT;
-			break;
-		case (5):
-			*fflags &= ~FL_NIGN_ESCAPE;
-			break;
 		default:
-			fprintf(stderr, "%s: Bad argument\n", o);
+			fprintf(stderr, "%s: -W%s: Bad argument\n",
+			    progname, o);
 			return(0);
 		}
 	}
@@ -663,72 +407,24 @@ foptions(int *fflags, char *arg)
 	return(1);
 }
 
-
-static int
-woptions(int *wflags, char *arg)
+static void
+mmsg(enum mandocerr t, enum mandoclevel lvl,
+		const char *file, int line, int col, const char *msg)
 {
-	char		*v, *o;
-	const char	*toks[3]; 
+	const char	*mparse_msg;
 
-	toks[0] = "all";
-	toks[1] = "error";
-	toks[2] = NULL;
+	fprintf(stderr, "%s: %s:", progname, file);
 
-	while (*arg) {
-		o = arg;
-		switch (getsubopt(&arg, UNCONST(toks), &v)) {
-		case (0):
-			*wflags |= WARN_WALL;
-			break;
-		case (1):
-			*wflags |= WARN_WERR;
-			break;
-		default:
-			fprintf(stderr, "%s: Bad argument\n", o);
-			return(0);
-		}
-	}
+	if (line)
+		fprintf(stderr, "%d:%d:", line, col + 1);
 
-	return(1);
-}
+	fprintf(stderr, " %s", mparse_strlevel(lvl));
 
+	if (NULL != (mparse_msg = mparse_strerror(t)))
+		fprintf(stderr, ": %s", mparse_msg);
 
-/* ARGSUSED */
-static int
-merr(void *arg, int line, int col, const char *msg)
-{
-	struct curparse *curp;
+	if (msg)
+		fprintf(stderr, ": %s", msg);
 
-	curp = (struct curparse *)arg;
-
-	(void)fprintf(stderr, "%s:%d:%d: error: %s\n", 
-			curp->file, line, col + 1, msg);
-
-	with_error = 1;
-
-	return(0);
+	fputc('\n', stderr);
 }
-
-
-static int
-mwarn(void *arg, int line, int col, const char *msg)
-{
-	struct curparse *curp;
-
-	curp = (struct curparse *)arg;
-
-	if ( ! (curp->wflags & WARN_WALL))
-		return(1);
-
-	(void)fprintf(stderr, "%s:%d:%d: warning: %s\n", 
-			curp->file, line, col + 1, msg);
-
-	with_warning = 1;
-	if (curp->wflags & WARN_WERR) {
-		with_error = 1;
-		return(0);
-	}
-
-	return(1);
-}
-