diff options
-rw-r--r-- | libman.h | 1 | ||||
-rw-r--r-- | man.c | 19 | ||||
-rw-r--r-- | man_macro.c | 2 | ||||
-rw-r--r-- | man_validate.c | 3 |
4 files changed, 2 insertions, 23 deletions
@@ -39,5 +39,4 @@ struct man_macro { const struct man_macro *man_macro(enum roff_tok); void man_descope(struct roff_man *, int, int, char *); -void man_state(struct roff_man *, struct roff_node *); void man_unscope(struct roff_man *, const struct roff_node *); @@ -343,22 +343,3 @@ man_breakscope(struct roff_man *man, int tok) man->flags &= ~MAN_BLINE; } } - -void -man_state(struct roff_man *man, struct roff_node *n) -{ - - switch(n->tok) { - case ROFF_nf: - case MAN_EX: - man->flags |= ROFF_NOFILL; - break; - case ROFF_fi: - case MAN_EE: - man->flags &= ~ROFF_NOFILL; - break; - default: - break; - } - man->last->flags |= NODE_VALID; -} diff --git a/man_macro.c b/man_macro.c index 9d460c1d..8b30bed6 100644 --- a/man_macro.c +++ b/man_macro.c @@ -429,7 +429,7 @@ in_line_eoln(MACRO_PROT_ARGS) /* Rewind our element scope. */ for ( ; man->last; man->last = man->last->parent) { - man_state(man, man->last); + man->last->flags |= NODE_VALID; if (man->last == n) break; } diff --git a/man_validate.c b/man_validate.c index 1407d7f4..e96c4983 100644 --- a/man_validate.c +++ b/man_validate.c @@ -153,7 +153,6 @@ man_validate(struct roff_man *man) default: if (n->tok < ROFF_MAX) { roff_validate(man); - man_state(man, n); break; } assert(n->tok >= MAN_TH && n->tok < MAN_MAX); @@ -161,7 +160,7 @@ man_validate(struct roff_man *man) if (*cp) (*cp)(man, n); if (man->last == n) - man_state(man, n); + n->flags |= NODE_VALID; break; } } |