Now that the NODE_NOFILL flag in the syntax tree is accurate,

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 89b4e7259cadb0d381453b176e8a9bc6cb03a805..eec4896c108bc53b8d8b7f722c85800b8e3aa6c3 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,7 +1,7 @@
-/*     $Id: man_macro.c,v 1.134 2018/12/14 01:18:25 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.143 2019/01/05 00:36:50 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -63,8 +63,6 @@ static const struct man_macro man_macros[MAN_MAX - MAN_TH] = {
        { in_line_eoln, MAN_NSCOPED | MAN_ESCOPED | MAN_JOIN }, /* I */
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
-       { in_line_eoln, MAN_NSCOPED }, /* nf */
-       { in_line_eoln, MAN_NSCOPED }, /* fi */
        { blk_close, MAN_XSCOPE }, /* RE */
        { blk_exp, MAN_XSCOPE }, /* RS */
        { in_line_eoln, 0 }, /* DT */
@@ -106,8 +104,8 @@ man_unscope(struct roff_man *man, const struct roff_node *to)
                        if (man->flags & (MAN_BLINE | MAN_ELINE) &&
                            man_macro(n->tok)->flags &
                             (MAN_BSCOPED | MAN_NSCOPED)) {
-                               mandoc_vmsg(MANDOCERR_BLK_LINE,
-                                   man->parse, n->line, n->pos,
+                               mandoc_msg(MANDOCERR_BLK_LINE,
+                                   n->line, n->pos,
                                    "EOF breaks %s", roff_name[n->tok]);
                                if (man->flags & MAN_ELINE)
                                        man->flags &= ~MAN_ELINE;
@@ -124,7 +122,7 @@ man_unscope(struct roff_man *man, const struct roff_node *to)
                        if (n->type == ROFFT_BLOCK &&
                            man_macro(n->tok)->fp == blk_exp)
                                mandoc_msg(MANDOCERR_BLK_NOEND,
-                                   man->parse, n->line, n->pos,
+                                   n->line, n->pos, "%s",
                                    roff_name[n->tok]);
                }
 
@@ -202,27 +200,30 @@ blk_close(MACRO_PROT_ARGS)
 {
        enum roff_tok            ctok, ntok;
        const struct roff_node  *nn;
-       char                    *p;
-       int                      cline, cpos, nrew, target;
+       char                    *p, *ep;
+       int                      cline, cpos, la, nrew, target;
 
        nrew = 1;
        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, &p, 10);
-               if (*p != '\0')
-                       mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
-                           line, p - buf, "RE ... %s", p);
+               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_vmsg(MANDOCERR_RE_NOTOPEN, man->parse,
+                       mandoc_msg(MANDOCERR_RE_NOTOPEN,
                            line, ppos, "RE %d", target);
                        return;
                }
@@ -245,8 +246,8 @@ blk_close(MACRO_PROT_ARGS)
                        break;
 
        if (nn == NULL) {
-               mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse,
-                   line, ppos, roff_name[tok]);
+               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);
@@ -312,11 +313,12 @@ blk_exp(MACRO_PROT_ARGS)
                                roff_setreg(man->roff, "an-margin",
                                    head->aux, '+');
                }
+               free(p);
        }
 
        if (buf[*pos] != '\0')
-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line,
-                   *pos, "%s ... %s", roff_name[tok], buf + *pos);
+               mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,
+                   "%s ... %s", roff_name[tok], buf + *pos);
 
        man_unscope(man, head);
        roff_body_alloc(man, line, ppos, tok);
@@ -336,9 +338,10 @@ blk_imp(MACRO_PROT_ARGS)
        struct roff_node *n;
 
        rew_scope(man, tok);
-       n = roff_block_alloc(man, line, ppos, tok);
-       if (n->tok == MAN_SH || n->tok == MAN_SS)
-               man->flags &= ~MAN_LITERAL;
+       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. */
@@ -348,6 +351,7 @@ blk_imp(MACRO_PROT_ARGS)
                if ( ! man_args(man, line, pos, buf, &p))
                        break;
                roff_word_alloc(man, line, la, p);
+               free(p);
        }
 
        /*
@@ -366,6 +370,7 @@ blk_imp(MACRO_PROT_ARGS)
 
        man_unscope(man, n);
        roff_body_alloc(man, line, ppos, tok);
+       man->flags &= ~ROFF_NONOFILL;
 }
 
 void
@@ -378,17 +383,15 @@ in_line_eoln(MACRO_PROT_ARGS)
        roff_elem_alloc(man, line, ppos, tok);
        n = man->last;
 
+       if (tok == MAN_EX)
+               man->flags |= ROFF_NOFILL;
+       else if (tok == MAN_EE)
+               man->flags &= ~ROFF_NOFILL;
+
        for (;;) {
-               if (buf[*pos] != '\0' && (tok == MAN_fi || tok == MAN_nf)) {
-                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
-                           man->parse, line, *pos, "%s %s",
-                           roff_name[tok], buf + *pos);
-                       break;
-               }
                if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) {
-                       mandoc_vmsg(MANDOCERR_ARG_EXCESS,
-                           man->parse, line, *pos, "%s ... %s",
-                           roff_name[tok], buf + *pos);
+                       mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,
+                           "%s ... %s", roff_name[tok], buf + *pos);
                        break;
                }
                la = *pos;
@@ -399,6 +402,7 @@ in_line_eoln(MACRO_PROT_ARGS)
                        roff_word_append(man, p);
                else
                        roff_word_alloc(man, line, la, p);
+               free(p);
        }
 
        /*
@@ -427,7 +431,7 @@ in_line_eoln(MACRO_PROT_ARGS)
        /* Rewind our element scope. */
 
        for ( ; man->last; man->last = man->last->parent) {
-               man_state(man, man->last);
+               man->last->flags |= NODE_VALID;
                if (man->last == n)
                        break;
        }
@@ -441,9 +445,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 void
 man_endparse(struct roff_man *man)
 {
-
-       man_unscope(man, man->first);
-       man->flags &= ~MAN_LITERAL;
+       man_unscope(man, man->meta.first);
 }
 
 static int
@@ -458,6 +460,6 @@ man_args(struct roff_man *man, int line, int *pos, char *buf, char **v)
        if ('\0' == *start)
                return 0;
 
-       *v = mandoc_getarg(man->parse, v, line, pos);
+       *v = roff_getarg(man->roff, v, line, pos);
        return 1;
 }