More in-code documentation and clarity re-arrangements.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 867e3e700fe59a376c00336f737e5b530f5c20a1..845cc29b5cfe6d929fec06d00c9c043ba75ff2e9 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.26 2009/08/21 12:12:12 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.30 2010/01/01 17:14:28 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -40,7 +44,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 +70,8 @@ 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 */
+       { in_line_eoln, 0 }, /* PD */
 };
 
 const  struct man_macro * const man_macros = __man_macros;
@@ -271,10 +277,18 @@ blk_imp(MACRO_PROT_ARGS)
 
        /* 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));