=================================================================== RCS file: /cvs/mandoc/man_term.c,v retrieving revision 1.39 retrieving revision 1.52 diff -u -p -r1.39 -r1.52 --- mandoc/man_term.c 2009/10/18 13:34:16 1.39 +++ mandoc/man_term.c 2009/11/12 05:50:12 1.52 @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.39 2009/10/18 13:34:16 kristaps Exp $ */ +/* $Id: man_term.c,v 1.52 2009/11/12 05:50:12 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -18,11 +18,11 @@ #include #include -#include #include #include #include +#include "out.h" #include "man.h" #include "term.h" #include "chars.h" @@ -31,6 +31,8 @@ #define INDENT 7 #define HALFINDENT 3 +/* FIXME: have PD set the default vspace width. */ + struct mtermp { int fl; #define MANT_LITERAL (1 << 0) @@ -66,14 +68,14 @@ 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 *); -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 *); @@ -83,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); @@ -95,11 +96,8 @@ 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); @@ -120,26 +118,27 @@ 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_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 */ + { pre_ign, NULL }, /* PD */ }; @@ -167,7 +166,7 @@ terminal_man(void *arg, const struct man *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; @@ -175,33 +174,36 @@ terminal_man(void *arg, const struct man *man) 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 -arg2height(const struct man_node *n) +a2height(const struct man_node *n) { - int r; + struct roffsu su; assert(MAN_TEXT == n->type); assert(n->string); + if ( ! a2roffsu(n->string, &su, SCALE_VS)) + SCALE_VS_INIT(&su, strlen(n->string)); - if ((r = a2height(n->string)) < 0) - return(1); - - return(r); + return((int)term_vspan(&su)); } static int -arg2width(const struct man_node *n) +a2width(const struct man_node *n) { + struct roffsu su; assert(MAN_TEXT == n->type); assert(n->string); - return(a2width(n->string)); + if ( ! a2roffsu(n->string, &su, SCALE_BU)) + return(-1); + + return((int)term_hspan(&su)); } @@ -236,41 +238,23 @@ 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--; + /* FIXME */ + /*if (n->nchild) + p->under--;*/ } /* ARGSUSED */ -static void -post_I(DECL_ARGS) -{ - - p->under--; -} - - -/* ARGSUSED */ static int pre_fi(DECL_ARGS) { @@ -293,26 +277,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) { const struct man_node *nn; @@ -320,19 +284,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_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); } @@ -346,13 +307,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_node(p, mt, nn, m); - if ( ! (i % 2)) - p->under--; + + print_man_node(p, mt, nn, m); } return(0); } @@ -367,26 +332,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_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); } @@ -397,27 +354,18 @@ 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) { int i, len; - len = n->child ? arg2height(n->child) : 1; + len = n->child ? a2height(n->child) : 1; if (0 == len) term_newln(p); @@ -464,7 +412,7 @@ pre_HP(DECL_ARGS) /* 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) @@ -554,7 +502,7 @@ pre_IP(DECL_ARGS) 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; } @@ -574,7 +522,7 @@ pre_IP(DECL_ARGS) /* 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; @@ -641,7 +589,7 @@ pre_TP(DECL_ARGS) if (NULL != (nn = n->parent->head->child)) if (NULL != nn->next) - if ((ival = arg2width(nn)) >= 0) + if ((ival = a2width(nn)) >= 0) len = (size_t)ival; switch (n->type) { @@ -656,7 +604,7 @@ pre_TP(DECL_ARGS) /* 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; @@ -714,7 +662,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): @@ -736,7 +684,6 @@ post_SS(DECL_ARGS) switch (n->type) { case (MAN_HEAD): term_newln(p); - p->bold--; break; case (MAN_BODY): term_newln(p); @@ -763,7 +710,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): @@ -785,7 +732,6 @@ post_SH(DECL_ARGS) switch (n->type) { case (MAN_HEAD): term_newln(p); - p->bold--; break; case (MAN_BODY): term_newln(p); @@ -819,7 +765,7 @@ pre_RS(DECL_ARGS) return(1); } - if ((ival = arg2width(nn)) < 0) + if ((ival = a2width(nn)) < 0) return(1); mt->offset = INDENT + (size_t)ival; @@ -847,7 +793,7 @@ post_RS(DECL_ARGS) static void -print_node(DECL_ARGS) +print_man_node(DECL_ARGS) { int c, sz; @@ -870,48 +816,51 @@ print_node(DECL_ARGS) 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_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_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; - print_body(p, mt, n->next, m); + print_man_nodelist(p, mt, n->next, m); } 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); @@ -936,26 +885,19 @@ print_foot(struct termp *p, const struct man_meta *met 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; + 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 (m->vol) + strlcpy(buf, m->vol, BUFSIZ); - if (meta->vol) - (void)strlcpy(buf, meta->vol, p->rmargin); - else - *buf = 0; + snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec); - (void)snprintf(title, p->rmargin, "%s(%d)", - meta->title, meta->msec); - p->offset = 0; p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; @@ -981,8 +923,4 @@ print_head(struct termp *p, const struct man_meta *met p->rmargin = p->maxrmargin; p->offset = 0; p->flags &= ~TERMP_NOSPACE; - - free(title); - free(buf); } -