=================================================================== RCS file: /cvs/mandoc/man_macro.c,v retrieving revision 1.135 retrieving revision 1.150 diff -u -p -r1.135 -r1.150 --- mandoc/man_macro.c 2018/12/14 05:18:02 1.135 +++ mandoc/man_macro.c 2023/11/13 19:13:01 1.150 @@ -1,7 +1,7 @@ -/* $Id: man_macro.c,v 1.135 2018/12/14 05:18:02 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.150 2023/11/13 19:13:01 schwarze Exp $ */ /* + * Copyright (c) 2012-2015,2017-2020,2022 Ingo Schwarze * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2012-2015, 2017, 2018 Ingo Schwarze * Copyright (c) 2013 Franco Fichtner * * Permission to use, copy, modify, and distribute this software for any @@ -26,6 +26,9 @@ #include #include +#if DEBUG_MEMORY +#include "mandoc_dbg.h" +#endif #include "mandoc.h" #include "roff.h" #include "man.h" @@ -63,14 +66,12 @@ static const struct man_macro man_macros[MAN_MAX - MAN { 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 */ - { in_line_eoln, 0 }, /* UC */ + { in_line_eoln, MAN_NSCOPED }, /* DT */ + { in_line_eoln, MAN_NSCOPED }, /* UC */ { in_line_eoln, MAN_NSCOPED }, /* PD */ - { in_line_eoln, 0 }, /* AT */ + { in_line_eoln, MAN_NSCOPED }, /* AT */ { in_line_eoln, MAN_NSCOPED }, /* in */ { blk_imp, MAN_XSCOPE }, /* SY */ { blk_close, MAN_XSCOPE }, /* YS */ @@ -81,6 +82,7 @@ static const struct man_macro man_macros[MAN_MAX - MAN { blk_close, MAN_XSCOPE }, /* UE */ { blk_exp, MAN_XSCOPE }, /* MT */ { blk_close, MAN_XSCOPE }, /* ME */ + { in_line_eoln, 0 }, /* MR */ }; @@ -109,9 +111,12 @@ man_unscope(struct roff_man *man, const struct roff_no 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 (n->parent->type == ROFFT_ROOT || + (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 +207,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 +304,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); @@ -307,11 +317,12 @@ blk_exp(MACRO_PROT_ARGS) if (tok == MAN_RS) { if (roff_getreg(man->roff, "an-margin") == 0) roff_setreg(man->roff, "an-margin", - 7 * 24, '='); + 5 * 24, '='); if ((head->aux = strtod(p, NULL) * 24.0) > 0) roff_setreg(man->roff, "an-margin", head->aux, '+'); } + free(p); } if (buf[*pos] != '\0') @@ -320,6 +331,7 @@ blk_exp(MACRO_PROT_ARGS) man_unscope(man, head); roff_body_alloc(man, line, ppos, tok); + man->flags &= ~ROFF_NONOFILL; } /* @@ -336,9 +348,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 +361,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 +380,7 @@ blk_imp(MACRO_PROT_ARGS) man_unscope(man, n); roff_body_alloc(man, line, ppos, tok); + man->flags &= ~ROFF_NONOFILL; } void @@ -378,12 +393,17 @@ 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; + +#if DEBUG_MEMORY + if (tok == MAN_TH) + mandoc_dbg_name(buf); +#endif + 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 +417,7 @@ in_line_eoln(MACRO_PROT_ARGS) roff_word_append(man, p); else roff_word_alloc(man, line, la, p); + free(p); } /* @@ -425,7 +446,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 +460,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 +475,6 @@ man_args(struct roff_man *man, int line, int *pos, cha if ('\0' == *start) return 0; - *v = mandoc_getarg(man->parse, v, line, pos); + *v = roff_getarg(man->roff, v, line, pos); return 1; }