Make sure that the configuration file is always read, even when

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index f1796f3cc70e9976256381eec2596d6096adc9b5..b3c3a3cb488b273bca0d81bc65dca51bfc1c6bbe 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,16 +1,16 @@
-/*     $Id: man_macro.c,v 1.92 2014/12/16 17:26:00 schwarze Exp $ */
+/* $Id: man_macro.c,v 1.145 2020/09/09 17:01:10 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * 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) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * 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
  * 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


@@ -22,83 +22,77 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "man.h"

 #include "mandoc.h"
 #include "mandoc.h"

+#include "roff.h"
+#include "man.h"

 #include "libmandoc.h"
 #include "libmandoc.h"

+#include "roff_int.h"

 #include "libman.h"
 
 #include "libman.h"
 

-enum   rew {
-       REW_REWIND,
-       REW_NOHALT,
-       REW_HALT
-};
-

 static void             blk_close(MACRO_PROT_ARGS);
 static void             blk_exp(MACRO_PROT_ARGS);
 static void             blk_imp(MACRO_PROT_ARGS);
 static void             in_line_eoln(MACRO_PROT_ARGS);
 static void             blk_close(MACRO_PROT_ARGS);
 static void             blk_exp(MACRO_PROT_ARGS);
 static void             blk_imp(MACRO_PROT_ARGS);
 static void             in_line_eoln(MACRO_PROT_ARGS);

-static int              man_args(struct man *, int,
+static int              man_args(struct roff_man *, int,

                                int *, char *, char **);
                                int *, char *, char **);

-
-static void             rew_scope(enum man_type,
-                               struct man *, enum mant);
-static enum rew         rew_dohalt(enum mant, enum man_type,
-                               const struct man_node *);
-static enum rew         rew_block(enum mant, enum man_type,
-                               const struct man_node *);
-
-const  struct man_macro __man_macros[MAN_MAX] = {
-       { in_line_eoln, MAN_NSCOPED }, /* br */
-       { in_line_eoln, MAN_BSCOPE }, /* TH */
-       { blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */
-       { blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */
-       { blk_imp, MAN_BSCOPE | MAN_SCOPED | MAN_FSCOPED }, /* TP */
-       { blk_imp, MAN_BSCOPE }, /* LP */
-       { blk_imp, MAN_BSCOPE }, /* PP */
-       { blk_imp, MAN_BSCOPE }, /* P */
-       { blk_imp, MAN_BSCOPE }, /* IP */
-       { blk_imp, MAN_BSCOPE }, /* HP */
-       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* SM */
-       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* SB */
+static void             rew_scope(struct roff_man *, enum roff_tok);
+
+static const struct man_macro man_macros[MAN_MAX - MAN_TH] = {
+       { in_line_eoln, MAN_XSCOPE }, /* TH */
+       { blk_imp, MAN_XSCOPE | MAN_BSCOPED }, /* SH */
+       { blk_imp, MAN_XSCOPE | MAN_BSCOPED }, /* SS */
+       { blk_imp, MAN_XSCOPE | MAN_BSCOPED }, /* TP */
+       { blk_imp, MAN_XSCOPE | MAN_BSCOPED }, /* TQ */
+       { blk_imp, MAN_XSCOPE }, /* LP */
+       { blk_imp, MAN_XSCOPE }, /* PP */
+       { blk_imp, MAN_XSCOPE }, /* P */
+       { blk_imp, MAN_XSCOPE }, /* IP */
+       { blk_imp, MAN_XSCOPE }, /* HP */
+       { in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* SM */
+       { in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* SB */

        { in_line_eoln, 0 }, /* BI */
        { in_line_eoln, 0 }, /* IB */
        { in_line_eoln, 0 }, /* BR */
        { in_line_eoln, 0 }, /* RB */
        { in_line_eoln, 0 }, /* BI */
        { in_line_eoln, 0 }, /* IB */
        { in_line_eoln, 0 }, /* BR */
        { in_line_eoln, 0 }, /* RB */

-       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* R */
-       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* B */
-       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */
+       { in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* R */
+       { in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* B */
+       { in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* I */

        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */

-       { in_line_eoln, MAN_NSCOPED }, /* na */
-       { in_line_eoln, MAN_NSCOPED }, /* sp */
-       { in_line_eoln, MAN_BSCOPE }, /* nf */
-       { in_line_eoln, MAN_BSCOPE }, /* fi */
-       { blk_close, MAN_BSCOPE }, /* RE */
-       { blk_exp, MAN_BSCOPE | MAN_EXPLICIT }, /* RS */
+       { blk_close, MAN_XSCOPE }, /* RE */
+       { blk_exp, MAN_XSCOPE }, /* RS */

        { in_line_eoln, 0 }, /* DT */
        { in_line_eoln, 0 }, /* UC */
        { in_line_eoln, 0 }, /* DT */
        { in_line_eoln, 0 }, /* UC */

-       { in_line_eoln, 0 }, /* PD */
+       { in_line_eoln, MAN_NSCOPED }, /* PD */

        { in_line_eoln, 0 }, /* AT */
        { in_line_eoln, 0 }, /* AT */

-       { in_line_eoln, 0 }, /* in */
-       { in_line_eoln, 0 }, /* ft */
+       { in_line_eoln, MAN_NSCOPED }, /* in */
+       { blk_imp, MAN_XSCOPE }, /* SY */
+       { blk_close, MAN_XSCOPE }, /* YS */

        { in_line_eoln, 0 }, /* OP */
        { in_line_eoln, 0 }, /* OP */

-       { in_line_eoln, MAN_BSCOPE }, /* EX */
-       { in_line_eoln, MAN_BSCOPE }, /* EE */
-       { blk_exp, MAN_BSCOPE | MAN_EXPLICIT }, /* UR */
-       { blk_close, MAN_BSCOPE }, /* UE */
-       { in_line_eoln, 0 }, /* ll */
+       { in_line_eoln, MAN_XSCOPE }, /* EX */
+       { in_line_eoln, MAN_XSCOPE }, /* EE */
+       { blk_exp, MAN_XSCOPE }, /* UR */
+       { blk_close, MAN_XSCOPE }, /* UE */
+       { blk_exp, MAN_XSCOPE }, /* MT */
+       { blk_close, MAN_XSCOPE }, /* ME */

 };
 
 };
 

-const  struct man_macro * const man_macros = __man_macros;

 
 

+const struct man_macro *
+man_macro(enum roff_tok tok)
+{
+       assert(tok >= MAN_TH && tok <= MAN_MAX);
+       return man_macros + (tok - MAN_TH);
+}

 
 void
 
 void

-man_unscope(struct man *man, const struct man_node *to)
+man_unscope(struct roff_man *man, const struct roff_node *to)

 {
 {

-       struct man_node *n;
+       struct roff_node *n;

 
        to = to->parent;
        n = man->last;
 
        to = to->parent;
        n = man->last;


@@ -106,30 +100,32 @@ man_unscope(struct man *man, const struct man_node *to)
 
                /* Reached the end of the document? */
 
 
                /* Reached the end of the document? */
 

-               if (to == NULL && ! (n->flags & MAN_VALID)) {
+               if (to == NULL && ! (n->flags & NODE_VALID)) {

                        if (man->flags & (MAN_BLINE | MAN_ELINE) &&
                        if (man->flags & (MAN_BLINE | MAN_ELINE) &&

-                           man_macros[n->tok].flags & MAN_SCOPED) {
-                               mandoc_vmsg(MANDOCERR_BLK_LINE,
-                                   man->parse, n->line, n->pos,
-                                   "EOF breaks %s",
-                                   man_macronames[n->tok]);
-                               if (man->flags & MAN_ELINE)
-                                       man->flags &= ~MAN_ELINE;
-                               else {
-                                       assert(n->type == MAN_HEAD);
+                           man_macro(n->tok)->flags &
+                            (MAN_BSCOPED | MAN_NSCOPED)) {
+                               mandoc_msg(MANDOCERR_BLK_LINE,
+                                   n->line, n->pos,
+                                   "EOF breaks %s", roff_name[n->tok]);
+                               if (man->flags & MAN_ELINE) {
+                                       if ((man_macro(n->parent->tok)->flags &
+                                           MAN_ESCOPED) == 0)
+                                               man->flags &= ~MAN_ELINE;
+                               } else {
+                                       assert(n->type == ROFFT_HEAD);

                                        n = n->parent;
                                        man->flags &= ~MAN_BLINE;
                                }
                                man->last = n;
                                n = n->parent;
                                        n = n->parent;
                                        man->flags &= ~MAN_BLINE;
                                }
                                man->last = n;
                                n = n->parent;

-                               man_node_delete(man, man->last);
+                               roff_node_delete(man, man->last);

                                continue;
                        }
                                continue;
                        }

-                       if (n->type == MAN_BLOCK &&
-                           man_macros[n->tok].flags & MAN_EXPLICIT)
+                       if (n->type == ROFFT_BLOCK &&
+                           man_macro(n->tok)->fp == blk_exp)

                                mandoc_msg(MANDOCERR_BLK_NOEND,
                                mandoc_msg(MANDOCERR_BLK_NOEND,

-                                   man->parse, n->line, n->pos,
-                                   man_macronames[n->tok]);
+                                   n->line, n->pos, "%s",
+                                   roff_name[n->tok]);

                }
 
                /*
                }
 
                /*


@@ -141,7 +137,7 @@ man_unscope(struct man *man, const struct man_node *to)
 
                man->last = n;
                n = n->parent;
 
                man->last = n;
                n = n->parent;

-               man_valid_post(man);
+               man->last->flags |= NODE_VALID;

        }
 
        /*
        }
 
        /*


@@ -152,90 +148,7 @@ man_unscope(struct man *man, const struct man_node *to)
         */
 
        man->next = (man->last == to) ?
         */
 
        man->next = (man->last == to) ?

-           MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
-}
-
-static enum rew
-rew_block(enum mant ntok, enum man_type type, const struct man_node *n)
-{
-
-       if (type == MAN_BLOCK && ntok == n->parent->tok &&
-           n->parent->type == MAN_BODY)
-               return(REW_REWIND);
-       return(ntok == n->tok ? REW_HALT : REW_NOHALT);
-}
-
-/*
- * There are three scope levels: scoped to the root (all), scoped to the
- * section (all less sections), and scoped to subsections (all less
- * sections and subsections).
- */
-static enum rew
-rew_dohalt(enum mant tok, enum man_type type, const struct man_node *n)
-{
-       enum rew         c;
-
-       /* We cannot progress beyond the root ever. */
-       if (MAN_ROOT == n->type)
-               return(REW_HALT);
-
-       assert(n->parent);
-
-       /* Normal nodes shouldn't go to the level of the root. */
-       if (MAN_ROOT == n->parent->type)
-               return(REW_REWIND);
-
-       /* Already-validated nodes should be closed out. */
-       if (MAN_VALID & n->flags)
-               return(REW_NOHALT);
-
-       /* First: rewind to ourselves. */
-       if (type == n->type && tok == n->tok) {
-               if (MAN_EXPLICIT & man_macros[n->tok].flags)
-                       return(REW_HALT);
-               else
-                       return(REW_REWIND);
-       }
-
-       /*
-        * Next follow the implicit scope-smashings as defined by man.7:
-        * section, sub-section, etc.
-        */
-
-       switch (tok) {
-       case MAN_SH:
-               break;
-       case MAN_SS:
-               /* Rewind to a section, if a block. */
-               if (REW_NOHALT != (c = rew_block(MAN_SH, type, n)))
-                       return(c);
-               break;
-       case MAN_RS:
-               /* Preserve empty paragraphs before RS. */
-               if (0 == n->nchild && (MAN_P == n->tok ||
-                   MAN_PP == n->tok || MAN_LP == n->tok))
-                       return(REW_HALT);
-               /* Rewind to a subsection, if a block. */
-               if (REW_NOHALT != (c = rew_block(MAN_SS, type, n)))
-                       return(c);
-               /* Rewind to a section, if a block. */
-               if (REW_NOHALT != (c = rew_block(MAN_SH, type, n)))
-                       return(c);
-               break;
-       default:
-               /* Rewind to an offsetter, if a block. */
-               if (REW_NOHALT != (c = rew_block(MAN_RS, type, n)))
-                       return(c);
-               /* Rewind to a subsection, if a block. */
-               if (REW_NOHALT != (c = rew_block(MAN_SS, type, n)))
-                       return(c);
-               /* Rewind to a section, if a block. */
-               if (REW_NOHALT != (c = rew_block(MAN_SH, type, n)))
-                       return(c);
-               break;
-       }
-
-       return(REW_NOHALT);
+           ROFF_NEXT_CHILD : ROFF_NEXT_SIBLING;

 }
 
 /*
 }
 
 /*


@@ -244,30 +157,40 @@ rew_dohalt(enum mant tok, enum man_type type, const struct man_node *n)
  * scopes.  When a scope is closed, it must be validated and actioned.
  */
 static void
  * scopes.  When a scope is closed, it must be validated and actioned.
  */
 static void

-rew_scope(enum man_type type, struct man *man, enum mant tok)
+rew_scope(struct roff_man *man, enum roff_tok tok)

 {
 {

-       struct man_node *n;
-       enum rew         c;
+       struct roff_node *n;

 
 

-       for (n = man->last; n; n = n->parent) {
-               /*
-                * Whether we should stop immediately (REW_HALT), stop
-                * and rewind until this point (REW_REWIND), or keep
-                * rewinding (REW_NOHALT).
-                */
-               c = rew_dohalt(tok, type, n);
-               if (REW_HALT == c)
-                       return;
-               if (REW_REWIND == c)
-                       break;
-       }
+       /* Preserve empty paragraphs before RS. */

 
 

-       /*
-        * Rewind until the current point.  Warn if we're a roff
-        * instruction that's mowing over explicit scopes.
-        */
+       n = man->last;
+       if (tok == MAN_RS && n->child == NULL &&
+           (n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP))
+               return;

 
 

-       man_unscope(man, n);
+       for (;;) {
+               if (n->type == ROFFT_ROOT)
+                       return;
+               if (n->flags & NODE_VALID) {
+                       n = n->parent;
+                       continue;
+               }
+               if (n->type != ROFFT_BLOCK) {
+                       if (n->parent->type == ROFFT_ROOT) {
+                               man_unscope(man, n);
+                               return;
+                       } else {
+                               n = n->parent;
+                               continue;
+                       }
+               }
+               if (tok != MAN_SH && (n->tok == MAN_SH ||
+                   (tok != MAN_SS && (n->tok == MAN_SS ||
+                    man_macro(n->tok)->fp == blk_exp))))
+                       return;
+               man_unscope(man, n);
+               n = man->last;
+       }

 }
 
 
 }
 
 


@@ -277,67 +200,138 @@ rew_scope(enum man_type type, struct man *man, enum mant tok)
 void
 blk_close(MACRO_PROT_ARGS)
 {
 void
 blk_close(MACRO_PROT_ARGS)
 {

-       enum mant                ntok;
-       const struct man_node   *nn;
+       enum roff_tok            ctok, ntok;
+       const struct roff_node  *nn;
+       char                    *p, *ep;
+       int                      cline, cpos, la, nrew, target;

 
 

+       nrew = 1;

        switch (tok) {
        case MAN_RE:
                ntok = MAN_RS;
        switch (tok) {
        case MAN_RE:
                ntok = MAN_RS;

+               la = *pos;
+               if ( ! man_args(man, line, pos, buf, &p))
+                       break;
+               for (nn = man->last->parent; nn; nn = nn->parent)
+                       if (nn->tok == ntok && nn->type == ROFFT_BLOCK)
+                               nrew++;
+               target = strtol(p, &ep, 10);
+               if (*ep != '\0')
+                       mandoc_msg(MANDOCERR_ARG_EXCESS, line,
+                           la + (buf[la] == '"') + (int)(ep - p),
+                           "RE ... %s", ep);
+               free(p);
+               if (target == 0)
+                       target = 1;
+               nrew -= target;
+               if (nrew < 1) {
+                       mandoc_msg(MANDOCERR_RE_NOTOPEN,
+                           line, ppos, "RE %d", target);
+                       return;
+               }
+               break;
+       case MAN_YS:
+               ntok = MAN_SY;

                break;
        case MAN_UE:
                ntok = MAN_UR;
                break;
                break;
        case MAN_UE:
                ntok = MAN_UR;
                break;

+       case MAN_ME:
+               ntok = MAN_MT;
+               break;

        default:
                abort();
        default:
                abort();

-               /* NOTREACHED */

        }
 
        for (nn = man->last->parent; nn; nn = nn->parent)
        }
 
        for (nn = man->last->parent; nn; nn = nn->parent)

-               if (nn->tok == ntok && nn->type == MAN_BLOCK)
+               if (nn->tok == ntok && nn->type == ROFFT_BLOCK && ! --nrew)

                        break;
 
        if (nn == NULL) {
                        break;
 
        if (nn == NULL) {

-               mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse,
-                   line, ppos, man_macronames[tok]);
-               rew_scope(MAN_BLOCK, man, MAN_PP);
-       } else
-               man_unscope(man, nn);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN,
+                   line, ppos, "%s", roff_name[tok]);
+               rew_scope(man, MAN_PP);
+               if (tok == MAN_RE) {
+                       roff_elem_alloc(man, line, ppos, ROFF_br);
+                       man->last->flags |= NODE_LINE |
+                           NODE_VALID | NODE_ENDED;
+                       man->next = ROFF_NEXT_SIBLING;
+               }
+               return;
+       }
+
+       cline = man->last->line;
+       cpos = man->last->pos;
+       ctok = man->last->tok;
+       man_unscope(man, nn);
+
+       if (tok == MAN_RE && nn->head->aux > 0)
+               roff_setreg(man->roff, "an-margin", nn->head->aux, '-');
+
+       /* Trailing text. */
+
+       if (buf[*pos] != '\0') {
+               roff_word_alloc(man, line, ppos, buf + *pos);
+               man->last->flags |= NODE_DELIMC;
+               if (mandoc_eos(man->last->string, strlen(man->last->string)))
+                       man->last->flags |= NODE_EOS;
+       }
+
+       /* Move a trailing paragraph behind the block. */
+
+       if (ctok == MAN_LP || ctok == MAN_PP || ctok == MAN_P) {
+               *pos = strlen(buf);
+               blk_imp(man, ctok, cline, cpos, pos, buf);
+       }
+
+       /* Synopsis blocks need an explicit end marker for spacing. */
+
+       if (tok == MAN_YS && man->last == nn) {
+               roff_elem_alloc(man, line, ppos, tok);
+               man_unscope(man, man->last);
+       }

 }
 
 void
 blk_exp(MACRO_PROT_ARGS)
 {
 }
 
 void
 blk_exp(MACRO_PROT_ARGS)
 {

-       struct man_node *n;
-       int              la;
+       struct roff_node *head;

        char            *p;
        char            *p;

+       int              la;

 
 

-       rew_scope(MAN_BLOCK, man, tok);
-       man_block_alloc(man, line, ppos, tok);
-       man_head_alloc(man, line, ppos, tok);
-
-       for (;;) {
-               la = *pos;
-               if ( ! man_args(man, line, pos, buf, &p))
-                       break;
-               man_word_alloc(man, line, la, p);
+       if (tok == MAN_RS) {
+               rew_scope(man, tok);
+               man->flags |= ROFF_NONOFILL;

        }
        }

-
-       assert(man);
-       assert(tok != MAN_MAX);
-
-       for (n = man->last; n; n = n->parent)
-               if (n->tok == tok) {
-                       assert(n->type == MAN_HEAD);
-                       man_unscope(man, n);
-                       break;
+       roff_block_alloc(man, line, ppos, tok);
+       head = roff_head_alloc(man, line, ppos, tok);
+
+       la = *pos;
+       if (man_args(man, line, pos, buf, &p)) {
+               roff_word_alloc(man, line, la, p);
+               if (tok == MAN_RS) {
+                       if (roff_getreg(man->roff, "an-margin") == 0)
+                               roff_setreg(man->roff, "an-margin",
+                                   7 * 24, '=');
+                       if ((head->aux = strtod(p, NULL) * 24.0) > 0)
+                               roff_setreg(man->roff, "an-margin",
+                                   head->aux, '+');

                }
                }

+               free(p);
+       }
+
+       if (buf[*pos] != '\0')
+               mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,
+                   "%s ... %s", roff_name[tok], buf + *pos);

 
 

-       man_body_alloc(man, line, ppos, tok);
+       man_unscope(man, head);
+       roff_body_alloc(man, line, ppos, tok);
+       man->flags &= ~ROFF_NONOFILL;

 }
 
 /*
 }
 
 /*

- * Parse an implicit-block macro.  These contain a MAN_HEAD and a
- * MAN_BODY contained within a MAN_BLOCK.  Rules for closing out other
+ * Parse an implicit-block macro.  These contain a ROFFT_HEAD and a
+ * ROFFT_BODY contained within a ROFFT_BLOCK.  Rules for closing out other

  * scopes, such as `SH' closing out an `SS', are defined in the rew
  * routines.
  */
  * scopes, such as `SH' closing out an `SS', are defined in the rew
  * routines.
  */


@@ -346,13 +340,14 @@ blk_imp(MACRO_PROT_ARGS)
 {
        int              la;
        char            *p;
 {
        int              la;
        char            *p;

-       struct man_node *n;
+       struct roff_node *n;

 
 

-       rew_scope(MAN_BODY, man, tok);
-       rew_scope(MAN_BLOCK, man, tok);
-       man_block_alloc(man, line, ppos, tok);
-       man_head_alloc(man, line, ppos, tok);
-       n = man->last;
+       rew_scope(man, tok);
+       man->flags |= ROFF_NONOFILL;
+       if (tok == MAN_SH || tok == MAN_SS)
+               man->flags &= ~ROFF_NOFILL;
+       roff_block_alloc(man, line, ppos, tok);
+       n = roff_head_alloc(man, line, ppos, tok);

 
        /* Add line arguments. */
 
 
        /* Add line arguments. */
 


@@ -360,23 +355,27 @@ blk_imp(MACRO_PROT_ARGS)
                la = *pos;
                if ( ! man_args(man, line, pos, buf, &p))
                        break;
                la = *pos;
                if ( ! man_args(man, line, pos, buf, &p))
                        break;

-               man_word_alloc(man, line, la, p);
+               roff_word_alloc(man, line, la, p);
+               free(p);

        }
 
        }
 

-       /* Close out head and open body (unless MAN_SCOPE). */
+       /*
+        * For macros having optional next-line scope,
+        * keep the head open if there were no arguments.
+        * For `TP' and `TQ', always keep the head open.
+        */

 
 

-       if (man_macros[tok].flags & MAN_SCOPED) {
-               /* If we're forcing scope (`TP'), keep it open. */
-               if (man_macros[tok].flags & MAN_FSCOPED) {
-                       man->flags |= MAN_BLINE;
-                       return;
-               } else if (n == man->last) {
-                       man->flags |= MAN_BLINE;
-                       return;
-               }
+       if (man_macro(tok)->flags & MAN_BSCOPED &&
+           (tok == MAN_TP || tok == MAN_TQ || n == man->last)) {
+               man->flags |= MAN_BLINE;
+               return;

        }
        }

-       rew_scope(MAN_HEAD, man, tok);
-       man_body_alloc(man, line, ppos, tok);
+
+       /* Close out the head and open the body. */
+
+       man_unscope(man, n);
+       roff_body_alloc(man, line, ppos, tok);
+       man->flags &= ~ROFF_NONOFILL;

 }
 
 void
 }
 
 void


@@ -384,80 +383,78 @@ in_line_eoln(MACRO_PROT_ARGS)
 {
        int              la;
        char            *p;
 {
        int              la;
        char            *p;

-       struct man_node *n;
+       struct roff_node *n;

 
 

-       man_elem_alloc(man, line, ppos, tok);
+       roff_elem_alloc(man, line, ppos, tok);

        n = man->last;
 
        n = man->last;
 

+       if (tok == MAN_EX)
+               man->flags |= ROFF_NOFILL;
+       else if (tok == MAN_EE)
+               man->flags &= ~ROFF_NOFILL;
+

        for (;;) {
        for (;;) {

+               if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) {
+                       mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,
+                           "%s ... %s", roff_name[tok], buf + *pos);
+                       break;
+               }

                la = *pos;
                if ( ! man_args(man, line, pos, buf, &p))
                        break;
                la = *pos;
                if ( ! man_args(man, line, pos, buf, &p))
                        break;

-               if (man_macros[tok].flags & MAN_JOIN &&
-                   man->last->type == MAN_TEXT)
-                       man_word_append(man, p);
+               if (man_macro(tok)->flags & MAN_JOIN &&
+                   man->last->type == ROFFT_TEXT)
+                       roff_word_append(man, p);

                else
                else

-                       man_word_alloc(man, line, la, p);
+                       roff_word_alloc(man, line, la, p);
+               free(p);

        }
 
        /*
        }
 
        /*

-        * Append MAN_EOS in case the last snipped argument
+        * Append NODE_EOS in case the last snipped argument

         * ends with a dot, e.g. `.IR syslog (3).'
         */
 
        if (n != man->last &&
            mandoc_eos(man->last->string, strlen(man->last->string)))
         * ends with a dot, e.g. `.IR syslog (3).'
         */
 
        if (n != man->last &&
            mandoc_eos(man->last->string, strlen(man->last->string)))

-               man->last->flags |= MAN_EOS;
+               man->last->flags |= NODE_EOS;

 
        /*
 
        /*

-        * If no arguments are specified and this is MAN_SCOPED (i.e.,
+        * If no arguments are specified and this is MAN_ESCOPED (i.e.,

         * next-line scoped), then set our mode to indicate that we're
         * waiting for terms to load into our context.
         */
 
         * next-line scoped), then set our mode to indicate that we're
         * waiting for terms to load into our context.
         */
 

-       if (n == man->last && man_macros[tok].flags & MAN_SCOPED) {
-               assert( ! (man_macros[tok].flags & MAN_NSCOPED));
+       if (n == man->last && man_macro(tok)->flags & MAN_ESCOPED) {

                man->flags |= MAN_ELINE;
                return;
        }
 
                man->flags |= MAN_ELINE;
                return;
        }
 

-       assert(man->last->type != MAN_ROOT);
-       man->next = MAN_NEXT_SIBLING;
+       assert(man->last->type != ROFFT_ROOT);
+       man->next = ROFF_NEXT_SIBLING;

 
 

-       /*
-        * Rewind our element scope.  Note that when TH is pruned, we'll
-        * be back at the root, so make sure that we don't clobber as
-        * its sibling.
-        */
+       /* Rewind our element scope. */

 
        for ( ; man->last; man->last = man->last->parent) {
 
        for ( ; man->last; man->last = man->last->parent) {

+               man->last->flags |= NODE_VALID;

                if (man->last == n)
                        break;
                if (man->last == n)
                        break;

-               if (man->last->type == MAN_ROOT)
-                       break;
-               man_valid_post(man);

        }
 
        }
 

-       assert(man->last);
-
-       /*
-        * Same here regarding whether we're back at the root.
-        */
+       /* Rewind next-line scoped ancestors, if any. */

 
 

-       if (man->last->type != MAN_ROOT)
-               man_valid_post(man);
+       if (man_macro(tok)->flags & MAN_ESCOPED)
+               man_descope(man, line, ppos, NULL);

 }
 
 }
 

-

 void
 void

-man_macroend(struct man *man)
+man_endparse(struct roff_man *man)

 {
 {

-
-       man_unscope(man, man->first);
+       man_unscope(man, man->meta.first);

 }
 
 static int
 }
 
 static int

-man_args(struct man *man, int line, int *pos, char *buf, char **v)
+man_args(struct roff_man *man, int line, int *pos, char *buf, char **v)

 {
        char     *start;
 
 {
        char     *start;
 


@@ -466,8 +463,8 @@ man_args(struct man *man, int line, int *pos, char *buf, char **v)
        assert(' ' != *start);
 
        if ('\0' == *start)
        assert(' ' != *start);
 
        if ('\0' == *start)

-               return(0);
+               return 0;

 
 

-       *v = mandoc_getarg(man->parse, v, line, pos);
-       return(1);
+       *v = roff_getarg(man->roff, v, line, pos);
+       return 1;

 }
 }