Ugly fix for `Bl' or `Bd' causing badness when nested in `Bl -hang' lists.

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index b0b5561a1cc15a3933b86e99b1a53c479d006547..26988773e7bf647641613f7338ba8750fd7e60e9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,20 +1,18 @@
-/* $Id: main.c,v 1.16 2009/03/25 21:46:24 kristaps Exp $ */
+/*     $Id: main.c,v 1.38 2009/07/07 09:52:08 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * 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 <sys/stat.h>
 


@@ -42,26 +40,18 @@ extern      int               getsubopt(char **, char * const *, char **);
 # endif
 #endif
 
 # endif
 #endif
 

+typedef        int             (*out_mdoc)(void *, const struct mdoc *);
+typedef        int             (*out_man)(void *, const struct man *);
+typedef        void            (*out_free)(void *);
+

 struct buf {
        char             *buf;
        size_t            sz;
 };
 
 struct buf {
        char             *buf;
        size_t            sz;
 };
 

-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. */
-};
-
-#define        IGN_SCOPE        (1 << 0)       /* Ignore scope errors. */
-#define        IGN_ESCAPE       (1 << 1)       /* Ignore bad escapes. */
-#define        IGN_MACRO        (1 << 2)       /* Ignore unknown macros. */
-

 enum   intt {
 enum   intt {

-       INTT_MDOC = 0,
+       INTT_AUTO,
+       INTT_MDOC,

        INTT_MAN
 };
 
        INTT_MAN
 };
 


@@ -71,17 +61,34 @@ enum        outt {
        OUTT_LINT
 };
 
        OUTT_LINT
 };
 

-typedef        int             (*out_run)(void *, const struct man *,
-                               const struct mdoc *);
-typedef        void            (*out_free)(void *);
-
-extern char             *__progname;
+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        IGN_SCOPE        (1 << 0)       /* Ignore scope errors. */
+#define        NO_IGN_ESCAPE    (1 << 1)       /* Don't ignore bad escapes. */
+#define        NO_IGN_MACRO     (1 << 2)       /* Don't ignore bad macros. */
+#define        NO_IGN_CHARS     (1 << 3)       /* Don't ignore bad chars. */
+       enum intt         inttype;      /* Input parsers... */
+       struct man       *man;
+       struct man       *lastman;
+       struct mdoc      *mdoc;
+       struct mdoc      *lastmdoc;
+       enum outt         outtype;      /* Output devices... */
+       out_mdoc          outmdoc;
+       out_man           outman;
+       out_free          outfree;
+       void             *outdata;
+};

 
 extern void             *ascii_alloc(void);
 
 extern void             *ascii_alloc(void);

-extern int               terminal_run(void *, const struct man *, 
-                               const struct mdoc *);
-extern int               tree_run(void *, const struct man *,
-                               const struct mdoc *);
+extern int               tree_mdoc(void *, const struct mdoc *);
+extern int               tree_man(void *, const struct man *);
+extern int               terminal_mdoc(void *, const struct mdoc *);
+extern int               terminal_man(void *, const struct man *);

 extern void              terminal_free(void *);
 
 static int               foptions(int *, char *);
 extern void              terminal_free(void *);
 
 static int               foptions(int *, char *);


@@ -89,59 +96,51 @@ static      int               toptions(enum outt *, char *);
 static int               moptions(enum intt *, char *);
 static int               woptions(int *, char *);
 static int               merr(void *, int, int, const char *);
 static int               moptions(enum intt *, char *);
 static int               woptions(int *, char *);
 static int               merr(void *, int, int, const char *);

-static int               manwarn(void *, int, int, const char *);
-static int               mdocwarn(void *, int, int, 
-                               enum mdoc_warn, const char *);
-static int               file(struct buf *, struct buf *, 
-                               const char *, 
-                               struct man *, struct mdoc *);
+static int               mwarn(void *, int, int, const char *);
+static int               ffile(struct buf *, struct buf *, 
+                               const char *, struct curparse *);

 static int               fdesc(struct buf *, struct buf *,
 static int               fdesc(struct buf *, struct buf *,

-                               const char *, int, 
-                               struct man *, struct mdoc *);
+                               struct curparse *);
+static int               pset(const char *, int, struct curparse *,
+                               struct man **, struct mdoc **);
+static struct man       *man_init(struct curparse *);
+static struct mdoc      *mdoc_init(struct curparse *);

 __dead static void       version(void);
 __dead static void       usage(void);
 
 __dead static void       version(void);
 __dead static void       usage(void);
 

+extern char             *__progname;
+

 
 int
 main(int argc, char *argv[])
 {
 
 int
 main(int argc, char *argv[])
 {

-       int              c, rc, fflags, pflags;
-       struct mdoc_cb   mdoccb;
-       struct man_cb    mancb;
-       struct man      *man;
-       struct mdoc     *mdoc;
-       void            *outdata;
-       enum outt        outtype;
-       enum intt        inttype;
+       int              c, rc;

        struct buf       ln, blk;
        struct buf       ln, blk;

-       out_run          outrun;
-       out_free         outfree;

        struct curparse  curp;
 
        struct curparse  curp;
 

-       fflags = 0;
-       outtype = OUTT_ASCII;
-       inttype = INTT_MDOC;
-

        bzero(&curp, sizeof(struct curparse));
 
        bzero(&curp, sizeof(struct curparse));
 

+       curp.inttype = INTT_AUTO;
+       curp.outtype = OUTT_ASCII;
+

        /* LINTED */
        while (-1 != (c = getopt(argc, argv, "f:m:VW:T:")))
                switch (c) {
                case ('f'):
        /* LINTED */
        while (-1 != (c = getopt(argc, argv, "f:m:VW:T:")))
                switch (c) {
                case ('f'):

-                       if ( ! foptions(&fflags, optarg))
-                               return(0);
+                       if ( ! foptions(&curp.fflags, optarg))
+                               return(EXIT_FAILURE);

                        break;
                case ('m'):
                        break;
                case ('m'):

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

                        break;
                case ('T'):
                        break;
                case ('T'):

-                       if ( ! toptions(&outtype, optarg))
-                               return(0);
+                       if ( ! toptions(&curp.outtype, optarg))
+                               return(EXIT_FAILURE);

                        break;
                case ('W'):
                        if ( ! woptions(&curp.wflags, optarg))
                        break;
                case ('W'):
                        if ( ! woptions(&curp.wflags, optarg))

-                               return(0);
+                               return(EXIT_FAILURE);

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


@@ -154,115 +153,44 @@ main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

-       /*
-        * Allocate the appropriate front-end.  Note that utf8, latin1
-        * (both not yet implemented) and ascii all resolve to the
-        * terminal front-end with different encodings (see terminal.c).
-        * Not all frontends have cleanup or alloc routines.
-        */
-
-       switch (outtype) {
-       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;
-       }
-
-       /*
-        * All callbacks route into here, where we print them onto the
-        * screen.  XXX - for now, no path for debugging messages.
-        */
-
-       mdoccb.mdoc_msg = NULL;
-       mdoccb.mdoc_err = merr;
-       mdoccb.mdoc_warn = mdocwarn;
-
-       mancb.man_err = merr;
-       mancb.man_warn = manwarn;
-
-       /* Configure buffers. */
-

        bzero(&ln, sizeof(struct buf));
        bzero(&blk, sizeof(struct buf));
 
        bzero(&ln, sizeof(struct buf));
        bzero(&blk, sizeof(struct buf));
 

-       man = NULL;
-       mdoc = NULL;
-       pflags = 0;
-
-       /*
-        * Allocate the parser.  There are two kinds of parser: libman
-        * and libmdoc.  We must separately copy over the flags that
-        * we'll use internally.
-        */
-
-       switch (inttype) {
-       case (INTT_MAN):
-               if (fflags & IGN_MACRO)
-                       pflags |= MAN_IGN_MACRO;
-               man = man_alloc(&curp, pflags, &mancb);
-               break;
-       default:
-               if (fflags & IGN_SCOPE)
-                       pflags |= MDOC_IGN_SCOPE;
-               if (fflags & IGN_ESCAPE)
-                       pflags |= MDOC_IGN_ESCAPE;
-               if (fflags & IGN_MACRO)
-                       pflags |= MDOC_IGN_MACRO;
-               mdoc = mdoc_alloc(&curp, pflags, &mdoccb);
-               break;
-       }
-
-       /*
-        * Main loop around available files.
-        */
+       rc = 1;

 
        if (NULL == *argv) {
                curp.file = "<stdin>";
 
        if (NULL == *argv) {
                curp.file = "<stdin>";

-               rc = 0;
-               c = fdesc(&blk, &ln, "stdin", STDIN_FILENO, man, mdoc);
-
-               if (c && NULL == outrun)
-                       rc = 1;
-               else if (c && outrun && (*outrun)(outdata, man, mdoc))
-                       rc = 1;
-       } else {
-               while (*argv) {
-                       curp.file = *argv;
-                       c = file(&blk, &ln, *argv, man, mdoc);
-                       if ( ! c)
-                               break;
-                       if (outrun && ! (*outrun)(outdata, man, mdoc))
-                               break;
-                       if (man)
-                               man_reset(man);
-                       if (mdoc)
-                               mdoc_reset(mdoc);
-                       argv++;
+               curp.fd = STDIN_FILENO;
+               if ( ! fdesc(&blk, &ln, &curp))
+                       rc = 0;
+       }
+
+       while (rc && *argv) {
+               if ( ! ffile(&blk, &ln, *argv, &curp))
+                       rc = 0;
+               argv++;
+               if (*argv && rc) {
+                       if (curp.lastman)
+                               if ( ! man_reset(curp.lastman))
+                                       rc = 0;
+                       if (curp.lastmdoc)
+                               if ( ! mdoc_reset(curp.lastmdoc))
+                                       rc = 0;
+                       curp.lastman = NULL;
+                       curp.lastmdoc = NULL;

                }
                }

-               rc = NULL == *argv;

        }
 
        if (blk.buf)
                free(blk.buf);
        if (ln.buf)
                free(ln.buf);
        }
 
        if (blk.buf)
                free(blk.buf);
        if (ln.buf)
                free(ln.buf);

-       if (outfree)
-               (*outfree)(outdata);
-       if (mdoc)
-               mdoc_free(mdoc);
-       if (man)
-               man_free(man);
+       if (curp.outfree)
+               (*curp.outfree)(curp.outdata);
+       if (curp.mdoc)
+               mdoc_free(curp.mdoc);
+       if (curp.man)
+               man_free(curp.man);

 
        return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
        return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
 }


@@ -273,8 +201,7 @@ version(void)
 {
 
        (void)printf("%s %s\n", __progname, VERSION);
 {
 
        (void)printf("%s %s\n", __progname, VERSION);

-       exit(0);
-       /* NOTREACHED */
+       exit(EXIT_SUCCESS);

 }
 
 
 }
 
 


@@ -285,94 +212,173 @@ usage(void)
        (void)fprintf(stderr, "usage: %s [-V] [-foption...] "
                        "[-mformat] [-Toutput] [-Werr...]\n", 
                        __progname);
        (void)fprintf(stderr, "usage: %s [-V] [-foption...] "
                        "[-mformat] [-Toutput] [-Werr...]\n", 
                        __progname);

-       exit(1);
-       /* NOTREACHED */
+       exit(EXIT_FAILURE);
+}
+
+
+static struct man *
+man_init(struct curparse *curp)
+{
+       int              pflags;
+       struct man      *man;
+       struct man_cb    mancb;
+
+       mancb.man_err = merr;
+       mancb.man_warn = mwarn;
+
+       /* Defaults from mandoc.1. */
+
+       pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS;
+
+       if (curp->fflags & NO_IGN_MACRO)
+               pflags &= ~MAN_IGN_MACRO;
+       if (curp->fflags & NO_IGN_CHARS)
+               pflags &= ~MAN_IGN_CHARS;
+       if (curp->fflags & NO_IGN_ESCAPE)
+               pflags &= ~MAN_IGN_ESCAPE;
+
+       if (NULL == (man = man_alloc(curp, pflags, &mancb)))
+               warnx("memory exhausted");
+
+       return(man);
+}
+
+
+static struct mdoc *
+mdoc_init(struct curparse *curp)
+{
+       int              pflags;
+       struct mdoc     *mdoc;
+       struct mdoc_cb   mdoccb;
+
+       mdoccb.mdoc_err = merr;
+       mdoccb.mdoc_warn = mwarn;
+
+       /* Defaults from mandoc.1. */
+
+       pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS;
+
+       if (curp->fflags & IGN_SCOPE)
+               pflags |= MDOC_IGN_SCOPE;
+       if (curp->fflags & NO_IGN_ESCAPE)
+               pflags &= ~MDOC_IGN_ESCAPE;
+       if (curp->fflags & NO_IGN_MACRO)
+               pflags &= ~MDOC_IGN_MACRO;
+       if (curp->fflags & NO_IGN_CHARS)
+               pflags &= ~MDOC_IGN_CHARS;
+
+       if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb)))
+               warnx("memory exhausted");
+
+       return(mdoc);

 }
 
 
 static int
 }
 
 
 static int

-file(struct buf *blk, struct buf *ln, const char *file, 
-               struct man *man, struct mdoc *mdoc)
+ffile(struct buf *blk, struct buf *ln, 
+               const char *file, struct curparse *curp)

 {
 {

-       int              fd, c;
+       int              c;

 
 

-       if (-1 == (fd = open(file, O_RDONLY, 0))) {
-               warn("%s", file);
+       curp->file = file;
+       if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
+               warn("%s", curp->file);

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

-       c = fdesc(blk, ln, file, fd, man, mdoc);
+       c = fdesc(blk, ln, curp);

 
 

-       if (-1 == close(fd))
-               warn("%s", file);
+       if (-1 == close(curp->fd))
+               warn("%s", curp->file);

 
        return(c);
 }
 
 
 static int
 
        return(c);
 }
 
 
 static int

-fdesc(struct buf *blk, struct buf *ln,
-               const char *f, int fd, 
-               struct man *man, struct mdoc *mdoc)
+fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)

 {
        size_t           sz;
        ssize_t          ssz;
        struct stat      st;
 {
        size_t           sz;
        ssize_t          ssz;
        struct stat      st;

-       int              j, i, pos, lnn;
+       int              j, i, pos, lnn, comment;
+       struct man      *man;
+       struct mdoc     *mdoc;

 
 

-       assert( ! (man && mdoc));
+       sz = BUFSIZ;
+       man = NULL;
+       mdoc = NULL;

 
        /*
 
        /*

-        * Two buffers: ln and buf.  buf is the input buffer, optimised
-        * for each file's block size.  ln is a line buffer.  Both
+        * 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.
         */
 
         * growable, hence passed in by ptr-ptr.
         */
 

-       sz = BUFSIZ;
-
-       if (-1 == fstat(fd, &st))
-               warnx("%s", f);
+       if (-1 == fstat(curp->fd, &st))
+               warn("%s", curp->file);

        else if ((size_t)st.st_blksize > sz)
                sz = st.st_blksize;
 
        if (sz > blk->sz) {
                blk->buf = realloc(blk->buf, sz);
        else if ((size_t)st.st_blksize > sz)
                sz = st.st_blksize;
 
        if (sz > blk->sz) {
                blk->buf = realloc(blk->buf, sz);

-               if (NULL == blk->buf)
-                       err(1, "realloc");
+               if (NULL == blk->buf) {
+                       warn("realloc");
+                       return(0);
+               }

                blk->sz = sz;
        }
 
                blk->sz = sz;
        }
 

-       /*
-        * Fill buf with file blocksize and parse newlines into ln.
-        */
+       /* Fill buf with file blocksize. */

 
 

-       for (lnn = 1, pos = 0; ; ) {
-               if (-1 == (ssz = read(fd, blk->buf, sz))) {
-                       warn("%s", f);
+       for (lnn = pos = comment = 0; ; ) {
+               if (-1 == (ssz = read(curp->fd, blk->buf, sz))) {
+                       warn("%s", curp->file);

                        return(0);
                } else if (0 == ssz) 
                        break;
 
                        return(0);
                } else if (0 == ssz) 
                        break;
 

+               /* Parse the read block into partial or full lines. */
+

                for (i = 0; i < (int)ssz; i++) {
                        if (pos >= (int)ln->sz) {
                                ln->sz += 256; /* Step-size. */
                                ln->buf = realloc(ln->buf, ln->sz);
                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");
+                               if (NULL == ln->buf) {
+                                       warn("realloc");
+                                       return(0);
+                               }

                        }
 
                        if ('\n' != blk->buf[i]) {
                        }
 
                        if ('\n' != blk->buf[i]) {

+                               if (comment)
+                                       continue;

                                ln->buf[pos++] = blk->buf[i];
                                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;

                                continue;
                                continue;

-                       }
+                       } 

 
 

-                       /* Check for CPP-escaped newline.  */
+                       /* Handle escaped `\\n' newlines. */

 
 

-                       if (pos > 0 && '\\' == ln->buf[pos - 1]) {
+                       if (pos > 0 && 0 == comment && 
+                                       '\\' == ln->buf[pos - 1]) {

                                for (j = pos - 1; j >= 0; j--)
                                        if ('\\' != ln->buf[j])
                                                break;
                                for (j = pos - 1; j >= 0; j--)
                                        if ('\\' != ln->buf[j])
                                                break;

-

                                if ( ! ((pos - j) % 2)) {
                                        pos--;
                                        lnn++;
                                if ( ! ((pos - j) % 2)) {
                                        pos--;
                                        lnn++;


@@ -381,19 +387,125 @@ fdesc(struct buf *blk, struct buf *ln,
                        }
 
                        ln->buf[pos] = 0;
                        }
 
                        ln->buf[pos] = 0;

-                       if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf))
+                       lnn++;
+
+                       /* If unset, assign parser in pset(). */
+
+                       if ( ! (man || mdoc) && ! pset(ln->buf, 
+                                               pos, curp, &man, &mdoc))

                                return(0);
                                return(0);

+
+                       pos = comment = 0;
+
+                       /* Pass down into parsers. */
+

                        if (man && ! man_parseln(man, lnn, ln->buf))
                                return(0);
                        if (man && ! man_parseln(man, lnn, ln->buf))
                                return(0);

-                       lnn++;
-                       pos = 0;
+                       if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf))
+                               return(0);
+               }
+       }
+
+       /* NOTE a parser may not have been assigned, yet. */
+
+       if ( ! (man || mdoc)) {
+               warnx("%s: not a manual", curp->file);
+               return(0);
+       }
+
+       if (mdoc && ! mdoc_endparse(mdoc))
+               return(0);
+       if (man && ! man_endparse(man))
+               return(0);
+
+       /* If unset, allocate output dev now (if applicable). */
+
+       if ( ! (curp->outman && curp->outmdoc)) {
+               switch (curp->outtype) {
+               case (OUTT_TREE):
+                       curp->outman = tree_man;
+                       curp->outmdoc = tree_mdoc;
+                       break;
+               case (OUTT_LINT):
+                       break;
+               default:
+                       curp->outdata = ascii_alloc();
+                       curp->outman = terminal_man;
+                       curp->outmdoc = terminal_mdoc;
+                       curp->outfree = terminal_free;
+                       break;

                }
        }
 
                }
        }
 

-       if (mdoc)
-              return(mdoc_endparse(mdoc));
+       /* Execute the out device, if it exists. */
+
+       if (man && curp->outman)
+               if ( ! (*curp->outman)(curp->outdata, man))
+                       return(0);
+       if (mdoc && curp->outmdoc)
+               if ( ! (*curp->outmdoc)(curp->outdata, mdoc))
+                       return(0);

 
 

-       return(man_endparse(man));
+       return(1);
+}
+
+
+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);
+               curp->lastmdoc = *mdoc;
+               return(1);
+       case (INTT_MAN):
+               if (NULL == curp->man) 
+                       curp->man = man_init(curp);
+               if (NULL == (*man = curp->man))
+                       return(0);
+               curp->lastman = *man;
+               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);
+               curp->lastmdoc = *mdoc;
+               return(1);
+       } 
+
+       if (NULL == curp->man) 
+               curp->man = man_init(curp);
+       if (NULL == (*man = curp->man))
+               return(0);
+       curp->lastman = *man;
+       return(1);

 }
 
 
 }
 
 


@@ -401,9 +513,11 @@ static int
 moptions(enum intt *tflags, char *arg)
 {
 
 moptions(enum intt *tflags, char *arg)
 {
 

-       if (0 == strcmp(arg, "mdoc"))
+       if (0 == strcmp(arg, "doc"))

                *tflags = INTT_MDOC;
                *tflags = INTT_MDOC;

-       else if (0 == strcmp(arg, "man"))
+       else if (0 == strcmp(arg, "andoc"))
+               *tflags = INTT_AUTO;
+       else if (0 == strcmp(arg, "an"))

                *tflags = INTT_MAN;
        else {
                warnx("bad argument: -m%s", arg);
                *tflags = INTT_MAN;
        else {
                warnx("bad argument: -m%s", arg);


@@ -433,75 +547,72 @@ toptions(enum outt *tflags, char *arg)
 }
 
 
 }
 
 

-/*
- * Parse out the options for [-fopt...] setting compiler options.  These
- * can be comma-delimited or called again.
- */

 static int
 foptions(int *fflags, char *arg)
 {
 static int
 foptions(int *fflags, char *arg)
 {

-       char            *v;
-       char            *toks[4];
+       char            *v, *o;
+       char            *toks[6];

 
        toks[0] = "ign-scope";
 
        toks[0] = "ign-scope";

-       toks[1] = "ign-escape";
-       toks[2] = "ign-macro";
-       toks[3] = NULL;
-
-       while (*arg) 
+       toks[1] = "no-ign-escape";
+       toks[2] = "no-ign-macro";
+       toks[3] = "no-ign-chars";
+       toks[4] = "strict";
+       toks[5] = NULL;
+
+       while (*arg) {
+               o = arg;

                switch (getsubopt(&arg, toks, &v)) {
                case (0):
                        *fflags |= IGN_SCOPE;
                        break;
                case (1):
                switch (getsubopt(&arg, toks, &v)) {
                case (0):
                        *fflags |= IGN_SCOPE;
                        break;
                case (1):

-                       *fflags |= IGN_ESCAPE;
+                       *fflags |= NO_IGN_ESCAPE;

                        break;
                case (2):
                        break;
                case (2):

-                       *fflags |= IGN_MACRO;
+                       *fflags |= NO_IGN_MACRO;
+                       break;
+               case (3):
+                       *fflags |= NO_IGN_CHARS;
+                       break;
+               case (4):
+                       *fflags |= NO_IGN_ESCAPE | 
+                                  NO_IGN_MACRO | NO_IGN_CHARS;

                        break;
                default:
                        break;
                default:

-                       warnx("bad argument: -f%s", arg);
+                       warnx("bad argument: -f%s", o);

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

+       }

 
        return(1);
 }
 
 
 
        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)
 {
 static int
 woptions(int *wflags, char *arg)
 {

-       char            *v;
-       char            *toks[5]; 
+       char            *v, *o;
+       char            *toks[3]; 

 
        toks[0] = "all";
 
        toks[0] = "all";

-       toks[1] = "compat";
-       toks[2] = "syntax";
-       toks[3] = "error";
-       toks[4] = NULL;
+       toks[1] = "error";
+       toks[2] = NULL;

 
 

-       while (*arg) 
+       while (*arg) {
+               o = arg;

                switch (getsubopt(&arg, toks, &v)) {
                case (0):
                        *wflags |= WARN_WALL;
                        break;
                case (1):
                switch (getsubopt(&arg, toks, &v)) {
                case (0):
                        *wflags |= WARN_WALL;
                        break;
                case (1):

-                       *wflags |= WARN_WCOMPAT;
-                       break;
-               case (2):
-                       *wflags |= WARN_WSYNTAX;
-                       break;
-               case (3):

                        *wflags |= WARN_WERR;
                        break;
                default:
                        *wflags |= WARN_WERR;
                        break;
                default:

-                       warnx("bad argument: -W%s", arg);
+                       warnx("bad argument: -W%s", o);

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

+       }

 
        return(1);
 }
 
        return(1);
 }


@@ -517,63 +628,28 @@ merr(void *arg, int line, int col, const char *msg)
 
        warnx("%s:%d: error: %s (column %d)", 
                        curp->file, line, msg, col);
 
        warnx("%s:%d: error: %s (column %d)", 
                        curp->file, line, msg, col);

-       return(0);
-}

 
 

-
-static int
-mdocwarn(void *arg, int line, int col, 
-               enum mdoc_warn type, const char *msg)
-{
-       struct curparse *curp;
-       char            *wtype;
-
-       curp = (struct curparse *)arg;
-       wtype = NULL;
-
-       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);
-       }
-
-       assert(wtype);
-       warnx("%s:%d: %s warning: %s (column %d)", 
-                       curp->file, line, wtype, msg, col);
-
-       if ( ! (curp->wflags & WARN_WERR))
-               return(1);
-
-       warnx("%s: considering warnings as errors", 
-                       __progname);

        return(0);
 }
 
 
 static int
        return(0);
 }
 
 
 static int

-manwarn(void *arg, int line, int col, const char *msg)
+mwarn(void *arg, int line, int col, const char *msg)

 {
        struct curparse *curp;
 
        curp = (struct curparse *)arg;
 
 {
        struct curparse *curp;
 
        curp = (struct curparse *)arg;
 

-       if ( ! (curp->wflags & WARN_WSYNTAX))
+       if ( ! (curp->wflags & WARN_WALL))

                return(1);
 
                return(1);
 

-       warnx("%s:%d: syntax warning: %s (column %d)", 
+       warnx("%s:%d: warning: %s (column %d)", 

                        curp->file, line, msg, col);
 
        if ( ! (curp->wflags & WARN_WERR))
                return(1);
                        curp->file, line, msg, col);
 
        if ( ! (curp->wflags & WARN_WERR))
                return(1);

-
-       warnx("%s: considering warnings as errors", 
-                       __progname);
+       
+       warnx("considering warnings as errors");

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

+