Wrangle mdoc_args() and mdoc_zargs() to use enum return type.

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index c15354c3919facdad81f571e4ce47060eb8d85b8..ee833bdcff5d17753a354ed267e0e06b76467da8 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.57 2010/03/23 11:30:48 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.59 2010/03/24 20:10:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -142,6 +142,12 @@ static     const struct termact termacts[MAN_MAX] = {
        { pre_sp, NULL, MAN_NOTEXT }, /* Sp */
        { pre_nf, NULL, 0 }, /* Vb */
        { pre_fi, NULL, 0 }, /* Ve */
+       { pre_ign, NULL, MAN_NOTEXT }, /* de */
+       { pre_ign, NULL, MAN_NOTEXT }, /* dei */
+       { pre_ign, NULL, MAN_NOTEXT }, /* am */
+       { pre_ign, NULL, MAN_NOTEXT }, /* ami */
+       { pre_ign, NULL, MAN_NOTEXT }, /* ig */
+       { NULL, NULL, 0 }, /* . */
 };
 
 
@@ -156,10 +162,12 @@ terminal_man(void *arg, const struct man *man)
 
        p = (struct termp *)arg;
 
+       p->overstep = 0;
+       p->maxrmargin = 65;
+
        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):
-                       p->maxrmargin = 65;
                        p->symtab = chars_init(CHARS_ASCII);
                        break;
                default:
@@ -783,6 +791,8 @@ post_RS(DECL_ARGS)
        case (MAN_BLOCK):
                mt->offset = mt->lmargin = INDENT;
                break;
+       case (MAN_HEAD):
+               break;
        default:
                term_newln(p);
                p->offset = INDENT;
@@ -883,6 +893,7 @@ print_man_head(struct termp *p, const struct man_meta *m)
        size_t          buflen, titlen;
 
        p->rmargin = p->maxrmargin;
+
        p->offset = 0;
        buf[0] = title[0] = '\0';