Note that "^" needs an empty cell, while "s" does not.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index da56081225edbb268f06472644e0901374879b57..bd0ca99243680e0c43b0ad2f0a2fdf98b36b2a48 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,6 +1,6 @@
-/*     $Id: man_macro.c,v 1.46 2010/05/17 22:11:42 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.54 2010/12/08 10:58:22 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -69,20 +69,17 @@ const       struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
        { in_line_eoln, MAN_NSCOPED }, /* na */
-       { in_line_eoln, 0 }, /* i */
        { in_line_eoln, MAN_NSCOPED }, /* sp */
        { in_line_eoln, 0 }, /* nf */
        { in_line_eoln, 0 }, /* fi */
-       { in_line_eoln, 0 }, /* r */
        { blk_close, 0 }, /* RE */
        { blk_exp, MAN_EXPLICIT }, /* RS */
        { in_line_eoln, 0 }, /* DT */
        { in_line_eoln, 0 }, /* UC */
        { in_line_eoln, 0 }, /* PD */
-       { in_line_eoln, MAN_NSCOPED }, /* Sp */
-       { in_line_eoln, 0 }, /* Vb */
-       { in_line_eoln, 0 }, /* Ve */
        { in_line_eoln, 0 }, /* AT */
+       { in_line_eoln, 0 }, /* in */
+       { in_line_eoln, 0 }, /* ft */
 };
 
 const  struct man_macro * const man_macros = __man_macros;
@@ -122,8 +119,6 @@ man_unscope(struct man *m, const struct man_node *n,
                        return(0);
                if ( ! man_valid_post(m))
                        return(0);
-               if ( ! man_action_post(m))
-                       return(0);
                m->last = m->last->parent;
                assert(m->last);
        }
@@ -132,8 +127,6 @@ man_unscope(struct man *m, const struct man_node *n,
                return(0);
        if ( ! man_valid_post(m))
                return(0);
-       if ( ! man_action_post(m))
-               return(0);
 
        m->next = MAN_ROOT == m->last->type ? 
                MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
@@ -290,6 +283,7 @@ blk_close(MACRO_PROT_ARGS)
 }
 
 
+/* ARGSUSED */
 int
 blk_exp(MACRO_PROT_ARGS)
 {
@@ -341,6 +335,7 @@ blk_exp(MACRO_PROT_ARGS)
  * scopes, such as `SH' closing out an `SS', are defined in the rew
  * routines.
  */
+/* ARGSUSED */
 int
 blk_imp(MACRO_PROT_ARGS)
 {
@@ -398,6 +393,7 @@ blk_imp(MACRO_PROT_ARGS)
 }
 
 
+/* ARGSUSED */
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {
@@ -454,8 +450,6 @@ in_line_eoln(MACRO_PROT_ARGS)
                        break;
                if ( ! man_valid_post(m))
                        return(0);
-               if ( ! man_action_post(m))
-                       return(0);
        }
 
        assert(m->last);
@@ -466,8 +460,6 @@ in_line_eoln(MACRO_PROT_ARGS)
 
        if (m->last->type != MAN_ROOT && ! man_valid_post(m))
                return(0);
-       if (m->last->type != MAN_ROOT && ! man_action_post(m))
-               return(0);
 
        m->next = MAN_ROOT == m->last->type ?
                MAN_NEXT_CHILD : MAN_NEXT_SIBLING;