Accent marks sync'd with current groff.

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index e6275b3c644aa0c0ff32e7e848dbfd9306471aeb..523be5129ae6c5d37ad3216ff896348951e50bd7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,20 +1,18 @@
-/* $Id: main.c,v 1.20 2009/04/02 16:37:40 kristaps Exp $ */
+/*     $Id: main.c,v 1.44 2009/09/21 13:06:13 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,6 +40,10 @@ extern       int               getsubopt(char **, char * const *, char **);
 # endif
 #endif
 
 # endif
 #endif
 

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

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


@@ -56,39 +58,44 @@ enum        intt {
 enum   outt {
        OUTT_ASCII = 0,
        OUTT_TREE,
 enum   outt {
        OUTT_ASCII = 0,
        OUTT_TREE,

+       OUTT_HTML,

        OUTT_LINT
 };
 
 struct curparse {
        OUTT_LINT
 };
 
 struct curparse {

-       const char       *file;
-       int               fd;
+       const char       *file;         /* Current parse. */
+       int               fd;           /* Current parse. */

        int               wflags;
        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_WALL        (1 << 0)       /* All-warnings mask. */

 #define        WARN_WERR        (1 << 2)       /* Warnings->errors. */
        int               fflags;
 #define        WARN_WERR        (1 << 2)       /* Warnings->errors. */
        int               fflags;

-       enum intt         inttype;
+#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. */
+#define        IGN_ERRORS       (1 << 4)       /* Ignore failed parse. */
+       enum intt         inttype;      /* Input parsers... */

        struct man       *man;
        struct man       *man;

+       struct man       *lastman;

        struct mdoc      *mdoc;
        struct mdoc      *mdoc;

+       struct mdoc      *lastmdoc;
+       enum outt         outtype;      /* Output devices... */
+       out_mdoc          outmdoc;
+       out_man           outman;
+       out_free          outfree;
+       void             *outdata;
+       char             *outopts;

 };
 
 };
 

-#define        IGN_SCOPE        (1 << 0)       /* Ignore scope errors. */
-#define        IGN_ESCAPE       (1 << 1)       /* Ignore bad escapes. */
-#define        IGN_MACRO        (1 << 2)       /* Ignore unknown macros. */
-#define        NO_IGN_MACRO     (1 << 3) 
-
-typedef        int             (*out_run)(void *, const struct man *,
-                               const struct mdoc *);
-typedef        void            (*out_free)(void *);
-
-extern char             *__progname;
-
+extern void             *html_alloc(char *);
+extern void              html_mdoc(void *, const struct mdoc *);
+extern void              html_man(void *, const struct man *);
+extern void              html_free(void *);

 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 void              tree_mdoc(void *, const struct mdoc *);
+extern void              tree_man(void *, const struct man *);
+extern void              terminal_mdoc(void *, const struct mdoc *);
+extern void              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 *);


@@ -96,58 +103,54 @@ 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               fstdin(struct buf *, struct buf *, 
-                               struct curparse *);
+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 *,
                                struct curparse *);
 static int               ffile(struct buf *, struct buf *, 
                                const char *, struct curparse *);
 static int               fdesc(struct buf *, struct buf *,
                                struct curparse *);

-static int               pset(const char *, size_t, 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);
 
                                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);
 

+extern char             *__progname;
+

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

-       void            *outdata;
-       enum outt        outtype;

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

-       out_run          outrun;
-       out_free         outfree;

        struct curparse  curp;
 
        struct curparse  curp;
 

-       outtype = OUTT_ASCII;
-

        bzero(&curp, sizeof(struct curparse));
 
        curp.inttype = INTT_AUTO;
        bzero(&curp, sizeof(struct curparse));
 
        curp.inttype = INTT_AUTO;

+       curp.outtype = OUTT_ASCII;

 
        /* LINTED */
 
        /* LINTED */

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

                switch (c) {
                case ('f'):
                        if ( ! foptions(&curp.fflags, optarg))
                switch (c) {
                case ('f'):
                        if ( ! foptions(&curp.fflags, optarg))

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

                        break;
                case ('m'):
                        if ( ! moptions(&curp.inttype, optarg))
                        break;
                case ('m'):
                        if ( ! moptions(&curp.inttype, optarg))

-                               return(0);
+                               return(EXIT_FAILURE);
+                       break;
+               case ('o'):
+                       curp.outopts = optarg;

                        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();


@@ -160,72 +163,48 @@ 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;
-       }
-
-       /* Configure buffers. */
-

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

-       /*
-        * Main loop around available files.
-        */
+       rc = 1;

 
        if (NULL == *argv) {
 
        if (NULL == *argv) {

-               rc = 0;
-               c = fstdin(&blk, &ln, &curp);
-
-               if (c && NULL == outrun)
-                       rc = 1;
-               /*else if (c && outrun && (*outrun)(outdata, curp.man, curp.mdoc))
-                       rc = 1;*/
-       } else {
-               while (*argv) {
-                       c = ffile(&blk, &ln, *argv, &curp);
-                       if ( ! c)
-                               break;
-                       /*if (outrun && ! (*outrun)(outdata, curp.man, curp.mdoc))
-                               break;*/
-                       if (curp.man)
-                               man_reset(curp.man);
-                       if (curp.mdoc && ! mdoc_reset(curp.mdoc)) {
-                               warnx("memory exhausted");
-                               break;
-                       }
-                       argv++;
+               curp.file = "<stdin>";
+               curp.fd = STDIN_FILENO;
+
+               c = fdesc(&blk, &ln, &curp);
+               if ( ! (IGN_ERRORS & curp.fflags)) 
+                       rc = 1 == c ? 1 : 0;
+               else
+                       rc = -1 == c ? 0 : 1;
+       }
+
+       while (rc && *argv) {
+               c = ffile(&blk, &ln, *argv, &curp);
+               if ( ! (IGN_ERRORS & curp.fflags)) 
+                       rc = 1 == c ? 1 : 0;
+               else
+                       rc = -1 == c ? 0 : 1;
+
+               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 (curp.outfree)
+               (*curp.outfree)(curp.outdata);

        if (curp.mdoc)
                mdoc_free(curp.mdoc);
        if (curp.man)
        if (curp.mdoc)
                mdoc_free(curp.mdoc);
        if (curp.man)


@@ -263,15 +242,18 @@ man_init(struct curparse *curp)
        struct man_cb    mancb;
 
        mancb.man_err = merr;
        struct man_cb    mancb;
 
        mancb.man_err = merr;

-       mancb.man_warn = manwarn;
+       mancb.man_warn = mwarn;

 
 

-       /* Set command defaults. */
-       pflags = MAN_IGN_MACRO;
+       /* Defaults from mandoc.1. */
+
+       pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS;

 
 

-       if (curp->fflags & IGN_MACRO)
-               pflags |= MAN_IGN_MACRO;

        if (curp->fflags & NO_IGN_MACRO)
                pflags &= ~MAN_IGN_MACRO;
        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");
 
        if (NULL == (man = man_alloc(curp, pflags, &mancb)))
                warnx("memory exhausted");


@@ -287,36 +269,29 @@ mdoc_init(struct curparse *curp)
        struct mdoc     *mdoc;
        struct mdoc_cb   mdoccb;
 
        struct mdoc     *mdoc;
        struct mdoc_cb   mdoccb;
 

-       mdoccb.mdoc_msg = NULL;

        mdoccb.mdoc_err = merr;
        mdoccb.mdoc_err = merr;

-       mdoccb.mdoc_warn = mdocwarn;
+       mdoccb.mdoc_warn = mwarn;
+
+       /* Defaults from mandoc.1. */

 
 

-       pflags = 0;
+       pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS;

 
        if (curp->fflags & IGN_SCOPE)
                pflags |= MDOC_IGN_SCOPE;
 
        if (curp->fflags & IGN_SCOPE)
                pflags |= MDOC_IGN_SCOPE;

-       if (curp->fflags & IGN_ESCAPE)
-               pflags |= MDOC_IGN_ESCAPE;
-       if (curp->fflags & IGN_MACRO)
-               pflags |= MDOC_IGN_MACRO;
+       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)))
 
        if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb)))

-               warnx("memory allocated");
+               warnx("memory exhausted");

 
        return(mdoc);
 }
 
 
 
        return(mdoc);
 }
 
 

-static int
-fstdin(struct buf *blk, struct buf *ln, struct curparse *curp)
-{
-
-       curp->file = "<stdin>";
-       curp->fd = STDIN_FILENO;
-       return(fdesc(blk, ln, curp));
-}
-
-

 static int
 ffile(struct buf *blk, struct buf *ln, 
                const char *file, struct curparse *curp)
 static int
 ffile(struct buf *blk, struct buf *ln, 
                const char *file, struct curparse *curp)


@@ -326,7 +301,7 @@ ffile(struct buf *blk, struct buf *ln,
        curp->file = file;
        if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
                warn("%s", curp->file);
        curp->file = file;
        if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
                warn("%s", curp->file);

-               return(0);
+               return(-1);

        }
 
        c = fdesc(blk, ln, curp);
        }
 
        c = fdesc(blk, ln, curp);


@@ -344,7 +319,7 @@ 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;
 
        struct man      *man;
        struct mdoc     *mdoc;
 


@@ -359,7 +334,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
         */
 
        if (-1 == fstat(curp->fd, &st))
         */
 
        if (-1 == fstat(curp->fd, &st))

-               warnx("%s", curp->file);
+               warn("%s", curp->file);

        else if ((size_t)st.st_blksize > sz)
                sz = st.st_blksize;
 
        else if ((size_t)st.st_blksize > sz)
                sz = st.st_blksize;
 


@@ -367,17 +342,17 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
                blk->buf = realloc(blk->buf, sz);
                if (NULL == blk->buf) {
                        warn("realloc");
                blk->buf = realloc(blk->buf, sz);
                if (NULL == blk->buf) {
                        warn("realloc");

-                       return(0);
+                       return(-1);

                }
                blk->sz = sz;
        }
 
        /* Fill buf with file blocksize. */
 
                }
                blk->sz = sz;
        }
 
        /* Fill buf with file blocksize. */
 

-       for (lnn = 0, pos = 0; ; ) {
+       for (lnn = pos = comment = 0; ; ) {

                if (-1 == (ssz = read(curp->fd, blk->buf, sz))) {
                        warn("%s", curp->file);
                if (-1 == (ssz = read(curp->fd, blk->buf, sz))) {
                        warn("%s", curp->file);

-                       return(0);
+                       return(-1);

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


@@ -389,22 +364,39 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
                                ln->buf = realloc(ln->buf, ln->sz);
                                if (NULL == ln->buf) {
                                        warn("realloc");
                                ln->buf = realloc(ln->buf, ln->sz);
                                if (NULL == ln->buf) {
                                        warn("realloc");

-                                       return(0);
+                                       return(-1);

                                }
                        }
 
                        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++;


@@ -414,19 +406,16 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
 
                        ln->buf[pos] = 0;
                        lnn++;
 
                        ln->buf[pos] = 0;
                        lnn++;

-                       
-                       /*
-                        * If no manual parser has been assigned, then
-                        * try to assign one in pset(), which may do
-                        * nothing at all.  After this, parse the manual
-                        * line accordingly.
-                        */
+
+                       /* If unset, assign parser in pset(). */

 
                        if ( ! (man || mdoc) && ! pset(ln->buf, 
                                                pos, curp, &man, &mdoc))
 
                        if ( ! (man || mdoc) && ! pset(ln->buf, 
                                                pos, curp, &man, &mdoc))

-                               return(0);
+                               return(-1);

 
 

-                       pos = 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);


@@ -435,33 +424,76 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
                }
        }
 
                }
        }
 

-       /* Note that a parser may not have been assigned, yet. */
+       /* NOTE a parser may not have been assigned, yet. */

 
 

-       if (mdoc)
-              return(mdoc_endparse(mdoc));
-       if (man)
-               return(man_endparse(man));
+       if ( ! (man || mdoc)) {
+               (void)fprintf(stderr, "%s: not a manual\n", 
+                               curp->file);
+               return(0);
+       }

 
 

-       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_HTML):
+                       curp->outdata = html_alloc(curp->outopts);
+                       curp->outman = html_man;
+                       curp->outmdoc = html_mdoc;
+                       curp->outfree = html_free;
+                       break;
+               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;
+               }
+       }
+
+       /* Execute the out device, if it exists. */
+
+       if (man && curp->outman)
+               (*curp->outman)(curp->outdata, man);
+       if (mdoc && curp->outmdoc)
+               (*curp->outmdoc)(curp->outdata, mdoc);
+
+       return(1);

 }
 
 
 static int
 }
 
 
 static int

-pset(const char *buf, size_t pos, struct curparse *curp,
+pset(const char *buf, int pos, struct curparse *curp,

                struct man **man, struct mdoc **mdoc)
 {
                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
 
        /*
         * 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 comments, use -mdoc when finding `.Dt', or
+        * line: either skip dot-lines, use -mdoc when finding `.Dt', or

         * default to -man, which is more lenient.
         */
 
         * default to -man, which is more lenient.
         */
 

-       if (pos >= 3 && 0 == memcmp(buf, ".\\\"", 3))
-               return(1);
+       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):
 
        switch (curp->inttype) {
        case (INTT_MDOC):


@@ -469,14 +501,14 @@ pset(const char *buf, size_t pos, struct curparse *curp,
                        curp->mdoc = mdoc_init(curp);
                if (NULL == (*mdoc = curp->mdoc))
                        return(0);
                        curp->mdoc = mdoc_init(curp);
                if (NULL == (*mdoc = curp->mdoc))
                        return(0);

-               warnx("inheriting -mdoc parser");
+               curp->lastmdoc = *mdoc;

                return(1);
        case (INTT_MAN):
                if (NULL == curp->man) 
                        curp->man = man_init(curp);
                if (NULL == (*man = curp->man))
                        return(0);
                return(1);
        case (INTT_MAN):
                if (NULL == curp->man) 
                        curp->man = man_init(curp);
                if (NULL == (*man = curp->man))
                        return(0);

-               warnx("inheriting -man parser");
+               curp->lastman = *man;

                return(1);
        default:
                break;
                return(1);
        default:
                break;


@@ -487,6 +519,7 @@ pset(const char *buf, size_t pos, struct curparse *curp,
                        curp->mdoc = mdoc_init(curp);
                if (NULL == (*mdoc = curp->mdoc))
                        return(0);
                        curp->mdoc = mdoc_init(curp);
                if (NULL == (*mdoc = curp->mdoc))
                        return(0);

+               curp->lastmdoc = *mdoc;

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


@@ -494,6 +527,7 @@ pset(const char *buf, size_t pos, struct curparse *curp,
                curp->man = man_init(curp);
        if (NULL == (*man = curp->man))
                return(0);
                curp->man = man_init(curp);
        if (NULL == (*man = curp->man))
                return(0);

+       curp->lastman = *man;

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


@@ -527,6 +561,8 @@ toptions(enum outt *tflags, char *arg)
                *tflags = OUTT_LINT;
        else if (0 == strcmp(arg, "tree"))
                *tflags = OUTT_TREE;
                *tflags = OUTT_LINT;
        else if (0 == strcmp(arg, "tree"))
                *tflags = OUTT_TREE;

+       else if (0 == strcmp(arg, "html"))
+               *tflags = OUTT_HTML;

        else {
                warnx("bad argument: -T%s", arg);
                return(0);
        else {
                warnx("bad argument: -T%s", arg);
                return(0);


@@ -536,79 +572,76 @@ 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[5];
+       char            *v, *o;
+       char            *toks[7];

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

-       toks[1] = "ign-escape";
-       toks[2] = "ign-macro";
-       toks[4] = "no-ign-macro";
-       toks[5] = NULL;
-
-       while (*arg) 
+       toks[1] = "no-ign-escape";
+       toks[2] = "no-ign-macro";
+       toks[3] = "no-ign-chars";
+       toks[4] = "ign-errors";
+       toks[5] = "strict";
+       toks[6] = 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):
                        break;
                case (3):

-                       *fflags |= NO_IGN_MACRO;
+                       *fflags |= NO_IGN_CHARS;
+                       break;
+               case (4):
+                       *fflags |= IGN_ERRORS;
+                       break;
+               case (5):
+                       *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);
 }


@@ -622,65 +655,29 @@ merr(void *arg, int line, int col, const char *msg)
 
        curp = (struct curparse *)arg;
 
 
        curp = (struct curparse *)arg;
 

-       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);
+       (void)fprintf(stderr, "%s:%d:%d: error: %s\n", 
+                       curp->file, line, col + 1, msg);

 
 

-       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)", 
-                       curp->file, line, msg, col);
+       (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", 
+                       curp->file, line, col + 1, msg);

 
        if ( ! (curp->wflags & WARN_WERR))
                return(1);
 
        if ( ! (curp->wflags & WARN_WERR))
                return(1);

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

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

+