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 0622d255de65020794976fa8725c63238a7c1877..df649b99cb7ca6067201299de4e622bf063f72cb 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.25 2009/08/20 13:55:19 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>
  *
 /*
  * 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 */
        { 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 */
        { blk_imp, 0 }, /* LP */
        { blk_imp, 0 }, /* PP */
        { blk_imp, 0 }, /* P */


@@ -66,6 +66,8 @@ const struct man_macro __man_macros[MAN_MAX] = {
        { blk_close, 0 }, /* RE */
        { blk_imp, MAN_EXPLICIT }, /* RS */
        { in_line_eoln, 0 }, /* DT */
        { blk_close, 0 }, /* RE */
        { 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;
 };
 
 const  struct man_macro * const man_macros = __man_macros;


@@ -271,10 +273,18 @@ blk_imp(MACRO_PROT_ARGS)
 
        /* Close out head and open body (unless MAN_SCOPE). */
 
 
        /* Close out head and open body (unless MAN_SCOPE). */
 

-       if (n == m->last && MAN_SCOPED & man_macros[tok].flags) {
-               m->flags |= MAN_BLINE;
-               return(1);
-       } else if ( ! rew_scope(MAN_HEAD, m, tok))
+       if (MAN_SCOPED & man_macros[tok].flags) {
+               /* 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));
                return(0);
 
        return(man_body_alloc(m, line, ppos, tok));


@@ -357,7 +367,8 @@ man_macroend(struct man *m)
                        continue;
                if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
                        continue;
                        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));
        }
 
        return(man_unscope(m, m->first));