Removed superfluous HTML_NEWLINE.

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index fd3f42648acfb85e6f3119a746e28f732cb9dfc2..fefbc1cb99bc58dfb3378048feb97c20d72abe2d 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.47 2009/10/30 18:53:08 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>
  *
@@ -73,7 +73,7 @@ static        int               a2height(const struct man_node *);
 
 static void              print_man_head(struct termp *, 
                                const struct man_meta *);
-static void              print_man_body(DECL_ARGS);
+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 *);
@@ -85,7 +85,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_IR(DECL_ARGS);
 static int               pre_PP(DECL_ARGS);
 static int               pre_RB(DECL_ARGS);
 static int               pre_RI(DECL_ARGS);
@@ -97,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_r(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_i(DECL_ARGS);
 
 static const struct termact termacts[MAN_MAX] = {
        { pre_br, NULL }, /* br */
@@ -122,22 +117,22 @@ static    const struct termact termacts[MAN_MAX] = {
        { 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_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_I, post_i }, /* i */
+       { pre_I, NULL }, /* i */
        { 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 */
@@ -178,7 +173,7 @@ terminal_man(void *arg, const struct man *man)
        mt.offset = INDENT;
 
        if (n->child)
-               print_man_body(p, &mt, n->child, m);
+               print_man_nodelist(p, &mt, n->child, m);
        print_man_foot(p, m);
 }
 
@@ -242,40 +237,11 @@ static int
 pre_I(DECL_ARGS)
 {
 
-       p->under++;
+       term_fontrepl(p, TERMFONT_UNDER);
        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)
@@ -297,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_man_node(p, mt, nn, m);
-               if ( ! (i % 2))
-                       p->under--;
-       }
-       return(0);
-}
-
-
 /* ARGSUSED */
 static int
 pre_RB(DECL_ARGS)
@@ -326,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)
-                       p->bold++;
+                       term_fontrepl(p, TERMFONT_BOLD);
                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;
 
                print_man_node(p, mt, nn, m);
-
-               if (i % 2 && MAN_RB == n->tok)
-                       p->bold--;
-               else if ( ! (i % 2) && MAN_RB != n->tok)
-                       p->bold--;
        }
        return(0);
 }
@@ -352,13 +295,17 @@ pre_RI(DECL_ARGS)
        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;
+
                print_man_node(p, mt, nn, m);
-               if ( ! (i % 2))
-                       p->under--;
        }
        return(0);
 }
@@ -373,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)
-                       p->under++;
+                       term_fontrepl(p, TERMFONT_UNDER);
                else if (i % 2)
-                       p->bold++;
+                       term_fontrepl(p, TERMFONT_BOLD);
                else if (MAN_BI == n->tok)
-                       p->bold++;
+                       term_fontrepl(p, TERMFONT_BOLD);
                else
-                       p->under++;
+                       term_fontrepl(p, TERMFONT_UNDER);
 
                if (i)
                        p->flags |= TERMP_NOSPACE;
-               print_man_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);
 }
@@ -403,20 +342,11 @@ static int
 pre_B(DECL_ARGS)
 {
 
-       p->bold++;
+       term_fontrepl(p, TERMFONT_BOLD);
        return(1);
 }
 
 
-/* ARGSUSED */
-static void
-post_B(DECL_ARGS)
-{
-
-       p->bold--;
-}
-
-
 /* ARGSUSED */
 static int
 pre_sp(DECL_ARGS)
@@ -720,7 +650,7 @@ pre_SS(DECL_ARGS)
                term_vspace(p);
                break;
        case (MAN_HEAD):
-               p->bold++;
+               term_fontrepl(p, TERMFONT_BOLD);
                p->offset = HALFINDENT;
                break;
        case (MAN_BODY):
@@ -742,7 +672,6 @@ post_SS(DECL_ARGS)
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);
-               p->bold--;
                break;
        case (MAN_BODY):
                term_newln(p);
@@ -769,7 +698,7 @@ pre_SH(DECL_ARGS)
                term_vspace(p);
                break;
        case (MAN_HEAD):
-               p->bold++;
+               term_fontrepl(p, TERMFONT_BOLD);
                p->offset = 0;
                break;
        case (MAN_BODY):
@@ -791,7 +720,6 @@ post_SH(DECL_ARGS)
        switch (n->type) {
        case (MAN_HEAD):
                term_newln(p);
-               p->bold--;
                break;
        case (MAN_BODY):
                term_newln(p);
@@ -855,7 +783,7 @@ post_RS(DECL_ARGS)
 static void
 print_man_node(DECL_ARGS)
 {
-       int              c, sz;
+       int              c;
 
        c = 1;
 
@@ -865,46 +793,42 @@ print_man_node(DECL_ARGS)
                        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);
-               if (sz >= 2 && n->string[sz - 1] == 'c' &&
-                               n->string[sz - 2] == '\\')
-                       p->flags |= TERMP_NOSPACE;
+
                /* FIXME: this means that macro lines are munged!  */
+
                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)
-               print_man_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);
+               term_fontrepl(p, TERMFONT_NONE);
+       }
 }
 
 
 static void
-print_man_body(DECL_ARGS)
+print_man_nodelist(DECL_ARGS)
 {
 
        print_man_node(p, mt, n, m);
        if ( ! n->next)
                return;
-       print_man_body(p, mt, n->next, m);
+       print_man_nodelist(p, mt, n->next, m);
 }
 
 
@@ -913,6 +837,8 @@ print_man_foot(struct termp *p, const struct man_meta *meta)
 {
        char            buf[DATESIZ];
 
+       term_fontrepl(p, TERMFONT_NONE);
+
        time2a(meta->date, buf, DATESIZ);
 
        term_vspace(p);