diff options
| -rw-r--r-- | man.7 | 12 | ||||
| -rw-r--r-- | man.c | 30 | ||||
| -rw-r--r-- | man_macro.c | 3 | ||||
| -rw-r--r-- | man_validate.c | 34 |
4 files changed, 41 insertions, 38 deletions
@@ -205,18 +205,14 @@ foo .Pp is equivalent to .Sq \&.I foo . -.\" PARAGRAPH -Consecutive next-line scope invocations are disallowed. +If next-line macros are invoked consecutively, only the last is used. +If a next-line macro is proceded by a block macro, it is ignored. .Bd -literal -offset indent \&.YO \(lBbody...\(rB \(lBbody...\(rB .Ed . .Pp -It is considered an error when next-line scope is open at the end of -file. -. -.Pp .Bl -column -compact -offset indent "MacroX" "ArgumentsX" "ScopeXXXXX" .It Em Macro Ta Em Arguments Ta Em Scope .It B Ta n Ta next-line @@ -288,10 +284,6 @@ or No closure refers to an explicit block closing macro. . .Pp -It is considered an error when part or next-line scope is open at the -end of file. -. -.Pp .Bl -column "MacroX" "ArgumentsX" "Head ScopeX" "sub-sectionX" -compact -offset indent .It Em Macro Ta Em Arguments Ta Em Head Scope Ta Em Body Scope .It HP Ta <2 Ta current Ta paragraph @@ -454,8 +454,9 @@ descope: int man_pmacro(struct man *m, int ln, char *buf) { - int i, j, c, ppos, fl; - char mac[5]; + int i, j, c, ppos, fl; + char mac[5]; + struct man_node *n; /* Comments and empties are quickly ignored. */ @@ -512,6 +513,29 @@ man_pmacro(struct man *m, int ln, char *buf) while (buf[i] && ' ' == buf[i]) i++; + /* Remove prior ELINE macro, if applicable. */ + + if (m->flags & MAN_ELINE) { + n = m->last; + assert(NULL == n->child); + if ( ! man_nwarn(m, n, WLNSCOPE)) + return(0); + + if (n->prev) { + assert(n != n->parent->child); + assert(n == n->prev->next); + n->prev->next = NULL; + m->last = n->prev; + } else { + assert(n == n->parent->child); + n->parent->child = NULL; + m->last = n->parent; + } + + man_node_free(n); + m->flags &= ~MAN_ELINE; + } + /* Begin recursive parse sequence. */ assert(man_macros[c].fp); @@ -533,8 +557,6 @@ out: /* Close out the block scope opened in the prior line. */ - /* XXX - this should be in man_action.c. */ - assert(MAN_BLINE & m->flags); m->flags &= ~MAN_BLINE; diff --git a/man_macro.c b/man_macro.c index f6b9e1a8..c09b0070 100644 --- a/man_macro.c +++ b/man_macro.c @@ -357,7 +357,8 @@ man_macroend(struct man *m) continue; if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) continue; - return(man_nerr(m, n, WEXITSCOPE)); + if ( ! man_nwarn(m, n, WEXITSCOPE)) + return(0); } return(man_unscope(m, m->first)); diff --git a/man_validate.c b/man_validate.c index 668d5c87..a2507a85 100644 --- a/man_validate.c +++ b/man_validate.c @@ -36,7 +36,6 @@ struct man_valid { }; static int check_bline(CHKARGS); -static int check_eline(CHKARGS); static int check_eq0(CHKARGS); static int check_eq1(CHKARGS); static int check_ge2(CHKARGS); @@ -52,7 +51,6 @@ static v_check posts_ge2_le5[] = { check_ge2, check_le5, NULL }; static v_check posts_par[] = { check_par, NULL }; static v_check posts_sec[] = { check_sec, NULL }; static v_check posts_sp[] = { check_sp, NULL }; -static v_check pres_eline[] = { check_eline, NULL }; static v_check pres_bline[] = { check_bline, NULL }; static const struct man_valid man_valids[MAN_MAX] = { @@ -66,15 +64,15 @@ static const struct man_valid man_valids[MAN_MAX] = { { pres_bline, posts_par }, /* P */ { pres_bline, posts_par }, /* IP */ { pres_bline, posts_par }, /* HP */ - { pres_eline, NULL }, /* SM */ - { pres_eline, NULL }, /* SB */ + { NULL, NULL }, /* SM */ + { NULL, NULL }, /* SB */ { NULL, NULL }, /* BI */ { NULL, NULL }, /* IB */ { NULL, NULL }, /* BR */ { NULL, NULL }, /* RB */ - { pres_eline, NULL }, /* R */ - { pres_eline, NULL }, /* B */ - { pres_eline, NULL }, /* I */ + { NULL, NULL }, /* R */ + { NULL, NULL }, /* B */ + { NULL, NULL }, /* I */ { NULL, NULL }, /* IR */ { NULL, NULL }, /* RI */ { pres_bline, posts_eq0 }, /* na */ @@ -140,12 +138,13 @@ static int check_root(CHKARGS) { - /* XXX - make this into a warning? */ if (MAN_BLINE & m->flags) - return(man_nerr(m, n, WEXITSCOPE)); - /* XXX - make this into a warning? */ + return(man_nwarn(m, n, WEXITSCOPE)); if (MAN_ELINE & m->flags) - return(man_nerr(m, n, WEXITSCOPE)); + return(man_nwarn(m, n, WEXITSCOPE)); + + m->flags &= ~MAN_BLINE; + m->flags &= ~MAN_ELINE; if (NULL == m->first->child) return(man_nerr(m, n, WNODATA)); @@ -289,23 +288,12 @@ check_par(CHKARGS) static int -check_eline(CHKARGS) -{ - - if (MAN_ELINE & m->flags) - return(man_nerr(m, n, WLNSCOPE)); - return(1); -} - - -static int check_bline(CHKARGS) { + assert( ! (MAN_ELINE & m->flags)); if (MAN_BLINE & m->flags) return(man_nerr(m, n, WLNSCOPE)); - if (MAN_ELINE & m->flags) - return(man_nerr(m, n, WLNSCOPE)); return(1); } |