=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- src/usr.bin/mandoc/mdoc_term.c 2010/06/26 17:56:43 1.88 +++ src/usr.bin/mandoc/mdoc_term.c 2010/06/26 19:08:00 1.89 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.88 2010/06/26 17:56:43 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.89 2010/06/26 19:08:00 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -48,9 +48,9 @@ void (*post)(DECL_ARGS); }; -static size_t a2width(const char *); -static size_t a2height(const struct mdoc_node *); -static size_t a2offs(const char *); +static size_t a2width(const struct termp *, const char *); +static size_t a2height(const struct termp *, const char *); +static size_t a2offs(const struct termp *, const char *); static int arg_hasattr(int, const struct mdoc_node *); static int arg_getattr(int, const struct mdoc_node *); @@ -267,7 +267,7 @@ p->overstep = 0; p->maxrmargin = p->defrmargin; - p->tabwidth = 5; + p->tabwidth = term_len(p, 5); if (NULL == p->symtab) switch (p->enc) { @@ -365,14 +365,15 @@ term_vspace(p); p->offset = 0; - p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; + p->rmargin = (p->maxrmargin - + term_strlen(p, buf) + term_len(p, 1)) / 2; p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; term_word(p, os); term_flushln(p); p->offset = p->rmargin; - p->rmargin = p->maxrmargin - strlen(os); + p->rmargin = p->maxrmargin - term_strlen(p, os); p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; term_word(p, buf); @@ -428,14 +429,15 @@ snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); p->offset = 0; - p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; + p->rmargin = (p->maxrmargin - + term_strlen(p, buf) + term_len(p, 1)) / 2; p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; term_word(p, title); term_flushln(p); p->offset = p->rmargin; - p->rmargin = p->maxrmargin - strlen(title); + p->rmargin = p->maxrmargin - term_strlen(p, title); p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; term_word(p, buf); @@ -456,34 +458,33 @@ static size_t -a2height(const struct mdoc_node *n) +a2height(const struct termp *p, const char *v) { struct roffsu su; - assert(MDOC_TEXT == n->type); - assert(n->string); - if ( ! a2roffsu(n->string, &su, SCALE_VS)) - SCALE_VS_INIT(&su, strlen(n->string)); + assert(v); + if ( ! a2roffsu(v, &su, SCALE_VS)) + SCALE_VS_INIT(&su, term_len(p, 1)); - return(term_vspan(&su)); + return(term_vspan(p, &su)); } static size_t -a2width(const char *v) +a2width(const struct termp *p, const char *v) { struct roffsu su; assert(v); if ( ! a2roffsu(v, &su, SCALE_MAX)) - SCALE_HS_INIT(&su, strlen(v)); + SCALE_HS_INIT(&su, term_strlen(p, v)); - return(term_hspan(&su)); + return(term_hspan(p, &su)); } static size_t -a2offs(const char *v) +a2offs(const struct termp *p, const char *v) { struct roffsu su; @@ -492,13 +493,13 @@ else if (0 == strcmp(v, "left")) return(0); else if (0 == strcmp(v, "indent")) - return(INDENT + 1); + return(term_len(p, INDENT + 1)); else if (0 == strcmp(v, "indent-two")) - return((INDENT + 1) * 2); + return(term_len(p, (INDENT + 1) * 2)); else if ( ! a2roffsu(v, &su, SCALE_MAX)) - SCALE_HS_INIT(&su, strlen(v)); + SCALE_HS_INIT(&su, term_strlen(p, v)); - return(term_hspan(&su)); + return(term_hspan(p, &su)); } @@ -640,7 +641,7 @@ width = offset = 0; if (bl->data.Bl.offs) - offset = a2offs(bl->data.Bl.offs); + offset = a2offs(p, bl->data.Bl.offs); switch (type) { case (LIST_column): @@ -660,7 +661,8 @@ */ ncols = bl->args->argv[col].sz; /* LINTED */ - dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1; + dcol = ncols < 5 ? term_len(p, 4) : + ncols == 5 ? term_len(p, 3) : term_len(p, 1); /* * Calculate the offset by applying all prior MDOC_BODY, @@ -671,7 +673,7 @@ nn->prev && i < (int)ncols; nn = nn->prev, i++) offset += dcol + a2width - (bl->args->argv[col].value[i]); + (p, bl->args->argv[col].value[i]); /* * When exceeding the declared number of columns, leave @@ -686,7 +688,7 @@ * Use the declared column widths, extended as explained * in the preceding paragraph. */ - width = a2width(bl->args->argv[col].value[i]) + dcol; + width = a2width(p, bl->args->argv[col].value[i]) + dcol; break; default: if (NULL == bl->data.Bl.width) @@ -698,7 +700,7 @@ * handling for column for how this changes. */ assert(bl->data.Bl.width); - width = a2width(bl->data.Bl.width) + 2; + width = a2width(p, bl->data.Bl.width) + term_len(p, 2); break; } @@ -714,22 +716,22 @@ case (LIST_dash): /* FALLTHROUGH */ case (LIST_hyphen): - if (width < 4) - width = 4; + if (width < term_len(p, 4)) + width = term_len(p, 4); break; case (LIST_enum): - if (width < 5) - width = 5; + if (width < term_len(p, 5)) + width = term_len(p, 5); break; case (LIST_hang): if (0 == width) - width = 8; + width = term_len(p, 8); break; case (LIST_column): /* FALLTHROUGH */ case (LIST_tag): if (0 == width) - width = 10; + width = term_len(p, 10); break; default: break; @@ -1370,7 +1372,7 @@ term_fontpush(p, TERMFONT_BOLD); break; case (MDOC_BODY): - p->offset = INDENT; + p->offset = term_len(p, INDENT); break; default: break; @@ -1455,7 +1457,7 @@ if (MDOC_BLOCK != n->type) return(1); term_newln(p); - p->offset += (INDENT + 1); + p->offset += term_len(p, (INDENT + 1)); return(1); } @@ -1583,7 +1585,7 @@ return(0); if (n->data.Bd.offs) - p->offset += a2offs(n->data.Bd.offs); + p->offset += a2offs(p, n->data.Bd.offs); /* * If -ragged or -filled are specified, the block does nothing @@ -1598,7 +1600,7 @@ return(1); tabwidth = p->tabwidth; - p->tabwidth = 8; + p->tabwidth = term_len(p, 8); rm = p->rmargin; rmax = p->maxrmargin; p->rmargin = p->maxrmargin = TERM_MAXMARGIN; @@ -1773,7 +1775,7 @@ break; case (MDOC_HEAD): term_fontpush(p, TERMFONT_BOLD); - p->offset = HALFINDENT; + p->offset = term_len(p, HALFINDENT); break; default: break; @@ -1849,7 +1851,7 @@ switch (n->tok) { case (MDOC_sp): - len = n->child ? a2height(n->child) : 1; + len = n->child ? a2height(p, n->child->string) : 1; break; case (MDOC_br): len = 0;