Show the flags MDOC_DELIMO, MDOC_DELIMC, MDOC_EOS, and MAN_EOS.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index d82811d44735f34cb9b11d854291b88a9c73acd6..6cc3f5c66be0b516c5db48fa6838362c211a475d 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.107 2015/04/19 14:25:41 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.111 2015/09/26 00:54:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -63,8 +63,8 @@ const struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
        { in_line_eoln, MAN_NSCOPED }, /* sp */
-       { in_line_eoln, MAN_BSCOPE }, /* nf */
-       { in_line_eoln, MAN_BSCOPE }, /* fi */
+       { in_line_eoln, MAN_NSCOPED }, /* nf */
+       { in_line_eoln, MAN_NSCOPED }, /* fi */
        { blk_close, MAN_BSCOPE }, /* RE */
        { blk_exp, MAN_BSCOPE }, /* RS */
        { in_line_eoln, 0 }, /* DT */
@@ -225,7 +225,6 @@ blk_close(MACRO_PROT_ARGS)
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        for (nn = man->last->parent; nn; nn = nn->parent)
@@ -259,7 +258,7 @@ blk_exp(MACRO_PROT_ARGS)
        int              la;
 
        rew_scope(man, tok);
-       man_block_alloc(man, line, ppos, tok);
+       roff_block_alloc(man, line, ppos, tok);
        head = roff_head_alloc(man, line, ppos, tok);
 
        la = *pos;
@@ -289,8 +288,7 @@ blk_imp(MACRO_PROT_ARGS)
        struct roff_node *n;
 
        rew_scope(man, tok);
-       man_block_alloc(man, line, ppos, tok);
-       n = man->last;
+       n = roff_block_alloc(man, line, ppos, tok);
        if (n->tok == MAN_SH || n->tok == MAN_SS)
                man->flags &= ~MAN_LITERAL;
        n = roff_head_alloc(man, line, ppos, tok);
@@ -329,7 +327,7 @@ in_line_eoln(MACRO_PROT_ARGS)
        char            *p;
        struct roff_node *n;
 
-       man_elem_alloc(man, line, ppos, tok);
+       roff_elem_alloc(man, line, ppos, tok);
        n = man->last;
 
        for (;;) {
@@ -405,9 +403,8 @@ in_line_eoln(MACRO_PROT_ARGS)
                man_valid_post(man);
 }
 
-
 void
-man_macroend(struct roff_man *man)
+man_endparse(struct roff_man *man)
 {
 
        man_unscope(man, man->first);