Removed need for superfluous `os' value in overstep calculation (thanks Ingo Schwarze).

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index ba06f76166b7b4b48e8c3183bdcc7be36d1b4ee3..df649b99cb7ca6067201299de4e622bf063f72cb 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.21 2009/08/19 09:14:50 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.29 2009/10/24 05:45:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -38,9 +38,9 @@ static        int              rew_block(int, enum man_type,
 const  struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, 0 }, /* br */
        { in_line_eoln, 0 }, /* TH */
-       { blk_imp, 0 }, /* SH */
-       { blk_imp, 0 }, /* SS */
-       { blk_imp, MAN_SCOPED }, /* TP */
+       { blk_imp, MAN_SCOPED }, /* SH */
+       { blk_imp, MAN_SCOPED }, /* SS */
+       { blk_imp, MAN_SCOPED | MAN_FSCOPED }, /* TP */
        { blk_imp, 0 }, /* LP */
        { blk_imp, 0 }, /* PP */
        { blk_imp, 0 }, /* P */
@@ -64,7 +64,10 @@ const        struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, 0 }, /* fi */
        { in_line_eoln, 0 }, /* r */
        { blk_close, 0 }, /* RE */
-       { blk_imp, 0 }, /* RS */
+       { blk_imp, MAN_EXPLICIT }, /* RS */
+       { in_line_eoln, 0 }, /* DT */
+       { in_line_eoln, 0 }, /* UC */
+       { in_line_eoln, 0 }, /* PD */
 };
 
 const  struct man_macro * const man_macros = __man_macros;
@@ -235,6 +238,7 @@ blk_imp(MACRO_PROT_ARGS)
 {
        int              w, la;
        char            *p;
+       struct man_node *n;
 
        /* Close out prior scopes. */
 
@@ -250,6 +254,8 @@ blk_imp(MACRO_PROT_ARGS)
        if ( ! man_head_alloc(m, line, ppos, tok))
                return(0);
 
+       n = m->last;
+
        /* Add line arguments. */
 
        for (;;) {
@@ -268,9 +274,17 @@ blk_imp(MACRO_PROT_ARGS)
        /* Close out head and open body (unless MAN_SCOPE). */
 
        if (MAN_SCOPED & man_macros[tok].flags) {
-               m->flags |= MAN_BLINE;
-               return(1);
-       } else if ( ! rew_scope(MAN_HEAD, m, tok))
+               /* If we're forcing scope (`TP'), keep it open. */
+               if (MAN_FSCOPED & man_macros[tok].flags) {
+                       m->flags |= MAN_BLINE;
+                       return(1);
+               } else if (n == m->last) {
+                       m->flags |= MAN_BLINE;
+                       return(1);
+               }
+       }
+
+       if ( ! rew_scope(MAN_HEAD, m, tok))
                return(0);
 
        return(man_body_alloc(m, line, ppos, tok));
@@ -302,7 +316,7 @@ in_line_eoln(MACRO_PROT_ARGS)
                        return(0);
        }
 
-       if (n == m->last && (MAN_SCOPED & man_macros[tok].flags)) {
+       if (n == m->last && MAN_SCOPED & man_macros[tok].flags) {
                m->flags |= MAN_ELINE;
                return(1);
        } 
@@ -312,8 +326,6 @@ in_line_eoln(MACRO_PROT_ARGS)
         * make sure that we don't clobber as its sibling.
         */
 
-       /* FIXME: clean this to use man_unscope(). */
-
        for ( ; m->last; m->last = m->last->parent) {
                if (m->last == n)
                        break;
@@ -345,6 +357,19 @@ in_line_eoln(MACRO_PROT_ARGS)
 int
 man_macroend(struct man *m)
 {
+       struct man_node *n;
+
+       n = MAN_VALID & m->last->flags ?
+               m->last->parent : m->last;
+
+       for ( ; n; n = n->parent) {
+               if (MAN_BLOCK != n->type)
+                       continue;
+               if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
+                       continue;
+               if ( ! man_nwarn(m, n, WEXITSCOPE))
+                       return(0);
+       }
 
        return(man_unscope(m, m->first));
 }