]> git.cameronkatri.com Git - mandoc.git/blobdiff - main.c
Kick out two attibutes we don't use any more in HTML5.
[mandoc.git] / main.c
diff --git a/main.c b/main.c
index 889b3387af3a774011fe5cb3711d7018c9ad3232..620cd6c13a2439bdc7d9e9127111fefd4db49ba6 100644 (file)
--- a/main.c
+++ b/main.c
-/* $Id: main.c,v 1.8 2009/03/22 19:01:11 kristaps Exp $ */
+/*     $Id: main.c,v 1.192 2014/09/03 23:21:47 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008-2012 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 copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include <sys/stat.h>
+#include "config.h"
+
+#include <sys/types.h>
 
 #include <assert.h>
-#include <err.h>
+#include <ctype.h>
+#include <errno.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 "manpath.h"
+#include "mansearch.h"
 
-#ifdef __linux__
-extern int               getsubopt(char **, char * const *, char **);
-# ifndef __dead
-#  define __dead __attribute__((__noreturn__))
+#if !defined(__GNUC__) || (__GNUC__ < 2)
+# if !defined(lint)
+#  define __attribute__(x)
 # endif
-#endif
-
-struct buf {
-       char             *buf;
-       size_t            sz;
+#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
+
+enum   outmode {
+       OUTMODE_DEF = 0,
+       OUTMODE_FLN,
+       OUTMODE_LST,
+       OUTMODE_ALL,
+       OUTMODE_INT,
+       OUTMODE_ONE
 };
 
-struct curparse {
-       const char       *file;
-       int               wflags;
-#define        WARN_WALL         0x03          /* All-warnings mask. */
-#define        WARN_WCOMPAT     (1 << 0)       /* Compatibility warnings. */
-#define        WARN_WSYNTAX     (1 << 1)       /* Syntax warnings. */
-#define        WARN_WERR        (1 << 2)       /* Warnings->errors. */
+typedef        void            (*out_mdoc)(void *, const struct mdoc *);
+typedef        void            (*out_man)(void *, const struct man *);
+typedef        void            (*out_free)(void *);
+
+enum   outt {
+       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 */
 };
 
-enum outt {
-       OUTT_ASCII,
-       OUTT_LATIN1,
-       OUTT_UTF8,
-       OUTT_TREE,
-       OUTT_LINT
+struct curparse {
+       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 */
 };
 
-typedef        int             (*out_run)(void *, const struct mdoc *);
-typedef        void            (*out_free)(void *);
+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 enum mandoclevel  passthrough(const char *, int);
+static void              spawn_pager(void);
+static int               toptions(struct curparse *, char *);
+static void              usage(enum argmode) __attribute__((noreturn));
+static void              version(void) __attribute__((noreturn));
+static int               woptions(struct curparse *, char *);
 
-extern char             *__progname;
-
-extern void             *ascii_alloc(void);
-extern void             *latin1_alloc(void);
-extern void             *utf8_alloc(void);
-extern int               terminal_run(void *, const struct mdoc *);
-extern int               tree_run(void *, const struct mdoc *);
-extern void              terminal_free(void *);
-
-__dead static void       version(void);
-__dead static void       usage(void);
-static int               foptions(int *, char *);
-static int               toptions(enum outt *, char *);
-static int               woptions(int *, char *);
-static int               merr(void *, int, int, const char *);
-static int               mwarn(void *, int, int, 
-                               enum mdoc_warn, const char *);
-static int               file(struct buf *, struct buf *,
-                               const char *, struct mdoc *);
-static int               fdesc(struct buf *, struct buf *,
-                               const char *, int, struct mdoc *);
+static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
+static const char       *progname;
 
 
 int
 main(int argc, char *argv[])
 {
-       int              c, rc, fflags;
-       struct mdoc_cb   cb;
-       struct mdoc     *mdoc;
-       void            *outdata;
-       enum outt        outtype;
-       struct buf       ln, blk;
-       out_run          outrun;
-       out_free         outfree;
        struct curparse  curp;
-
-       fflags = 0;
-       outtype = OUTT_ASCII;
-
-       bzero(&curp, sizeof(struct curparse));
-
-       /* LINTED */
-       while (-1 != (c = getopt(argc, argv, "f:VW:T:")))
+       struct mansearch search;
+       struct manpaths  paths;
+       char            *conf_file, *defpaths, *auxpaths;
+       char            *defos;
+#if HAVE_SQLITE3
+       struct manpage  *res, *resp;
+       size_t           isec, i, sz;
+       int              prio, best_prio;
+       char             sec;
+#endif
+       enum mandoclevel rc;
+       enum outmode     outmode;
+       pid_t            child_pid;
+       int              fd;
+       int              show_usage;
+       int              use_pager;
+       int              options;
+       int              c;
+
+       progname = strrchr(argv[0], '/');
+       if (progname == NULL)
+               progname = argv[0];
+       else
+               ++progname;
+
+       /* Search options. */
+
+       memset(&paths, 0, sizeof(struct manpaths));
+       conf_file = defpaths = auxpaths = NULL;
+
+       memset(&search, 0, sizeof(struct mansearch));
+       search.outkey = "Nd";
+
+       if (strcmp(progname, "man") == 0)
+               search.argmode = ARG_NAME;
+       else if (strncmp(progname, "apropos", 7) == 0)
+               search.argmode = ARG_EXPR;
+       else if (strncmp(progname, "whatis", 6) == 0)
+               search.argmode = ARG_WORD;
+       else
+               search.argmode = ARG_FILE;
+
+       /* Parser and formatter options. */
+
+       memset(&curp, 0, sizeof(struct curparse));
+       curp.outtype = OUTT_ASCII;
+       curp.wlevel  = MANDOCLEVEL_FATAL;
+       options = MPARSE_SO;
+       defos = NULL;
+
+       use_pager = 1;
+       show_usage = 0;
+       outmode = OUTMODE_DEF;
+
+       while (-1 != (c = getopt(argc, argv, "aC:cfhI:iklM:m:O:S:s:T:VW:w"))) {
                switch (c) {
-               case ('f'):
-                       if ( ! foptions(&fflags, optarg))
-                               return(0);
+               case 'a':
+                       outmode = OUTMODE_ALL;
+                       break;
+               case 'C':
+                       conf_file = optarg;
+                       break;
+               case 'c':
+                       use_pager = 0;
+                       break;
+               case 'f':
+                       search.argmode = ARG_WORD;
+                       break;
+               case 'h':
+                       (void)strlcat(curp.outopts, "synopsis,", BUFSIZ);
+                       outmode = OUTMODE_ALL;
+                       break;
+               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 'i':
+                       outmode = OUTMODE_INT;
+                       break;
+               case 'k':
+                       search.argmode = ARG_EXPR;
                        break;
-               case ('T'):
-                       if ( ! toptions(&outtype, optarg))
-                               return(0);
+               case 'l':
+                       search.argmode = ARG_FILE;
+                       outmode = OUTMODE_ALL;
                        break;
-               case ('W'):
-                       if ( ! woptions(&curp.wflags, optarg))
-                               return(0);
+               case 'M':
+                       defpaths = optarg;
                        break;
-               case ('V'):
+               case 'm':
+                       auxpaths = optarg;
+                       break;
+               case 'O':
+                       search.outkey = optarg;
+                       (void)strlcat(curp.outopts, optarg, BUFSIZ);
+                       (void)strlcat(curp.outopts, ",", BUFSIZ);
+                       break;
+               case 'S':
+                       search.arch = optarg;
+                       break;
+               case 's':
+                       search.sec = optarg;
+                       break;
+               case 'T':
+                       if ( ! toptions(&curp, optarg))
+                               return((int)MANDOCLEVEL_BADARG);
+                       break;
+               case 'W':
+                       if ( ! woptions(&curp, optarg))
+                               return((int)MANDOCLEVEL_BADARG);
+                       break;
+               case 'w':
+                       outmode = OUTMODE_FLN;
+                       break;
+               case 'V':
                        version();
                        /* NOTREACHED */
                default:
-                       usage();
-                       /* NOTREACHED */
+                       show_usage = 1;
+                       break;
                }
+       }
+
+       if (show_usage)
+               usage(search.argmode);
+
+       /* Postprocess options. */
+
+       if (outmode == OUTMODE_DEF) {
+               switch (search.argmode) {
+               case ARG_FILE:
+                       outmode = OUTMODE_ALL;
+                       use_pager = 0;
+                       break;
+               case ARG_NAME:
+                       outmode = OUTMODE_ONE;
+                       break;
+               default:
+                       outmode = OUTMODE_LST;
+                       break;
+               }
+       }
+
+       /* Parse arguments. */
 
        argc -= optind;
        argv += optind;
+#if HAVE_SQLITE3
+       resp = NULL;
+#endif
 
-       /*
-        * Allocate the appropriate front-end.  Note that utf8, ascii
-        * and latin1 all resolve to the terminal front-end with
-        * different encodings (see terminal.c).  Not all frontends have
-        * cleanup or alloc routines.
-        */
+       /* Quirk for a man(1) section argument without -s. */
 
-       switch (outtype) {
-       case (OUTT_LATIN1):
-               outdata = latin1_alloc();
-               outrun = terminal_run;
-               outfree = terminal_free;
-               break;
-       case (OUTT_UTF8):
-               outdata = utf8_alloc();
-               outrun = terminal_run;
-               outfree = terminal_free;
-               break;
-       case (OUTT_TREE):
-               outdata = NULL;
-               outrun = tree_run;
-               outfree = NULL;
-               break;
-       case (OUTT_LINT):
-               outdata = NULL;
-               outrun = NULL;
-               outfree = NULL;
-               break;
-       default:
-               outdata = ascii_alloc();
-               outrun = terminal_run;
-               outfree = terminal_free;
-               break;
+       if (search.argmode == ARG_NAME &&
+           argv[0] != NULL &&
+           isdigit((unsigned char)argv[0][0]) &&
+           (argv[0][1] == '\0' || !strcmp(argv[0], "3p"))) {
+               search.sec = argv[0];
+               argv++;
+               argc--;
        }
 
-       /*
-        * All callbacks route into here, where we print them onto the
-        * screen.  XXX - for now, no path for debugging messages.
-        */
+       rc = MANDOCLEVEL_OK;
+
+       /* man(1), whatis(1), apropos(1) */
+
+       if (search.argmode != ARG_FILE) {
+#if HAVE_SQLITE3
+               if (argc == 0)
+                       usage(search.argmode);
+
+               /* Access the mandoc database. */
+
+               manpath_parse(&paths, conf_file, defpaths, auxpaths);
+               mansearch_setup(1);
+               if( ! mansearch(&search, &paths, argc, argv, &res, &sz))
+                       usage(search.argmode);
+               resp = res;
+
+               if (sz == 0) {
+                       if (search.argmode == ARG_NAME)
+                               fprintf(stderr, "%s: No entry for %s "
+                                   "in the manual.\n", progname, argv[0]);
+                       rc = MANDOCLEVEL_BADARG;
+                       goto out;
+               }
+
+               /*
+                * For standard man(1) and -a output mode,
+                * prepare for copying filename pointers
+                * into the program parameter array.
+                */
+
+               if (outmode == OUTMODE_ONE) {
+                       argc = 1;
+                       best_prio = 10;
+               } else if (outmode == OUTMODE_ALL)
+                       argc = (int)sz;
+
+               /* Iterate all matching manuals. */
+
+               for (i = 0; i < sz; i++) {
+                       if (outmode == OUTMODE_FLN)
+                               puts(res[i].file);
+                       else if (outmode == OUTMODE_LST)
+                               printf("%s - %s\n", res[i].names,
+                                   res[i].output == NULL ? "" :
+                                   res[i].output);
+                       else if (outmode == OUTMODE_ONE) {
+                               /* Search for the best section. */
+                               isec = strcspn(res[i].file, "123456789");
+                               sec = res[i].file[isec];
+                               if ('\0' == sec)
+                                       continue;
+                               prio = sec_prios[sec - '1'];
+                               if (prio >= best_prio)
+                                       continue;
+                               best_prio = prio;
+                               resp = res + i;
+                       }
+               }
 
-       cb.mdoc_msg = NULL;
-       cb.mdoc_err = merr;
-       cb.mdoc_warn = mwarn;
+               /*
+                * For man(1), -a and -i output mode, fall through
+                * to the main mandoc(1) code iterating files
+                * and running the parsers on each of them.
+                */
+
+               if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST)
+                       goto out;
+#else
+               fputs("mandoc: database support not compiled in\n",
+                   stderr);
+               return((int)MANDOCLEVEL_BADARG);
+#endif
+       }
+
+       /* mandoc(1) */
 
-       bzero(&ln, sizeof(struct buf));
-       bzero(&blk, sizeof(struct buf));
+       if ( ! moptions(&options, auxpaths))
+               return((int)MANDOCLEVEL_BADARG);
 
-       mdoc = mdoc_alloc(&curp, fflags, &cb);
+       if (use_pager && isatty(STDOUT_FILENO))
+               spawn_pager();
+
+       curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos);
 
        /*
-        * Loop around available files.
+        * Conditionally start up the lookaside buffer before parsing.
         */
-
-       if (NULL == *argv) {
-               curp.file = "<stdin>";
-               c = fdesc(&blk, &ln, "stdin", STDIN_FILENO, mdoc);
-               rc = 0;
-               if (c && NULL == outrun)
-                       rc = 1;
-               else if (c && outrun && (*outrun)(outdata, mdoc))
-                       rc = 1;
-       } else {
-               while (*argv) {
-                       curp.file = *argv;
-                       c = file(&blk, &ln, *argv, mdoc);
-                       if ( ! c)
-                               break;
-                       if (outrun && ! (*outrun)(outdata, mdoc))
-                               break;
-                       /* Reset the parser for another file. */
-                       mdoc_reset(mdoc);
-                       argv++;
+       if (OUTT_MAN == curp.outtype)
+               mparse_keep(curp.mp);
+
+       if (argc == 0)
+               parse(&curp, STDIN_FILENO, "<stdin>", &rc);
+
+       while (argc) {
+#if HAVE_SQLITE3
+               if (resp != NULL) {
+                       rc = mparse_open(curp.mp, &fd, resp->file,
+                           &child_pid);
+                       if (fd == -1)
+                               /* nothing */;
+                       else if (resp->form & FORM_SRC) {
+                               /* For .so only; ignore failure. */
+                               chdir(paths.paths[resp->ipath]);
+                               parse(&curp, fd, resp->file, &rc);
+                       } else
+                               rc = passthrough(resp->file, fd);
+                       resp++;
+               } else
+#endif
+               {
+                       rc = mparse_open(curp.mp, &fd, *argv++,
+                           &child_pid);
+                       if (fd != -1)
+                               parse(&curp, fd, argv[-1], &rc);
                }
-               rc = NULL == *argv;
+
+               if (child_pid &&
+                   mparse_wait(curp.mp, child_pid) != MANDOCLEVEL_OK)
+                       rc = MANDOCLEVEL_SYSERR;
+
+               if (MANDOCLEVEL_OK != rc && curp.wstop)
+                       break;
+               argc--;
        }
 
-       if (blk.buf)
-               free(blk.buf);
-       if (ln.buf)
-               free(ln.buf);
-       if (outfree)
-               (*outfree)(outdata);
+       if (curp.outfree)
+               (*curp.outfree)(curp.outdata);
+       if (curp.mp)
+               mparse_free(curp.mp);
+
+#if HAVE_SQLITE3
+out:
+       if (search.argmode != ARG_FILE) {
+               manpath_free(&paths);
+               mansearch_free(res, sz);
+               mansearch_setup(0);
+       }
+#endif
 
-       mdoc_free(mdoc);
+       free(defos);
 
-       return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
+       return((int)rc);
 }
 
-
-__dead static void
+static void
 version(void)
 {
 
-       (void)printf("%s %s\n", __progname, VERSION);
-       exit(0);
-       /* NOTREACHED */
+       printf("mandoc %s\n", VERSION);
+       exit((int)MANDOCLEVEL_OK);
 }
 
-
-__dead static void
-usage(void)
+static void
+usage(enum argmode argmode)
 {
 
-       (void)fprintf(stderr, "usage: %s\n", __progname);
-       exit(1);
-       /* NOTREACHED */
+       switch (argmode) {
+       case ARG_FILE:
+               fputs("usage: mandoc [-acfhklV] [-Ios=name] "
+                   "[-mformat] [-Ooption] [-Toutput] [-Wlevel]\n"
+                   "\t      [file ...]\n", stderr);
+               break;
+       case ARG_NAME:
+               fputs("usage: man [-acfhklVw] [-C file] "
+                   "[-M path] [-m path] [-S arch] [-s section]\n"
+                   "\t   [section] name ...\n", stderr);
+               break;
+       case ARG_WORD:
+               fputs("usage: whatis [-acfhklVw] [-C file] "
+                   "[-M path] [-m path] [-O outkey] [-S arch]\n"
+                   "\t      [-s section] name ...\n", stderr);
+               break;
+       case ARG_EXPR:
+               fputs("usage: apropos [-acfhklVw] [-C file] "
+                   "[-M path] [-m path] [-O outkey] [-S arch]\n"
+                   "\t       [-s section] expression ...\n", stderr);
+               break;
+       }
+       exit((int)MANDOCLEVEL_BADARG);
 }
 
-
-static int
-file(struct buf *blk, struct buf *ln,
-               const char *file, struct mdoc *mdoc)
+static void
+parse(struct curparse *curp, int fd, const char *file,
+       enum mandoclevel *level)
 {
-       int              fd, c;
-
-       if (-1 == (fd = open(file, O_RDONLY, 0))) {
-               warn("%s", file);
-               return(0);
-       }
+       enum mandoclevel  rc;
+       struct mdoc      *mdoc;
+       struct man       *man;
 
-       c = fdesc(blk, ln, file, fd, mdoc);
+       /* Begin by parsing the file itself. */
 
-       if (-1 == close(fd))
-               warn("%s", file);
+       assert(file);
+       assert(fd >= -1);
 
-       return(c);
-}
+       rc = mparse_readfd(curp->mp, fd, file);
 
+       /* Stop immediately if the parse has failed. */
 
-static int
-fdesc(struct buf *blk, struct buf *ln,
-               const char *f, int fd, struct mdoc *mdoc)
-{
-       size_t           sz;
-       ssize_t          ssz;
-       struct stat      st;
-       int              j, i, pos, lnn;
-#ifdef STRIP_XO
-       int              macro, xo, xeoln;
-#endif
+       if (MANDOCLEVEL_FATAL <= rc)
+               goto cleanup;
 
        /*
-        * Two buffers: ln and buf.  buf is the input buffer, optimised
-        * for each file's block size.  ln is a line buffer.  Both
-        * growable, hence passed in by ptr-ptr.
+        * With -Wstop and warnings or errors of at least the requested
+        * level, do not produce output.
         */
 
-       sz = BUFSIZ;
+       if (MANDOCLEVEL_OK != rc && curp->wstop)
+               goto cleanup;
 
-       if (-1 == fstat(fd, &st))
-               warnx("%s", f);
-       else if ((size_t)st.st_blksize > sz)
-               sz = st.st_blksize;
+       /* If unset, allocate output dev now (if applicable). */
 
-       if (sz > blk->sz) {
-               blk->buf = realloc(blk->buf, sz);
-               if (NULL == blk->buf)
-                       err(1, "realloc");
-               blk->sz = sz;
-       }
-
-       /*
-        * Fill buf with file blocksize and parse newlines into ln.
-        */
-#ifdef STRIP_XO
-       macro = xo = xeoln = 0;
-#endif
+       if ( ! (curp->outman && curp->outmdoc)) {
+               switch (curp->outtype) {
+               case OUTT_XHTML:
+                       curp->outdata = xhtml_alloc(curp->outopts);
+                       curp->outfree = html_free;
+                       break;
+               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;
+               }
 
-       for (lnn = 1, pos = 0; ; ) {
-               if (-1 == (ssz = read(fd, blk->buf, sz))) {
-                       warn("%s", f);
-                       return(0);
-               } else if (0 == ssz) 
+               switch (curp->outtype) {
+               case OUTT_HTML:
+                       /* FALLTHROUGH */
+               case OUTT_XHTML:
+                       curp->outman = html_man;
+                       curp->outmdoc = html_mdoc;
+                       break;
+               case OUTT_TREE:
+                       curp->outman = tree_man;
+                       curp->outmdoc = tree_mdoc;
+                       break;
+               case OUTT_MAN:
+                       curp->outmdoc = man_mdoc;
+                       curp->outman = man_man;
+                       break;
+               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;
+                       break;
+               default:
                        break;
+               }
+       }
 
-               for (i = 0; i < (int)ssz; i++) {
-                       if (pos >= (int)ln->sz) {
-                               ln->sz += 256; /* Step-size. */
-                               ln->buf = realloc(ln->buf, ln->sz);
-                               if (NULL == ln->buf)
-                                       err(1, "realloc");
-                       }
+       mparse_result(curp->mp, &mdoc, &man, NULL);
 
-                       if ('\n' != blk->buf[i]) {
-                               /*
-                                * Ugly of uglies.  Here we handle the
-                                * dreaded `Xo/Xc' scoping.  Cover the
-                                * eyes of any nearby children.  This
-                                * makes `Xo/Xc' enclosures look like
-                                * one huge line.
-                                */
-#ifdef STRIP_XO
-                               /*
-                                * First, note whether we're in a macro
-                                * line.
-                                */
-                               if (0 == pos && '.' == blk->buf[i])
-                                       macro = 1;
-
-                               /*
-                                * If we're in an `Xo' context and just
-                                * nixed a newline, remove the control
-                                * character for new macro lines:
-                                * they're going to show up as all part
-                                * of the same line.
-                                */
-                               if (xo && xeoln && '.' == blk->buf[i]) {
-                                       xeoln = 0;
-                                       continue;
-                               }
-                               xeoln = 0;
-
-                               /*
-                                * If we've parsed `Xo', enter an xo
-                                * context.  `Xo' must be in a parsable
-                                * state.  This is the ugly part.  IT IS
-                                * NOT SMART ENOUGH TO HANDLE ESCAPED
-                                * WHITESPACE.
-                                */
-                               if (macro && pos && 'o' == blk->buf[i]) {
-                                       if (xo && 'X' == ln->buf[pos - 1])  {
-                                               if (' ' == ln->buf[pos - 2])
-                                                       xo++;
-                                       } else if ('X' == ln->buf[pos - 1]) {
-                                               if (2 == pos && '.' == ln->buf[pos - 2])
-                                                       xo++;
-                                               else if (' ' == ln->buf[pos - 2])
-                                                       xo++;
-                                       }
-                               }
-
-                               /*
-                                * If we're parsed `Xc', leave an xo
-                                * context if one's already pending.
-                                * `Xc' must be in a parsable state.
-                                * THIS IS NOT SMART ENOUGH TO HANDLE
-                                * ESCAPED WHITESPACE.
-                                */
-                               if (macro && pos && 'c' == blk->buf[i])
-                                       if (xo && 'X' == ln->buf[pos - 1])
-                                               if (' ' == ln->buf[pos - 2])
-                                                       xo--;
-#endif /* STRIP_XO */
-
-                               ln->buf[pos++] = blk->buf[i];
-                               continue;
-                       }
+       /* Execute the out device, if it exists. */
 
-                       /* Check for CPP-escaped newline.  */
+       if (man && curp->outman)
+               (*curp->outman)(curp->outdata, man);
+       if (mdoc && curp->outmdoc)
+               (*curp->outmdoc)(curp->outdata, mdoc);
 
-                       if (pos > 0 && '\\' == ln->buf[pos - 1]) {
-                               for (j = pos - 1; j >= 0; j--)
-                                       if ('\\' != ln->buf[j])
-                                               break;
+ cleanup:
 
-                               if ( ! ((pos - j) % 2)) {
-                                       pos--;
-                                       lnn++;
-                                       continue;
-                               }
-                       }
+       mparse_reset(curp->mp);
 
-#ifdef STRIP_XO
-                       /*
-                        * If we're in an xo context, put a space in
-                        * place of the newline and continue parsing.
-                        * Mark that we just did a newline.
-                        */
-                       if (xo) {
-                               xeoln = 1;
-                               ln->buf[pos++] = ' ';
-                               lnn++;
-                               continue;
+       if (*level < rc)
+               *level = rc;
+}
+
+static enum mandoclevel
+passthrough(const char *file, int fd)
+{
+       char             buf[BUFSIZ];
+       const char      *syscall;
+       ssize_t          nr, nw, off;
+
+       while ((nr = read(fd, buf, BUFSIZ)) != -1 && nr != 0)
+               for (off = 0; off < nr; off += nw)
+                       if ((nw = write(STDOUT_FILENO, buf + off,
+                           (size_t)(nr - off))) == -1 || nw == 0) {
+                               syscall = "write";
+                               goto fail;
                        }
-#endif /* STRIP_XO */
 
-                       ln->buf[pos] = 0;
-                       if ( ! mdoc_parseln(mdoc, lnn, ln->buf))
-                               return(0);
-                       lnn++;
-                       macro = pos = 0;
-               }
-       }
+        if (nr == 0) {
+               close(fd);
+               return(MANDOCLEVEL_OK);
+        }
 
-       return(mdoc_endparse(mdoc));
+       syscall = "read";
+fail:
+       fprintf(stderr, "%s: %s: SYSERR: %s: %s",
+           progname, file, syscall, strerror(errno));
+       return(MANDOCLEVEL_SYSERR);
 }
 
-
 static int
-toptions(enum outt *tflags, char *arg)
+moptions(int *options, char *arg)
 {
 
-       if (0 == strcmp(arg, "ascii"))
-               *tflags = OUTT_ASCII;
-       else if (0 == strcmp(arg, "latin1"))
-               *tflags = OUTT_LATIN1;
-       else if (0 == strcmp(arg, "utf8"))
-               *tflags = OUTT_UTF8;
-       else if (0 == strcmp(arg, "lint"))
-               *tflags = OUTT_LINT;
-       else if (0 == strcmp(arg, "tree"))
-               *tflags = OUTT_TREE;
+       if (arg == NULL)
+               /* nothing to do */;
+       else if (0 == strcmp(arg, "doc"))
+               *options |= MPARSE_MDOC;
+       else if (0 == strcmp(arg, "andoc"))
+               /* nothing to do */;
+       else if (0 == strcmp(arg, "an"))
+               *options |= MPARSE_MAN;
        else {
-               warnx("bad argument: -T%s", arg);
+               fprintf(stderr, "%s: -m%s: Bad argument\n",
+                   progname, arg);
                return(0);
        }
 
        return(1);
 }
 
-
-/*
- * Parse out the options for [-fopt...] setting compiler options.  These
- * can be comma-delimited or called again.
- */
 static int
-foptions(int *fflags, char *arg)
+toptions(struct curparse *curp, char *arg)
 {
-       char            *v;
-       char            *toks[4];
 
-       toks[0] = "ign-scope";
-       toks[1] = "ign-escape";
-       toks[2] = "ign-macro";
-       toks[3] = NULL;
-
-       while (*arg) 
-               switch (getsubopt(&arg, toks, &v)) {
-               case (0):
-                       *fflags |= MDOC_IGN_SCOPE;
-                       break;
-               case (1):
-                       *fflags |= MDOC_IGN_ESCAPE;
-                       break;
-               case (2):
-                       *fflags |= MDOC_IGN_MACRO;
-                       break;
-               default:
-                       warnx("bad argument: -f%s", arg);
-                       return(0);
-               }
+       if (0 == strcmp(arg, "ascii"))
+               curp->outtype = OUTT_ASCII;
+       else if (0 == strcmp(arg, "lint")) {
+               curp->outtype = OUTT_LINT;
+               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: -T%s: Bad argument\n",
+                   progname, arg);
+               return(0);
+       }
 
        return(1);
 }
 
-
-/* 
- * Parse out the options for [-Werr...], which sets warning modes.
- * These can be comma-delimited or called again.  
- */
 static int
-woptions(int *wflags, char *arg)
+woptions(struct curparse *curp, char *arg)
 {
-       char            *v;
-       char            *toks[5]; 
+       char            *v, *o;
+       const char      *toks[6];
 
-       toks[0] = "all";
-       toks[1] = "compat";
-       toks[2] = "syntax";
+       toks[0] = "stop";
+       toks[1] = "all";
+       toks[2] = "warning";
        toks[3] = "error";
-       toks[4] = NULL;
-
-       while (*arg) 
-               switch (getsubopt(&arg, toks, &v)) {
-               case (0):
-                       *wflags |= WARN_WALL;
+       toks[4] = "fatal";
+       toks[5] = NULL;
+
+       while (*arg) {
+               o = arg;
+               switch (getsubopt(&arg, UNCONST(toks), &v)) {
+               case 0:
+                       curp->wstop = 1;
                        break;
-               case (1):
-                       *wflags |= WARN_WCOMPAT;
+               case 1:
+                       /* FALLTHROUGH */
+               case 2:
+                       curp->wlevel = MANDOCLEVEL_WARNING;
                        break;
-               case (2):
-                       *wflags |= WARN_WSYNTAX;
+               case 3:
+                       curp->wlevel = MANDOCLEVEL_ERROR;
                        break;
-               case (3):
-                       *wflags |= WARN_WERR;
+               case 4:
+                       curp->wlevel = MANDOCLEVEL_FATAL;
                        break;
                default:
-                       warnx("bad argument: -W%s", arg);
+                       fprintf(stderr, "%s: -W%s: Bad argument\n",
+                           progname, o);
                        return(0);
                }
+       }
 
        return(1);
 }
 
-
-/* ARGSUSED */
-static int
-merr(void *arg, int line, int col, const char *msg)
+static void
+mmsg(enum mandocerr t, enum mandoclevel lvl,
+               const char *file, int line, int col, const char *msg)
 {
-       struct curparse *curp;
+       const char      *mparse_msg;
 
-       curp = (struct curparse *)arg;
+       fprintf(stderr, "%s: %s:", progname, file);
 
-       warnx("%s:%d: error: %s (column %d)", 
-                       curp->file, line, msg, col);
-       return(0);
-}
+       if (line)
+               fprintf(stderr, "%d:%d:", line, col + 1);
 
+       fprintf(stderr, " %s", mparse_strlevel(lvl));
 
-static int
-mwarn(void *arg, int line, int col, 
-               enum mdoc_warn type, const char *msg)
+       if (NULL != (mparse_msg = mparse_strerror(t)))
+               fprintf(stderr, ": %s", mparse_msg);
+
+       if (msg)
+               fprintf(stderr, ": %s", msg);
+
+       fputc('\n', stderr);
+}
+
+static void
+spawn_pager(void)
 {
-       struct curparse *curp;
-       char            *wtype;
+#define MAX_PAGER_ARGS 16
+       char            *argv[MAX_PAGER_ARGS];
+       const char      *pager;
+       char            *cp;
+       int              fildes[2];
+       int              argc;
+
+       if (pipe(fildes) == -1) {
+               fprintf(stderr, "%s: pipe: %s\n",
+                   progname, strerror(errno));
+               return;
+       }
 
-       curp = (struct curparse *)arg;
-       wtype = NULL;
+       switch (fork()) {
+       case -1:
+               fprintf(stderr, "%s: fork: %s\n",
+                   progname, strerror(errno));
+               exit((int)MANDOCLEVEL_SYSERR);
+       case 0:
+               close(fildes[0]);
+               if (dup2(fildes[1], STDOUT_FILENO) == -1) {
+                       fprintf(stderr, "%s: dup output: %s\n",
+                           progname, strerror(errno));
+                       exit((int)MANDOCLEVEL_SYSERR);
+               }
+               return;
+       default:
+               break;
+       }
 
-       switch (type) {
-       case (WARN_COMPAT):
-               wtype = "compat";
-               if (curp->wflags & WARN_WCOMPAT)
-                       break;
-               return(1);
-       case (WARN_SYNTAX):
-               wtype = "syntax";
-               if (curp->wflags & WARN_WSYNTAX)
-                       break;
-               return(1);
+       /* The original process becomes the pager. */
+
+       close(fildes[1]);
+       if (dup2(fildes[0], STDIN_FILENO) == -1) {
+               fprintf(stderr, "%s: dup input: %s\n",
+                   progname, strerror(errno));
+               exit((int)MANDOCLEVEL_SYSERR);
        }
 
-       assert(wtype);
-       warnx("%s:%d: %s warning: %s (column %d)", 
-                       curp->file, line, wtype, msg, col);
+       pager = getenv("MANPAGER");
+       if (pager == NULL || *pager == '\0')
+               pager = getenv("PAGER");
+       if (pager == NULL || *pager == '\0')
+               pager = "/usr/bin/more -s";
+       cp = mandoc_strdup(pager);
 
-       if ( ! (curp->wflags & WARN_WERR))
-               return(1);
+       /*
+        * Parse the pager command into words.
+        * Intentionally do not do anything fancy here.
+        */
 
-       warnx("%s: considering warnings as errors", 
-                       __progname);
-       return(0);
-}
+       argc = 0;
+       while (argc + 1 < MAX_PAGER_ARGS) {
+               argv[argc++] = cp;
+               cp = strchr(cp, ' ');
+               if (cp == NULL)
+                       break;
+               *cp++ = '\0';
+               while (*cp == ' ')
+                       cp++;
+               if (*cp == '\0')
+                       break;
+       }
+       argv[argc] = NULL;
 
+       /* Hand over to the pager. */
 
+       execvp(argv[0], argv);
+       fprintf(stderr, "%s: exec: %s\n",
+           progname, strerror(errno));
+       exit((int)MANDOCLEVEL_SYSERR);
+}