Clarify what eqn actually is.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index c5a7d4ab849fde6016277e61a978ae969db7ec57..1d0a431baa09b7ea4aa51545a93382f3674e20f6 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.63 2011/06/18 17:36:52 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.64 2011/07/07 05:42:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -120,6 +120,9 @@ man_unscope(struct man *m, const struct man_node *to,
 
        assert(to);
 
+       assert(MAN_ROOT != m->last->type);
+       m->next = MAN_NEXT_SIBLING;
+
        /* LINTED */
        while (m->last != to) {
                /*
@@ -140,9 +143,6 @@ man_unscope(struct man *m, const struct man_node *to,
        if ( ! man_valid_post(m))
                return(0);
 
-       m->next = MAN_ROOT == m->last->type ? 
-               MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
-
        return(1);
 }
 
@@ -428,6 +428,9 @@ in_line_eoln(MACRO_PROT_ARGS)
                assert( ! (MAN_SCOPED & man_macros[tok].flags));
                m->flags |= MAN_ILINE;
        }
+
+       assert(MAN_ROOT != m->last->type);
+       m->next = MAN_NEXT_SIBLING;
        
        /*
         * Rewind our element scope.  Note that when TH is pruned, we'll
@@ -453,9 +456,6 @@ in_line_eoln(MACRO_PROT_ARGS)
        if (m->last->type != MAN_ROOT && ! man_valid_post(m))
                return(0);
 
-       m->next = MAN_ROOT == m->last->type ?
-               MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
-
        return(1);
 }