Kill man_action.c.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 387e0a3451df69ce4981a859a1470f8c1f524a3e..e866d81db359dade9e788449d3e9852fb907c1d7 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,6 +1,6 @@
-/*     $Id: man_macro.c,v 1.47 2010/06/19 20:46:28 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.51 2010/11/30 15:36:28 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -83,6 +83,7 @@ const struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, 0 }, /* Vb */
        { in_line_eoln, 0 }, /* Ve */
        { in_line_eoln, 0 }, /* AT */
        { in_line_eoln, 0 }, /* Vb */
        { in_line_eoln, 0 }, /* Ve */
        { in_line_eoln, 0 }, /* AT */

+       { in_line_eoln, 0 }, /* in */

 };
 
 const  struct man_macro * const man_macros = __man_macros;
 };
 
 const  struct man_macro * const man_macros = __man_macros;


@@ -122,8 +123,6 @@ man_unscope(struct man *m, const struct man_node *n,
                        return(0);
                if ( ! man_valid_post(m))
                        return(0);
                        return(0);
                if ( ! man_valid_post(m))
                        return(0);

-               if ( ! man_action_post(m))
-                       return(0);

                m->last = m->last->parent;
                assert(m->last);
        }
                m->last = m->last->parent;
                assert(m->last);
        }


@@ -132,8 +131,6 @@ man_unscope(struct man *m, const struct man_node *n,
                return(0);
        if ( ! man_valid_post(m))
                return(0);
                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;
 
        m->next = MAN_ROOT == m->last->type ? 
                MAN_NEXT_CHILD : MAN_NEXT_SIBLING;


@@ -290,6 +287,7 @@ blk_close(MACRO_PROT_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */

 int
 blk_exp(MACRO_PROT_ARGS)
 {
 int
 blk_exp(MACRO_PROT_ARGS)
 {


@@ -341,6 +339,7 @@ blk_exp(MACRO_PROT_ARGS)
  * scopes, such as `SH' closing out an `SS', are defined in the rew
  * routines.
  */
  * scopes, such as `SH' closing out an `SS', are defined in the rew
  * routines.
  */

+/* ARGSUSED */

 int
 blk_imp(MACRO_PROT_ARGS)
 {
 int
 blk_imp(MACRO_PROT_ARGS)
 {


@@ -398,6 +397,7 @@ blk_imp(MACRO_PROT_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */

 int
 in_line_eoln(MACRO_PROT_ARGS)
 {
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {


@@ -454,8 +454,6 @@ in_line_eoln(MACRO_PROT_ARGS)
                        break;
                if ( ! man_valid_post(m))
                        return(0);
                        break;
                if ( ! man_valid_post(m))
                        return(0);

-               if ( ! man_action_post(m))
-                       return(0);

        }
 
        assert(m->last);
        }
 
        assert(m->last);


@@ -466,8 +464,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_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;
 
        m->next = MAN_ROOT == m->last->type ?
                MAN_NEXT_CHILD : MAN_NEXT_SIBLING;