Tentative fix of quoted punctuation issue noted by Jason McIntyre, e.g., `Li "!"...

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index e9f4264d728c5403c2390740c57fa18a086edc08..ee833bdcff5d17753a354ed267e0e06b76467da8 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.44 2009/10/24 05:45:05 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>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -14,11 +14,14 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -62,21 +65,18 @@ struct      mtermp {
 struct termact {
        int             (*pre)(DECL_ARGS);
        void            (*post)(DECL_ARGS);
 struct termact {
        int             (*pre)(DECL_ARGS);
        void            (*post)(DECL_ARGS);

+       int               flags;
+#define        MAN_NOTEXT       (1 << 0) /* Never has text children. */

 };
 
 };
 

-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
-
-static int               arg2width(const struct man_node *);
-static int               arg2height(const struct man_node *);
+static int               a2width(const struct man_node *);
+static int               a2height(const struct man_node *);

 
 

-static void              print_head(struct termp *, 
+static void              print_man_head(struct termp *, 

                                const struct man_meta *);
                                const struct man_meta *);

-static void              print_body(DECL_ARGS);
-static void              print_node(DECL_ARGS);
-static void              print_foot(struct termp *, 
+static void              print_man_nodelist(DECL_ARGS);
+static void              print_man_node(DECL_ARGS);
+static void              print_man_foot(struct termp *, 

                                const struct man_meta *);
 static void              print_bvspace(struct termp *, 
                                const struct man_node *);
                                const struct man_meta *);
 static void              print_bvspace(struct termp *, 
                                const struct man_node *);


@@ -86,7 +86,6 @@ static        int               pre_BI(DECL_ARGS);
 static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);
 static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);

-static int               pre_IR(DECL_ARGS);

 static int               pre_PP(DECL_ARGS);
 static int               pre_RB(DECL_ARGS);
 static int               pre_RI(DECL_ARGS);
 static int               pre_PP(DECL_ARGS);
 static int               pre_RB(DECL_ARGS);
 static int               pre_RI(DECL_ARGS);


@@ -98,52 +97,57 @@ static      int               pre_br(DECL_ARGS);
 static int               pre_fi(DECL_ARGS);
 static int               pre_ign(DECL_ARGS);
 static int               pre_nf(DECL_ARGS);
 static int               pre_fi(DECL_ARGS);
 static int               pre_ign(DECL_ARGS);
 static int               pre_nf(DECL_ARGS);

-static int               pre_r(DECL_ARGS);

 static int               pre_sp(DECL_ARGS);
 
 static int               pre_sp(DECL_ARGS);
 

-static void              post_B(DECL_ARGS);
-static void              post_I(DECL_ARGS);

 static void              post_IP(DECL_ARGS);
 static void              post_HP(DECL_ARGS);
 static void              post_RS(DECL_ARGS);
 static void              post_SH(DECL_ARGS);
 static void              post_SS(DECL_ARGS);
 static void              post_TP(DECL_ARGS);
 static void              post_IP(DECL_ARGS);
 static void              post_HP(DECL_ARGS);
 static void              post_RS(DECL_ARGS);
 static void              post_SH(DECL_ARGS);
 static void              post_SS(DECL_ARGS);
 static void              post_TP(DECL_ARGS);

-static void              post_i(DECL_ARGS);

 
 static const struct termact termacts[MAN_MAX] = {
 
 static const struct termact termacts[MAN_MAX] = {

-       { pre_br, NULL }, /* br */
-       { NULL, NULL }, /* TH */
-       { pre_SH, post_SH }, /* SH */
-       { pre_SS, post_SS }, /* SS */
-       { pre_TP, post_TP }, /* TP */
-       { pre_PP, NULL }, /* LP */
-       { pre_PP, NULL }, /* PP */
-       { pre_PP, NULL }, /* P */
-       { pre_IP, post_IP }, /* IP */
-       { pre_HP, post_HP }, /* HP */ 
-       { NULL, NULL }, /* SM */
-       { pre_B, post_B }, /* SB */
-       { pre_BI, NULL }, /* BI */
-       { pre_BI, NULL }, /* IB */
-       { pre_RB, NULL }, /* BR */
-       { pre_RB, NULL }, /* RB */
-       { NULL, NULL }, /* R */
-       { pre_B, post_B }, /* B */
-       { pre_I, post_I }, /* I */
-       { pre_IR, NULL }, /* IR */
-       { pre_RI, NULL }, /* RI */
-       { NULL, NULL }, /* na */
-       { pre_I, post_i }, /* i */
-       { pre_sp, NULL }, /* sp */
-       { pre_nf, NULL }, /* nf */
-       { pre_fi, NULL }, /* fi */
-       { pre_r, NULL }, /* r */
-       { NULL, NULL }, /* RE */
-       { pre_RS, post_RS }, /* RS */
-       { pre_ign, NULL }, /* DT */
-       { pre_ign, NULL }, /* UC */
-       { pre_ign, NULL }, /* PD */
+       { pre_br, NULL, MAN_NOTEXT }, /* br */
+       { NULL, NULL, 0 }, /* TH */
+       { pre_SH, post_SH, 0 }, /* SH */
+       { pre_SS, post_SS, 0 }, /* SS */
+       { pre_TP, post_TP, 0 }, /* TP */
+       { pre_PP, NULL, 0 }, /* LP */
+       { pre_PP, NULL, 0 }, /* PP */
+       { pre_PP, NULL, 0 }, /* P */
+       { pre_IP, post_IP, 0 }, /* IP */
+       { pre_HP, post_HP, 0 }, /* HP */ 
+       { NULL, NULL, 0 }, /* SM */
+       { pre_B, NULL, 0 }, /* SB */
+       { pre_BI, NULL, 0 }, /* BI */
+       { pre_BI, NULL, 0 }, /* IB */
+       { pre_RB, NULL, 0 }, /* BR */
+       { pre_RB, NULL, 0 }, /* RB */
+       { NULL, NULL, 0 }, /* R */
+       { pre_B, NULL, 0 }, /* B */
+       { pre_I, NULL, 0 }, /* I */
+       { pre_RI, NULL, 0 }, /* IR */
+       { pre_RI, NULL, 0 }, /* RI */
+       { NULL, NULL, MAN_NOTEXT }, /* na */
+       { pre_I, NULL, 0 }, /* i */
+       { pre_sp, NULL, MAN_NOTEXT }, /* sp */
+       { pre_nf, NULL, 0 }, /* nf */
+       { pre_fi, NULL, 0 }, /* fi */
+       { NULL, NULL, 0 }, /* r */
+       { NULL, NULL, 0 }, /* RE */
+       { pre_RS, post_RS, 0 }, /* RS */
+       { pre_ign, NULL, 0 }, /* DT */
+       { pre_ign, NULL, 0 }, /* UC */
+       { pre_ign, NULL, 0 }, /* PD */
+       { 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 }, /* . */

 };
 
 
 };
 
 


@@ -158,6 +162,9 @@ terminal_man(void *arg, const struct man *man)
 
        p = (struct termp *)arg;
 
 
        p = (struct termp *)arg;
 

+       p->overstep = 0;
+       p->maxrmargin = 65;
+

        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):
        if (NULL == p->symtab)
                switch (p->enc) {
                case (TERMENC_ASCII):


@@ -171,7 +178,7 @@ terminal_man(void *arg, const struct man *man)
        n = man_node(man);
        m = man_meta(man);
 
        n = man_node(man);
        m = man_meta(man);
 

-       print_head(p, m);
+       print_man_head(p, m);

        p->flags |= TERMP_NOSPACE;
 
        mt.fl = 0;
        p->flags |= TERMP_NOSPACE;
 
        mt.fl = 0;


@@ -179,13 +186,13 @@ terminal_man(void *arg, const struct man *man)
        mt.offset = INDENT;
 
        if (n->child)
        mt.offset = INDENT;
 
        if (n->child)

-               print_body(p, &mt, n->child, m);
-       print_foot(p, m);
+               print_man_nodelist(p, &mt, n->child, m);
+       print_man_foot(p, m);

 }
 
 
 static int
 }
 
 
 static int

-arg2height(const struct man_node *n)
+a2height(const struct man_node *n)

 {
        struct roffsu    su;
 
 {
        struct roffsu    su;
 


@@ -199,7 +206,7 @@ arg2height(const struct man_node *n)
 
 
 static int
 
 
 static int

-arg2width(const struct man_node *n)
+a2width(const struct man_node *n)

 {
        struct roffsu    su;
 
 {
        struct roffsu    su;
 


@@ -243,45 +250,17 @@ static int
 pre_I(DECL_ARGS)
 {
 
 pre_I(DECL_ARGS)
 {
 

-       p->under++;
+       term_fontrepl(p, TERMFONT_UNDER);

        return(1);
 }
 
 
        return(1);
 }
 
 

-/* ARGSUSED */
-static int
-pre_r(DECL_ARGS)
-{
-
-       p->bold = p->under = 0;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-post_i(DECL_ARGS)
-{
-
-       if (n->nchild)
-               p->under--;
-}
-
-
-/* ARGSUSED */
-static void
-post_I(DECL_ARGS)
-{
-
-       p->under--;
-}
-
-

 /* ARGSUSED */
 static int
 pre_fi(DECL_ARGS)
 {
 
 /* ARGSUSED */
 static int
 pre_fi(DECL_ARGS)
 {
 

+       p->rmargin = p->maxrmargin = 65;

        mt->fl &= ~MANT_LITERAL;
        return(1);
 }
        mt->fl &= ~MANT_LITERAL;
        return(1);
 }


@@ -292,29 +271,11 @@ static int
 pre_nf(DECL_ARGS)
 {
 
 pre_nf(DECL_ARGS)
 {
 

+       p->rmargin = p->maxrmargin = 78;

        term_newln(p);
        mt->fl |= MANT_LITERAL;
        term_newln(p);
        mt->fl |= MANT_LITERAL;

-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-pre_IR(DECL_ARGS)
-{
-       const struct man_node *nn;
-       int              i;

 
 

-       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
-               if ( ! (i % 2))
-                       p->under++;
-               if (i > 0)
-                       p->flags |= TERMP_NOSPACE;
-               print_node(p, mt, nn, m);
-               if ( ! (i % 2))
-                       p->under--;
-       }
-       return(0);
+       return(MAN_Vb != n->tok);

 }
 
 
 }
 
 


@@ -327,19 +288,16 @@ pre_RB(DECL_ARGS)
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                if (i % 2 && MAN_RB == n->tok)
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                if (i % 2 && MAN_RB == n->tok)

-                       p->bold++;
+                       term_fontrepl(p, TERMFONT_BOLD);

                else if ( ! (i % 2) && MAN_RB != n->tok)
                else if ( ! (i % 2) && MAN_RB != n->tok)

-                       p->bold++;
+                       term_fontrepl(p, TERMFONT_BOLD);
+               else
+                       term_fontrepl(p, TERMFONT_NONE);

 
                if (i > 0)
                        p->flags |= TERMP_NOSPACE;
 
 
                if (i > 0)
                        p->flags |= TERMP_NOSPACE;
 

-               print_node(p, mt, nn, m);
-
-               if (i % 2 && MAN_RB == n->tok)
-                       p->bold--;
-               else if ( ! (i % 2) && MAN_RB != n->tok)
-                       p->bold--;
+               print_man_node(p, mt, nn, m);

        }
        return(0);
 }
        }
        return(0);
 }


@@ -353,13 +311,17 @@ pre_RI(DECL_ARGS)
        int              i;
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
        int              i;
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {

-               if ( ! (i % 2))
-                       p->under++;
+               if (i % 2 && MAN_RI == n->tok)
+                       term_fontrepl(p, TERMFONT_UNDER);
+               else if ( ! (i % 2) && MAN_RI != n->tok)
+                       term_fontrepl(p, TERMFONT_UNDER);
+               else
+                       term_fontrepl(p, TERMFONT_NONE);
+

                if (i > 0)
                        p->flags |= TERMP_NOSPACE;
                if (i > 0)
                        p->flags |= TERMP_NOSPACE;

-               print_node(p, mt, nn, m);
-               if ( ! (i % 2))
-                       p->under--;
+
+               print_man_node(p, mt, nn, m);

        }
        return(0);
 }
        }
        return(0);
 }


@@ -374,26 +336,18 @@ pre_BI(DECL_ARGS)
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                if (i % 2 && MAN_BI == n->tok)
 
        for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
                if (i % 2 && MAN_BI == n->tok)

-                       p->under++;
+                       term_fontrepl(p, TERMFONT_UNDER);

                else if (i % 2)
                else if (i % 2)

-                       p->bold++;
+                       term_fontrepl(p, TERMFONT_BOLD);

                else if (MAN_BI == n->tok)
                else if (MAN_BI == n->tok)

-                       p->bold++;
+                       term_fontrepl(p, TERMFONT_BOLD);

                else
                else

-                       p->under++;
+                       term_fontrepl(p, TERMFONT_UNDER);

 
                if (i)
                        p->flags |= TERMP_NOSPACE;
 
                if (i)
                        p->flags |= TERMP_NOSPACE;

-               print_node(p, mt, nn, m);

 
 

-               if (i % 2 && MAN_BI == n->tok)
-                       p->under--;
-               else if (i % 2)
-                       p->bold--;
-               else if (MAN_BI == n->tok)
-                       p->bold--;
-               else
-                       p->under--;
+               print_man_node(p, mt, nn, m);

        }
        return(0);
 }
        }
        return(0);
 }


@@ -404,27 +358,18 @@ static int
 pre_B(DECL_ARGS)
 {
 
 pre_B(DECL_ARGS)
 {
 

-       p->bold++;
+       term_fontrepl(p, TERMFONT_BOLD);

        return(1);
 }
 
 
        return(1);
 }
 
 

-/* ARGSUSED */
-static void
-post_B(DECL_ARGS)
-{
-
-       p->bold--;
-}
-
-

 /* ARGSUSED */
 static int
 pre_sp(DECL_ARGS)
 {
        int              i, len;
 
 /* ARGSUSED */
 static int
 pre_sp(DECL_ARGS)
 {
        int              i, len;
 

-       len = n->child ? arg2height(n->child) : 1;
+       len = n->child ? a2height(n->child) : 1;

 
        if (0 == len)
                term_newln(p);
 
        if (0 == len)
                term_newln(p);


@@ -471,7 +416,7 @@ pre_HP(DECL_ARGS)
        /* Calculate offset. */
 
        if (NULL != (nn = n->parent->head->child))
        /* Calculate offset. */
 
        if (NULL != (nn = n->parent->head->child))

-               if ((ival = arg2width(nn)) >= 0)
+               if ((ival = a2width(nn)) >= 0)

                        len = (size_t)ival;
 
        if (0 == len)
                        len = (size_t)ival;
 
        if (0 == len)


@@ -561,7 +506,7 @@ pre_IP(DECL_ARGS)
                if (NULL != (nn = nn->next)) {
                        for ( ; nn->next; nn = nn->next)
                                /* Do nothing. */ ;
                if (NULL != (nn = nn->next)) {
                        for ( ; nn->next; nn = nn->next)
                                /* Do nothing. */ ;

-                       if ((ival = arg2width(nn)) >= 0)
+                       if ((ival = a2width(nn)) >= 0)

                                len = (size_t)ival;
                }
 
                                len = (size_t)ival;
                }
 


@@ -581,7 +526,7 @@ pre_IP(DECL_ARGS)
 
                /* Don't print the length value. */
                for (nn = n->child; nn->next; nn = nn->next)
 
                /* Don't print the length value. */
                for (nn = n->child; nn->next; nn = nn->next)

-                       print_node(p, mt, nn, m);
+                       print_man_node(p, mt, nn, m);

                return(0);
        case (MAN_BODY):
                p->offset = mt->offset + len;
                return(0);
        case (MAN_BODY):
                p->offset = mt->offset + len;


@@ -646,10 +591,13 @@ pre_TP(DECL_ARGS)
 
        /* Calculate offset. */
 
 
        /* Calculate offset. */
 

-       if (NULL != (nn = n->parent->head->child))
-               if (NULL != nn->next)
-                       if ((ival = arg2width(nn)) >= 0)
+       if (NULL != (nn = n->parent->head->child)) {
+               while (nn && MAN_TEXT != nn->type)
+                       nn = nn->next;
+               if (nn && nn->next)
+                       if ((ival = a2width(nn)) >= 0)

                                len = (size_t)ival;
                                len = (size_t)ival;

+       }

 
        switch (n->type) {
        case (MAN_HEAD):
 
        switch (n->type) {
        case (MAN_HEAD):


@@ -663,7 +611,7 @@ pre_TP(DECL_ARGS)
                /* Don't print same-line elements. */
                for (nn = n->child; nn; nn = nn->next) 
                        if (nn->line > n->line)
                /* Don't print same-line elements. */
                for (nn = n->child; nn; nn = nn->next) 
                        if (nn->line > n->line)

-                               print_node(p, mt, nn, m);
+                               print_man_node(p, mt, nn, m);

 
                if (ival >= 0)
                        mt->lmargin = (size_t)ival;
 
                if (ival >= 0)
                        mt->lmargin = (size_t)ival;


@@ -721,7 +669,7 @@ pre_SS(DECL_ARGS)
                term_vspace(p);
                break;
        case (MAN_HEAD):
                term_vspace(p);
                break;
        case (MAN_HEAD):

-               p->bold++;
+               term_fontrepl(p, TERMFONT_BOLD);

                p->offset = HALFINDENT;
                break;
        case (MAN_BODY):
                p->offset = HALFINDENT;
                break;
        case (MAN_BODY):


@@ -743,7 +691,6 @@ post_SS(DECL_ARGS)
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);

-               p->bold--;

                break;
        case (MAN_BODY):
                term_newln(p);
                break;
        case (MAN_BODY):
                term_newln(p);


@@ -770,7 +717,7 @@ pre_SH(DECL_ARGS)
                term_vspace(p);
                break;
        case (MAN_HEAD):
                term_vspace(p);
                break;
        case (MAN_HEAD):

-               p->bold++;
+               term_fontrepl(p, TERMFONT_BOLD);

                p->offset = 0;
                break;
        case (MAN_BODY):
                p->offset = 0;
                break;
        case (MAN_BODY):


@@ -792,7 +739,6 @@ post_SH(DECL_ARGS)
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);

-               p->bold--;

                break;
        case (MAN_BODY):
                term_newln(p);
                break;
        case (MAN_BODY):
                term_newln(p);


@@ -826,7 +772,7 @@ pre_RS(DECL_ARGS)
                return(1);
        }
 
                return(1);
        }
 

-       if ((ival = arg2width(nn)) < 0)
+       if ((ival = a2width(nn)) < 0)

                return(1);
 
        mt->offset = INDENT + (size_t)ival;
                return(1);
 
        mt->offset = INDENT + (size_t)ival;


@@ -845,6 +791,8 @@ post_RS(DECL_ARGS)
        case (MAN_BLOCK):
                mt->offset = mt->lmargin = INDENT;
                break;
        case (MAN_BLOCK):
                mt->offset = mt->lmargin = INDENT;
                break;

+       case (MAN_HEAD):
+               break;

        default:
                term_newln(p);
                p->offset = INDENT;
        default:
                term_newln(p);
                p->offset = INDENT;


@@ -854,9 +802,9 @@ post_RS(DECL_ARGS)
 
 
 static void
 
 
 static void

-print_node(DECL_ARGS)
+print_man_node(DECL_ARGS)

 {
 {

-       int              c, sz;
+       int              c;

 
        c = 1;
 
 
        c = 1;
 


@@ -866,54 +814,54 @@ print_node(DECL_ARGS)
                        term_vspace(p);
                        break;
                }
                        term_vspace(p);
                        break;
                }

-               /*
-                * Note!  This is hacky.  Here, we recognise the `\c'
-                * escape embedded in so many -man pages.  It's supposed
-                * to remove the subsequent space, so we mark NOSPACE if
-                * it's encountered in the string.
-                */
-               sz = (int)strlen(n->string);
+

                term_word(p, n->string);
                term_word(p, n->string);

-               if (sz >= 2 && n->string[sz - 1] == 'c' &&
-                               n->string[sz - 2] == '\\')
-                       p->flags |= TERMP_NOSPACE;
+

                /* FIXME: this means that macro lines are munged!  */
                /* FIXME: this means that macro lines are munged!  */

+

                if (MANT_LITERAL & mt->fl) {
                        p->flags |= TERMP_NOSPACE;
                        term_flushln(p);
                }
                break;
        default:
                if (MANT_LITERAL & mt->fl) {
                        p->flags |= TERMP_NOSPACE;
                        term_flushln(p);
                }
                break;
        default:

+               if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
+                       term_fontrepl(p, TERMFONT_NONE);

                if (termacts[n->tok].pre)
                        c = (*termacts[n->tok].pre)(p, mt, n, m);
                break;
        }
 
        if (c && n->child)
                if (termacts[n->tok].pre)
                        c = (*termacts[n->tok].pre)(p, mt, n, m);
                break;
        }
 
        if (c && n->child)

-               print_body(p, mt, n->child, m);
+               print_man_nodelist(p, mt, n->child, m);

 
 

-       if (MAN_TEXT != n->type)
+       if (MAN_TEXT != n->type) {

                if (termacts[n->tok].post)
                        (*termacts[n->tok].post)(p, mt, n, m);
                if (termacts[n->tok].post)
                        (*termacts[n->tok].post)(p, mt, n, m);

+               if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
+                       term_fontrepl(p, TERMFONT_NONE);
+       }

 }
 
 
 static void
 }
 
 
 static void

-print_body(DECL_ARGS)
+print_man_nodelist(DECL_ARGS)

 {
 
 {
 

-       print_node(p, mt, n, m);
+       print_man_node(p, mt, n, m);

        if ( ! n->next)
                return;
        if ( ! n->next)
                return;

-       print_body(p, mt, n->next, m);
+       print_man_nodelist(p, mt, n->next, m);

 }
 
 
 static void
 }
 
 
 static void

-print_foot(struct termp *p, const struct man_meta *meta)
+print_man_foot(struct termp *p, const struct man_meta *meta)

 {
        char            buf[DATESIZ];
 
 {
        char            buf[DATESIZ];
 

+       term_fontrepl(p, TERMFONT_NONE);
+

        time2a(meta->date, buf, DATESIZ);
 
        term_vspace(p);
        time2a(meta->date, buf, DATESIZ);
 
        term_vspace(p);


@@ -939,28 +887,27 @@ print_foot(struct termp *p, const struct man_meta *meta)
 
 
 static void
 
 
 static void

-print_head(struct termp *p, const struct man_meta *meta)
+print_man_head(struct termp *p, const struct man_meta *m)

 {
 {

-       char            *buf, *title;
+       char            buf[BUFSIZ], title[BUFSIZ];
+       size_t          buflen, titlen;

 
        p->rmargin = p->maxrmargin;
 
        p->rmargin = p->maxrmargin;

-       p->offset = 0;

 
 

-       if (NULL == (buf = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
+       p->offset = 0;
+       buf[0] = title[0] = '\0';

 
 

-       if (meta->vol)
-               (void)strlcpy(buf, meta->vol, p->rmargin);
-       else
-               *buf = 0;
+       if (m->vol)
+               strlcpy(buf, m->vol, BUFSIZ);
+       buflen = strlen(buf);

 
 

-       (void)snprintf(title, p->rmargin, "%s(%d)", 
-                       meta->title, meta->msec);
+       snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
+       titlen = strlen(title);

 
        p->offset = 0;
 
        p->offset = 0;

-       p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
+       p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
+           (p->maxrmargin - strlen(buf) + 1) / 2 :
+           p->maxrmargin - buflen;

        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
        term_word(p, title);
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
        term_word(p, title);


@@ -968,24 +915,22 @@ print_head(struct termp *p, const struct man_meta *meta)
 
        p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
        p->offset = p->rmargin;
 
        p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
        p->offset = p->rmargin;

-       p->rmargin = p->maxrmargin - strlen(title);
+       p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
+           p->maxrmargin - titlen : p->maxrmargin;

 
        term_word(p, buf);
        term_flushln(p);
 
 
        term_word(p, buf);
        term_flushln(p);
 

-       p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin;

        p->flags &= ~TERMP_NOBREAK;
        p->flags &= ~TERMP_NOBREAK;

-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
-
-       term_word(p, title);
-       term_flushln(p);
+       if (p->rmargin + titlen <= p->maxrmargin) {
+               p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+               p->offset = p->rmargin;
+               p->rmargin = p->maxrmargin;
+               term_word(p, title);
+               term_flushln(p);
+       }

 
        p->rmargin = p->maxrmargin;
        p->offset = 0;
        p->flags &= ~TERMP_NOSPACE;
 
        p->rmargin = p->maxrmargin;
        p->offset = 0;
        p->flags &= ~TERMP_NOSPACE;

-
-       free(title);
-       free(buf);

 }
 }

-