Add lint target to Makefile.

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 47a092fbb44bd7c5eb1ab194b87a3b5d2f7e2959..cb0b08d7e60a707ef5db067430a01198f8de67a6 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.100 2011/01/23 14:54:21 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.105 2011/03/22 10:13:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,7 +31,6 @@
 #include "out.h"
 #include "man.h"
 #include "term.h"
-#include "chars.h"
 #include "main.h"
 
 #define        INDENT            7
@@ -212,6 +211,9 @@ print_bvspace(struct termp *p, const struct man_node *n)
 {
        term_newln(p);
 
+       if (n->body && n->body->child && MAN_TBL == n->body->child->type)
+               return;
+
        if (NULL == n->prev)
                return;
 
@@ -893,6 +895,9 @@ print_man_node(DECL_ARGS)
                if (MAN_EOS & n->flags)
                        p->flags |= TERMP_SENTENCE;
                return;
+       case (MAN_EQN):
+               term_word(p, n->eqn->data);
+               return;
        case (MAN_TBL):
                /*
                 * Tables are preceded by a newline.  Then process a
@@ -940,24 +945,18 @@ print_man_nodelist(DECL_ARGS)
 static void
 print_man_foot(struct termp *p, const void *arg)
 {
-       char            buf[DATESIZ];
        const struct man_meta *meta;
 
        meta = (const struct man_meta *)arg;
 
        term_fontrepl(p, TERMFONT_NONE);
 
-       if (meta->rawdate)
-               strlcpy(buf, meta->rawdate, DATESIZ);
-       else
-               time2a(meta->date, buf, DATESIZ);
-
        term_vspace(p);
        term_vspace(p);
        term_vspace(p);
 
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
-       p->rmargin = p->maxrmargin - term_strlen(p, buf);
+       p->rmargin = p->maxrmargin - term_strlen(p, meta->date);
        p->offset = 0;
 
        /* term_strlen() can return zero. */
@@ -975,7 +974,7 @@ print_man_foot(struct termp *p, const void *arg)
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOBREAK;
 
-       term_word(p, buf);
+       term_word(p, meta->date);
        term_flushln(p);
 }