diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-02-01 23:56:37 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-02-01 23:56:37 +0000 |
| commit | 457f37994fb415c2a3fb29512226644399355327 (patch) | |
| tree | 18b239a4f00a9bff176b6bbcd5f05a7cff284eb8 /mdoc_macro.c | |
| parent | d769b406898f4cb6b65c691825fb2a8f9d89aa13 (diff) | |
| download | mandoc-457f37994fb415c2a3fb29512226644399355327.tar.gz mandoc-457f37994fb415c2a3fb29512226644399355327.tar.zst mandoc-457f37994fb415c2a3fb29512226644399355327.zip | |
get rid of rew_sub() in blk_part_imp(); no functional change
Diffstat (limited to 'mdoc_macro.c')
| -rw-r--r-- | mdoc_macro.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 6e6fba3a..21e01587 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.163 2015/02/01 17:30:45 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.164 2015/02/01 23:56:37 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -1321,10 +1321,21 @@ blk_part_imp(MACRO_PROT_ARGS) } } assert(n == body); - rew_sub(MDOC_BODY, mdoc, tok, line, ppos); + rew_last(mdoc, body); if (nl) append_delims(mdoc, line, pos, buf); - rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos); + rew_last(mdoc, blk); + + /* + * The current block extends an enclosing block. + * Now that the current block ends, close the enclosing block, too. + */ + + while ((blk = blk->pending) != NULL) { + rew_last(mdoc, blk); + if (blk->type == MDOC_HEAD) + mdoc_body_alloc(mdoc, blk->line, blk->pos, blk->tok); + } /* Move trailing .Ns out of scope. */ |