=================================================================== RCS file: /cvs/mandoc/man_macro.c,v retrieving revision 1.49 retrieving revision 1.53 diff -u -p -r1.49 -r1.53 --- mandoc/man_macro.c 2010/07/22 23:03:15 1.49 +++ mandoc/man_macro.c 2010/12/06 15:31:19 1.53 @@ -1,6 +1,6 @@ -/* $Id: man_macro.c,v 1.49 2010/07/22 23:03:15 kristaps Exp $ */ +/* $Id: man_macro.c,v 1.53 2010/12/06 15:31:19 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -79,11 +79,9 @@ const struct man_macro __man_macros[MAN_MAX] = { { 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; @@ -123,8 +121,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); } @@ -133,8 +129,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; @@ -458,8 +452,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); @@ -469,8 +461,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 ?