=================================================================== RCS file: /cvs/mandoc/man_term.c,v retrieving revision 1.36 retrieving revision 1.45 diff -u -p -r1.36 -r1.45 --- mandoc/man_term.c 2009/10/13 10:57:25 1.36 +++ mandoc/man_term.c 2009/10/26 04:09:45 1.45 @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.36 2009/10/13 10:57:25 kristaps Exp $ */ +/* $Id: man_term.c,v 1.45 2009/10/26 04:09:45 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -23,6 +23,7 @@ #include #include +#include "out.h" #include "man.h" #include "term.h" #include "chars.h" @@ -31,6 +32,8 @@ #define INDENT 7 #define HALFINDENT 3 +/* FIXME: have PD set the default vspace width. */ + struct mtermp { int fl; #define MANT_LITERAL (1 << 0) @@ -61,6 +64,23 @@ struct termact { 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_body(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); @@ -123,24 +143,11 @@ static const struct termact termacts[MAN_MAX] = { { 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 arg_width(const struct man_node *); - void terminal_man(void *arg, const struct man *man) { @@ -164,7 +171,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; @@ -172,53 +179,53 @@ 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_body(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); + struct roffsu su; - if (NULL == n->prev) - return; + assert(MAN_TEXT == n->type); + assert(n->string); + if ( ! a2roffsu(n->string, &su, SCALE_VS)) + SCALE_VS_INIT(&su, strlen(n->string)); - if (MAN_SS == n->prev->tok) - return; - if (MAN_SH == n->prev->tok) - return; - - term_vspace(p); + return((int)term_vspan(&su)); } static int -arg_width(const struct man_node *n) +a2width(const struct man_node *n) { - int i, len; - const char *p; + struct roffsu su; assert(MAN_TEXT == n->type); assert(n->string); + if ( ! a2roffsu(n->string, &su, SCALE_BU)) + return(-1); - p = n->string; + return((int)term_hspan(&su)); +} - if (0 == (len = (int)strlen(p))) - return(-1); - for (i = 0; i < len; i++) - if ( ! isdigit((u_char)p[i])) - break; +static void +print_bvspace(struct termp *p, const struct man_node *n) +{ + term_newln(p); - if (i == len - 1) { - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p)); - } else if (i == len) - return(atoi(p)); + if (NULL == n->prev) + return; - return(-1); + if (MAN_SS == n->prev->tok) + return; + if (MAN_SH == n->prev->tok) + return; + + term_vspace(p); } @@ -303,7 +310,7 @@ pre_IR(DECL_ARGS) p->under++; if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, mt, nn, m); + print_man_node(p, mt, nn, m); if ( ! (i % 2)) p->under--; } @@ -327,7 +334,7 @@ pre_RB(DECL_ARGS) if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, mt, nn, m); + print_man_node(p, mt, nn, m); if (i % 2 && MAN_RB == n->tok) p->bold--; @@ -350,7 +357,7 @@ pre_RI(DECL_ARGS) p->under++; if (i > 0) p->flags |= TERMP_NOSPACE; - print_node(p, mt, nn, m); + print_man_node(p, mt, nn, m); if ( ! (i % 2)) p->under--; } @@ -377,7 +384,7 @@ pre_BI(DECL_ARGS) if (i) p->flags |= TERMP_NOSPACE; - print_node(p, mt, nn, m); + print_man_node(p, mt, nn, m); if (i % 2 && MAN_BI == n->tok) p->under--; @@ -417,12 +424,8 @@ pre_sp(DECL_ARGS) { int i, len; - if (NULL == n->child) { - term_vspace(p); - return(0); - } + len = n->child ? a2height(n->child) : 1; - len = atoi(n->child->string); if (0 == len) term_newln(p); for (i = 0; i < len; i++) @@ -452,7 +455,7 @@ pre_HP(DECL_ARGS) switch (n->type) { case (MAN_BLOCK): - fmt_block_vspace(p, n); + print_bvspace(p, n); return(1); case (MAN_BODY): p->flags |= TERMP_NOBREAK; @@ -468,7 +471,7 @@ pre_HP(DECL_ARGS) /* Calculate offset. */ if (NULL != (nn = n->parent->head->child)) - if ((ival = arg_width(nn)) >= 0) + if ((ival = a2width(nn)) >= 0) len = (size_t)ival; if (0 == len) @@ -514,7 +517,7 @@ pre_PP(DECL_ARGS) switch (n->type) { case (MAN_BLOCK): mt->lmargin = INDENT; - fmt_block_vspace(p, n); + print_bvspace(p, n); break; default: p->offset = mt->offset; @@ -543,7 +546,7 @@ pre_IP(DECL_ARGS) p->flags |= TERMP_TWOSPACE; break; case (MAN_BLOCK): - fmt_block_vspace(p, n); + print_bvspace(p, n); /* FALLTHROUGH */ default: return(1); @@ -558,7 +561,7 @@ pre_IP(DECL_ARGS) if (NULL != (nn = nn->next)) { for ( ; nn->next; nn = nn->next) /* Do nothing. */ ; - if ((ival = arg_width(nn)) >= 0) + if ((ival = a2width(nn)) >= 0) len = (size_t)ival; } @@ -578,7 +581,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; @@ -632,7 +635,7 @@ pre_TP(DECL_ARGS) p->flags |= TERMP_NOSPACE; break; case (MAN_BLOCK): - fmt_block_vspace(p, n); + print_bvspace(p, n); /* FALLTHROUGH */ default: return(1); @@ -645,7 +648,7 @@ pre_TP(DECL_ARGS) if (NULL != (nn = n->parent->head->child)) if (NULL != nn->next) - if ((ival = arg_width(nn)) >= 0) + if ((ival = a2width(nn)) >= 0) len = (size_t)ival; switch (n->type) { @@ -660,7 +663,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; @@ -823,7 +826,7 @@ pre_RS(DECL_ARGS) return(1); } - if ((ival = arg_width(nn)) < 0) + if ((ival = a2width(nn)) < 0) return(1); mt->offset = INDENT + (size_t)ival; @@ -851,7 +854,7 @@ post_RS(DECL_ARGS) static void -print_node(DECL_ARGS) +print_man_node(DECL_ARGS) { int c, sz; @@ -887,7 +890,7 @@ print_node(DECL_ARGS) } if (c && n->child) - print_body(p, mt, n->child, m); + print_man_body(p, mt, n->child, m); if (MAN_TEXT != n->type) if (termacts[n->tok].post) @@ -896,27 +899,23 @@ print_node(DECL_ARGS) static void -print_body(DECL_ARGS) +print_man_body(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_body(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); + time2a(meta->date, buf, DATESIZ); - if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) - (void)strlcpy(buf, "(invalid date)", BUFSIZ); - term_vspace(p); p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; @@ -940,7 +939,7 @@ 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 *meta) { char *buf, *title;