Let .it accept numerical expressions, not just numerical constants.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 96f3f5816bfadcbb0467ed9973f10d68aae9b1e8..c86ab6f13f01bcccf014c34e34dc3a492102d5d2 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.97 2015/02/06 09:38:43 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.98 2015/02/06 11:54:36 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>


@@ -337,31 +337,25 @@ blk_close(MACRO_PROT_ARGS)
 void
 blk_exp(MACRO_PROT_ARGS)
 {
 void
 blk_exp(MACRO_PROT_ARGS)
 {

-       struct man_node *n;
-       int              la;
+       struct man_node *head;

        char            *p;
        char            *p;

+       int              la;

 
        rew_scope(MAN_BLOCK, man, tok);
        man_block_alloc(man, line, ppos, tok);
        man_head_alloc(man, line, ppos, tok);
 
        rew_scope(MAN_BLOCK, man, tok);
        man_block_alloc(man, line, ppos, tok);
        man_head_alloc(man, line, ppos, tok);

+       head = man->last;

 
 

-       for (;;) {
-               la = *pos;
-               if ( ! man_args(man, line, pos, buf, &p))
-                       break;
+       la = *pos;
+       if (man_args(man, line, pos, buf, &p))

                man_word_alloc(man, line, la, p);
                man_word_alloc(man, line, la, p);

-       }
-
-       assert(man);
-       assert(tok != MAN_MAX);

 
 

-       for (n = man->last; n; n = n->parent)
-               if (n->tok == tok) {
-                       assert(n->type == MAN_HEAD);
-                       man_unscope(man, n);
-                       break;
-               }
+       if (buf[*pos] != '\0')
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+                   man->parse, line, *pos, "%s ... %s",
+                   man_macronames[tok], buf + *pos);

 
 

+       man_unscope(man, head);

        man_body_alloc(man, line, ppos, tok);
 }
 
        man_body_alloc(man, line, ppos, tok);
 }