Support nesting of elements with next-line scope.

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 600bc9bb4befbffd2e2e635d5304885e405ffbd0..cad227507eaf34302dd3c86e7646d25b69c96097 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.306 2018/05/14 14:10:23 schwarze Exp $ */
+/*     $Id: main.c,v 1.308 2018/08/23 19:33:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -486,12 +486,6 @@ main(int argc, char *argv[])
        curp.mp = mparse_alloc(options, curp.mmin, mmsg,
            curp.os_e, curp.os_s);
 
-       /*
-        * Conditionally start up the lookaside buffer before parsing.
-        */
-       if (OUTT_MAN == curp.outtype)
-               mparse_keep(curp.mp);
-
        if (argc < 1) {
                if (use_pager)
                        tag_files = tag_init();
@@ -790,8 +784,14 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
                                        return 1;
                }
                if (res != NULL && *ressz == lastsz &&
-                   strchr(*argv, '/') == NULL)
-                       warnx("No entry for %s in the manual.", *argv);
+                   strchr(*argv, '/') == NULL) {
+                       if (cfg->sec == NULL)
+                               warnx("No entry for %s in the manual.",
+                                   *argv);
+                       else
+                               warnx("No entry for %s in section %s "
+                                   "of the manual.", *argv, cfg->sec);
+               }
                lastsz = *ressz;
                argv++;
                argc--;
@@ -872,7 +872,7 @@ parse(struct curparse *curp, int fd, const char *file)
                        tree_man(curp->outdata, man);
                        break;
                case OUTT_MAN:
-                       man_man(curp->outdata, man);
+                       mparse_copy(curp->mp);
                        break;
                case OUTT_PDF:
                case OUTT_ASCII: