Moved output definitions into main.h.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index bc39053fb864511278ee0632fdd5dc7f5a6a35b4..865427d79992f67c2e09b41e45b8a542ccb60c7e 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.24 2009/08/20 13:51:55 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.28 2009/08/22 09:10:38 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -40,7 +40,7 @@ const struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, 0 }, /* TH */
        { blk_imp, MAN_SCOPED }, /* SH */
        { blk_imp, MAN_SCOPED }, /* SS */
-       { blk_imp, MAN_SCOPED }, /* TP */
+       { blk_imp, MAN_SCOPED | MAN_FSCOPED }, /* TP */
        { blk_imp, 0 }, /* LP */
        { blk_imp, 0 }, /* PP */
        { blk_imp, 0 }, /* P */
@@ -66,6 +66,7 @@ const struct man_macro __man_macros[MAN_MAX] = {
        { blk_close, 0 }, /* RE */
        { blk_imp, MAN_EXPLICIT }, /* RS */
        { in_line_eoln, 0 }, /* DT */
+       { in_line_eoln, 0 }, /* UC */
 };
 
 const  struct man_macro * const man_macros = __man_macros;
@@ -236,6 +237,7 @@ blk_imp(MACRO_PROT_ARGS)
 {
        int              w, la;
        char            *p;
+       struct man_node *n;
 
        /* Close out prior scopes. */
 
@@ -251,6 +253,8 @@ blk_imp(MACRO_PROT_ARGS)
        if ( ! man_head_alloc(m, line, ppos, tok))
                return(0);
 
+       n = m->last;
+
        /* Add line arguments. */
 
        for (;;) {
@@ -269,9 +273,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));
@@ -303,7 +315,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);
        } 
@@ -354,7 +366,8 @@ man_macroend(struct man *m)
                        continue;
                if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
                        continue;
-               return(man_nerr(m, n, WEXITSCOPE));
+               if ( ! man_nwarn(m, n, WEXITSCOPE))
+                       return(0);
        }
 
        return(man_unscope(m, m->first));