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 f6df381c3fef89ad5d07c41d91156849bdff0256..ee833bdcff5d17753a354ed267e0e06b76467da8 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.55 2010/01/01 17:14:28 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>
  *


@@ -65,6 +65,8 @@ 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. */

 };
 
 static int               a2width(const struct man_node *);
 };
 
 static int               a2width(const struct man_node *);


@@ -105,38 +107,47 @@ static    void              post_SS(DECL_ARGS);
 static void              post_TP(DECL_ARGS);
 
 static const struct termact termacts[MAN_MAX] = {
 static void              post_TP(DECL_ARGS);
 
 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, NULL }, /* SB */
-       { pre_BI, NULL }, /* BI */
-       { pre_BI, NULL }, /* IB */
-       { pre_RB, NULL }, /* BR */
-       { pre_RB, NULL }, /* RB */
-       { NULL, NULL }, /* R */
-       { pre_B, NULL }, /* B */
-       { pre_I, NULL }, /* I */
-       { pre_RI, NULL }, /* IR */
-       { pre_RI, NULL }, /* RI */
-       { NULL, NULL }, /* na */
-       { pre_I, NULL }, /* i */
-       { pre_sp, NULL }, /* sp */
-       { pre_nf, NULL }, /* nf */
-       { pre_fi, NULL }, /* fi */
-       { NULL, 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 }, /* . */

 };
 
 
 };
 
 


@@ -151,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):


@@ -246,6 +260,7 @@ static int
 pre_fi(DECL_ARGS)
 {
 
 pre_fi(DECL_ARGS)
 {
 

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

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


@@ -256,9 +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);
+
+       return(MAN_Vb != n->tok);

 }
 
 
 }
 
 


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

-       if (NULL != (nn = n->parent->head->child))
-               if (NULL != nn->next)
+       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;
                        if ((ival = a2width(nn)) >= 0)
                                len = (size_t)ival;

+       }

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


@@ -771,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;


@@ -803,7 +825,8 @@ print_man_node(DECL_ARGS)
                }
                break;
        default:
                }
                break;
        default:

-               term_fontrepl(p, TERMFONT_NONE);
+               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 (termacts[n->tok].pre)
                        c = (*termacts[n->tok].pre)(p, mt, n, m);
                break;


@@ -815,7 +838,8 @@ print_man_node(DECL_ARGS)
        if (MAN_TEXT != n->type) {
                if (termacts[n->tok].post)
                        (*termacts[n->tok].post)(p, mt, n, m);
        if (MAN_TEXT != n->type) {
                if (termacts[n->tok].post)
                        (*termacts[n->tok].post)(p, mt, n, m);

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

        }
 }
 
        }
 }
 


@@ -866,18 +890,24 @@ static void
 print_man_head(struct termp *p, const struct man_meta *m)
 {
        char            buf[BUFSIZ], title[BUFSIZ];
 print_man_head(struct termp *p, const struct man_meta *m)
 {
        char            buf[BUFSIZ], title[BUFSIZ];

+       size_t          buflen, titlen;

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

+

        p->offset = 0;
        buf[0] = title[0] = '\0';
 
        if (m->vol)
                strlcpy(buf, m->vol, BUFSIZ);
        p->offset = 0;
        buf[0] = title[0] = '\0';
 
        if (m->vol)
                strlcpy(buf, m->vol, BUFSIZ);

+       buflen = strlen(buf);

 
        snprintf(title, BUFSIZ, "%s(%d)", m->title, m->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);


@@ -885,18 +915,20 @@ print_man_head(struct termp *p, const struct man_meta *m)
 
        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->rmargin = p->maxrmargin;
        p->offset = 0;