Removed superfluous HTML_NEWLINE.

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index b5196503b99dab7c29afa196d901a4fa034960fe..fefbc1cb99bc58dfb3378048feb97c20d72abe2d 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.38 2009/10/18 11:52:18 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.54 2009/11/12 08:21:05 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -18,20 +18,21 @@
 
 #include <assert.h>
 #include <ctype.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>
 

+#include "out.h"

 #include "man.h"
 #include "term.h"
 #include "chars.h"
 #include "main.h"
 #include "man.h"
 #include "term.h"
 #include "chars.h"
 #include "main.h"

-#include "out.h"

 
 #define        INDENT            7
 #define        HALFINDENT        3
 
 
 #define        INDENT            7
 #define        HALFINDENT        3
 

+/* FIXME: have PD set the default vspace width. */
+

 struct mtermp {
        int               fl;
 #define        MANT_LITERAL     (1 << 0)
 struct mtermp {
        int               fl;
 #define        MANT_LITERAL     (1 << 0)


@@ -62,12 +63,28 @@ struct      termact {
        void            (*post)(DECL_ARGS);
 };
 
        void            (*post)(DECL_ARGS);
 };
 

+#ifdef __linux__
+extern size_t            strlcpy(char *, const char *, size_t);
+extern size_t            strlcat(char *, const char *, size_t);
+#endif
+
+static int               a2width(const struct man_node *);
+static int               a2height(const struct man_node *);
+
+static void              print_man_head(struct termp *, 
+                               const struct man_meta *);
+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 *);
+

 static int               pre_B(DECL_ARGS);
 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_B(DECL_ARGS);
 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_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);


@@ -79,18 +96,14 @@ 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] = {
        { pre_br, NULL }, /* br */
 
 static const struct termact termacts[MAN_MAX] = {
        { pre_br, NULL }, /* br */


@@ -104,43 +117,29 @@ static    const struct termact termacts[MAN_MAX] = {
        { pre_IP, post_IP }, /* IP */
        { pre_HP, post_HP }, /* HP */ 
        { NULL, NULL }, /* SM */
        { pre_IP, post_IP }, /* IP */
        { pre_HP, post_HP }, /* HP */ 
        { NULL, NULL }, /* SM */

-       { pre_B, post_B }, /* SB */
+       { pre_B, NULL }, /* SB */

        { pre_BI, NULL }, /* BI */
        { pre_BI, NULL }, /* IB */
        { pre_RB, NULL }, /* BR */
        { pre_RB, NULL }, /* RB */
        { NULL, NULL }, /* R */
        { 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_B, NULL }, /* B */
+       { pre_I, NULL }, /* I */
+       { pre_RI, NULL }, /* IR */

        { pre_RI, NULL }, /* RI */
        { NULL, NULL }, /* na */
        { pre_RI, NULL }, /* RI */
        { NULL, NULL }, /* na */

-       { pre_I, post_i }, /* i */
+       { pre_I, NULL }, /* i */

        { pre_sp, NULL }, /* sp */
        { pre_nf, NULL }, /* nf */
        { pre_fi, NULL }, /* fi */
        { pre_sp, NULL }, /* sp */
        { pre_nf, NULL }, /* nf */
        { pre_fi, NULL }, /* fi */

-       { pre_r, NULL }, /* r */
+       { NULL, NULL }, /* r */

        { NULL, NULL }, /* RE */
        { pre_RS, post_RS }, /* RS */
        { pre_ign, NULL }, /* DT */
        { pre_ign, NULL }, /* UC */
        { NULL, NULL }, /* RE */
        { pre_RS, post_RS }, /* RS */
        { pre_ign, NULL }, /* DT */
        { pre_ign, NULL }, /* UC */

+       { pre_ign, NULL }, /* PD */

 };
 
 };
 

-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
-
-static void              print_head(struct termp *, 
-                               const struct man_meta *);
-static void              print_body(DECL_ARGS);
-static void              print_node(DECL_ARGS);
-static void              print_foot(struct termp *, 
-                               const struct man_meta *);
-static void              fmt_block_vspace(struct termp *, 
-                               const struct man_node *);
-static int               a2width(const char *);
-static int               a2height(const char *);

 
 
 void
 
 
 void


@@ -166,7 +165,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;


@@ -174,105 +173,53 @@ 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 void
-fmt_block_vspace(struct termp *p, const struct man_node *n)
+static int
+a2height(const struct man_node *n)

 {
 {

-       term_newln(p);
-
-       if (NULL == n->prev)
-               return;
+       struct roffsu    su;

 
 

-       if (MAN_SS == n->prev->tok)
-               return;
-       if (MAN_SH == n->prev->tok)
-               return;
+       assert(MAN_TEXT == n->type);
+       assert(n->string);
+       if ( ! a2roffsu(n->string, &su, SCALE_VS))
+               SCALE_VS_INIT(&su, strlen(n->string));

 
 

-       term_vspace(p);
+       return((int)term_vspan(&su));

 }
 
 
 static int
 }
 
 
 static int

-a2height(const char *p)
+a2width(const struct man_node *n)

 {
        struct roffsu    su;
 {
        struct roffsu    su;

-       double           r;
-
-       if ( ! a2roffsu(p, &su)) 
-               return(1);

 
 

-       switch (su.unit) {
-       case (SCALE_CM):
-               r = su.scale * 2;
-               break;
-       case (SCALE_IN):
-               r = su.scale * 6;
-               break;
-       case (SCALE_PC):
-               r = su.scale;
-               break;
-       case (SCALE_PT):
-               r = su.scale / 8;
-               break;
-       case (SCALE_MM):
-               r = su.scale / 1000;
-               break;
-       case (SCALE_VS):
-               r = su.scale;
-               break;
-       default:
-               r = su.scale - 1;
-               break;
-       }
+       assert(MAN_TEXT == n->type);
+       assert(n->string);
+       if ( ! a2roffsu(n->string, &su, SCALE_BU))
+               return(-1);

 
 

-       if (r < 0.0)
-               r = 0.0;
-       return(/* LINTED */(int)
-                       r);
+       return((int)term_hspan(&su));

 }
 
 
 }
 
 

-static int
-a2width(const char *p)
+static void
+print_bvspace(struct termp *p, const struct man_node *n)

 {
 {

-       struct roffsu    su;
-       double           r;
+       term_newln(p);

 
 

-       if ( ! a2roffsu(p, &su)) 
-               return(-1);
+       if (NULL == n->prev)
+               return;

 
 

-       switch (su.unit) {
-       case (SCALE_CM):
-               r = 4 * su.scale;
-               break;
-       case (SCALE_IN):
-               r = 10 * su.scale;
-               break;
-       case (SCALE_PC):
-               r = 2 * su.scale;
-               break;
-       case (SCALE_PT):
-               r = (su.scale / 10) + 1;
-               break;
-       case (SCALE_MM):
-               r = su.scale / 1000;
-               break;
-       case (SCALE_VS):
-               r = su.scale * 2 - 1;
-               break;
-       default:
-               r = su.scale + 1;
-               break;
-       }
+       if (MAN_SS == n->prev->tok)
+               return;
+       if (MAN_SH == n->prev->tok)
+               return;

 
 

-       if (r < 0.0)
-               r = 0.0;
-       return((int)/* LINTED */
-                       r);
+       term_vspace(p);

 }
 
 
 }
 
 


@@ -290,40 +237,11 @@ 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)


@@ -345,26 +263,6 @@ pre_nf(DECL_ARGS)
 }
 
 
 }
 
 

-/* 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);
-}
-
-

 /* ARGSUSED */
 static int
 pre_RB(DECL_ARGS)
 /* ARGSUSED */
 static int
 pre_RB(DECL_ARGS)


@@ -374,19 +272,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);
 }


@@ -400,13 +295,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);
 }


@@ -421,26 +320,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);
 }


@@ -451,33 +342,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;
 

-       if (NULL == n->child) {
-               term_vspace(p);
-               return(0);
-       }
-
-       assert(MAN_TEXT == n->child->type);
-       len = a2height(n->child->string);
+       len = n->child ? a2height(n->child) : 1;

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


@@ -508,7 +384,7 @@ pre_HP(DECL_ARGS)
 
        switch (n->type) {
        case (MAN_BLOCK):
 
        switch (n->type) {
        case (MAN_BLOCK):

-               fmt_block_vspace(p, n);
+               print_bvspace(p, n);

                return(1);
        case (MAN_BODY):
                p->flags |= TERMP_NOBREAK;
                return(1);
        case (MAN_BODY):
                p->flags |= TERMP_NOBREAK;


@@ -523,11 +399,9 @@ pre_HP(DECL_ARGS)
 
        /* Calculate offset. */
 
 
        /* Calculate offset. */
 

-       if (NULL != (nn = n->parent->head->child)) {
-               assert(MAN_TEXT == nn->type);
-               if ((ival = a2width(nn->string)) >= 0)
+       if (NULL != (nn = n->parent->head->child))
+               if ((ival = a2width(nn)) >= 0)

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

-       }

 
        if (0 == len)
                len = 1;
 
        if (0 == len)
                len = 1;


@@ -572,7 +446,7 @@ pre_PP(DECL_ARGS)
        switch (n->type) {
        case (MAN_BLOCK):
                mt->lmargin = INDENT;
        switch (n->type) {
        case (MAN_BLOCK):
                mt->lmargin = INDENT;

-               fmt_block_vspace(p, n);
+               print_bvspace(p, n);

                break;
        default:
                p->offset = mt->offset;
                break;
        default:
                p->offset = mt->offset;


@@ -601,7 +475,7 @@ pre_IP(DECL_ARGS)
                p->flags |= TERMP_TWOSPACE;
                break;
        case (MAN_BLOCK):
                p->flags |= TERMP_TWOSPACE;
                break;
        case (MAN_BLOCK):

-               fmt_block_vspace(p, n);
+               print_bvspace(p, n);

                /* FALLTHROUGH */
        default:
                return(1);
                /* FALLTHROUGH */
        default:
                return(1);


@@ -616,8 +490,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. */ ;

-                       assert(MAN_TEXT == nn->type);
-                       if ((ival = a2width(nn->string)) >= 0)
+                       if ((ival = a2width(nn)) >= 0)

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


@@ -637,7 +510,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;


@@ -691,7 +564,7 @@ pre_TP(DECL_ARGS)
                p->flags |= TERMP_NOSPACE;
                break;
        case (MAN_BLOCK):
                p->flags |= TERMP_NOSPACE;
                break;
        case (MAN_BLOCK):

-               fmt_block_vspace(p, n);
+               print_bvspace(p, n);

                /* FALLTHROUGH */
        default:
                return(1);
                /* FALLTHROUGH */
        default:
                return(1);


@@ -703,11 +576,9 @@ pre_TP(DECL_ARGS)
        /* Calculate offset. */
 
        if (NULL != (nn = n->parent->head->child))
        /* Calculate offset. */
 
        if (NULL != (nn = n->parent->head->child))

-               if (NULL != nn->next) {
-                       assert(MAN_TEXT == nn->type);
-                       if ((ival = a2width(nn->string)) >= 0)
+               if (NULL != 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):


@@ -721,7 +592,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;


@@ -779,7 +650,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):


@@ -801,7 +672,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);


@@ -828,7 +698,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):


@@ -850,7 +720,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);


@@ -884,8 +753,7 @@ pre_RS(DECL_ARGS)
                return(1);
        }
 
                return(1);
        }
 

-       assert(MAN_TEXT == nn->type);
-       if ((ival = a2width(nn->string)) < 0)
+       if ((ival = a2width(nn)) < 0)

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


@@ -913,9 +781,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;
 


@@ -925,59 +793,53 @@ 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:

+               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);

+               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)

 {
 {

-       struct tm       *tm;
-       char             buf[BUFSIZ];
+       char            buf[DATESIZ];

 
 

-       tm = localtime(&meta->date);
+       term_fontrepl(p, TERMFONT_NONE);

 
 

-       if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-               (void)strlcpy(buf, "(invalid date)", BUFSIZ);
+       time2a(meta->date, buf, DATESIZ);

 
        term_vspace(p);
 
 
        term_vspace(p);
 


@@ -1002,25 +864,18 @@ 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];

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

+       buf[0] = title[0] = '\0';

 
 

-       if (NULL == (buf = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-
-       if (meta->vol)
-               (void)strlcpy(buf, meta->vol, p->rmargin);
-       else
-               *buf = 0;
+       if (m->vol)
+               strlcpy(buf, m->vol, BUFSIZ);

 
 

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

 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;


@@ -1047,8 +902,4 @@ print_head(struct termp *p, const struct man_meta *meta)
        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);

 }
 }

-