Make empty sections and parts (SH, SS, RS) only produce a warning if it

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 3324f8a82524de0a4456ec11825fbf0a16439ca4..f6f52fda0c83bff0e7274a44836c5e168c9c7b44 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/*     $Id: main.c,v 1.98 2010/07/07 15:04:54 kristaps Exp $ */
+/*     $Id: main.c,v 1.158 2011/03/22 10:35:26 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -19,11 +19,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <sys/mman.h>
-#include <sys/stat.h>
-

 #include <assert.h>
 #include <assert.h>

-#include <fcntl.h>

 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>


@@ -34,11 +30,6 @@
 #include "main.h"
 #include "mdoc.h"
 #include "man.h"
 #include "main.h"
 #include "mdoc.h"
 #include "man.h"

-#include "roff.h"
-
-#define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
-
-/* FIXME: Intel's compiler?  LLVM?  pcc?  */

 
 #if !defined(__GNUC__) || (__GNUC__ < 2)
 # if !defined(lint)
 
 #if !defined(__GNUC__) || (__GNUC__ < 2)
 # if !defined(lint)


@@ -50,45 +41,20 @@ typedef     void            (*out_mdoc)(void *, const struct mdoc *);
 typedef        void            (*out_man)(void *, const struct man *);
 typedef        void            (*out_free)(void *);
 
 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 {
 enum   outt {

-       OUTT_ASCII = 0,
-       OUTT_TREE,
-       OUTT_HTML,
-       OUTT_XHTML,
-       OUTT_LINT,
-       OUTT_PS
+       OUTT_ASCII = 0, /* -Tascii */
+       OUTT_TREE,      /* -Ttree */
+       OUTT_HTML,      /* -Thtml */
+       OUTT_XHTML,     /* -Txhtml */
+       OUTT_LINT,      /* -Tlint */
+       OUTT_PS,        /* -Tps */
+       OUTT_PDF        /* -Tpdf */

 };
 
 struct curparse {
 };
 
 struct curparse {

-       const char       *file;         /* Current parse. */
-       int               fd;           /* Current parse. */
-       int               wflags;
-       /* FIXME: set by max error */
-#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 /* ignore nothing */
-       enum intt         inttype;      /* which parser to use */
-       struct man       *man;          /* man parser */
-       struct mdoc      *mdoc;         /* mdoc parser */
-       struct roff      *roff;         /* roff parser (!NULL) */
-       struct regset     regs;         /* roff registers */
+       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 */
        enum outt         outtype;      /* which output to use */
        out_mdoc          outmdoc;      /* mdoc output ptr */
        out_man           outman;       /* man output ptr */


@@ -97,109 +63,143 @@ struct    curparse {
        char              outopts[BUFSIZ]; /* buf of output opts */
 };
 
        char              outopts[BUFSIZ]; /* buf of output opts */
 };
 

+static const char * const      mandoclevels[MANDOCLEVEL_MAX] = {
+       "SUCCESS",
+       "RESERVED",
+       "WARNING",
+       "ERROR",
+       "FATAL",
+       "BADARG",
+       "SYSERR"
+};
+

 static const char * const      mandocerrs[MANDOCERR_MAX] = {
        "ok",
 
        "generic warning",
 
 static const char * const      mandocerrs[MANDOCERR_MAX] = {
        "ok",
 
        "generic warning",
 

-       "text should be uppercase",
-       "sections out of conventional order",
-       "section name repeats",
-       "out of order prologue",
-       "repeated prologue entry",
-       "list type must come first",
-       "bad standard",
-       "bad library",
-       "bad escape sequence",
-       "unterminated quoted string",
-       "argument requires the width argument",
-       "superfluous width argument",
-       "ignoring argument",
-       "bad date argument",
-       "bad width argument",
+       /* related to the prologue */
+       "no title in document",
+       "document title should be all caps",

        "unknown manual section",
        "unknown manual section",

+       "date missing, using today's date",
+       "cannot parse date, using it verbatim",
+       "prologue macros out of order",
+       "duplicate prologue macro",
+       "macro not allowed in prologue",
+       "macro not allowed in body",
+
+       /* related to document structure */
+       ".so is fragile, better use ln(1)",
+       "NAME section must come first",
+       "bad NAME section contents",
+       "manual name not yet set",
+       "sections out of conventional order",
+       "duplicate section name",

        "section not in conventional manual section",
        "section not in conventional manual section",

-       "end of line whitespace",
-       "blocks badly nested",
-       "scope open on exit",

 
 

-       "generic error",
+       /* related to macros and nesting */
+       "skipping obsolete macro",
+       "skipping paragraph macro",
+       "skipping no-space macro",
+       "blocks badly nested",
+       "child violates parent syntax",
+       "nested displays are not portable",
+       "already in literal mode",

 
 

-       "NAME section must come first",
+       /* related to missing macro arguments */
+       "skipping empty macro",
+       "argument count wrong",
+       "missing display type",
+       "list type must come first",
+       "tag lists require a width argument",
+       "missing font type",
+       "skipping end of block that is not open",
+
+       /* related to bad macro arguments */
+       "skipping argument",
+       "duplicate argument",
+       "duplicate display type",
+       "duplicate list type",
+       "unknown AT&T UNIX version",

        "bad Boolean value",
        "bad Boolean value",

-       "child violates parent syntax",
-       "bad AT&T symbol",
-       "list type repeated",
-       "display type repeated",
-       "argument repeated",
-       "manual name not yet set",
-       "obsolete macro ignored",
-       "empty macro ignored",
-       "macro not allowed in body",
-       "macro not allowed in prologue",
-       "bad character",
-       "bad NAME section contents",
-       "no blank lines",
-       "no text in this context",
+       "unknown font",
+       "unknown standard specifier",
+       "bad width argument",
+
+       /* related to plain text */
+       "blank line in non-literal context",
+       "tab in non-literal context",
+       "end of line whitespace",

        "bad comment style",
        "bad comment style",

-       "unknown macro will be lost",
+       "unknown escape sequence",
+       "unterminated quoted string",
+       
+       "generic error",
+
+       /* related to tables */
+       "bad table syntax",
+       "bad table option",
+       "bad table layout",
+       "no table layout cells specified",
+       "no table data cells specified",
+       "ignore data in cell",
+       "data block still open",
+       "ignoring extra data cells",
+
+       "input stack limit exceeded, infinite loop?",
+       "skipping bad character",
+       "escaped character not allowed in a name",
+       "skipping text before the first section header",
+       "skipping unknown macro",
+       "NOT IMPLEMENTED, please use groff: skipping request",

        "line scope broken",
        "argument count wrong",
        "line scope broken",
        "argument count wrong",

-       "request scope close w/none open",
-       "scope already open",
+       "skipping end of block that is not open",
+       "missing end of block",
+       "scope open on exit",
+       "uname(3) system call failed",

        "macro requires line argument(s)",
        "macro requires body argument(s)",
        "macro requires argument(s)",
        "macro requires line argument(s)",
        "macro requires body argument(s)",
        "macro requires argument(s)",

-       "no title in document",

        "missing list type",
        "missing list type",

-       "missing display type",
-       "missing font type",

        "line argument(s) will be lost",
        "body argument(s) will be lost",
 
        "generic fatal error",
 
        "line argument(s) will be lost",
        "body argument(s) will be lost",
 
        "generic fatal error",
 

+       "not a manual",

        "column syntax is inconsistent",
        "column syntax is inconsistent",

-       "displays may not be nested",
-       "unsupported display type",
-       "blocks badly nested",
-       "no such block is open",
-       "scope broken, syntax violated",
+       "NOT IMPLEMENTED: .Bd -file",

        "line scope broken, syntax violated",
        "argument count wrong, violates syntax",
        "child violates parent syntax",
        "argument count wrong, violates syntax",
        "line scope broken, syntax violated",
        "argument count wrong, violates syntax",
        "child violates parent syntax",
        "argument count wrong, violates syntax",

+       "NOT IMPLEMENTED: .so with absolute path or \"..\"",

        "no document body",
        "no document prologue",
        "no document body",
        "no document prologue",

-       "utsname system call failed",
-       "memory exhausted",
+       "static buffer exhausted",

 };
 
 };
 

-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 struct roff      *roff_init(struct curparse *);
-static int               moptions(enum intt *, char *);
-static int               mmsg(enum mandocerr, void *, 
-                               int, int, const char *);
-static int               pset(const char *, int, struct curparse *,
-                               struct man **, struct mdoc **);
+static int               moptions(enum mparset *, 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               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 const char       *progname;

-static int               with_fatal;
-static int               with_error;

 
 int
 main(int argc, char *argv[])
 {
        int              c;
        struct curparse  curp;
 
 int
 main(int argc, char *argv[])
 {
        int              c;
        struct curparse  curp;

+       enum mparset     type;
+       enum mandoclevel rc;

 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)
 
        progname = strrchr(argv[0], '/');
        if (progname == NULL)


@@ -209,19 +209,16 @@ main(int argc, char *argv[])
 
        memset(&curp, 0, sizeof(struct curparse));
 
 
        memset(&curp, 0, sizeof(struct curparse));
 

-       curp.inttype = INTT_AUTO;
+       type = MPARSE_AUTO;

        curp.outtype = OUTT_ASCII;
        curp.outtype = OUTT_ASCII;

+       curp.wlevel  = MANDOCLEVEL_FATAL;

 
        /* LINTED */
 
        /* LINTED */

-       while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:")))
+       while (-1 != (c = getopt(argc, argv, "m:O:T:VW:")))

                switch (c) {
                switch (c) {

-               case ('f'):
-                       if ( ! foptions(&curp.fflags, optarg))
-                               return(EXIT_FAILURE);
-                       break;

                case ('m'):
                case ('m'):

-                       if ( ! moptions(&curp.inttype, optarg))
-                               return(EXIT_FAILURE);
+                       if ( ! moptions(&type, optarg))
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                case ('O'):
                        (void)strlcat(curp.outopts, optarg, BUFSIZ);
                        break;
                case ('O'):
                        (void)strlcat(curp.outopts, optarg, BUFSIZ);


@@ -229,11 +226,11 @@ main(int argc, char *argv[])
                        break;
                case ('T'):
                        if ( ! toptions(&curp, optarg))
                        break;
                case ('T'):
                        if ( ! toptions(&curp, optarg))

-                               return(EXIT_FAILURE);
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                case ('W'):
                        break;
                case ('W'):

-                       if ( ! woptions(&curp.wflags, optarg))
-                               return(EXIT_FAILURE);
+                       if ( ! woptions(&curp, optarg))
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                case ('V'):
                        version();
                        break;
                case ('V'):
                        version();


@@ -243,356 +240,83 @@ main(int argc, char *argv[])
                        /* NOTREACHED */
                }
 
                        /* NOTREACHED */
                }
 

+       curp.mp = mparse_alloc(type, curp.wlevel, mmsg, &curp);
+

        argc -= optind;
        argv += optind;
 
        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) {
 
        while (*argv) {

-               ffile(*argv, &curp);
-
-               if (with_fatal && !(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);
                        break;
                ++argv;
        }
 
        if (curp.outfree)
                (*curp.outfree)(curp.outdata);

-       if (curp.mdoc)
-               mdoc_free(curp.mdoc);
-       if (curp.man)
-               man_free(curp.man);
-       if (curp.roff)
-               roff_free(curp.roff);
-
-       return((with_fatal || with_error) ? 
-                       EXIT_FAILURE :  EXIT_SUCCESS);
-}
+       if (curp.mp)
+               mparse_free(curp.mp);

 
 

+       return((int)rc);
+}

 
 static void
 version(void)
 {
 
 
 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)
 {
 
 static void
 usage(void)
 {
 

-       (void)fprintf(stderr, "usage: %s [-V] [-foption] "
-                       "[-mformat] [-Ooption] [-Toutput] "
-                       "[-Werr] [file...]\n", progname);
-       exit(EXIT_FAILURE);
-}
-
-
-static struct man *
-man_init(struct curparse *curp)
-{
-       int              pflags;
-
-       /* 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->regs, curp, pflags, mmsg));
-}
-
-
-static struct roff *
-roff_init(struct curparse *curp)
-{
-
-       return(roff_alloc(&curp->regs, mmsg, curp));
-}
-
-
-static struct mdoc *
-mdoc_init(struct curparse *curp)
-{
-       int              pflags;
-
-       /* 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->regs, curp, pflags, mmsg));
+       fprintf(stderr, "usage: %s "
+                       "[-V] "
+                       "[-foption] "
+                       "[-mformat] "
+                       "[-Ooption] "
+                       "[-Toutput] "
+                       "[-Werr] "
+                       "[file...]\n", 
+                       progname);
+
+       exit((int)MANDOCLEVEL_BADARG);

 }
 
 }
 

-

 static void
 static void

-ffile(const char *file, struct curparse *curp)
-{
-
-       curp->file = file;
-       if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
-               perror(curp->file);
-               with_fatal = 1;
-               return;
-       }
-
-       fdesc(curp);
-
-       if (-1 == close(curp->fd))
-               perror(curp->file);
-}
-
-
-static int
-resize_buf(struct buf *buf, size_t initial)
-{
-       void *tmp;
-       size_t sz;
-
-       if (buf->sz == 0)
-               sz = initial;
-       else
-               sz = 2 * buf->sz;
-       tmp = realloc(buf->buf, sz);
-       if (NULL == tmp) {
-               perror(NULL);
-               return(0);
-       }
-       buf->buf = tmp;
-       buf->sz = sz;
-       return(1);
-}
-
-
-static int
-read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
+parse(struct curparse *curp, int fd, 
+               const char *file, enum mandoclevel *level)

 {
 {

-       struct stat      st;
-       size_t           off;
-       ssize_t          ssz;
-
-       if (-1 == fstat(curp->fd, &st)) {
-               perror(curp->file);
-               with_fatal = 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.
-        */
-
-       if (S_ISREG(st.st_mode)) {
-               if (st.st_size >= (1U << 31)) {
-                       fprintf(stderr, "%s: input too large\n", 
-                                       curp->file);
-                       with_fatal = 1;
-                       return(0);
-               }
-               *with_mmap = 1;
-               fb->sz = (size_t)st.st_size;
-               fb->buf = mmap(NULL, fb->sz, PROT_READ, 
-                               MAP_FILE|MAP_SHARED, curp->fd, 0);
-               if (fb->buf != MAP_FAILED)
-                       return(1);
-       }
-
-       /*
-        * 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 (! resize_buf(fb, 65536))
-                               break;
-               }
-               ssz = read(curp->fd, fb->buf + (int)off, fb->sz - off);
-               if (ssz == 0) {
-                       fb->sz = off;
-                       return(1);
-               }
-               if (ssz == -1) {
-                       perror(curp->file);
-                       break;
-               }
-               off += (size_t)ssz;
-       }
+       enum mandoclevel  rc;
+       struct mdoc      *mdoc;
+       struct man       *man;

 
 

-       free(fb->buf);
-       fb->buf = NULL;
-       with_fatal = 1;
-       return(0);
-}
+       /* Begin by parsing the file itself. */

 
 

+       assert(file);
+       assert(fd >= -1);

 
 

-static void
-fdesc(struct curparse *curp)
-{
-       struct buf       ln, blk;
-       int              i, pos, lnn, lnn_start, with_mmap, of;
-       enum rofferr     re;
-       struct man      *man;
-       struct mdoc     *mdoc;
-       struct roff     *roff;
+       rc = mparse_readfd(curp->mp, fd, file);

 
 

-       man = NULL;
-       mdoc = NULL;
-       roff = NULL;
+       /* Stop immediately if the parse has failed. */

 
 

-       memset(&ln, 0, sizeof(struct buf));
+       if (MANDOCLEVEL_FATAL <= rc)
+               goto cleanup;

 
        /*
 
        /*

-        * Two buffers: ln and buf.  buf is the input file and may be
-        * memory mapped.  ln is a line buffer and grows on-demand.
+        * With -Wstop and warnings or errors of at least the requested
+        * level, do not produce output.

         */
 
         */
 

-       if ( ! read_whole_file(curp, &blk, &with_mmap))
-               return;
-
-       if (NULL == curp->roff) 
-               curp->roff = roff_init(curp);
-       if (NULL == (roff = curp->roff))
-               goto bailout;
-
-       for (i = 0, lnn = 1; i < (int)blk.sz;) {
-               pos = 0;
-               lnn_start = lnn;
-               while (i < (int)blk.sz) {
-                       if ('\n' == blk.buf[i]) {
-                               ++i;
-                               ++lnn;
-                               break;
-                       }
-                       /* Trailing backslash is like a plain character. */
-                       if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
-                               if (pos >= (int)ln.sz)
-                                       if (! resize_buf(&ln, 256))
-                                               goto bailout;
-                               ln.buf[pos++] = blk.buf[i++];
-                               continue;
-                       }
-                       /* Found an escape and at least one other character. */
-                       if ('\n' == blk.buf[i + 1]) {
-                               /* Escaped newlines are skipped over */
-                               i += 2;
-                               ++lnn;
-                               continue;
-                       }
-                       if ('"' == blk.buf[i + 1]) {
-                               i += 2;
-                               /* Comment, skip to end of line */
-                               for (; i < (int)blk.sz; ++i) {
-                                       if ('\n' == blk.buf[i]) {
-                                               ++i;
-                                               ++lnn;
-                                               break;
-                                       }
-                               }
-                               /* Backout trailing whitespaces */
-                               for (; pos > 0; --pos) {
-                                       if (ln.buf[pos - 1] != ' ')
-                                               break;
-                                       if (pos > 2 && ln.buf[pos - 2] == '\\')
-                                               break;
-                               }
-                               break;
-                       }
-                       /* Some other escape sequence, copy and continue. */
-                       if (pos + 1 >= (int)ln.sz)
-                               if (! resize_buf(&ln, 256))
-                                       goto bailout;
-
-                       ln.buf[pos++] = blk.buf[i++];
-                       ln.buf[pos++] = blk.buf[i++];
-               }
-
-               if (pos >= (int)ln.sz)
-                       if (! resize_buf(&ln, 256))
-                               goto bailout;
-               ln.buf[pos] = '\0';
-
-               /*
-                * A significant amount of complexity is contained by
-                * the roff preprocessor.  It's line-oriented but can be
-                * expressed on one line, so we need at times to
-                * readjust our starting point and re-run it.  The roff
-                * preprocessor can also readjust the buffers with new
-                * data, so we pass them in wholesale.
-                */
-
-               of = 0;
-               do {
-                       re = roff_parseln(roff, lnn_start, 
-                                       &ln.buf, &ln.sz, of, &of);
-               } while (ROFF_RERUN == re);
-
-               if (ROFF_IGN == re)
-                       continue;
-               else if (ROFF_ERR == re)
-                       goto bailout;
-
-               /*
-                * If input parsers have not been allocated, do so now.
-                * We keep these instanced betwen parsers, but set them
-                * locally per parse routine since we can use different
-                * parsers with each one.
-                */
-
-               if ( ! (man || mdoc))
-                       if ( ! pset(ln.buf + of, pos - of, curp, &man, &mdoc))
-                               goto bailout;
-
-               /* Lastly, push down into the parsers themselves. */
-
-               if (man && ! man_parseln(man, lnn_start, ln.buf, of))
-                       goto bailout;
-               if (mdoc && ! mdoc_parseln(mdoc, lnn_start, ln.buf, of))
-                       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;
-       }
-
-       /* Clean up the parse routine ASTs. */
-
-       if (mdoc && ! mdoc_endparse(mdoc))
-               goto bailout;
-       if (man && ! man_endparse(man))
-               goto bailout;
-       if (roff && ! roff_endparse(roff))
-               goto bailout;
+       if (MANDOCLEVEL_OK != rc && curp->wstop)
+               goto cleanup;

 
        /* If unset, allocate output dev now (if applicable). */
 
 
        /* If unset, allocate output dev now (if applicable). */
 


@@ -608,9 +332,13 @@ fdesc(struct curparse *curp)
                        curp->outdata = ascii_alloc(curp->outopts);
                        curp->outfree = ascii_free;
                        break;
                        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);
                case (OUTT_PS):
                        curp->outdata = ps_alloc(curp->outopts);

-                       curp->outfree = ps_free;
+                       curp->outfree = pspdf_free;

                        break;
                default:
                        break;
                        break;
                default:
                        break;


@@ -628,6 +356,8 @@ fdesc(struct curparse *curp)
                        curp->outman = tree_man;
                        curp->outmdoc = tree_mdoc;
                        break;
                        curp->outman = tree_man;
                        curp->outmdoc = tree_mdoc;
                        break;

+               case (OUTT_PDF):
+                       /* FALLTHROUGH */

                case (OUTT_ASCII):
                        /* FALLTHROUGH */
                case (OUTT_PS):
                case (OUTT_ASCII):
                        /* FALLTHROUGH */
                case (OUTT_PS):


@@ -639,6 +369,8 @@ fdesc(struct curparse *curp)
                }
        }
 
                }
        }
 

+       mparse_result(curp->mp, &mdoc, &man);
+

        /* Execute the out device, if it exists. */
 
        if (man && curp->outman)
        /* Execute the out device, if it exists. */
 
        if (man && curp->outman)


@@ -647,93 +379,23 @@ fdesc(struct curparse *curp)
                (*curp->outmdoc)(curp->outdata, mdoc);
 
  cleanup:
                (*curp->outmdoc)(curp->outdata, mdoc);
 
  cleanup:

-       memset(&curp->regs, 0, sizeof(struct regset));
-       if (mdoc)
-               mdoc_reset(mdoc);
-       if (man)
-               man_reset(man);
-       if (roff)
-               roff_reset(roff);
-       if (ln.buf)
-               free(ln.buf);
-       if (with_mmap)
-               munmap(blk.buf, blk.sz);
-       else
-               free(blk.buf);
-
-       return;
-
- bailout:
-       with_fatal = 1;
-       goto cleanup;
-}
-
-
-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] || '\'' == 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);
-       } 
+       mparse_reset(curp->mp);

 
 

-       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
 static int

-moptions(enum intt *tflags, char *arg)
+moptions(enum mparset *tflags, char *arg)

 {
 
        if (0 == strcmp(arg, "doc"))
 {
 
        if (0 == strcmp(arg, "doc"))

-               *tflags = INTT_MDOC;
+               *tflags = MPARSE_MDOC;

        else if (0 == strcmp(arg, "andoc"))
        else if (0 == strcmp(arg, "andoc"))

-               *tflags = INTT_AUTO;
+               *tflags = MPARSE_AUTO;

        else if (0 == strcmp(arg, "an"))
        else if (0 == strcmp(arg, "an"))

-               *tflags = INTT_MAN;
+               *tflags = MPARSE_MAN;

        else {
                fprintf(stderr, "%s: Bad argument\n", arg);
                return(0);
        else {
                fprintf(stderr, "%s: Bad argument\n", arg);
                return(0);


@@ -742,7 +404,6 @@ moptions(enum intt *tflags, char *arg)
        return(1);
 }
 
        return(1);
 }
 

-

 static int
 toptions(struct curparse *curp, char *arg)
 {
 static int
 toptions(struct curparse *curp, char *arg)
 {


@@ -751,10 +412,8 @@ toptions(struct curparse *curp, char *arg)
                curp->outtype = OUTT_ASCII;
        else if (0 == strcmp(arg, "lint")) {
                curp->outtype = 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"))
+               curp->wlevel  = MANDOCLEVEL_WARNING;
+       } else if (0 == strcmp(arg, "tree"))

                curp->outtype = OUTT_TREE;
        else if (0 == strcmp(arg, "html"))
                curp->outtype = OUTT_HTML;
                curp->outtype = OUTT_TREE;
        else if (0 == strcmp(arg, "html"))
                curp->outtype = OUTT_HTML;


@@ -762,6 +421,8 @@ toptions(struct curparse *curp, char *arg)
                curp->outtype = OUTT_XHTML;
        else if (0 == strcmp(arg, "ps"))
                curp->outtype = OUTT_PS;
                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);
        else {
                fprintf(stderr, "%s: Bad argument\n", arg);
                return(0);


@@ -770,44 +431,38 @@ toptions(struct curparse *curp, char *arg)
        return(1);
 }
 
        return(1);
 }
 

-

 static int
 static int

-foptions(int *fflags, char *arg)
+woptions(struct curparse *curp, char *arg)

 {
        char            *v, *o;
 {
        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):
 
        while (*arg) {
                o = arg;
                switch (getsubopt(&arg, UNCONST(toks), &v)) {
                case (0):

-                       *fflags |= FL_IGN_SCOPE;
+                       curp->wstop = 1;

                        break;
                case (1):
                        break;
                case (1):

-                       *fflags |= FL_NIGN_ESCAPE;
-                       break;
+                       /* FALLTHROUGH */

                case (2):
                case (2):

-                       *fflags |= FL_NIGN_MACRO;
+                       curp->wlevel = MANDOCLEVEL_WARNING;

                        break;
                case (3):
                        break;
                case (3):

-                       *fflags |= FL_IGN_ERRORS;
+                       curp->wlevel = MANDOCLEVEL_ERROR;

                        break;
                case (4):
                        break;
                case (4):

-                       *fflags |= FL_STRICT;
-                       break;
-               case (5):
-                       *fflags &= ~FL_NIGN_ESCAPE;
+                       curp->wlevel = MANDOCLEVEL_FATAL;

                        break;
                default:
                        break;
                default:

-                       fprintf(stderr, "%s: Bad argument\n", o);
+                       fprintf(stderr, "-W%s: Bad argument\n", o);

                        return(0);
                }
        }
                        return(0);
                }
        }


@@ -815,71 +470,17 @@ foptions(int *fflags, char *arg)
        return(1);
 }
 
        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]; 
-
-       toks[0] = "all";
-       toks[1] = "error";
-       toks[2] = NULL;

 
 

-       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);
-               }
-       }
+       fprintf(stderr, "%s:%d:%d: %s: %s", 
+                       file, line, col + 1, 
+                       mandoclevels[lvl], mandocerrs[t]);

 
 

-       return(1);
-}
-
-
-static int
-mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg)
-{
-       struct curparse *cp;
-       const char *level;
-       int rc;
-
-       cp = (struct curparse *)arg;
-       level = NULL;
-       rc = 1;
-
-       if (t >= MANDOCERR_FATAL) {
-               with_fatal = 1;
-               level = "FATAL";
-               rc = 0;
-       } else {
-               if ( ! (WARN_WALL & cp->wflags))
-                       return(1);
-               if (t >= MANDOCERR_ERROR) {
-                       with_error = 1;
-                       level = "ERROR";
-               }
-               if (WARN_WERR & cp->wflags) {
-                       with_fatal = 1;
-                       rc = 0;
-               }
-       }
-
-       fprintf(stderr, "%s:%d:%d:", cp->file, ln, col + 1);
-       if (level)
-               fprintf(stderr, " %s:", level);
-       fprintf(stderr, " %s", mandocerrs[t]);

        if (msg)
                fprintf(stderr, ": %s", msg);
        if (msg)
                fprintf(stderr, ": %s", msg);

-       fputc('\n', stderr);

 
 

-       return(rc);
+       fputc('\n', stderr);

 }
 }