]> git.cameronkatri.com Git - mandoc.git/blobdiff - read.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix incorrectly swapped labels of left/right arrows; from bentley@.
[mandoc.git] / read.c
diff --git a/read.c b/read.c
index 201100cdc307a70e9f0d95f10ddec73c43b73f6d..bed97580f66f0e31959d62a25de603b016d93a00 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,76 +1,71 @@
-/*     $Id: read.c,v 1.74 2014/07/30 23:38:52 schwarze Exp $ */
+/*     $Id: read.c,v 1.191 2017/07/08 17:52:50 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2010, 2012 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * Copyright (c) 2010, 2012 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS 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.
  */
  * 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.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config.h"
-#endif
 
 
-#ifdef HAVE_MMAP
-# include <sys/stat.h>
-# include <sys/mman.h>
-#endif
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>
+#if HAVE_ERR
+#include <err.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <zlib.h>
 
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
 #include "mandoc_aux.h"
-#include "libmandoc.h"
+#include "mandoc.h"
+#include "roff.h"
 #include "mdoc.h"
 #include "man.h"
 #include "mdoc.h"
 #include "man.h"
-#include "main.h"
+#include "libmandoc.h"
 
 #define        REPARSE_LIMIT   1000
 
 
 #define        REPARSE_LIMIT   1000
 
-struct buf {
-       char             *buf; /* binary input buffer */
-       size_t            sz; /* size of binary buffer */
-};
-
 struct mparse {
 struct mparse {
-       enum mandoclevel  file_status; /* status of current parse */
-       enum mandoclevel  wlevel; /* ignore messages below this */
-       int               line; /* line number in the file */
-       int               options; /* parser options */
-       struct man       *pman; /* persistent man parser */
-       struct mdoc      *pmdoc; /* persistent mdoc parser */
-       struct man       *man; /* man parser */
-       struct mdoc      *mdoc; /* mdoc parser */
        struct roff      *roff; /* roff parser (!NULL) */
        struct roff      *roff; /* roff parser (!NULL) */
+       struct roff_man  *man; /* man parser */
        char             *sodest; /* filename pointed to by .so */
        char             *sodest; /* filename pointed to by .so */
-       int               reparse_count; /* finite interp. stack */
+       const char       *file; /* filename of current input file */
+       struct buf       *primary; /* buffer currently being parsed */
+       struct buf       *secondary; /* preprocessed copy of input */
+       const char       *os_s; /* default operating system */
        mandocmsg         mmsg; /* warning/error message handler */
        mandocmsg         mmsg; /* warning/error message handler */
-       const char       *file;
-       struct buf       *secondary;
-       const char       *defos; /* default operating system */
+       enum mandoclevel  file_status; /* status of current parse */
+       enum mandocerr    mmin; /* ignore messages below this */
+       int               options; /* parser options */
+       int               gzip; /* current input file is gzipped */
+       int               filenc; /* encoding of the current file */
+       int               reparse_count; /* finite interp. stack */
+       int               line; /* line number in the file */
 };
 
 };
 
+static void      choose_parser(struct mparse *);
 static void      resize_buf(struct buf *, size_t);
 static void      resize_buf(struct buf *, size_t);
-static void      mparse_buf_r(struct mparse *, struct buf, int);
-static void      pset(const char *, int, struct mparse *);
+static int       mparse_buf_r(struct mparse *, struct buf, size_t, int);
 static int       read_whole_file(struct mparse *, const char *, int,
                                struct buf *, int *);
 static void      mparse_end(struct mparse *);
 static int       read_whole_file(struct mparse *, const char *, int,
                                struct buf *, int *);
 static void      mparse_end(struct mparse *);
@@ -79,10 +74,10 @@ static      void      mparse_parse_buffer(struct mparse *, struct buf,
 
 static const enum mandocerr    mandoclimits[MANDOCLEVEL_MAX] = {
        MANDOCERR_OK,
 
 static const enum mandocerr    mandoclimits[MANDOCLEVEL_MAX] = {
        MANDOCERR_OK,
-       MANDOCERR_WARNING,
+       MANDOCERR_OK,
        MANDOCERR_WARNING,
        MANDOCERR_ERROR,
        MANDOCERR_WARNING,
        MANDOCERR_ERROR,
-       MANDOCERR_FATAL,
+       MANDOCERR_UNSUPP,
        MANDOCERR_MAX,
        MANDOCERR_MAX
 };
        MANDOCERR_MAX,
        MANDOCERR_MAX
 };
@@ -90,139 +85,194 @@ static    const enum mandocerr    mandoclimits[MANDOCLEVEL_MAX] = {
 static const char * const      mandocerrs[MANDOCERR_MAX] = {
        "ok",
 
 static const char * const      mandocerrs[MANDOCERR_MAX] = {
        "ok",
 
+       "base system convention",
+
+       "Mdocdate found",
+       "Mdocdate missing",
+       "unknown architecture",
+       "operating system explicitly specified",
+       "RCS id missing",
+       "referenced manual not found",
+
+       "generic style suggestion",
+
+       "legacy man(7) date format",
+       "lower case character in document title",
+       "duplicate RCS id",
+       "typo in section name",
+       "unterminated quoted argument",
+       "useless macro",
+       "consider using OS macro",
+       "errnos out of order",
+       "duplicate errno",
+       "trailing delimiter",
+       "no blank before trailing delimiter",
+       "fill mode already enabled, skipping",
+       "fill mode already disabled, skipping",
+       "function name without markup",
+       "whitespace at end of input line",
+       "bad comment style",
+
        "generic warning",
 
        /* related to the prologue */
        "generic warning",
 
        /* related to the prologue */
-       "missing .TH macro, using \"unknown 1\"",
-       "lower case character in document title",
+       "missing manual title, using UNTITLED",
+       "missing manual title, using \"\"",
+       "missing manual section, using \"\"",
        "unknown manual section",
        "unknown manual section",
-       "unknown manual volume or arch",
        "missing date, using today's date",
        "cannot parse date, using it verbatim",
        "missing date, using today's date",
        "cannot parse date, using it verbatim",
+       "date in the future, using it anyway",
+       "missing Os macro, using \"\"",
+       "late prologue macro",
        "prologue macros out of order",
        "prologue macros out of order",
-       "duplicate prologue macro",
-       "incomplete prologue, terminated by",
-       "skipping prologue macro in body",
 
        /* related to document structure */
        ".so is fragile, better use ln(1)",
        "no document body",
        "content before first section header",
        "first section is not \"NAME\"",
 
        /* related to document structure */
        ".so is fragile, better use ln(1)",
        "no document body",
        "content before first section header",
        "first section is not \"NAME\"",
-       "bad NAME section contents",
+       "NAME section without Nm before Nd",
+       "NAME section without description",
+       "description not at the end of NAME",
+       "bad NAME section content",
+       "missing comma before name",
+       "missing description line, using \"\"",
+       "description line outside NAME section",
        "sections out of conventional order",
        "duplicate section title",
        "unexpected section",
        "sections out of conventional order",
        "duplicate section title",
        "unexpected section",
+       "cross reference to self",
+       "unusual Xr order",
+       "unusual Xr punctuation",
+       "AUTHORS section without An macro",
 
        /* related to macros and nesting */
        "obsolete macro",
 
        /* related to macros and nesting */
        "obsolete macro",
+       "macro neither callable nor escaped",
        "skipping paragraph macro",
        "moving paragraph macro out of list",
        "skipping no-space macro",
        "blocks badly nested",
        "nested displays are not portable",
        "moving content out of list",
        "skipping paragraph macro",
        "moving paragraph macro out of list",
        "skipping no-space macro",
        "blocks badly nested",
        "nested displays are not portable",
        "moving content out of list",
-       ".Vt block has child macro",
-       "fill mode already enabled, skipping .fi",
-       "fill mode already disabled, skipping .nf",
+       "first macro on line",
        "line scope broken",
        "line scope broken",
+       "skipping blank line in line scope",
 
        /* related to missing macro arguments */
        "skipping empty request",
        "conditional request controls empty scope",
        "skipping empty macro",
 
        /* related to missing macro arguments */
        "skipping empty request",
        "conditional request controls empty scope",
        "skipping empty macro",
+       "empty block",
        "empty argument, using 0n",
        "empty argument, using 0n",
-       "argument count wrong",
        "missing display type, using -ragged",
        "list type is not the first argument",
        "missing display type, using -ragged",
        "list type is not the first argument",
-       "missing -width in -tag list, using 8n",
-       "missing name for .Ex, using \"\"",
+       "missing -width in -tag list, using 6n",
+       "missing utility name, using \"\"",
+       "missing function name, using \"\"",
        "empty head in list item",
        "empty list item",
        "empty head in list item",
        "empty list item",
+       "missing argument, using next line",
        "missing font type, using \\fR",
        "unknown font type, using \\fR",
        "missing font type, using \\fR",
        "unknown font type, using \\fR",
+       "nothing follows prefix",
+       "empty reference block",
+       "missing section argument",
        "missing -std argument, adding it",
        "missing -std argument, adding it",
+       "missing option string, using \"\"",
+       "missing resource identifier, using \"\"",
+       "missing eqn box, using \"\"",
 
        /* related to bad macro arguments */
 
        /* related to bad macro arguments */
-       "skipping argument",
-       "unterminated quoted argument",
        "duplicate argument",
        "duplicate argument",
+       "skipping duplicate argument",
        "skipping duplicate display type",
        "skipping duplicate list type",
        "skipping duplicate display type",
        "skipping duplicate list type",
+       "skipping -width argument",
+       "wrong number of cells",
        "unknown AT&T UNIX version",
        "unknown AT&T UNIX version",
+       "comma in function argument",
+       "parenthesis in function name",
+       "unknown library name",
        "invalid content in Rs block",
        "invalid Boolean argument",
        "unknown font, skipping request",
        "invalid content in Rs block",
        "invalid Boolean argument",
        "unknown font, skipping request",
+       "odd number of characters in request",
 
        /* related to plain text */
        "blank line in fill mode, using .sp",
        "tab in filled text",
 
        /* related to plain text */
        "blank line in fill mode, using .sp",
        "tab in filled text",
-       "whitespace at end of input line",
-       "bad comment style",
+       "new sentence, new line",
        "invalid escape sequence",
        "undefined string, using \"\"",
 
        "invalid escape sequence",
        "undefined string, using \"\"",
 
-       "generic error",
+       /* related to tables */
+       "tbl line starts with span",
+       "tbl column starts with span",
+       "skipping vertical bar in tbl layout",
 
 
-       /* related to equations */
-       "unexpected equation scope closure",
-       "equation scope open on exit",
-       "overlapping equation scopes",
-       "unexpected end of equation",
-       "equation syntax error",
+       "generic error",
 
        /* related to tables */
 
        /* 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",
+       "non-alphabetic character in tbl options",
+       "skipping unknown tbl option",
+       "missing tbl option argument",
+       "wrong tbl option argument size",
+       "empty tbl layout",
+       "invalid character in tbl layout",
+       "unmatched parenthesis in tbl layout",
+       "tbl without any data cells",
+       "ignoring data in spanned tbl cell",
+       "ignoring extra tbl data cells",
+       "data block open at end of tbl",
 
        /* related to document structure and macros */
 
        /* related to document structure and macros */
+       NULL,
+       "duplicate prologue macro",
+       "skipping late title macro",
        "input stack limit exceeded, infinite loop?",
        "skipping bad character",
        "skipping unknown macro",
        "input stack limit exceeded, infinite loop?",
        "skipping bad character",
        "skipping unknown macro",
+       "skipping insecure request",
        "skipping item outside list",
        "skipping column outside column list",
        "skipping end of block that is not open",
        "skipping item outside list",
        "skipping column outside column list",
        "skipping end of block that is not open",
+       "fewer RS blocks open, skipping",
        "inserting missing end of block",
        "appending missing end of block",
 
        /* related to request and macro arguments */
        "escaped character not allowed in a name",
        "inserting missing end of block",
        "appending missing end of block",
 
        /* related to request and macro arguments */
        "escaped character not allowed in a name",
-       "argument count wrong",
+       "NOT IMPLEMENTED: Bd -file",
+       "skipping display without arguments",
        "missing list type, using -item",
        "missing list type, using -item",
+       "argument is not numeric, using 1",
        "missing manual name, using \"\"",
        "uname(3) system call failed, using UNKNOWN",
        "unknown standard specifier",
        "skipping request without numeric argument",
        "missing manual name, using \"\"",
        "uname(3) system call failed, using UNKNOWN",
        "unknown standard specifier",
        "skipping request without numeric argument",
+       "NOT IMPLEMENTED: .so with absolute path or \"..\"",
+       ".so request failed",
        "skipping all arguments",
        "skipping excess arguments",
        "skipping all arguments",
        "skipping excess arguments",
+       "divide by zero",
 
 
-       "generic fatal error",
-
+       "unsupported feature",
        "input too large",
        "input too large",
-       "column syntax is inconsistent",
-       "NOT IMPLEMENTED: .Bd -file",
-       "NOT IMPLEMENTED: .so with absolute path or \"..\"",
-       ".so request failed",
-       "static buffer exhausted",
-
-       /* system errors */
-       NULL,
-       "cannot stat file",
-       "cannot read file",
+       "unsupported control character",
+       "unsupported roff request",
+       "eqn delim option in tbl",
+       "unsupported tbl layout modifier",
+       "ignoring macro in table",
 };
 
 static const char * const      mandoclevels[MANDOCLEVEL_MAX] = {
        "SUCCESS",
 };
 
 static const char * const      mandoclevels[MANDOCLEVEL_MAX] = {
        "SUCCESS",
-       "RESERVED",
+       "STYLE",
        "WARNING",
        "ERROR",
        "WARNING",
        "ERROR",
-       "FATAL",
+       "UNSUPP",
        "BADARG",
        "SYSERR"
 };
        "BADARG",
        "SYSERR"
 };
@@ -237,85 +287,91 @@ resize_buf(struct buf *buf, size_t initial)
 }
 
 static void
 }
 
 static void
-pset(const char *buf, int pos, struct mparse *curp)
+choose_parser(struct mparse *curp)
 {
 {
-       int              i;
+       char            *cp, *ep;
+       int              format;
 
        /*
 
        /*
-        * 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.
-        *
-        * Separate out pmdoc/pman from mdoc/man: the first persists
-        * through all parsers, while the latter is used per-parse.
+        * If neither command line arguments -mdoc or -man select
+        * a parser nor the roff parser found a .Dd or .TH macro
+        * yet, look ahead in the main input buffer.
         */
 
         */
 
-       if ('.' == buf[0] || '\'' == buf[0]) {
-               for (i = 1; buf[i]; i++)
-                       if (' ' != buf[i] && '\t' != buf[i])
+       if ((format = roff_getformat(curp->roff)) == 0) {
+               cp = curp->primary->buf;
+               ep = cp + curp->primary->sz;
+               while (cp < ep) {
+                       if (*cp == '.' || *cp == '\'') {
+                               cp++;
+                               if (cp[0] == 'D' && cp[1] == 'd') {
+                                       format = MPARSE_MDOC;
+                                       break;
+                               }
+                               if (cp[0] == 'T' && cp[1] == 'H') {
+                                       format = MPARSE_MAN;
+                                       break;
+                               }
+                       }
+                       cp = memchr(cp, '\n', ep - cp);
+                       if (cp == NULL)
                                break;
                                break;
-               if ('\0' == buf[i])
-                       return;
-       }
-
-       if (MPARSE_MDOC & curp->options) {
-               curp->mdoc = curp->pmdoc;
-               return;
-       } else if (MPARSE_MAN & curp->options) {
-               curp->man = curp->pman;
-               return;
+                       cp++;
+               }
        }
 
        }
 
-       if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3))  {
-               if (NULL == curp->pmdoc)
-                       curp->pmdoc = mdoc_alloc(
-                           curp->roff, curp, curp->defos,
-                           MPARSE_QUICK & curp->options ? 1 : 0);
-               assert(curp->pmdoc);
-               curp->mdoc = curp->pmdoc;
-               return;
+       if (format == MPARSE_MDOC) {
+               curp->man->macroset = MACROSET_MDOC;
+               if (curp->man->mdocmac == NULL)
+                       curp->man->mdocmac = roffhash_alloc(MDOC_Dd, MDOC_MAX);
+       } else {
+               curp->man->macroset = MACROSET_MAN;
+               if (curp->man->manmac == NULL)
+                       curp->man->manmac = roffhash_alloc(MAN_TH, MAN_MAX);
        }
        }
-
-       if (NULL == curp->pman)
-               curp->pman = man_alloc(curp->roff, curp,
-                   MPARSE_QUICK & curp->options ? 1 : 0);
-       assert(curp->pman);
-       curp->man = curp->pman;
+       curp->man->first->tok = TOKEN_NONE;
 }
 
 /*
 }
 
 /*
- * Main parse routine for an opened file.  This is called for each
- * opened file and simply loops around the full input file, possibly
- * nesting (i.e., with `so').
+ * Main parse routine for a buffer.
+ * It assumes encoding and line numbering are already set up.
+ * It can recurse directly (for invocations of user-defined
+ * macros, inline equations, and input line traps)
+ * and indirectly (for .so file inclusion).
  */
  */
-static void
-mparse_buf_r(struct mparse *curp, struct buf blk, int start)
+static int
+mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
 {
 {
-       const struct tbl_span   *span;
        struct buf       ln;
        struct buf       ln;
+       const char      *save_file;
+       char            *cp;
+       size_t           pos; /* byte number in the ln buffer */
        enum rofferr     rr;
        enum rofferr     rr;
-       int              i, of, rc;
-       int              pos; /* byte number in the ln buffer */
+       int              of;
        int              lnn; /* line number in the real file */
        int              lnn; /* line number in the real file */
+       int              fd;
        unsigned char    c;
 
        unsigned char    c;
 
-       memset(&ln, 0, sizeof(struct buf));
+       memset(&ln, 0, sizeof(ln));
 
        lnn = curp->line;
        pos = 0;
 
 
        lnn = curp->line;
        pos = 0;
 
-       for (i = 0; i < (int)blk.sz; ) {
+       while (i < blk.sz) {
                if (0 == pos && '\0' == blk.buf[i])
                        break;
 
                if (start) {
                        curp->line = lnn;
                        curp->reparse_count = 0;
                if (0 == pos && '\0' == blk.buf[i])
                        break;
 
                if (start) {
                        curp->line = lnn;
                        curp->reparse_count = 0;
+
+                       if (lnn < 3 &&
+                           curp->filenc & MPARSE_UTF8 &&
+                           curp->filenc & MPARSE_LATIN1)
+                               curp->filenc = preconv_cue(&blk, i);
                }
 
                }
 
-               while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) {
+               while (i < blk.sz && (start || blk.buf[i] != '\0')) {
 
                        /*
                         * When finding an unescaped newline character,
 
                        /*
                         * When finding an unescaped newline character,
@@ -323,7 +379,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                         * Skip a preceding carriage return, if any.
                         */
 
                         * Skip a preceding carriage return, if any.
                         */
 
-                       if ('\r' == blk.buf[i] && i + 1 < (int)blk.sz &&
+                       if ('\r' == blk.buf[i] && i + 1 < blk.sz &&
                            '\n' == blk.buf[i + 1])
                                ++i;
                        if ('\n' == blk.buf[i]) {
                            '\n' == blk.buf[i + 1])
                                ++i;
                        if ('\n' == blk.buf[i]) {
@@ -333,100 +389,52 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                        }
 
                        /*
                        }
 
                        /*
-                        * Make sure we have space for at least
-                        * one backslash and one other character
-                        * and the trailing NUL byte.
+                        * Make sure we have space for the worst
+                        * case of 11 bytes: "\\[u10ffff]\0"
                         */
 
                         */
 
-                       if (pos + 2 >= (int)ln.sz)
+                       if (pos + 11 > ln.sz)
                                resize_buf(&ln, 256);
 
                        /*
                                resize_buf(&ln, 256);
 
                        /*
-                        * Warn about bogus characters.  If you're using
-                        * non-ASCII encoding, you're screwing your
-                        * readers.  Since I'd rather this not happen,
-                        * I'll be helpful and replace these characters
-                        * with "?", so we don't display gibberish.
-                        * Note to manual writers: use special characters.
+                        * Encode 8-bit input.
                         */
 
                         */
 
-                       c = (unsigned char) blk.buf[i];
-
-                       if ( ! (isascii(c) &&
-                           (isgraph(c) || isblank(c)))) {
-                               mandoc_msg(MANDOCERR_BADCHAR, curp,
-                                   curp->line, pos, NULL);
-                               i++;
-                               ln.buf[pos++] = '?';
-                               continue;
-                       }
-
-                       /* Trailing backslash = a plain char. */
-
-                       if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
-                               ln.buf[pos++] = blk.buf[i++];
+                       c = blk.buf[i];
+                       if (c & 0x80) {
+                               if ( ! (curp->filenc && preconv_encode(
+                                   &blk, &i, &ln, &pos, &curp->filenc))) {
+                                       mandoc_vmsg(MANDOCERR_CHAR_BAD, curp,
+                                           curp->line, pos, "0x%x", c);
+                                       ln.buf[pos++] = '?';
+                                       i++;
+                               }
                                continue;
                        }
 
                        /*
                                continue;
                        }
 
                        /*
-                        * Found escape and at least one other character.
-                        * When it's a newline character, skip it.
-                        * When there is a carriage return in between,
-                        * skip that one as well.
+                        * Exclude control characters.
                         */
 
                         */
 
-                       if ('\r' == blk.buf[i + 1] && i + 2 < (int)blk.sz &&
-                           '\n' == blk.buf[i + 2])
-                               ++i;
-                       if ('\n' == blk.buf[i + 1]) {
-                               i += 2;
-                               ++lnn;
-                               continue;
-                       }
-
-                       if ('"' == blk.buf[i + 1] || '#' == 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;
-                       }
-
-                       /* Catch escaped bogus characters. */
-
-                       c = (unsigned char) blk.buf[i+1];
-
-                       if ( ! (isascii(c) &&
-                           (isgraph(c) || isblank(c)))) {
-                               mandoc_msg(MANDOCERR_BADCHAR, curp,
-                                   curp->line, pos, NULL);
-                               i += 2;
-                               ln.buf[pos++] = '?';
+                       if (c == 0x7f || (c < 0x20 && c != 0x09)) {
+                               mandoc_vmsg(c == 0x00 || c == 0x04 ||
+                                   c > 0x0a ? MANDOCERR_CHAR_BAD :
+                                   MANDOCERR_CHAR_UNSUPP,
+                                   curp, curp->line, pos, "0x%x", c);
+                               i++;
+                               if (c != '\r')
+                                       ln.buf[pos++] = '?';
                                continue;
                        }
 
                                continue;
                        }
 
-                       /* Some other escape sequence, copy & cont. */
-
-                       ln.buf[pos++] = blk.buf[i++];
                        ln.buf[pos++] = blk.buf[i++];
                }
 
                        ln.buf[pos++] = blk.buf[i++];
                }
 
-               if (pos >= (int)ln.sz)
+               if (pos + 1 >= ln.sz)
                        resize_buf(&ln, 256);
 
                        resize_buf(&ln, 256);
 
+               if (i == blk.sz || blk.buf[i] == '\0')
+                       ln.buf[pos++] = '\n';
                ln.buf[pos] = '\0';
 
                /*
                ln.buf[pos] = '\0';
 
                /*
@@ -461,35 +469,34 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                                [curp->secondary->sz] = '\0';
                }
 rerun:
                                [curp->secondary->sz] = '\0';
                }
 rerun:
-               rr = roff_parseln(curp->roff, curp->line,
-                   &ln.buf, &ln.sz, of, &of);
+               rr = roff_parseln(curp->roff, curp->line, &ln, &of);
 
                switch (rr) {
                case ROFF_REPARSE:
 
                switch (rr) {
                case ROFF_REPARSE:
-                       if (REPARSE_LIMIT >= ++curp->reparse_count)
-                               mparse_buf_r(curp, ln, 0);
-                       else
+                       if (++curp->reparse_count > REPARSE_LIMIT)
                                mandoc_msg(MANDOCERR_ROFFLOOP, curp,
                                    curp->line, pos, NULL);
                                mandoc_msg(MANDOCERR_ROFFLOOP, curp,
                                    curp->line, pos, NULL);
-                       pos = 0;
-                       continue;
+                       else if (mparse_buf_r(curp, ln, of, 0) == 1 ||
+                           start == 1) {
+                               pos = 0;
+                               continue;
+                       }
+                       free(ln.buf);
+                       return 0;
                case ROFF_APPEND:
                case ROFF_APPEND:
-                       pos = (int)strlen(ln.buf);
+                       pos = strlen(ln.buf);
                        continue;
                case ROFF_RERUN:
                        goto rerun;
                case ROFF_IGN:
                        pos = 0;
                        continue;
                        continue;
                case ROFF_RERUN:
                        goto rerun;
                case ROFF_IGN:
                        pos = 0;
                        continue;
-               case ROFF_ERR:
-                       assert(MANDOCLEVEL_FATAL <= curp->file_status);
-                       break;
                case ROFF_SO:
                case ROFF_SO:
-                       if (0 == (MPARSE_SO & curp->options) &&
-                           (i >= (int)blk.sz || '\0' == blk.buf[i])) {
+                       if ( ! (curp->options & MPARSE_SO) &&
+                           (i >= blk.sz || blk.buf[i] == '\0')) {
                                curp->sodest = mandoc_strdup(ln.buf + of);
                                free(ln.buf);
                                curp->sodest = mandoc_strdup(ln.buf + of);
                                free(ln.buf);
-                               return;
+                               return 1;
                        }
                        /*
                         * We remove `so' clauses from our lookaside
                        }
                        /*
                         * We remove `so' clauses from our lookaside
@@ -498,12 +505,23 @@ rerun:
                         */
                        if (curp->secondary)
                                curp->secondary->sz -= pos + 1;
                         */
                        if (curp->secondary)
                                curp->secondary->sz -= pos + 1;
-                       mparse_readfd(curp, -1, ln.buf + of);
-                       if (MANDOCLEVEL_FATAL <= curp->file_status) {
+                       save_file = curp->file;
+                       if ((fd = mparse_open(curp, ln.buf + of)) != -1) {
+                               mparse_readfd(curp, fd, ln.buf + of);
+                               close(fd);
+                               curp->file = save_file;
+                       } else {
+                               curp->file = save_file;
                                mandoc_vmsg(MANDOCERR_SO_FAIL,
                                    curp, curp->line, pos,
                                    ".so %s", ln.buf + of);
                                mandoc_vmsg(MANDOCERR_SO_FAIL,
                                    curp, curp->line, pos,
                                    ".so %s", ln.buf + of);
-                               break;
+                               ln.sz = mandoc_asprintf(&cp,
+                                   ".sp\nSee the file %s.\n.sp",
+                                   ln.buf + of);
+                               free(ln.buf);
+                               ln.buf = cp;
+                               of = 0;
+                               mparse_buf_r(curp, ln, of, 0);
                        }
                        pos = 0;
                        continue;
                        }
                        pos = 0;
                        continue;
@@ -511,63 +529,13 @@ rerun:
                        break;
                }
 
                        break;
                }
 
-               /*
-                * If we encounter errors in the recursive parse, make
-                * sure we don't continue parsing.
-                */
-
-               if (MANDOCLEVEL_FATAL <= curp->file_status)
-                       break;
-
-               /*
-                * If input parsers have not been allocated, do so now.
-                * We keep these instanced between parsers, but set them
-                * locally per parse routine since we can use different
-                * parsers with each one.
-                */
-
-               if ( ! (curp->man || curp->mdoc))
-                       pset(ln.buf + of, pos - of, curp);
-
-               /*
-                * Lastly, push down into the parsers themselves.  One
-                * of these will have already been set in the pset()
-                * routine.
-                * If libroff returns ROFF_TBL, then add it to the
-                * currently open parse.  Since we only get here if
-                * there does exist data (see tbl_data.c), we're
-                * guaranteed that something's been allocated.
-                * Do the same for ROFF_EQN.
-                */
+               if (curp->man->macroset == MACROSET_NONE)
+                       choose_parser(curp);
 
 
-               rc = -1;
-
-               if (ROFF_TBL == rr)
-                       while (NULL != (span = roff_span(curp->roff))) {
-                               rc = curp->man ?
-                                   man_addspan(curp->man, span) :
-                                   mdoc_addspan(curp->mdoc, span);
-                               if (0 == rc)
-                                       break;
-                       }
-               else if (ROFF_EQN == rr)
-                       rc = curp->mdoc ?
-                           mdoc_addeqn(curp->mdoc,
-                               roff_eqn(curp->roff)) :
-                           man_addeqn(curp->man,
-                               roff_eqn(curp->roff));
-               else if (curp->man || curp->mdoc)
-                       rc = curp->man ?
-                           man_parseln(curp->man,
-                               curp->line, ln.buf, of) :
-                           mdoc_parseln(curp->mdoc,
-                               curp->line, ln.buf, of);
-
-               if (0 == rc) {
-                       assert(MANDOCLEVEL_FATAL <= curp->file_status);
-                       break;
-               } else if (2 == rc)
-                       break;
+               if ((curp->man->macroset == MACROSET_MDOC ?
+                   mdoc_parseln(curp->man, curp->line, ln.buf, of) :
+                   man_parseln(curp->man, curp->line, ln.buf, of)) == 2)
+                               break;
 
                /* Temporary buffers typically are not full. */
 
 
                /* Temporary buffers typically are not full. */
 
@@ -580,24 +548,20 @@ rerun:
        }
 
        free(ln.buf);
        }
 
        free(ln.buf);
+       return 1;
 }
 
 static int
 read_whole_file(struct mparse *curp, const char *file, int fd,
                struct buf *fb, int *with_mmap)
 {
 }
 
 static int
 read_whole_file(struct mparse *curp, const char *file, int fd,
                struct buf *fb, int *with_mmap)
 {
+       struct stat      st;
+       gzFile           gz;
        size_t           off;
        ssize_t          ssz;
 
        size_t           off;
        ssize_t          ssz;
 
-#ifdef HAVE_MMAP
-       struct stat      st;
-       if (-1 == fstat(fd, &st)) {
-               curp->file_status = MANDOCLEVEL_SYSERR;
-               if (curp->mmsg)
-                       (*curp->mmsg)(MANDOCERR_SYSSTAT, curp->file_status,
-                           file, 0, 0, strerror(errno));
-               return(0);
-       }
+       if (fstat(fd, &st) == -1)
+               err((int)MANDOCLEVEL_SYSERR, "%s", file);
 
        /*
         * If we're a regular file, try just reading in the whole entry
 
        /*
         * If we're a regular file, try just reading in the whole entry
@@ -606,21 +570,23 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
         * concerned that this is going to tank any machines.
         */
 
         * concerned that this is going to tank any machines.
         */
 
-       if (S_ISREG(st.st_mode)) {
-               if (st.st_size >= (1U << 31)) {
-                       curp->file_status = MANDOCLEVEL_FATAL;
-                       if (curp->mmsg)
-                               (*curp->mmsg)(MANDOCERR_TOOLARGE,
-                                   curp->file_status, file, 0, 0, NULL);
-                       return(0);
+       if (curp->gzip == 0 && S_ISREG(st.st_mode)) {
+               if (st.st_size > 0x7fffffff) {
+                       mandoc_msg(MANDOCERR_TOOLARGE, curp, 0, 0, NULL);
+                       return 0;
                }
                *with_mmap = 1;
                fb->sz = (size_t)st.st_size;
                fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_SHARED, fd, 0);
                if (fb->buf != MAP_FAILED)
                }
                *with_mmap = 1;
                fb->sz = (size_t)st.st_size;
                fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_SHARED, fd, 0);
                if (fb->buf != MAP_FAILED)
-                       return(1);
+                       return 1;
        }
        }
-#endif
+
+       if (curp->gzip) {
+               if ((gz = gzdopen(fd, "rb")) == NULL)
+                       err((int)MANDOCLEVEL_SYSERR, "%s", file);
+       } else
+               gz = NULL;
 
        /*
         * If this isn't a regular file (like, say, stdin), then we must
 
        /*
         * If this isn't a regular file (like, say, stdin), then we must
@@ -634,73 +600,47 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
        for (;;) {
                if (off == fb->sz) {
                        if (fb->sz == (1U << 31)) {
        for (;;) {
                if (off == fb->sz) {
                        if (fb->sz == (1U << 31)) {
-                               curp->file_status = MANDOCLEVEL_FATAL;
-                               if (curp->mmsg)
-                                       (*curp->mmsg)(MANDOCERR_TOOLARGE,
-                                           curp->file_status,
-                                           file, 0, 0, NULL);
+                               mandoc_msg(MANDOCERR_TOOLARGE, curp,
+                                   0, 0, NULL);
                                break;
                        }
                        resize_buf(fb, 65536);
                }
                                break;
                        }
                        resize_buf(fb, 65536);
                }
-               ssz = read(fd, fb->buf + (int)off, fb->sz - off);
+               ssz = curp->gzip ?
+                   gzread(gz, fb->buf + (int)off, fb->sz - off) :
+                   read(fd, fb->buf + (int)off, fb->sz - off);
                if (ssz == 0) {
                        fb->sz = off;
                if (ssz == 0) {
                        fb->sz = off;
-                       return(1);
-               }
-               if (ssz == -1) {
-                       curp->file_status = MANDOCLEVEL_SYSERR;
-                       if (curp->mmsg)
-                               (*curp->mmsg)(MANDOCERR_SYSREAD,
-                                   curp->file_status, file, 0, 0,
-                                   strerror(errno));
-                       break;
+                       return 1;
                }
                }
+               if (ssz == -1)
+                       err((int)MANDOCLEVEL_SYSERR, "%s", file);
                off += (size_t)ssz;
        }
 
        free(fb->buf);
        fb->buf = NULL;
                off += (size_t)ssz;
        }
 
        free(fb->buf);
        fb->buf = NULL;
-       return(0);
+       return 0;
 }
 
 static void
 mparse_end(struct mparse *curp)
 {
 }
 
 static void
 mparse_end(struct mparse *curp)
 {
-
-       if (MANDOCLEVEL_FATAL <= curp->file_status)
-               return;
-
-       if (curp->mdoc == NULL &&
-           curp->man == NULL &&
-           curp->sodest == NULL) {
-               if (curp->options & MPARSE_MDOC)
-                       curp->mdoc = curp->pmdoc;
-               else {
-                       if (curp->pman == NULL)
-                               curp->pman = man_alloc(curp->roff, curp,
-                                   curp->options & MPARSE_QUICK ? 1 : 0);
-                       curp->man = curp->pman;
-               }
-       }
-
-       if (curp->mdoc && ! mdoc_endparse(curp->mdoc)) {
-               assert(MANDOCLEVEL_FATAL <= curp->file_status);
-               return;
-       }
-
-       if (curp->man && ! man_endparse(curp->man)) {
-               assert(MANDOCLEVEL_FATAL <= curp->file_status);
-               return;
-       }
-
+       if (curp->man->macroset == MACROSET_NONE)
+               curp->man->macroset = MACROSET_MAN;
+       if (curp->man->macroset == MACROSET_MDOC)
+               mdoc_endparse(curp->man);
+       else
+               man_endparse(curp->man);
        roff_endparse(curp->roff);
 }
 
 static void
 mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file)
 {
        roff_endparse(curp->roff);
 }
 
 static void
 mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file)
 {
+       struct buf      *svprimary;
        const char      *svfile;
        const char      *svfile;
+       size_t           offset;
        static int       recursion_depth;
 
        if (64 < recursion_depth) {
        static int       recursion_depth;
 
        if (64 < recursion_depth) {
@@ -711,128 +651,158 @@ mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file)
        /* Line number is per-file. */
        svfile = curp->file;
        curp->file = file;
        /* Line number is per-file. */
        svfile = curp->file;
        curp->file = file;
+       svprimary = curp->primary;
+       curp->primary = &blk;
        curp->line = 1;
        recursion_depth++;
 
        curp->line = 1;
        recursion_depth++;
 
-       mparse_buf_r(curp, blk, 1);
+       /* Skip an UTF-8 byte order mark. */
+       if (curp->filenc & MPARSE_UTF8 && blk.sz > 2 &&
+           (unsigned char)blk.buf[0] == 0xef &&
+           (unsigned char)blk.buf[1] == 0xbb &&
+           (unsigned char)blk.buf[2] == 0xbf) {
+               offset = 3;
+               curp->filenc &= ~MPARSE_LATIN1;
+       } else
+               offset = 0;
+
+       mparse_buf_r(curp, blk, offset, 1);
 
 
-       if (0 == --recursion_depth && MANDOCLEVEL_FATAL > curp->file_status)
+       if (--recursion_depth == 0)
                mparse_end(curp);
 
                mparse_end(curp);
 
+       curp->primary = svprimary;
        curp->file = svfile;
 }
 
 enum mandoclevel
        curp->file = svfile;
 }
 
 enum mandoclevel
-mparse_readmem(struct mparse *curp, const void *buf, size_t len,
+mparse_readmem(struct mparse *curp, void *buf, size_t len,
                const char *file)
 {
        struct buf blk;
 
                const char *file)
 {
        struct buf blk;
 
-       blk.buf = UNCONST(buf);
+       blk.buf = buf;
        blk.sz = len;
 
        mparse_parse_buffer(curp, blk, file);
        blk.sz = len;
 
        mparse_parse_buffer(curp, blk, file);
-       return(curp->file_status);
+       return curp->file_status;
 }
 
 }
 
+/*
+ * Read the whole file into memory and call the parsers.
+ * Called recursively when an .so request is encountered.
+ */
 enum mandoclevel
 mparse_readfd(struct mparse *curp, int fd, const char *file)
 {
        struct buf       blk;
        int              with_mmap;
 enum mandoclevel
 mparse_readfd(struct mparse *curp, int fd, const char *file)
 {
        struct buf       blk;
        int              with_mmap;
-
-       if (-1 == fd && -1 == (fd = open(file, O_RDONLY, 0))) {
-               curp->file_status = MANDOCLEVEL_SYSERR;
-               if (curp->mmsg)
-                       (*curp->mmsg)(MANDOCERR_SYSOPEN,
-                           curp->file_status,
-                           file, 0, 0, strerror(errno));
-               goto out;
+       int              save_filenc;
+
+       if (read_whole_file(curp, file, fd, &blk, &with_mmap)) {
+               save_filenc = curp->filenc;
+               curp->filenc = curp->options &
+                   (MPARSE_UTF8 | MPARSE_LATIN1);
+               mparse_parse_buffer(curp, blk, file);
+               curp->filenc = save_filenc;
+               if (with_mmap)
+                       munmap(blk.buf, blk.sz);
+               else
+                       free(blk.buf);
        }
        }
+       return curp->file_status;
+}
+
+int
+mparse_open(struct mparse *curp, const char *file)
+{
+       char             *cp;
+       int               fd;
+
+       curp->file = file;
+       cp = strrchr(file, '.');
+       curp->gzip = (cp != NULL && ! strcmp(cp + 1, "gz"));
+
+       /* First try to use the filename as it is. */
+
+       if ((fd = open(file, O_RDONLY)) != -1)
+               return fd;
 
        /*
 
        /*
-        * Run for each opened file; may be called more than once for
-        * each full parse sequence if the opened file is nested (i.e.,
-        * from `so').  Simply sucks in the whole file and moves into
-        * the parse phase for the file.
+        * If that doesn't work and the filename doesn't
+        * already  end in .gz, try appending .gz.
         */
 
         */
 
-       if ( ! read_whole_file(curp, file, fd, &blk, &with_mmap))
-               goto out;
-
-       mparse_parse_buffer(curp, blk, file);
+       if ( ! curp->gzip) {
+               mandoc_asprintf(&cp, "%s.gz", file);
+               fd = open(cp, O_RDONLY);
+               free(cp);
+               if (fd != -1) {
+                       curp->gzip = 1;
+                       return fd;
+               }
+       }
 
 
-#ifdef HAVE_MMAP
-       if (with_mmap)
-               munmap(blk.buf, blk.sz);
-       else
-#endif
-               free(blk.buf);
+       /* Neither worked, give up. */
 
 
-       if (STDIN_FILENO != fd && -1 == close(fd))
-               perror(file);
-out:
-       return(curp->file_status);
+       mandoc_msg(MANDOCERR_FILE, curp, 0, 0, strerror(errno));
+       return -1;
 }
 
 struct mparse *
 }
 
 struct mparse *
-mparse_alloc(int options, enum mandoclevel wlevel,
-               mandocmsg mmsg, const char *defos)
+mparse_alloc(int options, enum mandocerr mmin, mandocmsg mmsg,
+    enum mandoc_os os_e, const char *os_s)
 {
        struct mparse   *curp;
 
 {
        struct mparse   *curp;
 
-       assert(wlevel <= MANDOCLEVEL_FATAL);
-
        curp = mandoc_calloc(1, sizeof(struct mparse));
 
        curp->options = options;
        curp = mandoc_calloc(1, sizeof(struct mparse));
 
        curp->options = options;
-       curp->wlevel = wlevel;
+       curp->mmin = mmin;
        curp->mmsg = mmsg;
        curp->mmsg = mmsg;
-       curp->defos = defos;
+       curp->os_s = os_s;
 
        curp->roff = roff_alloc(curp, options);
 
        curp->roff = roff_alloc(curp, options);
-       if (curp->options & MPARSE_MDOC)
-               curp->pmdoc = mdoc_alloc(
-                   curp->roff, curp, curp->defos,
-                   curp->options & MPARSE_QUICK ? 1 : 0);
-       if (curp->options & MPARSE_MAN)
-               curp->pman = man_alloc(curp->roff, curp,
-                   curp->options & MPARSE_QUICK ? 1 : 0);
-
-       return(curp);
+       curp->man = roff_man_alloc(curp->roff, curp, curp->os_s,
+               curp->options & MPARSE_QUICK ? 1 : 0);
+       if (curp->options & MPARSE_MDOC) {
+               curp->man->macroset = MACROSET_MDOC;
+               if (curp->man->mdocmac == NULL)
+                       curp->man->mdocmac = roffhash_alloc(MDOC_Dd, MDOC_MAX);
+       } else if (curp->options & MPARSE_MAN) {
+               curp->man->macroset = MACROSET_MAN;
+               if (curp->man->manmac == NULL)
+                       curp->man->manmac = roffhash_alloc(MAN_TH, MAN_MAX);
+       }
+       curp->man->first->tok = TOKEN_NONE;
+       curp->man->meta.os_e = os_e;
+       return curp;
 }
 
 void
 mparse_reset(struct mparse *curp)
 {
 }
 
 void
 mparse_reset(struct mparse *curp)
 {
-
        roff_reset(curp->roff);
        roff_reset(curp->roff);
+       roff_man_reset(curp->man);
+
+       free(curp->sodest);
+       curp->sodest = NULL;
 
 
-       if (curp->mdoc)
-               mdoc_reset(curp->mdoc);
-       if (curp->man)
-               man_reset(curp->man);
        if (curp->secondary)
                curp->secondary->sz = 0;
 
        curp->file_status = MANDOCLEVEL_OK;
        if (curp->secondary)
                curp->secondary->sz = 0;
 
        curp->file_status = MANDOCLEVEL_OK;
-       curp->mdoc = NULL;
-       curp->man = NULL;
-
-       free(curp->sodest);
-       curp->sodest = NULL;
+       curp->gzip = 0;
 }
 
 void
 mparse_free(struct mparse *curp)
 {
 
 }
 
 void
 mparse_free(struct mparse *curp)
 {
 
-       if (curp->pmdoc)
-               mdoc_free(curp->pmdoc);
-       if (curp->pman)
-               man_free(curp->pman);
-       if (curp->roff)
-               roff_free(curp->roff);
+       roffhash_free(curp->man->mdocmac);
+       roffhash_free(curp->man->manmac);
+       roff_man_free(curp->man);
+       roff_free(curp->roff);
        if (curp->secondary)
                free(curp->secondary->buf);
 
        if (curp->secondary)
                free(curp->secondary->buf);
 
@@ -842,21 +812,25 @@ mparse_free(struct mparse *curp)
 }
 
 void
 }
 
 void
-mparse_result(struct mparse *curp,
-       struct mdoc **mdoc, struct man **man, char **sodest)
+mparse_result(struct mparse *curp, struct roff_man **man,
+       char **sodest)
 {
 
        if (sodest && NULL != (*sodest = curp->sodest)) {
 {
 
        if (sodest && NULL != (*sodest = curp->sodest)) {
-               *mdoc = NULL;
                *man = NULL;
                return;
        }
                *man = NULL;
                return;
        }
-       if (mdoc)
-               *mdoc = curp->mdoc;
        if (man)
                *man = curp->man;
 }
 
        if (man)
                *man = curp->man;
 }
 
+void
+mparse_updaterc(struct mparse *curp, enum mandoclevel *rc)
+{
+       if (curp->file_status > *rc)
+               *rc = curp->file_status;
+}
+
 void
 mandoc_vmsg(enum mandocerr t, struct mparse *m,
                int ln, int pos, const char *fmt, ...)
 void
 mandoc_vmsg(enum mandocerr t, struct mparse *m,
                int ln, int pos, const char *fmt, ...)
@@ -877,13 +851,13 @@ mandoc_msg(enum mandocerr er, struct mparse *m,
 {
        enum mandoclevel level;
 
 {
        enum mandoclevel level;
 
-       level = MANDOCLEVEL_FATAL;
+       if (er < m->mmin && er != MANDOCERR_FILE)
+               return;
+
+       level = MANDOCLEVEL_UNSUPP;
        while (er < mandoclimits[level])
                level--;
 
        while (er < mandoclimits[level])
                level--;
 
-       if (level < m->wlevel)
-               return;
-
        if (m->mmsg)
                (*m->mmsg)(er, level, m->file, ln, col, msg);
 
        if (m->mmsg)
                (*m->mmsg)(er, level, m->file, ln, col, msg);
 
@@ -895,13 +869,13 @@ const char *
 mparse_strerror(enum mandocerr er)
 {
 
 mparse_strerror(enum mandocerr er)
 {
 
-       return(mandocerrs[er]);
+       return mandocerrs[er];
 }
 
 const char *
 mparse_strlevel(enum mandoclevel lvl)
 {
 }
 
 const char *
 mparse_strlevel(enum mandoclevel lvl)
 {
-       return(mandoclevels[lvl]);
+       return mandoclevels[lvl];
 }
 
 void
 }
 
 void
@@ -917,5 +891,5 @@ mparse_getkeep(const struct mparse *p)
 {
 
        assert(p->secondary);
 {
 
        assert(p->secondary);
-       return(p->secondary->sz ? p->secondary->buf : NULL);
+       return p->secondary->sz ? p->secondary->buf : NULL;
 }
 }
A git conversion mirror of mandoc.bsd.lv