]> 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
Promote section headers that can can be used unmodified as fragment
[mandoc.git] / read.c
diff --git a/read.c b/read.c
index e33ab91564bb4798787c2dee4d2413f61baf4fcd..03a71c33e5a574ee05b0d8eea30a5e91c060e113 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,230 +1,76 @@
-/*     $Id: read.c,v 1.60 2014/07/04 01:50:07 schwarze Exp $ */
+/* $Id: read.c,v 1.219 2020/04/24 12:02:33 schwarze Exp $ */
 /*
 /*
+ * Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org>
  * 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, 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.
+ *
+ * Top-level functions of the mandoc(3) parser:
+ * Parser and input encoding selection, decompression,
+ * handling of input bytes, characters, lines, and files,
+ * handling of roff(7) loops and file inclusion,
+ * and steering of the various parsers.
  */
  */
-#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 <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 
 #include <assert.h>
 #include <ctype.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 "mandoc_parse.h"
+#include "libmandoc.h"
+#include "roff_int.h"
+#include "tag.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) */
-       char             *sodest; /* filename pointed to by .so */
+       struct roff_man  *man; /* man parser */
+       struct buf       *primary; /* buffer currently being parsed */
+       struct buf       *secondary; /* copy of top level input */
+       struct buf       *loop; /* open .while request line */
+       const char       *os_s; /* default operating system */
+       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               reparse_count; /* finite interp. stack */
-       mandocmsg         mmsg; /* warning/error message handler */
-       const char       *file;
-       struct buf       *secondary;
-       char             *defos; /* default operating system */
+       int               line; /* line number in the file */
 };
 
 };
 
+static void      choose_parser(struct mparse *);
+static void      free_buf_list(struct buf *);
 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       read_whole_file(struct mparse *, const char *, int,
-                               struct buf *, int *);
+static int       mparse_buf_r(struct mparse *, struct buf, size_t, int);
+static int       read_whole_file(struct mparse *, int, struct buf *, int *);
 static void      mparse_end(struct mparse *);
 static void      mparse_end(struct mparse *);
-static void      mparse_parse_buffer(struct mparse *, struct buf,
-                       const char *);
-
-static const enum mandocerr    mandoclimits[MANDOCLEVEL_MAX] = {
-       MANDOCERR_OK,
-       MANDOCERR_WARNING,
-       MANDOCERR_WARNING,
-       MANDOCERR_ERROR,
-       MANDOCERR_FATAL,
-       MANDOCERR_MAX,
-       MANDOCERR_MAX
-};
-
-static const char * const      mandocerrs[MANDOCERR_MAX] = {
-       "ok",
-
-       "generic warning",
-
-       /* related to the prologue */
-       "missing .TH macro, using \"unknown 1\"",
-       "lower case character in document title",
-       "unknown manual section",
-       "unknown manual volume or arch",
-       "missing date, using today's date",
-       "cannot parse date, using it verbatim",
-       "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\"",
-       "bad NAME section contents",
-       "sections out of conventional order",
-       "duplicate section title",
-       "unexpected section",
-
-       /* related to macros and nesting */
-       "obsolete macro",
-       "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",
-       "line scope broken",
-
-       /* related to missing macro arguments */
-       "skipping empty request",
-       "conditional request controls empty scope",
-       "skipping empty macro",
-       "argument count wrong",
-       "missing display type, using -ragged",
-       "list type is not the first argument",
-       "missing -width in -tag list, using 8n",
-       "empty head in list item",
-       "empty list item",
-       "missing font type",
-       "missing -std argument, adding it",
-
-       /* related to bad macro arguments */
-       "skipping argument",
-       "duplicate argument",
-       "duplicate display type",
-       "duplicate list type",
-       "unknown AT&T UNIX version",
-       "bad Boolean value",
-       "unknown font",
-       "unknown standard specifier",
-       "bad width argument",
-
-       /* related to plain text */
-       "blank line in non-literal context",
-       "tab in non-literal context",
-       "end of line whitespace",
-       "bad comment style",
-       "bad escape sequence",
-       "unterminated quoted string",
-
-       "generic error",
-
-       /* related to equations */
-       "unexpected equation scope closure",
-       "equation scope open on exit",
-       "overlapping equation scopes",
-       "unexpected end of equation",
-       "equation syntax error",
-
-       /* related to tables */
-       "bad table syntax",
-       "bad table option",
-       "bad table layout",
-       "no table layout cells specified",
-       "no table data cells specified",
-       "ignore data in cell",
-       "data block still open",
-       "ignoring extra data cells",
-
-       "input stack limit exceeded, infinite loop?",
-       "skipping bad character",
-       "escaped character not allowed in a name",
-       "manual name not yet set",
-       "skipping text before first section header",
-       "skipping unknown macro",
-       "NOT IMPLEMENTED, please use groff: skipping request",
-       "argument count wrong",
-       "skipping invalid content in .Rs block",
-       "skipping column outside column list",
-       "skipping end of block that is not open",
-       "missing end of block",
-       "scope open on exit",
-       "uname(3) system call failed",
-       "request requires a numeric argument",
-       "missing list type, using -item",
-       "line argument(s) will be lost",
-
-       "generic fatal error",
-
-       "input too large",
-       "not a manual",
-       "column syntax is inconsistent",
-       "NOT IMPLEMENTED: .Bd -file",
-       "argument count wrong, violates syntax",
-       "child violates parent syntax",
-       "argument count wrong, violates syntax",
-       "NOT IMPLEMENTED: .so with absolute path or \"..\"",
-       ".so request failed",
-       "no document prologue",
-       "static buffer exhausted",
-
-       /* system errors */
-       NULL,
-       "cannot stat file",
-       "cannot read file",
-};
-
-static const char * const      mandoclevels[MANDOCLEVEL_MAX] = {
-       "SUCCESS",
-       "RESERVED",
-       "WARNING",
-       "ERROR",
-       "FATAL",
-       "BADARG",
-       "SYSERR"
-};
 
 
 static void
 
 
 static void
@@ -236,94 +82,106 @@ resize_buf(struct buf *buf, size_t initial)
 }
 
 static void
 }
 
 static void
-pset(const char *buf, int pos, struct mparse *curp)
+free_buf_list(struct buf *buf)
+{
+       struct buf *tmp;
+
+       while (buf != NULL) {
+               tmp = buf;
+               buf = tmp->next;
+               free(tmp->buf);
+               free(tmp);
+       }
+}
+
+static void
+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) {
-               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;
-       } else if (MPARSE_MAN & curp->options) {
-               if (NULL == curp->pman)
-                       curp->pman = man_alloc(curp->roff, curp,
-                           MPARSE_QUICK & curp->options ? 1 : 0);
-               assert(curp->pman);
-               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->meta.macroset = MACROSET_MDOC;
+               if (curp->man->mdocmac == NULL)
+                       curp->man->mdocmac = roffhash_alloc(MDOC_Dd, MDOC_MAX);
+       } else {
+               curp->man->meta.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->meta.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;
-       enum rofferr     rr;
-       int              i, of, rc;
-       int              pos; /* byte number in the ln buffer */
+       struct buf      *firstln, *lastln, *thisln, *loop;
+       char            *cp;
+       size_t           pos; /* byte number in the ln buffer */
+       int              line_result, result;
+       int              of;
        int              lnn; /* line number in the real file */
        int              lnn; /* line number in the real file */
+       int              fd;
+       int              inloop; /* Saw .while on this level. */
        unsigned char    c;
 
        unsigned char    c;
 
-       memset(&ln, 0, sizeof(struct buf));
-
+       ln.sz = 256;
+       ln.buf = mandoc_malloc(ln.sz);
+       ln.next = NULL;
+       firstln = lastln = loop = NULL;
        lnn = curp->line;
        pos = 0;
        lnn = curp->line;
        pos = 0;
+       inloop = 0;
+       result = ROFF_CONT;
 
 
-       for (i = 0; i < (int)blk.sz; ) {
-               if (0 == pos && '\0' == blk.buf[i])
-                       break;
-
+       while (i < blk.sz && (blk.buf[i] != '\0' || pos != 0)) {
                if (start) {
                        curp->line = lnn;
                        curp->reparse_count = 0;
                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,
@@ -331,7 +189,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]) {
@@ -341,101 +199,74 @@ 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 12 bytes: "\\[u10ffff]\n\0"
                         */
 
                         */
 
-                       if (pos + 2 >= (int)ln.sz)
+                       if (pos + 12 > 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_msg(MANDOCERR_CHAR_BAD,
+                                           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;
+                       if (c == 0x7f || (c < 0x20 && c != 0x09)) {
+                               mandoc_msg(c == 0x00 || c == 0x04 ||
+                                   c > 0x0a ? MANDOCERR_CHAR_BAD :
+                                   MANDOCERR_CHAR_UNSUPP,
+                                   curp->line, pos, "0x%x", c);
+                               i++;
+                               if (c != '\r')
+                                       ln.buf[pos++] = '?';
                                continue;
                        }
 
                                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++] = '?';
-                               continue;
-                       }
+                       ln.buf[pos++] = blk.buf[i++];
+               }
+               ln.buf[pos] = '\0';
 
 
-                       /* Some other escape sequence, copy & cont. */
+               /*
+                * Maintain a lookaside buffer of all lines.
+                * parsed from this input source.
+                */
 
 
-                       ln.buf[pos++] = blk.buf[i++];
-                       ln.buf[pos++] = blk.buf[i++];
+               thisln = mandoc_malloc(sizeof(*thisln));
+               thisln->buf = mandoc_strdup(ln.buf);
+               thisln->sz = strlen(ln.buf) + 1;
+               thisln->next = NULL;
+               if (firstln == NULL) {
+                       firstln = lastln = thisln;
+                       if (curp->secondary == NULL)
+                               curp->secondary = firstln;
+               } else {
+                       lastln->next = thisln;
+                       lastln = thisln;
                }
 
                }
 
-               if (pos >= (int)ln.sz)
-                       resize_buf(&ln, 256);
+               /* XXX Ugly hack to mark the end of the input. */
 
 
-               ln.buf[pos] = '\0';
+               if (i == blk.sz || blk.buf[i] == '\0') {
+                       if (pos + 2 > ln.sz)
+                               resize_buf(&ln, 256);
+                       ln.buf[pos++] = '\n';
+                       ln.buf[pos] = '\0';
+               }
 
                /*
                 * A significant amount of complexity is contained by
 
                /*
                 * A significant amount of complexity is contained by
@@ -447,164 +278,168 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
                 */
 
                of = 0;
                 */
 
                of = 0;
+rerun:
+               line_result = roff_parseln(curp->roff, curp->line, &ln, &of);
 
 
-               /*
-                * Maintain a lookaside buffer of all parsed lines.  We
-                * only do this if mparse_keep() has been invoked (the
-                * buffer may be accessed with mparse_getkeep()).
-                */
+               /* Process options. */
+
+               if (line_result & ROFF_APPEND)
+                       assert(line_result == (ROFF_IGN | ROFF_APPEND));
 
 
-               if (curp->secondary) {
-                       curp->secondary->buf = mandoc_realloc(
-                           curp->secondary->buf,
-                           curp->secondary->sz + pos + 2);
-                       memcpy(curp->secondary->buf +
-                           curp->secondary->sz,
-                           ln.buf, pos);
-                       curp->secondary->sz += pos;
-                       curp->secondary->buf
-                               [curp->secondary->sz] = '\n';
-                       curp->secondary->sz++;
-                       curp->secondary->buf
-                               [curp->secondary->sz] = '\0';
+               if (line_result & ROFF_USERCALL)
+                       assert((line_result & ROFF_MASK) == ROFF_REPARSE);
+
+               if (line_result & ROFF_USERRET) {
+                       assert(line_result == (ROFF_IGN | ROFF_USERRET));
+                       if (start == 0) {
+                               /* Return from the current macro. */
+                               result = ROFF_USERRET;
+                               goto out;
+                       }
                }
                }
-rerun:
-               rr = roff_parseln(curp->roff, curp->line,
-                   &ln.buf, &ln.sz, of, &of);
 
 
-               switch (rr) {
-               case ROFF_REPARSE:
-                       if (REPARSE_LIMIT >= ++curp->reparse_count)
-                               mparse_buf_r(curp, ln, 0);
-                       else
-                               mandoc_msg(MANDOCERR_ROFFLOOP, curp,
-                                   curp->line, pos, NULL);
-                       pos = 0;
-                       continue;
-               case ROFF_APPEND:
-                       pos = (int)strlen(ln.buf);
-                       continue;
-               case ROFF_RERUN:
-                       goto rerun;
+               switch (line_result & ROFF_LOOPMASK) {
                case ROFF_IGN:
                case ROFF_IGN:
-                       pos = 0;
-                       continue;
-               case ROFF_ERR:
-                       assert(MANDOCLEVEL_FATAL <= curp->file_status);
                        break;
                        break;
-               case ROFF_SO:
-                       if (0 == (MPARSE_SO & curp->options) &&
-                           (i >= (int)blk.sz || '\0' == blk.buf[i])) {
-                               curp->sodest = mandoc_strdup(ln.buf + of);
-                               free(ln.buf);
-                               return;
+               case ROFF_WHILE:
+                       if (curp->loop != NULL) {
+                               if (loop == curp->loop)
+                                       break;
+                               mandoc_msg(MANDOCERR_WHILE_NEST,
+                                   curp->line, pos, NULL);
                        }
                        }
-                       /*
-                        * We remove `so' clauses from our lookaside
-                        * buffer because we're going to descend into
-                        * the file recursively.
-                        */
-                       if (curp->secondary)
-                               curp->secondary->sz -= pos + 1;
-                       mparse_readfd(curp, -1, ln.buf + of);
-                       if (MANDOCLEVEL_FATAL <= curp->file_status) {
-                               mandoc_vmsg(MANDOCERR_SO_FAIL,
-                                   curp, curp->line, pos,
-                                   ".so %s", ln.buf + of);
+                       curp->loop = thisln;
+                       loop = NULL;
+                       inloop = 1;
+                       break;
+               case ROFF_LOOPCONT:
+               case ROFF_LOOPEXIT:
+                       if (curp->loop == NULL) {
+                               mandoc_msg(MANDOCERR_WHILE_FAIL,
+                                   curp->line, pos, NULL);
                                break;
                        }
                                break;
                        }
-                       pos = 0;
-                       continue;
-               default:
+                       if (inloop == 0) {
+                               mandoc_msg(MANDOCERR_WHILE_INTO,
+                                   curp->line, pos, NULL);
+                               curp->loop = loop = NULL;
+                               break;
+                       }
+                       if (line_result & ROFF_LOOPCONT)
+                               loop = curp->loop;
+                       else {
+                               curp->loop = loop = NULL;
+                               inloop = 0;
+                       }
                        break;
                        break;
+               default:
+                       abort();
                }
 
                }
 
-               /*
-                * If we encounter errors in the recursive parse, make
-                * sure we don't continue parsing.
-                */
+               /* Process the main instruction from the roff parser. */
 
 
-               if (MANDOCLEVEL_FATAL <= curp->file_status)
+               switch (line_result & ROFF_MASK) {
+               case ROFF_IGN:
                        break;
                        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.
-                */
-
-               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);
+               case ROFF_CONT:
+                       if (curp->man->meta.macroset == MACROSET_NONE)
+                               choose_parser(curp);
+                       if ((curp->man->meta.macroset == MACROSET_MDOC ?
+                            mdoc_parseln(curp->man, curp->line, ln.buf, of) :
+                            man_parseln(curp->man, curp->line, ln.buf, of)
+                           ) == 2)
+                               goto out;
                        break;
                        break;
-               } else if (2 == rc)
+               case ROFF_RERUN:
+                       goto rerun;
+               case ROFF_REPARSE:
+                       if (++curp->reparse_count > REPARSE_LIMIT) {
+                               /* Abort and return to the top level. */
+                               result = ROFF_IGN;
+                               mandoc_msg(MANDOCERR_ROFFLOOP,
+                                   curp->line, pos, NULL);
+                               goto out;
+                       }
+                       result = mparse_buf_r(curp, ln, of, 0);
+                       if (line_result & ROFF_USERCALL) {
+                               roff_userret(curp->roff);
+                               /* Continue normally. */
+                               if (result & ROFF_USERRET)
+                                       result = ROFF_CONT;
+                       }
+                       if (start == 0 && result != ROFF_CONT)
+                               goto out;
                        break;
                        break;
-
-               /* Temporary buffers typically are not full. */
-
-               if (0 == start && '\0' == blk.buf[i])
+               case ROFF_SO:
+                       if ( ! (curp->options & MPARSE_SO) &&
+                           (i >= blk.sz || blk.buf[i] == '\0')) {
+                               curp->man->meta.sodest =
+                                   mandoc_strdup(ln.buf + of);
+                               goto out;
+                       }
+                       if ((fd = mparse_open(curp, ln.buf + of)) != -1) {
+                               mparse_readfd(curp, fd, ln.buf + of);
+                               close(fd);
+                       } else {
+                               mandoc_msg(MANDOCERR_SO_FAIL,
+                                   curp->line, of, ".so %s: %s",
+                                   ln.buf + of, strerror(errno));
+                               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);
+                       }
                        break;
                        break;
+               default:
+                       abort();
+               }
 
                /* Start the next input line. */
 
 
                /* Start the next input line. */
 
-               pos = 0;
-       }
+               if (loop != NULL &&
+                   (line_result & ROFF_LOOPMASK) == ROFF_IGN)
+                       loop = loop->next;
+
+               if (loop != NULL) {
+                       if ((line_result & ROFF_APPEND) == 0)
+                               *ln.buf = '\0';
+                       if (ln.sz < loop->sz)
+                               resize_buf(&ln, loop->sz);
+                       (void)strlcat(ln.buf, loop->buf, ln.sz);
+                       of = 0;
+                       goto rerun;
+               }
 
 
+               pos = (line_result & ROFF_APPEND) ? strlen(ln.buf) : 0;
+       }
+out:
+       if (inloop) {
+               if (result != ROFF_USERRET)
+                       mandoc_msg(MANDOCERR_WHILE_OUTOF,
+                           curp->line, pos, NULL);
+               curp->loop = NULL;
+       }
        free(ln.buf);
        free(ln.buf);
+       if (firstln != curp->secondary)
+               free_buf_list(firstln);
+       return result;
 }
 
 static int
 }
 
 static int
-read_whole_file(struct mparse *curp, const char *file, int fd,
-               struct buf *fb, int *with_mmap)
+read_whole_file(struct mparse *curp, 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;
+       int              gzerrnum, retval;
 
 
-#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) {
+               mandoc_msg(MANDOCERR_FSTAT, 0, 0, "%s", strerror(errno));
+               return -1;
        }
 
        /*
        }
 
        /*
@@ -614,21 +449,39 @@ 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, 0, 0, NULL);
+                       return -1;
                }
                *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 0;
        }
        }
-#endif
+
+       if (curp->gzip) {
+               /*
+                * Duplicating the file descriptor is required
+                * because we will have to call gzclose(3)
+                * to free memory used internally by zlib,
+                * but that will also close the file descriptor,
+                * which this function must not do.
+                */
+               if ((fd = dup(fd)) == -1) {
+                       mandoc_msg(MANDOCERR_DUP, 0, 0,
+                           "%s", strerror(errno));
+                       return -1;
+               }
+               if ((gz = gzdopen(fd, "rb")) == NULL) {
+                       mandoc_msg(MANDOCERR_GZDOPEN, 0, 0,
+                           "%s", strerror(errno));
+                       close(fd);
+                       return -1;
+               }
+       } 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
@@ -637,278 +490,240 @@ read_whole_file(struct mparse *curp, const char *file, int fd,
 
        *with_mmap = 0;
        off = 0;
 
        *with_mmap = 0;
        off = 0;
+       retval = -1;
        fb->sz = 0;
        fb->buf = NULL;
        for (;;) {
                if (off == fb->sz) {
                        if (fb->sz == (1U << 31)) {
        fb->sz = 0;
        fb->buf = NULL;
        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, 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);
+                       retval = 0;
+                       break;
                }
                if (ssz == -1) {
                }
                if (ssz == -1) {
-                       curp->file_status = MANDOCLEVEL_SYSERR;
-                       if (curp->mmsg)
-                               (*curp->mmsg)(MANDOCERR_SYSREAD,
-                                   curp->file_status, file, 0, 0,
-                                   strerror(errno));
+                       if (curp->gzip)
+                               (void)gzerror(gz, &gzerrnum);
+                       mandoc_msg(MANDOCERR_READ, 0, 0, "%s",
+                           curp->gzip && gzerrnum != Z_ERRNO ?
+                           zError(gzerrnum) : strerror(errno));
                        break;
                }
                off += (size_t)ssz;
        }
 
                        break;
                }
                off += (size_t)ssz;
        }
 
-       free(fb->buf);
-       fb->buf = NULL;
-       return(0);
+       if (curp->gzip && (gzerrnum = gzclose(gz)) != Z_OK)
+               mandoc_msg(MANDOCERR_GZCLOSE, 0, 0, "%s",
+                   gzerrnum == Z_ERRNO ? strerror(errno) :
+                   zError(gzerrnum));
+       if (retval == -1) {
+               free(fb->buf);
+               fb->buf = NULL;
+       }
+       return retval;
 }
 
 static void
 mparse_end(struct mparse *curp)
 {
 }
 
 static void
 mparse_end(struct mparse *curp)
 {
-
-       if (MANDOCLEVEL_FATAL <= curp->file_status)
-               return;
-
-       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->mdoc || curp->man || curp->sodest)) {
-               mandoc_msg(MANDOCERR_NOTMANUAL, curp, 0, 0, NULL);
-               curp->file_status = MANDOCLEVEL_FATAL;
-               return;
-       }
-
+       if (curp->man->meta.macroset == MACROSET_NONE)
+               curp->man->meta.macroset = MACROSET_MAN;
+       if (curp->man->meta.macroset == MACROSET_MDOC)
+               mdoc_endparse(curp->man);
+       else
+               man_endparse(curp->man);
        roff_endparse(curp->roff);
 }
 
        roff_endparse(curp->roff);
 }
 
-static void
-mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file)
+/*
+ * Read the whole file into memory and call the parsers.
+ * Called recursively when an .so request is encountered.
+ */
+void
+mparse_readfd(struct mparse *curp, int fd, const char *filename)
 {
 {
-       const char      *svfile;
        static int       recursion_depth;
 
        static int       recursion_depth;
 
-       if (64 < recursion_depth) {
-               mandoc_msg(MANDOCERR_ROFFLOOP, curp, curp->line, 0, NULL);
+       struct buf       blk;
+       struct buf      *save_primary;
+       const char      *save_filename, *cp;
+       size_t           offset;
+       int              save_filenc, save_lineno;
+       int              with_mmap;
+
+       if (recursion_depth > 64) {
+               mandoc_msg(MANDOCERR_ROFFLOOP, curp->line, 0, NULL);
                return;
                return;
-       }
+       } else if (recursion_depth == 0 &&
+           (cp = strrchr(filename, '.')) != NULL &&
+            cp[1] >= '1' && cp[1] <= '9')
+                curp->man->filesec = cp[1];
+        else
+                curp->man->filesec = '\0';
+
+       if (read_whole_file(curp, fd, &blk, &with_mmap) == -1)
+               return;
+
+       /*
+        * Save some properties of the parent file.
+        */
 
 
-       /* Line number is per-file. */
-       svfile = curp->file;
-       curp->file = file;
+       save_primary = curp->primary;
+       save_filenc = curp->filenc;
+       save_lineno = curp->line;
+       save_filename = mandoc_msg_getinfilename();
+
+       curp->primary = &blk;
+       curp->filenc = curp->options & (MPARSE_UTF8 | MPARSE_LATIN1);
        curp->line = 1;
        curp->line = 1;
+       mandoc_msg_setinfilename(filename);
+
+       /* 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;
+
        recursion_depth++;
        recursion_depth++;
+       mparse_buf_r(curp, blk, offset, 1);
+       if (--recursion_depth == 0)
+               mparse_end(curp);
 
 
-       mparse_buf_r(curp, blk, 1);
+       /*
+        * Clean up and restore saved parent properties.
+        */
 
 
-       if (0 == --recursion_depth && MANDOCLEVEL_FATAL > curp->file_status)
-               mparse_end(curp);
+       if (with_mmap)
+               munmap(blk.buf, blk.sz);
+       else
+               free(blk.buf);
 
 
-       curp->file = svfile;
+       curp->primary = save_primary;
+       curp->filenc = save_filenc;
+       curp->line = save_lineno;
+       if (save_filename != NULL)
+               mandoc_msg_setinfilename(save_filename);
 }
 
 }
 
-enum mandoclevel
-mparse_readmem(struct mparse *curp, const void *buf, size_t len,
-               const char *file)
+int
+mparse_open(struct mparse *curp, const char *file)
 {
 {
-       struct buf blk;
-
-       blk.buf = UNCONST(buf);
-       blk.sz = len;
+       char             *cp;
+       int               fd, save_errno;
 
 
-       mparse_parse_buffer(curp, blk, file);
-       return(curp->file_status);
-}
+       cp = strrchr(file, '.');
+       curp->gzip = (cp != NULL && ! strcmp(cp + 1, "gz"));
 
 
-enum mandoclevel
-mparse_readfd(struct mparse *curp, int fd, const char *file)
-{
-       struct buf       blk;
-       int              with_mmap;
+       /* First try to use the filename as it is. */
 
 
-       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;
-       }
+       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) {
+               save_errno = errno;
+               mandoc_asprintf(&cp, "%s.gz", file);
+               fd = open(cp, O_RDONLY);
+               free(cp);
+               errno = save_errno;
+               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);
+       return -1;
 }
 
 struct mparse *
 }
 
 struct mparse *
-mparse_alloc(int options, enum mandoclevel wlevel,
-               mandocmsg mmsg, char *defos)
+mparse_alloc(int options, 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->mmsg = mmsg;
-       curp->defos = defos;
-
-       curp->roff = roff_alloc(curp, options);
-       return(curp);
+       curp->os_s = os_s;
+
+       curp->roff = roff_alloc(options);
+       curp->man = roff_man_alloc(curp->roff, curp->os_s,
+               curp->options & MPARSE_QUICK ? 1 : 0);
+       if (curp->options & MPARSE_MDOC) {
+               curp->man->meta.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->meta.macroset = MACROSET_MAN;
+               if (curp->man->manmac == NULL)
+                       curp->man->manmac = roffhash_alloc(MAN_TH, MAN_MAX);
+       }
+       curp->man->meta.first->tok = TOKEN_NONE;
+       curp->man->meta.os_e = os_e;
+       tag_alloc();
+       return curp;
 }
 
 void
 mparse_reset(struct mparse *curp)
 {
 }
 
 void
 mparse_reset(struct mparse *curp)
 {
-
+       tag_free();
        roff_reset(curp->roff);
        roff_reset(curp->roff);
-
-       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;
-       curp->mdoc = NULL;
-       curp->man = NULL;
-
-       free(curp->sodest);
-       curp->sodest = NULL;
+       roff_man_reset(curp->man);
+       free_buf_list(curp->secondary);
+       curp->secondary = NULL;
+       curp->gzip = 0;
+       tag_alloc();
 }
 
 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);
-       if (curp->secondary)
-               free(curp->secondary->buf);
-
-       free(curp->secondary);
-       free(curp->sodest);
+       tag_free();
+       roffhash_free(curp->man->mdocmac);
+       roffhash_free(curp->man->manmac);
+       roff_man_free(curp->man);
+       roff_free(curp->roff);
+       free_buf_list(curp->secondary);
        free(curp);
 }
 
        free(curp);
 }
 
-void
-mparse_result(struct mparse *curp,
-       struct mdoc **mdoc, struct man **man, char **sodest)
+struct roff_meta *
+mparse_result(struct mparse *curp)
 {
 {
-
-       if (sodest && NULL != (*sodest = curp->sodest)) {
-               *mdoc = NULL;
-               *man = NULL;
-               return;
+       roff_state_reset(curp->man);
+       if (curp->options & MPARSE_VALIDATE) {
+               if (curp->man->meta.macroset == MACROSET_MDOC)
+                       mdoc_validate(curp->man);
+               else
+                       man_validate(curp->man);
+               tag_postprocess(curp->man, curp->man->meta.first);
        }
        }
-       if (mdoc)
-               *mdoc = curp->mdoc;
-       if (man)
-               *man = curp->man;
-}
-
-void
-mandoc_vmsg(enum mandocerr t, struct mparse *m,
-               int ln, int pos, const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
-
-       va_start(ap, fmt);
-       (void)vsnprintf(buf, sizeof(buf), fmt, ap);
-       va_end(ap);
-
-       mandoc_msg(t, m, ln, pos, buf);
-}
-
-void
-mandoc_msg(enum mandocerr er, struct mparse *m,
-               int ln, int col, const char *msg)
-{
-       enum mandoclevel level;
-
-       level = MANDOCLEVEL_FATAL;
-       while (er < mandoclimits[level])
-               level--;
-
-       if (level < m->wlevel)
-               return;
-
-       if (m->mmsg)
-               (*m->mmsg)(er, level, m->file, ln, col, msg);
-
-       if (m->file_status < level)
-               m->file_status = level;
-}
-
-const char *
-mparse_strerror(enum mandocerr er)
-{
-
-       return(mandocerrs[er]);
-}
-
-const char *
-mparse_strlevel(enum mandoclevel lvl)
-{
-       return(mandoclevels[lvl]);
+       return &curp->man->meta;
 }
 
 void
 }
 
 void
-mparse_keep(struct mparse *p)
-{
-
-       assert(NULL == p->secondary);
-       p->secondary = mandoc_calloc(1, sizeof(struct buf));
-}
-
-const char *
-mparse_getkeep(const struct mparse *p)
+mparse_copy(const struct mparse *p)
 {
 {
+       struct buf      *buf;
 
 
-       assert(p->secondary);
-       return(p->secondary->sz ? p->secondary->buf : NULL);
+       for (buf = p->secondary; buf != NULL; buf = buf->next)
+               puts(buf->buf);
 }
 }
A git conversion mirror of mandoc.bsd.lv