More accurately represent cells containing horizontal lines in -T tree

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index a52bfb1c443a2ee13a4c0791af852787c453c006..5b33edbe9cef4ef528ba141832e61b490edf52a3 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,245 +1,76 @@
-/*     $Id: read.c,v 1.124 2015/02/06 07:13:14 schwarze Exp $ */
+/* $Id: read.c,v 1.220 2021/06/27 17:57:54 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-2015 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.

  */
 #include "config.h"
 
 #include <sys/types.h>
  */
 #include "config.h"
 
 #include <sys/types.h>

-#if HAVE_MMAP

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

-#endif
-#include <sys/wait.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 "mandoc_parse.h"
+#include "libmandoc.h"
+#include "roff_int.h"
+#include "tag.h"

 
 #define        REPARSE_LIMIT   1000
 
 struct mparse {
 
 #define        REPARSE_LIMIT   1000
 
 struct mparse {

-       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) */

-       const struct mchars *mchars; /* character table */
-       char             *sodest; /* filename pointed to by .so */
-       const char       *file; /* filename of current input file */
+       struct roff_man  *man; /* man parser */

        struct buf       *primary; /* buffer currently being parsed */
        struct buf       *primary; /* buffer currently being parsed */

-       struct buf       *secondary; /* preprocessed copy of input */
-       const char       *defos; /* default operating system */
-       mandocmsg         mmsg; /* warning/error message handler */
-       enum mandoclevel  file_status; /* status of current parse */
-       enum mandoclevel  wlevel; /* ignore messages below this */
+       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               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 */
        int               filenc; /* encoding of the current file */
        int               reparse_count; /* finite interp. stack */
        int               line; /* line number in the file */

-       pid_t             child; /* the gunzip(1) process */

 };
 
 static void      choose_parser(struct mparse *);
 };
 
 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, size_t, int);
-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_UNSUPP,
-       MANDOCERR_MAX,
-       MANDOCERR_MAX
-};
-
-static const char * const      mandocerrs[MANDOCERR_MAX] = {
-       "ok",
-
-       "generic warning",
-
-       /* related to the prologue */
-       "missing manual title, using UNTITLED",
-       "missing manual title, using \"\"",
-       "lower case character in document title",
-       "missing manual section, using \"\"",
-       "unknown manual section",
-       "missing date, using today's date",
-       "cannot parse date, using it verbatim",
-       "missing Os macro, using \"\"",
-       "duplicate prologue macro",
-       "late prologue macro",
-       "skipping late title macro",
-       "prologue macros out of order",
-
-       /* 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",
-       "missing description line, using \"\"",
-       "sections out of conventional order",
-       "duplicate section title",
-       "unexpected section",
-       "unusual Xr order",
-       "unusual Xr punctuation",
-       "AUTHORS section without An 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",
-       ".Vt block has child macro",
-       "fill mode already enabled, skipping",
-       "fill mode already disabled, skipping",
-       "line scope broken",
-
-       /* related to missing macro arguments */
-       "skipping empty request",
-       "conditional request controls empty scope",
-       "skipping empty macro",
-       "empty block",
-       "empty argument, using 0n",
-       "missing display type, using -ragged",
-       "list type is not the first argument",
-       "missing -width in -tag list, using 8n",
-       "missing utility name, using \"\"",
-       "missing function name, using \"\"",
-       "empty head in list item",
-       "empty list item",
-       "missing font type, using \\fR",
-       "unknown font type, using \\fR",
-       "nothing follows prefix",
-       "empty reference block",
-       "missing -std argument, adding it",
-       "missing eqn box, using \"\"",
-
-       /* related to bad macro arguments */
-       "unterminated quoted argument",
-       "duplicate argument",
-       "skipping duplicate argument",
-       "skipping duplicate display type",
-       "skipping duplicate list type",
-       "skipping -width argument",
-       "unknown AT&T UNIX version",
-       "comma in function argument",
-       "parenthesis in function name",
-       "invalid content in Rs block",
-       "invalid Boolean argument",
-       "unknown font, skipping request",
-
-       /* related to plain text */
-       "blank line in fill mode, using .sp",
-       "tab in filled text",
-       "whitespace at end of input line",
-       "bad comment style",
-       "invalid escape sequence",
-       "undefined string, using \"\"",
-
-       /* related to tables */
-       "tbl line starts with span",
-       "tbl column starts with span",
-       "skipping vertical bar in tbl layout",
-
-       "generic error",
-
-       /* related to tables */
-       "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 */
-       NULL,
-       "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",
-       "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",
-       "argument count wrong",
-       "NOT IMPLEMENTED: Bd -file",
-       "missing list type, using -item",
-       "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",
-       "divide by zero",
-
-       "unsupported feature",
-       "input too large",
-       "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",
-       "RESERVED",
-       "WARNING",
-       "ERROR",
-       "UNSUPP",
-       "BADARG",
-       "SYSERR"
-};

 
 
 static void
 
 
 static void


@@ -250,6 +81,19 @@ resize_buf(struct buf *buf, size_t initial)
        buf->buf = mandoc_realloc(buf->buf, buf->sz);
 }
 
        buf->buf = mandoc_realloc(buf->buf, buf->sz);
 }
 

+static void
+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)
 {
 static void
 choose_parser(struct mparse *curp)
 {


@@ -285,23 +129,15 @@ choose_parser(struct mparse *curp)
        }
 
        if (format == MPARSE_MDOC) {
        }
 
        if (format == MPARSE_MDOC) {

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

        }
        }

-
-       /* Fall back to man(7) as a last resort. */
-
-       if (NULL == curp->pman)
-               curp->pman = man_alloc(
-                   curp->roff, curp, curp->defos,
-                   MPARSE_QUICK & curp->options ? 1 : 0);
-       assert(curp->pman);
-       curp->man = curp->pman;
+       curp->man->meta.first->tok = TOKEN_NONE;

 }
 
 /*
 }
 
 /*


@@ -311,30 +147,31 @@ choose_parser(struct mparse *curp)
  * macros, inline equations, and input line traps)
  * and indirectly (for .so file inclusion).
  */
  * macros, inline equations, and input line traps)
  * and indirectly (for .so file inclusion).
  */

-static void
+static int

 mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
 {
 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;
+       struct buf      *firstln, *lastln, *thisln, *loop;

        char            *cp;
        size_t           pos; /* byte number in the ln buffer */
        char            *cp;
        size_t           pos; /* byte number in the ln buffer */

-       enum rofferr     rr;
+       size_t           spos; /* at the start of the current line parse */
+       int              line_result, result;

        int              of;
        int              lnn; /* line number in the real file */
        int              fd;
        int              of;
        int              lnn; /* line number in the real file */
        int              fd;

-       pid_t            save_child;
+       int              inloop; /* Saw .while on this level. */

        unsigned char    c;
 
        unsigned char    c;
 

-       memset(&ln, 0, sizeof(ln));
-
+       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;

 
 

-       while (i < 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;


@@ -344,6 +181,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
                            curp->filenc & MPARSE_LATIN1)
                                curp->filenc = preconv_cue(&blk, i);
                }
                            curp->filenc & MPARSE_LATIN1)
                                curp->filenc = preconv_cue(&blk, i);
                }

+               spos = pos;

 
                while (i < blk.sz && (start || blk.buf[i] != '\0')) {
 
 
                while (i < blk.sz && (start || blk.buf[i] != '\0')) {
 


@@ -364,10 +202,10 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
 
                        /*
                         * Make sure we have space for the worst
 
                        /*
                         * Make sure we have space for the worst

-                        * case of 11 bytes: "\\[u10ffff]\0"
+                        * case of 12 bytes: "\\[u10ffff]\n\0"

                         */
 
                         */
 

-                       if (pos + 11 > ln.sz)
+                       if (pos + 12 > ln.sz)

                                resize_buf(&ln, 256);
 
                        /*
                                resize_buf(&ln, 256);
 
                        /*


@@ -378,7 +216,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
                        if (c & 0x80) {
                                if ( ! (curp->filenc && preconv_encode(
                                    &blk, &i, &ln, &pos, &curp->filenc))) {
                        if (c & 0x80) {
                                if ( ! (curp->filenc && preconv_encode(
                                    &blk, &i, &ln, &pos, &curp->filenc))) {

-                                       mandoc_vmsg(MANDOCERR_CHAR_BAD, curp,
+                                       mandoc_msg(MANDOCERR_CHAR_BAD,

                                            curp->line, pos, "0x%x", c);
                                        ln.buf[pos++] = '?';
                                        i++;
                                            curp->line, pos, "0x%x", c);
                                        ln.buf[pos++] = '?';
                                        i++;


@@ -391,82 +229,46 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
                         */
 
                        if (c == 0x7f || (c < 0x20 && c != 0x09)) {
                         */
 
                        if (c == 0x7f || (c < 0x20 && c != 0x09)) {

-                               mandoc_vmsg(c == 0x00 || c == 0x04 ||
+                               mandoc_msg(c == 0x00 || c == 0x04 ||

                                    c > 0x0a ? MANDOCERR_CHAR_BAD :
                                    MANDOCERR_CHAR_UNSUPP,
                                    c > 0x0a ? MANDOCERR_CHAR_BAD :
                                    MANDOCERR_CHAR_UNSUPP,

-                                   curp, curp->line, pos, "0x%x", c);
+                                   curp->line, pos, "0x%x", c);

                                i++;
                                i++;

-                               ln.buf[pos++] = '?';
-                               continue;
-                       }
-
-                       /* Trailing backslash = a plain char. */
-
-                       if (blk.buf[i] != '\\' || i + 1 == blk.sz) {
-                               ln.buf[pos++] = blk.buf[i++];
-                               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.
-                        */
-
-                       if ('\r' == blk.buf[i + 1] && i + 2 < blk.sz &&
-                           '\n' == blk.buf[i + 2])
-                               ++i;
-                       if ('\n' == blk.buf[i + 1]) {
-                               i += 2;
-                               ++lnn;
+                               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 < 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_vmsg(MANDOCERR_CHAR_BAD, curp,
-                                   curp->line, pos, "0x%x", c);
-                               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 >= 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


@@ -478,72 +280,113 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size_t i, int start)
                 */
 
                of = 0;
                 */
 
                of = 0;

+rerun:
+               line_result = roff_parseln(curp->roff, curp->line,
+                   &ln, &of, start && spos == 0 ? pos : 0);

 
 

-               /*
-                * 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, &of);

 
 

-               switch (rr) {
-               case ROFF_REPARSE:
-                       if (REPARSE_LIMIT >= ++curp->reparse_count)
-                               mparse_buf_r(curp, ln, of, 0);
-                       else
-                               mandoc_msg(MANDOCERR_ROFFLOOP, curp,
+               switch (line_result & ROFF_LOOPMASK) {
+               case ROFF_IGN:
+                       break;
+               case ROFF_WHILE:
+                       if (curp->loop != NULL) {
+                               if (loop == curp->loop)
+                                       break;
+                               mandoc_msg(MANDOCERR_WHILE_NEST,
+                                   curp->line, pos, NULL);
+                       }
+                       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;
+                       }
+                       if (inloop == 0) {
+                               mandoc_msg(MANDOCERR_WHILE_INTO,

                                    curp->line, pos, NULL);
                                    curp->line, pos, NULL);

-                       pos = 0;
-                       continue;
-               case ROFF_APPEND:
-                       pos = strlen(ln.buf);
-                       continue;
+                               curp->loop = loop = NULL;
+                               break;
+                       }
+                       if (line_result & ROFF_LOOPCONT)
+                               loop = curp->loop;
+                       else {
+                               curp->loop = loop = NULL;
+                               inloop = 0;
+                       }
+                       break;
+               default:
+                       abort();
+               }
+
+               /* Process the main instruction from the roff parser. */
+
+               switch (line_result & ROFF_MASK) {
+               case ROFF_IGN:
+                       break;
+               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;

                case ROFF_RERUN:
                        goto rerun;
                case ROFF_RERUN:
                        goto rerun;

-               case ROFF_IGN:
-                       pos = 0;
-                       continue;
+               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;

                case ROFF_SO:
                        if ( ! (curp->options & MPARSE_SO) &&
                            (i >= blk.sz || blk.buf[i] == '\0')) {
                case ROFF_SO:
                        if ( ! (curp->options & MPARSE_SO) &&
                            (i >= blk.sz || blk.buf[i] == '\0')) {

-                               curp->sodest = mandoc_strdup(ln.buf + of);
-                               free(ln.buf);
-                               return;
+                               curp->man->meta.sodest =
+                                   mandoc_strdup(ln.buf + of);
+                               goto out;

                        }
                        }

-                       /*
-                        * 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;
-                       save_file = curp->file;
-                       save_child = curp->child;
-                       if (mparse_open(curp, &fd, ln.buf + of) ==
-                           MANDOCLEVEL_OK) {
+                       if ((fd = mparse_open(curp, ln.buf + of)) != -1) {

                                mparse_readfd(curp, fd, ln.buf + of);
                                mparse_readfd(curp, fd, ln.buf + of);

-                               curp->file = save_file;
+                               close(fd);

                        } else {
                        } else {

-                               curp->file = save_file;
-                               mandoc_vmsg(MANDOCERR_SO_FAIL,
-                                   curp, curp->line, pos,
-                                   ".so %s", ln.buf + of);
+                               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);
                                ln.sz = mandoc_asprintf(&cp,
                                    ".sp\nSee the file %s.\n.sp",
                                    ln.buf + of);


@@ -552,73 +395,54 @@ rerun:
                                of = 0;
                                mparse_buf_r(curp, ln, of, 0);
                        }
                                of = 0;
                                mparse_buf_r(curp, ln, of, 0);
                        }

-                       curp->child = save_child;
-                       pos = 0;
-                       continue;
-               default:

                        break;
                        break;

+               default:
+                       abort();

                }
 
                }
 

-               /*
-                * 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))
-                       choose_parser(curp);
-
-               /*
-                * Lastly, push down into the parsers themselves.
-                * 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 (rr == ROFF_TBL) {
-                       while ((span = roff_span(curp->roff)) != NULL)
-                               if (curp->man == NULL)
-                                       mdoc_addspan(curp->mdoc, span);
-                               else
-                                       man_addspan(curp->man, span);
-               } else if (rr == ROFF_EQN) {
-                       if (curp->man == NULL)
-                               mdoc_addeqn(curp->mdoc, roff_eqn(curp->roff));
-                       else
-                               man_addeqn(curp->man, roff_eqn(curp->roff));
-               } else if ((curp->man == NULL ?
-                   mdoc_parseln(curp->mdoc, curp->line, ln.buf, of) :
-                   man_parseln(curp->man, curp->line, ln.buf, of)) == 2)
-                               break;
-
-               /* Temporary buffers typically are not full. */
-
-               if (0 == start && '\0' == blk.buf[i])
-                       break;
-

                /* 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;

 
 

-#if HAVE_MMAP
-       struct stat      st;
-       if (-1 == fstat(fd, &st)) {
-               perror(file);
-               exit((int)MANDOCLEVEL_SYSERR);
+       if (fstat(fd, &st) == -1) {
+               mandoc_msg(MANDOCERR_FSTAT, 0, 0, "%s", strerror(errno));
+               return -1;

        }
 
        /*
        }
 
        /*


@@ -628,18 +452,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)) {
-                       mandoc_msg(MANDOCERR_TOOLARGE, curp, 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


@@ -648,78 +493,101 @@ 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)) {

-                               mandoc_msg(MANDOCERR_TOOLARGE, curp,
-                                   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) {

-                       perror(file);
-                       exit((int)MANDOCLEVEL_SYSERR);
+                       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;
        }
 
                }
                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 (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->defos,
-                                   curp->options & MPARSE_QUICK ? 1 : 0);
-                       curp->man = curp->pman;
-               }
-       }
-       if (curp->mdoc)
-               mdoc_endparse(curp->mdoc);
-       if (curp->man)
+       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);
 }
 
                man_endparse(curp->man);
        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)

 {
 {

-       struct buf      *svprimary;
-       const char      *svfile;
-       size_t           offset;

        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.
+        */
+
+       save_primary = curp->primary;
+       save_filenc = curp->filenc;
+       save_lineno = curp->line;
+       save_filename = mandoc_msg_getinfilename();

 
 

-       /* Line number is per-file. */
-       svfile = curp->file;
-       curp->file = file;
-       svprimary = curp->primary;

        curp->primary = &blk;
        curp->primary = &blk;

+       curp->filenc = curp->options & (MPARSE_UTF8 | MPARSE_LATIN1);

        curp->line = 1;
        curp->line = 1;

-       recursion_depth++;
+       mandoc_msg_setinfilename(filename);

 
        /* Skip an UTF-8 byte order mark. */
        if (curp->filenc & MPARSE_UTF8 && blk.sz > 2 &&
 
        /* Skip an UTF-8 byte order mark. */
        if (curp->filenc & MPARSE_UTF8 && blk.sz > 2 &&


@@ -731,290 +599,134 @@ mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file)
        } else
                offset = 0;
 
        } else
                offset = 0;
 

+       recursion_depth++;

        mparse_buf_r(curp, blk, offset, 1);
        mparse_buf_r(curp, blk, offset, 1);

-

        if (--recursion_depth == 0)
                mparse_end(curp);
 
        if (--recursion_depth == 0)
                mparse_end(curp);
 

-       curp->primary = svprimary;
-       curp->file = svfile;
-}
-
-enum mandoclevel
-mparse_readmem(struct mparse *curp, void *buf, size_t len,
-               const char *file)
-{
-       struct buf blk;
-
-       blk.buf = buf;
-       blk.sz = len;
-
-       mparse_parse_buffer(curp, blk, file);
-       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;
-       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 HAVE_MMAP
-               if (with_mmap)
-                       munmap(blk.buf, blk.sz);
-               else
-#endif
-                       free(blk.buf);
-       }
+       /*
+        * Clean up and restore saved parent properties.
+        */

 
 

-       if (fd != STDIN_FILENO && close(fd) == -1)
-               perror(file);
+       if (with_mmap)
+               munmap(blk.buf, blk.sz);
+       else
+               free(blk.buf);

 
 

-       mparse_wait(curp);
-       return(curp->file_status);
+       curp->primary = save_primary;
+       curp->filenc = save_filenc;
+       curp->line = save_lineno;
+       if (save_filename != NULL)
+               mandoc_msg_setinfilename(save_filename);

 }
 
 }
 

-enum mandoclevel
-mparse_open(struct mparse *curp, int *fd, const char *file)
+int
+mparse_open(struct mparse *curp, const char *file)

 {
 {

-       int               pfd[2];
-       int               save_errno;

        char             *cp;
        char             *cp;

+       int               fd, save_errno;

 
 

-       curp->file = file;
+       cp = strrchr(file, '.');
+       curp->gzip = (cp != NULL && ! strcmp(cp + 1, "gz"));

 
 

-       /* Unless zipped, try to just open the file. */
+       /* First try to use the filename as it is. */

 
 

-       if ((cp = strrchr(file, '.')) == NULL ||
-           strcmp(cp + 1, "gz")) {
-               curp->child = 0;
-               if ((*fd = open(file, O_RDONLY)) != -1)
-                       return(MANDOCLEVEL_OK);
+       if ((fd = open(file, O_RDONLY)) != -1)
+               return fd;

 
 

-               /* Open failed; try to append ".gz". */
+       /*
+        * If that doesn't work and the filename doesn't
+        * already  end in .gz, try appending .gz.
+        */

 
 

+       if ( ! curp->gzip) {
+               save_errno = errno;

                mandoc_asprintf(&cp, "%s.gz", file);
                mandoc_asprintf(&cp, "%s.gz", file);

-               file = cp;
-       } else
-               cp = NULL;
-
-       /* Before forking, make sure the file can be read. */
-
-       save_errno = errno;
-       if (access(file, R_OK) == -1) {
-               if (cp != NULL)
-                       errno = save_errno;
+               fd = open(cp, O_RDONLY);

                free(cp);
                free(cp);

-               *fd = -1;
-               curp->child = 0;
-               mandoc_msg(MANDOCERR_FILE, curp, 0, 0, strerror(errno));
-               return(MANDOCLEVEL_ERROR);
-       }
-
-       /* Run gunzip(1). */
-
-       if (pipe(pfd) == -1) {
-               perror("pipe");
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       switch (curp->child = fork()) {
-       case -1:
-               perror("fork");
-               exit((int)MANDOCLEVEL_SYSERR);
-       case 0:
-               close(pfd[0]);
-               if (dup2(pfd[1], STDOUT_FILENO) == -1) {
-                       perror("dup");
-                       exit((int)MANDOCLEVEL_SYSERR);
+               errno = save_errno;
+               if (fd != -1) {
+                       curp->gzip = 1;
+                       return fd;

                }
                }

-               execlp("gunzip", "gunzip", "-c", file, NULL);
-               perror("exec");
-               exit((int)MANDOCLEVEL_SYSERR);
-       default:
-               close(pfd[1]);
-               *fd = pfd[0];
-               return(MANDOCLEVEL_OK);

        }
        }

-}

 
 

-enum mandoclevel
-mparse_wait(struct mparse *curp)
-{
-       int       status;
-
-       if (curp->child == 0)
-               return(MANDOCLEVEL_OK);
+       /* Neither worked, give up. */

 
 

-       if (waitpid(curp->child, &status, 0) == -1) {
-               perror("wait");
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-       if (WIFSIGNALED(status)) {
-               mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
-                   "gunzip died from signal %d", WTERMSIG(status));
-               return(MANDOCLEVEL_ERROR);
-       }
-       if (WEXITSTATUS(status)) {
-               mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
-                   "gunzip failed with code %d", WEXITSTATUS(status));
-               return(MANDOCLEVEL_ERROR);
-       }
-       return(MANDOCLEVEL_OK);
+       return -1;

 }
 
 struct mparse *
 }
 
 struct mparse *

-mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg,
-    const struct mchars *mchars, const char *defos)
+mparse_alloc(int options, enum mandoc_os os_e, const char *os_s)

 {
        struct mparse   *curp;
 
        curp = mandoc_calloc(1, sizeof(struct mparse));
 
        curp->options = options;
 {
        struct mparse   *curp;
 
        curp = mandoc_calloc(1, sizeof(struct mparse));
 
        curp->options = options;

-       curp->wlevel = wlevel;
-       curp->mmsg = mmsg;
-       curp->defos = defos;
-
-       curp->mchars = mchars;
-       curp->roff = roff_alloc(curp, curp->mchars, 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->defos,
-                   curp->options & MPARSE_QUICK ? 1 : 0);
-
-       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);
+       return &curp->man->meta;

 }
 
 void
 }
 
 void

-mandoc_msg(enum mandocerr er, struct mparse *m,
-               int ln, int col, const char *msg)
-{
-       enum mandoclevel level;
-
-       level = MANDOCLEVEL_UNSUPP;
-       while (er < mandoclimits[level])
-               level--;
-
-       if (level < m->wlevel && er != MANDOCERR_FILE)
-               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]);
-}
-
-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);

 }
 }