tagging issues from weerd@ regarding hyphens

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index faa37bf920683c7effc22c67f0c9223d30b42879..b3c3a3cb488b273bca0d81bc65dca51bfc1c6bbe 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,7 +1,7 @@
-/*     $Id: man_macro.c,v 1.136 2018/12/14 06:33:14 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) 2012-2015, 2017, 2018 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
@@ -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 */
@@ -109,9 +107,11 @@ man_unscope(struct roff_man *man, const struct roff_node *to)
                                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;
-                               else {
+                               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;
@@ -202,22 +202,25 @@ 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')
+               target = strtol(p, &ep, 10);
+               if (*ep != '\0')
                        mandoc_msg(MANDOCERR_ARG_EXCESS, line,
-                           (int)(p - buf), "RE ... %s", p);
+                           la + (buf[la] == '"') + (int)(ep - p),
+                           "RE ... %s", ep);
+               free(p);
                if (target == 0)
                        target = 1;
                nrew -= target;
@@ -296,8 +299,10 @@ blk_exp(MACRO_PROT_ARGS)
        char            *p;
        int              la;
 
-       if (tok == MAN_RS)
+       if (tok == MAN_RS) {
                rew_scope(man, tok);
+               man->flags |= ROFF_NONOFILL;
+       }
        roff_block_alloc(man, line, ppos, tok);
        head = roff_head_alloc(man, line, ppos, tok);
 
@@ -312,6 +317,7 @@ blk_exp(MACRO_PROT_ARGS)
                                roff_setreg(man->roff, "an-margin",
                                    head->aux, '+');
                }
+               free(p);
        }
 
        if (buf[*pos] != '\0')
@@ -320,6 +326,7 @@ blk_exp(MACRO_PROT_ARGS)
 
        man_unscope(man, head);
        roff_body_alloc(man, line, ppos, tok);
+       man->flags &= ~ROFF_NONOFILL;
 }
 
 /*
@@ -336,9 +343,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 +356,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 +375,7 @@ blk_imp(MACRO_PROT_ARGS)
 
        man_unscope(man, n);
        roff_body_alloc(man, line, ppos, tok);
+       man->flags &= ~ROFF_NONOFILL;
 }
 
 void
@@ -378,12 +388,12 @@ 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_msg(MANDOCERR_ARG_SKIP, line, *pos,
-                           "%s %s", roff_name[tok], buf + *pos);
-                       break;
-               }
                if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) {
                        mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,
                            "%s ... %s", roff_name[tok], buf + *pos);
@@ -397,6 +407,7 @@ in_line_eoln(MACRO_PROT_ARGS)
                        roff_word_append(man, p);
                else
                        roff_word_alloc(man, line, la, p);
+               free(p);
        }
 
        /*
@@ -425,7 +436,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;
        }
@@ -439,9 +450,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
@@ -456,6 +465,6 @@ man_args(struct roff_man *man, int line, int *pos, char *buf, char **v)
        if ('\0' == *start)
                return 0;
 
-       *v = mandoc_getarg(v, line, pos);
+       *v = roff_getarg(man->roff, v, line, pos);
        return 1;
 }