diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-22 05:59:32 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-03-22 05:59:32 +0000 |
| commit | f27e8dcec6089cf24702107e517e3c0c5950477d (patch) | |
| tree | 820e7552a3bbb4dec58c8f24329f3bce76140c82 /man_macro.c | |
| parent | b89219869bcc53798ee875bb243b8c4f60b23bda (diff) | |
| download | mandoc-f27e8dcec6089cf24702107e517e3c0c5950477d.tar.gz mandoc-f27e8dcec6089cf24702107e517e3c0c5950477d.tar.zst mandoc-f27e8dcec6089cf24702107e517e3c0c5950477d.zip | |
Accomodate (libman) for next-line macros followed by non-text macros `na', `sp', and `br'.
Based on a patch by Ingo Schwarze.
Diffstat (limited to 'man_macro.c')
| -rw-r--r-- | man_macro.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/man_macro.c b/man_macro.c index 845cc29b..0781bbda 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.30 2010/01/01 17:14:28 kristaps Exp $ */ +/* $Id: man_macro.c,v 1.31 2010/03/22 05:59:32 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -40,7 +40,7 @@ static int rew_block(int, enum man_type, const struct man_node *); const struct man_macro __man_macros[MAN_MAX] = { - { in_line_eoln, 0 }, /* br */ + { in_line_eoln, MAN_NSCOPED }, /* br */ { in_line_eoln, 0 }, /* TH */ { blk_imp, MAN_SCOPED }, /* SH */ { blk_imp, MAN_SCOPED }, /* SS */ @@ -61,9 +61,9 @@ const struct man_macro __man_macros[MAN_MAX] = { { in_line_eoln, MAN_SCOPED }, /* I */ { in_line_eoln, 0 }, /* IR */ { in_line_eoln, 0 }, /* RI */ - { in_line_eoln, 0 }, /* na */ + { in_line_eoln, MAN_NSCOPED }, /* na */ { in_line_eoln, 0 }, /* i */ - { in_line_eoln, 0 }, /* sp */ + { in_line_eoln, MAN_NSCOPED }, /* sp */ { in_line_eoln, 0 }, /* nf */ { in_line_eoln, 0 }, /* fi */ { in_line_eoln, 0 }, /* r */ @@ -320,14 +320,29 @@ in_line_eoln(MACRO_PROT_ARGS) return(0); } + /* + * If no arguments are specified and this is MAN_SCOPED (i.e., + * next-line scoped), then set our mode to indicate that we're + * waiting for terms to load into our context. + */ + if (n == m->last && MAN_SCOPED & man_macros[tok].flags) { + assert( ! (MAN_NSCOPED & man_macros[tok].flags)); m->flags |= MAN_ELINE; return(1); } + /* Set ignorable context, if applicable. */ + + if (MAN_NSCOPED & man_macros[tok].flags) { + assert( ! (MAN_SCOPED & man_macros[tok].flags)); + m->flags |= MAN_ILINE; + } + /* - * 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. Note that when TH is pruned, we'll + * be back at the root, so make sure that we don't clobber as + * its sibling. */ for ( ; m->last; m->last = m->last->parent) { |