It turns out the man(7) parser suffers from unintelligible handling

of block rewinding, just like then mdoc(7) parser did.
First step in getting rid of rew_scope():
Replace the only call where the target block is known.
This commit is analogous to mdoc_macro.c rev. 1.167.
One down, three to go.

diff --git a/man_macro.c b/man_macro.c
index 0de6f7ee1084ca663245e36fec5a6f8c450e7913..ca87460c2fab257edff0114873325daee2e32ca5 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.102 2015/04/02 22:48:17 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.103 2015/04/03 17:00:52 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -401,7 +401,7 @@ blk_imp(MACRO_PROT_ARGS)
 
        /* Close out the head and open the body. */
 
-       rew_scope(ROFFT_HEAD, man, tok);
+       man_unscope(man, n);
        man_body_alloc(man, line, ppos, tok);
 }