=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.76 retrieving revision 1.112 diff -u -p -r1.76 -r1.112 --- mandoc/mdoc_term.c 2009/09/21 14:07:07 1.76 +++ mandoc/mdoc_term.c 2010/03/29 19:28:04 1.112 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.76 2009/09/21 14:07:07 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.112 2010/03/29 19:28:04 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -14,72 +14,59 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include -#include #include #include #include +#include "out.h" #include "term.h" #include "mdoc.h" +#include "chars.h" +#include "main.h" -/* FIXME: check HANG lists: they seem to be broken... : - * .Bl -hang -width Ds - * .It a - * b - * .It Fl f Ns Ar option... - * Override default compiler behaviour. See - * .Sx Compiler Options - * for details. - * Override default compiler behaviour. See - * .Sx Compiler Options - * for details. - * Override default compiler behaviour. See - * .Sx Compiler Options - * for details. - * Override default compiler behaviour. See - * .Sx Compiler Options - * for details. - * . - * .It a sasd fasd as afsd sfad sfds sadfs sd sfd ssfad asfd - * Override default compiler behaviour. See - * .Sx Compiler Options - * for details. - * Override default compiler behaviour. See - * .Sx Compiler Options - * for details. - * Override default compiler behaviour. See - * .Sx Compiler Options - * for details. - * Override default compiler behaviour. See - * .Sx Compiler Options - * for details. - * .El - * - */ - #define INDENT 5 #define HALFINDENT 3 struct termpair { struct termpair *ppair; - int flag; int count; }; #define DECL_ARGS struct termp *p, \ struct termpair *pair, \ - const struct mdoc_meta *meta, \ - const struct mdoc_node *node + const struct mdoc_meta *m, \ + const struct mdoc_node *n struct termact { int (*pre)(DECL_ARGS); void (*post)(DECL_ARGS); }; +static size_t a2width(const struct mdoc_argv *, int); +static size_t a2height(const struct mdoc_node *); +static size_t a2offs(const struct mdoc_argv *); + +static int arg_hasattr(int, const struct mdoc_node *); +static int arg_getattrs(const int *, int *, size_t, + const struct mdoc_node *); +static int arg_getattr(int, const struct mdoc_node *); +static int arg_listtype(const struct mdoc_node *); +static void print_bvspace(struct termp *, + const struct mdoc_node *, + const struct mdoc_node *); +static void print_mdoc_node(DECL_ARGS); +static void print_mdoc_head(DECL_ARGS); +static void print_mdoc_nodelist(DECL_ARGS); +static void print_foot(DECL_ARGS); + static void termp____post(DECL_ARGS); static void termp_an_post(DECL_ARGS); static void termp_aq_post(DECL_ARGS); @@ -106,6 +93,7 @@ static void termp_sq_post(DECL_ARGS); static void termp_ss_post(DECL_ARGS); static void termp_vt_post(DECL_ARGS); +static int termp__t_pre(DECL_ARGS); static int termp_an_pre(DECL_ARGS); static int termp_ap_pre(DECL_ARGS); static int termp_aq_pre(DECL_ARGS); @@ -126,6 +114,7 @@ static int termp_fo_pre(DECL_ARGS); static int termp_ft_pre(DECL_ARGS); static int termp_in_pre(DECL_ARGS); static int termp_it_pre(DECL_ARGS); +static int termp_li_pre(DECL_ARGS); static int termp_lk_pre(DECL_ARGS); static int termp_nd_pre(DECL_ARGS); static int termp_nm_pre(DECL_ARGS); @@ -143,6 +132,7 @@ static int termp_sq_pre(DECL_ARGS); static int termp_ss_pre(DECL_ARGS); static int termp_under_pre(DECL_ARGS); static int termp_ud_pre(DECL_ARGS); +static int termp_vt_pre(DECL_ARGS); static int termp_xr_pre(DECL_ARGS); static int termp_xx_pre(DECL_ARGS); @@ -177,7 +167,7 @@ static const struct termact termacts[MDOC_MAX] = { { termp_ft_pre, termp_ft_post }, /* Ft */ { termp_bold_pre, NULL }, /* Ic */ { termp_in_pre, termp_in_post }, /* In */ - { NULL, NULL }, /* Li */ + { termp_li_pre, NULL }, /* Li */ { termp_nd_pre, NULL }, /* Nd */ { termp_nm_pre, NULL }, /* Nm */ { termp_op_pre, termp_op_post }, /* Op */ @@ -186,18 +176,18 @@ static const struct termact termacts[MDOC_MAX] = { { termp_rv_pre, NULL }, /* Rv */ { NULL, NULL }, /* St */ { termp_under_pre, NULL }, /* Va */ - { termp_under_pre, termp_vt_post }, /* Vt */ + { termp_vt_pre, termp_vt_post }, /* Vt */ { termp_xr_pre, NULL }, /* Xr */ { NULL, termp____post }, /* %A */ - { NULL, termp____post }, /* %B */ + { termp_under_pre, termp____post }, /* %B */ { NULL, termp____post }, /* %D */ - { NULL, termp____post }, /* %I */ + { termp_under_pre, termp____post }, /* %I */ { termp_under_pre, termp____post }, /* %J */ { NULL, termp____post }, /* %N */ { NULL, termp____post }, /* %O */ { NULL, termp____post }, /* %P */ { NULL, termp____post }, /* %R */ - { termp_under_pre, termp____post }, /* %T */ + { termp__t_pre, termp____post }, /* %T */ { NULL, termp____post }, /* %V */ { NULL, NULL }, /* Ac */ { termp_aq_pre, termp_aq_post }, /* Ao */ @@ -213,12 +203,12 @@ static const struct termact termacts[MDOC_MAX] = { { NULL, NULL }, /* Dc */ { termp_dq_pre, termp_dq_post }, /* Do */ { termp_dq_pre, termp_dq_post }, /* Dq */ - { NULL, NULL }, /* Ec */ + { NULL, NULL }, /* Ec */ /* FIXME: no space */ { NULL, NULL }, /* Ef */ { termp_under_pre, NULL }, /* Em */ { NULL, NULL }, /* Eo */ { termp_xx_pre, NULL }, /* Fx */ - { termp_bold_pre, NULL }, /* Ms */ + { termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */ { NULL, NULL }, /* No */ { termp_ns_pre, NULL }, /* Ns */ { termp_xx_pre, NULL }, /* Nx */ @@ -260,103 +250,91 @@ static const struct termact termacts[MDOC_MAX] = { { termp_brq_pre, termp_brq_post }, /* Brq */ { termp_brq_pre, termp_brq_post }, /* Bro */ { NULL, NULL }, /* Brc */ - { NULL, NULL }, /* %C */ - { NULL, NULL }, /* Es */ - { NULL, NULL }, /* En */ + { NULL, termp____post }, /* %C */ + { NULL, NULL }, /* Es */ /* TODO */ + { NULL, NULL }, /* En */ /* TODO */ { termp_xx_pre, NULL }, /* Dx */ - { NULL, NULL }, /* %Q */ + { NULL, termp____post }, /* %Q */ { termp_sp_pre, NULL }, /* br */ { termp_sp_pre, NULL }, /* sp */ + { termp_under_pre, termp____post }, /* %U */ }; -#ifdef __linux__ -extern size_t strlcpy(char *, const char *, size_t); -extern size_t strlcat(char *, const char *, size_t); -#endif -static int arg_hasattr(int, const struct mdoc_node *); -static int arg_getattrs(const int *, int *, size_t, - const struct mdoc_node *); -static int arg_getattr(int, const struct mdoc_node *); -static size_t arg_offset(const struct mdoc_argv *); -static size_t arg_width(const struct mdoc_argv *, int); -static int arg_listtype(const struct mdoc_node *); -static void fmt_block_vspace(struct termp *, - const struct mdoc_node *, - const struct mdoc_node *); -static void print_node(DECL_ARGS); -static void print_head(DECL_ARGS); -static void print_body(DECL_ARGS); -static void print_foot(DECL_ARGS); - - void -mdoc_run(struct termp *p, const struct mdoc *mdoc) +terminal_mdoc(void *arg, const struct mdoc *mdoc) { const struct mdoc_node *n; const struct mdoc_meta *m; + struct termp *p; + p = (struct termp *)arg; + + p->overstep = 0; + p->maxrmargin = 78; + + if (NULL == p->symtab) + switch (p->enc) { + case (TERMENC_ASCII): + p->symtab = chars_init(CHARS_ASCII); + break; + default: + abort(); + /* NOTREACHED */ + } + n = mdoc_node(mdoc); m = mdoc_meta(mdoc); - print_head(p, NULL, m, n); + print_mdoc_head(p, NULL, m, n); if (n->child) - print_body(p, NULL, m, n->child); + print_mdoc_nodelist(p, NULL, m, n->child); print_foot(p, NULL, m, n); } static void -print_body(DECL_ARGS) +print_mdoc_nodelist(DECL_ARGS) { - print_node(p, pair, meta, node); - if (node->next) - print_body(p, pair, meta, node->next); + print_mdoc_node(p, pair, m, n); + if (n->next) + print_mdoc_nodelist(p, pair, m, n->next); } /* ARGSUSED */ static void -print_node(DECL_ARGS) +print_mdoc_node(DECL_ARGS) { - int chld, bold, under; + int chld; + const void *font; struct termpair npair; size_t offset, rmargin; chld = 1; offset = p->offset; rmargin = p->rmargin; - bold = p->bold; - under = p->under; + font = term_fontq(p); - bzero(&npair, sizeof(struct termpair)); + memset(&npair, 0, sizeof(struct termpair)); npair.ppair = pair; - if (MDOC_TEXT != node->type) { - if (termacts[node->tok].pre) - chld = (*termacts[node->tok].pre) - (p, &npair, meta, node); + if (MDOC_TEXT != n->type) { + if (termacts[n->tok].pre) + chld = (*termacts[n->tok].pre)(p, &npair, m, n); } else - term_word(p, node->string); + term_word(p, n->string); - if (chld && node->child) - print_body(p, &npair, meta, node->child); + if (chld && n->child) + print_mdoc_nodelist(p, &npair, m, n->child); - /* - * XXX - if bold/under were to span scopes, this wouldn't be - * possible, but because decoration is always in-scope, we can - * get away with this. - */ + term_fontpopq(p, font); - p->bold = bold; - p->under = under; + if (MDOC_TEXT != n->type) + if (termacts[n->tok].post) + (*termacts[n->tok].post)(p, &npair, m, n); - if (MDOC_TEXT != node->type) - if (termacts[node->tok].post) - (*termacts[node->tok].post) - (p, &npair, meta, node); - p->offset = offset; p->rmargin = rmargin; } @@ -366,9 +344,10 @@ print_node(DECL_ARGS) static void print_foot(DECL_ARGS) { - struct tm *tm; - char *buf, *os; + char buf[DATESIZ], os[BUFSIZ]; + term_fontrepl(p, TERMFONT_NONE); + /* * Output the footer in new-groff style, that is, three columns * with the middle being the manual date and flanking columns @@ -377,18 +356,9 @@ print_foot(DECL_ARGS) * SYSTEM DATE SYSTEM */ - if (NULL == (buf = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); - if (NULL == (os = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); + time2a(m->date, buf, DATESIZ); + strlcpy(os, m->os, BUFSIZ); - tm = localtime(&meta->date); - - if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm)) - err(EXIT_FAILURE, "strftime"); - - (void)strlcpy(os, meta->os, p->rmargin); - term_vspace(p); p->offset = 0; @@ -416,27 +386,18 @@ print_foot(DECL_ARGS) p->offset = 0; p->rmargin = p->maxrmargin; p->flags = 0; - - free(buf); - free(os); } -/* FIXME: put in utility library. */ /* ARGSUSED */ static void -print_head(DECL_ARGS) +print_mdoc_head(DECL_ARGS) { - char *buf, *title; + char buf[BUFSIZ], title[BUFSIZ]; p->rmargin = p->maxrmargin; p->offset = 0; - if (NULL == (buf = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); - if (NULL == (title = malloc(p->rmargin))) - err(EXIT_FAILURE, "malloc"); - /* * The header is strange. It has three components, which are * really two with the first duplicated. It goes like this: @@ -450,16 +411,16 @@ print_head(DECL_ARGS) * switches on the manual section. */ - assert(meta->vol); - (void)strlcpy(buf, meta->vol, p->rmargin); + assert(m->vol); + strlcpy(buf, m->vol, BUFSIZ); - if (meta->arch) { - (void)strlcat(buf, " (", p->rmargin); - (void)strlcat(buf, meta->arch, p->rmargin); - (void)strlcat(buf, ")", p->rmargin); + if (m->arch) { + strlcat(buf, " (", BUFSIZ); + strlcat(buf, m->arch, BUFSIZ); + strlcat(buf, ")", BUFSIZ); } - snprintf(title, p->rmargin, "%s(%d)", meta->title, meta->msec); + snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec); p->offset = 0; p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; @@ -486,40 +447,36 @@ print_head(DECL_ARGS) p->offset = 0; p->rmargin = p->maxrmargin; p->flags &= ~TERMP_NOSPACE; - - free(title); - free(buf); } -/* FIXME: put in utility file for front-ends. */ static size_t -arg_width(const struct mdoc_argv *arg, int pos) +a2height(const struct mdoc_node *n) { - int i, len; - const char *p; + struct roffsu su; - assert(pos < (int)arg->sz && pos >= 0); - assert(arg->value[pos]); + assert(MDOC_TEXT == n->type); + assert(n->string); + if ( ! a2roffsu(n->string, &su, SCALE_VS)) + SCALE_VS_INIT(&su, strlen(n->string)); - p = arg->value[pos]; + return(term_vspan(&su)); +} - if (0 == (len = (int)strlen(p))) - return(0); - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; +static size_t +a2width(const struct mdoc_argv *arg, int pos) +{ + struct roffsu su; - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return((size_t)atoi(p) + 2); + assert(arg->value[pos]); + if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX)) + SCALE_HS_INIT(&su, strlen(arg->value[pos])); - return((size_t)len + 2); + return(term_hspan(&su)); } -/* FIXME: put in utility file for front-ends. */ static int arg_listtype(const struct mdoc_node *n) { @@ -561,38 +518,30 @@ arg_listtype(const struct mdoc_node *n) } -/* FIXME: put in utility file for front-ends. */ static size_t -arg_offset(const struct mdoc_argv *arg) +a2offs(const struct mdoc_argv *arg) { - int len, i; - const char *p; + struct roffsu su; - assert(*arg->value); - p = *arg->value; - - if (0 == strcmp(p, "left")) + if ('\0' == arg->value[0][0]) return(0); - if (0 == strcmp(p, "indent")) + else if (0 == strcmp(arg->value[0], "left")) + return(0); + else if (0 == strcmp(arg->value[0], "indent")) return(INDENT + 1); - if (0 == strcmp(p, "indent-two")) + else if (0 == strcmp(arg->value[0], "indent-two")) return((INDENT + 1) * 2); + else if ( ! a2roffsu(arg->value[0], &su, SCALE_MAX)) + SCALE_HS_INIT(&su, strlen(arg->value[0])); - if (0 == (len = (int)strlen(p))) - return(0); - - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; - - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return((size_t)atoi(p)); - - return((size_t)len); + return(term_hspan(&su)); } +/* + * Return 1 if an argument has a particular argument value or 0 if it + * does not. See arg_getattr(). + */ static int arg_hasattr(int arg, const struct mdoc_node *n) { @@ -601,6 +550,10 @@ arg_hasattr(int arg, const struct mdoc_node *n) } +/* + * Get the index of an argument in a node's argument list or -1 if it + * does not exist. See arg_getattrs(). + */ static int arg_getattr(int v, const struct mdoc_node *n) { @@ -610,6 +563,12 @@ arg_getattr(int v, const struct mdoc_node *n) } +/* + * Walk through the argument list for a node and fill an array "vals" + * with the positions of the argument structures listed in "keys". + * Return the number of elements that were written into "vals", which + * can be zero. + */ static int arg_getattrs(const int *keys, int *vals, size_t sz, const struct mdoc_node *n) @@ -629,54 +588,48 @@ arg_getattrs(const int *keys, int *vals, } -/* ARGSUSED */ +/* + * Determine how much space to print out before block elements of `It' + * (and thus `Bl') and `Bd'. And then go ahead and print that space, + * too. + */ static void -fmt_block_vspace(struct termp *p, +print_bvspace(struct termp *p, const struct mdoc_node *bl, - const struct mdoc_node *node) + const struct mdoc_node *n) { - const struct mdoc_node *n; + const struct mdoc_node *nn; term_newln(p); - - if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Compact, bl)) + if (arg_hasattr(MDOC_Compact, bl)) return; - assert(node); - /* - * Search through our prior nodes. If we follow a `Ss' or `Sh', - * then don't vspace. - */ + /* Do not vspace directly after Ss/Sh. */ - for (n = node; n; n = n->parent) { - if (MDOC_BLOCK != n->type) + for (nn = n; nn; nn = nn->parent) { + if (MDOC_BLOCK != nn->type) continue; - if (MDOC_Ss == n->tok) + if (MDOC_Ss == nn->tok) return; - if (MDOC_Sh == n->tok) + if (MDOC_Sh == nn->tok) return; - if (NULL == n->prev) + if (NULL == nn->prev) continue; break; } - /* - * XXX - not documented: a `-column' does not ever assert vspace - * within the list. - */ + /* A `-column' does not assert vspace within the list. */ if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Column, bl)) - if (node->prev && MDOC_It == node->prev->tok) + if (n->prev && MDOC_It == n->prev->tok) return; - /* - * XXX - not documented: a `-diag' without a body does not - * assert a vspace prior to the next element. - */ + /* A `-diag' without body does not vspace. */ + if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Diag, bl)) - if (node->prev && MDOC_It == node->prev->tok) { - assert(node->prev->body); - if (NULL == node->prev->body->child) + if (n->prev && MDOC_It == n->prev->tok) { + assert(n->prev->body); + if (NULL == n->prev->body->child) return; } @@ -689,7 +642,7 @@ static int termp_dq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\\(lq"); @@ -703,7 +656,7 @@ static void termp_dq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; @@ -715,72 +668,91 @@ termp_dq_post(DECL_ARGS) static int termp_it_pre(DECL_ARGS) { - const struct mdoc_node *bl, *n; + const struct mdoc_node *bl, *nn; char buf[7]; int i, type, keys[3], vals[3]; - size_t width, offset; + size_t width, offset, ncols, dcol; - if (MDOC_BLOCK == node->type) { - fmt_block_vspace(p, node->parent->parent, node); + if (MDOC_BLOCK == n->type) { + print_bvspace(p, n->parent->parent, n); return(1); } - bl = node->parent->parent->parent; + bl = n->parent->parent->parent; - /* Save parent attributes. */ + /* Get list width, offset, and list type from argument list. */ - pair->flag = p->flags; - - /* Get list width and offset. */ - keys[0] = MDOC_Width; keys[1] = MDOC_Offset; keys[2] = MDOC_Column; vals[0] = vals[1] = vals[2] = -1; - width = offset = 0; + arg_getattrs(keys, vals, 3, bl); - (void)arg_getattrs(keys, vals, 3, bl); - type = arg_listtype(bl); assert(-1 != type); - /* Calculate real width and offset. */ + /* + * First calculate width and offset. This is pretty easy unless + * we're a -column list, in which case all prior columns must + * be accounted for. + */ + width = offset = 0; + + if (vals[1] >= 0) + offset = a2offs(&bl->args->argv[vals[1]]); + switch (type) { case (MDOC_Column): - if (MDOC_BODY == node->type) + if (MDOC_BODY == n->type) break; - /* - * Work around groff's column handling. The offset is - * equal to the sum of all widths leading to the current - * column (plus the -offset value). If this column - * exceeds the stated number of columns, the width is - * set as 0, else it's the stated column width (later - * the 0 will be adjusted to default 10 or, if in the - * last column case, set to stretch to the margin). + /* + * Imitate groff's column handling: + * - For each earlier column, add its width. + * - For less than 5 columns, add four more blanks per + * column. + * - For exactly 5 columns, add three more blank per + * column. + * - For more than 5 columns, add only one column. */ - for (i = 0, n = node->prev; n && - i < (int)bl->args[vals[2]].argv->sz; - n = n->prev, i++) - offset += arg_width + ncols = bl->args->argv[vals[2]].sz; + /* LINTED */ + dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1; + + for (i = 0, nn = n->prev; + nn && i < (int)ncols; + nn = nn->prev, i++) + offset += dcol + a2width (&bl->args->argv[vals[2]], i); - /* Whether exceeds maximum column. */ - if (i < (int)bl->args[vals[2]].argv->sz) - width = arg_width(&bl->args->argv[vals[2]], i); - else - width = 0; - if (vals[1] >= 0) - offset += arg_offset(&bl->args->argv[vals[1]]); + /* + * When exceeding the declared number of columns, leave + * the remaining widths at 0. This will later be + * adjusted to the default width of 10, or, for the last + * column, stretched to the right margin. + */ + if (i >= (int)ncols) + break; + + /* + * Use the declared column widths, extended as explained + * in the preceding paragraph. + */ + width = a2width(&bl->args->argv[vals[2]], i) + dcol; break; default: - if (vals[0] >= 0) - width = arg_width(&bl->args->argv[vals[0]], 0); - if (vals[1] >= 0) - offset += arg_offset(&bl->args->argv[vals[1]]); + if (vals[0] < 0) + break; + + /* + * Note: buffer the width by 2, which is groff's magic + * number for buffering single arguments. See the above + * handling for column for how this changes. + */ + width = a2width(&bl->args->argv[vals[0]], 0) + 2; break; } @@ -826,11 +798,11 @@ termp_it_pre(DECL_ARGS) switch (type) { case (MDOC_Diag): - if (MDOC_BODY == node->type) + if (MDOC_BODY == n->type) term_word(p, "\\ \\ "); break; case (MDOC_Inset): - if (MDOC_BODY == node->type) + if (MDOC_BODY == n->type) term_word(p, "\\ "); break; default: @@ -841,19 +813,18 @@ termp_it_pre(DECL_ARGS) switch (type) { case (MDOC_Diag): - if (MDOC_HEAD == node->type) - p->bold++; + if (MDOC_HEAD == n->type) + term_fontpush(p, TERMFONT_BOLD); break; default: break; } /* - * Pad and break control. This is the tricker part. Lists with - * set right-margins for the head get TERMP_NOBREAK because, if - * they overrun the margin, they wrap to the new margin. - * Correspondingly, the body for these types don't left-pad, as - * the head will pad out to to the right. + * Pad and break control. This is the tricky part. These flags + * are documented in term_flushln() in term.c. Note that we're + * going to unset all of these flags in termp_it_post() when we + * exit. */ switch (type) { @@ -864,18 +835,18 @@ termp_it_pre(DECL_ARGS) case (MDOC_Enum): /* FALLTHROUGH */ case (MDOC_Hyphen): - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) p->flags |= TERMP_NOBREAK; else p->flags |= TERMP_NOLPAD; break; case (MDOC_Hang): - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) p->flags |= TERMP_NOBREAK; else p->flags |= TERMP_NOLPAD; - if (MDOC_HEAD != node->type) + if (MDOC_HEAD != n->type) break; /* @@ -884,38 +855,38 @@ termp_it_pre(DECL_ARGS) * the "overstep" effect in term_flushln() and treat * this as a `-ohang' list instead. */ - if (node->next->child && - (MDOC_Bl == node->next->child->tok || - MDOC_Bd == node->next->child->tok)) { + if (n->next->child && + (MDOC_Bl == n->next->child->tok || + MDOC_Bd == n->next->child->tok)) { p->flags &= ~TERMP_NOBREAK; p->flags &= ~TERMP_NOLPAD; } else p->flags |= TERMP_HANG; break; case (MDOC_Tag): - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE; else p->flags |= TERMP_NOLPAD; - if (MDOC_HEAD != node->type) + if (MDOC_HEAD != n->type) break; - if (NULL == node->next || NULL == node->next->child) + if (NULL == n->next || NULL == n->next->child) p->flags |= TERMP_DANGLE; break; case (MDOC_Column): - if (MDOC_HEAD == node->type) { - assert(node->next); - if (MDOC_BODY == node->next->type) + if (MDOC_HEAD == n->type) { + assert(n->next); + if (MDOC_BODY == n->next->type) p->flags &= ~TERMP_NOBREAK; else p->flags |= TERMP_NOBREAK; - if (node->prev) + if (n->prev) p->flags |= TERMP_NOLPAD; } break; case (MDOC_Diag): - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) p->flags |= TERMP_NOBREAK; break; default: @@ -937,9 +908,9 @@ termp_it_pre(DECL_ARGS) * don't want to recalculate rmargin and offsets when * using `Bd' or `Bl' within `-hang' overstep lists. */ - if (MDOC_HEAD == node->type && node->next->child && - (MDOC_Bl == node->next->child->tok || - MDOC_Bd == node->next->child->tok)) + if (MDOC_HEAD == n->type && n->next->child && + (MDOC_Bl == n->next->child->tok || + MDOC_Bd == n->next->child->tok)) break; /* FALLTHROUGH */ case (MDOC_Bullet): @@ -952,7 +923,7 @@ termp_it_pre(DECL_ARGS) /* FALLTHROUGH */ case (MDOC_Tag): assert(width); - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) p->rmargin = p->offset + width; else p->offset += width; @@ -964,8 +935,9 @@ termp_it_pre(DECL_ARGS) * XXX - this behaviour is not documented: the * right-most column is filled to the right margin. */ - if (MDOC_HEAD == node->type && - MDOC_BODY == node->next->type) + if (MDOC_HEAD == n->type && + MDOC_BODY == n->next->type && + p->rmargin < p->maxrmargin) p->rmargin = p->maxrmargin; break; default: @@ -977,23 +949,23 @@ termp_it_pre(DECL_ARGS) * HEAD character (temporarily bold, in some cases). */ - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) switch (type) { case (MDOC_Bullet): - p->bold++; + term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\[bu]"); - p->bold--; + term_fontpop(p); break; case (MDOC_Dash): /* FALLTHROUGH */ case (MDOC_Hyphen): - p->bold++; + term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\(hy"); - p->bold--; + term_fontpop(p); break; case (MDOC_Enum): (pair->ppair->ppair->count)++; - (void)snprintf(buf, sizeof(buf), "%d.", + snprintf(buf, sizeof(buf), "%d.", pair->ppair->ppair->count); term_word(p, buf); break; @@ -1015,11 +987,11 @@ termp_it_pre(DECL_ARGS) case (MDOC_Hyphen): /* FALLTHROUGH */ case (MDOC_Enum): - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) return(0); break; case (MDOC_Column): - if (MDOC_BODY == node->type) + if (MDOC_BODY == n->type) return(0); break; default: @@ -1036,10 +1008,10 @@ termp_it_post(DECL_ARGS) { int type; - if (MDOC_BODY != node->type && MDOC_HEAD != node->type) + if (MDOC_BLOCK == n->type) return; - type = arg_listtype(node->parent->parent->parent); + type = arg_listtype(n->parent->parent->parent); assert(-1 != type); switch (type) { @@ -1048,11 +1020,11 @@ termp_it_post(DECL_ARGS) case (MDOC_Diag): /* FALLTHROUGH */ case (MDOC_Inset): - if (MDOC_BODY == node->type) + if (MDOC_BODY == n->type) term_flushln(p); break; case (MDOC_Column): - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) term_flushln(p); break; default: @@ -1060,7 +1032,17 @@ termp_it_post(DECL_ARGS) break; } - p->flags = pair->flag; + /* + * Now that our output is flushed, we can reset our tags. Since + * only `It' sets these flags, we're free to assume that nobody + * has munged them in the meanwhile. + */ + + p->flags &= ~TERMP_DANGLE; + p->flags &= ~TERMP_NOBREAK; + p->flags &= ~TERMP_TWOSPACE; + p->flags &= ~TERMP_NOLPAD; + p->flags &= ~TERMP_HANG; } @@ -1069,11 +1051,13 @@ static int termp_nm_pre(DECL_ARGS) { - if (SEC_SYNOPSIS == node->sec) + if (SEC_SYNOPSIS == n->sec) term_newln(p); - p->bold++; - if (NULL == node->child) - term_word(p, meta->name); + + term_fontpush(p, TERMFONT_BOLD); + + if (NULL == n->child) + term_word(p, m->name); return(1); } @@ -1083,9 +1067,14 @@ static int termp_fl_pre(DECL_ARGS) { - p->bold++; + term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\-"); - p->flags |= TERMP_NOSPACE; + + /* A blank `Fl' should incur a subsequent space. */ + + if (n->child) + p->flags |= TERMP_NOSPACE; + return(1); } @@ -1095,20 +1084,19 @@ static int termp_an_pre(DECL_ARGS) { - if (NULL == node->child) + if (NULL == n->child) return(1); /* - * XXX: this is poorly documented. If not in the AUTHORS - * section, `An -split' will cause newlines to occur before the - * author name. If in the AUTHORS section, by default, the - * first `An' invocation is nosplit, then all subsequent ones, - * regardless of whether interspersed with other macros/text, - * are split. -split, in this case, will override the condition - * of the implied first -nosplit. + * If not in the AUTHORS section, `An -split' will cause + * newlines to occur before the author name. If in the AUTHORS + * section, by default, the first `An' invocation is nosplit, + * then all subsequent ones, regardless of whether interspersed + * with other macros/text, are split. -split, in this case, + * will override the condition of the implied first -nosplit. */ - if (node->sec == SEC_AUTHORS) { + if (n->sec == SEC_AUTHORS) { if ( ! (TERMP_ANPREC & p->flags)) { if (TERMP_SPLIT & p->flags) term_newln(p); @@ -1132,13 +1120,13 @@ static void termp_an_post(DECL_ARGS) { - if (node->child) { - if (SEC_AUTHORS == node->sec) + if (n->child) { + if (SEC_AUTHORS == n->sec) p->flags |= TERMP_ANPREC; return; } - if (arg_getattr(MDOC_Split, node) > -1) { + if (arg_getattr(MDOC_Split, n) > -1) { p->flags &= ~TERMP_NOSPLIT; p->flags |= TERMP_SPLIT; } else { @@ -1164,7 +1152,9 @@ static int termp_rs_pre(DECL_ARGS) { - if (MDOC_BLOCK == node->type && node->prev) + if (SEC_SEE_ALSO != n->sec) + return(1); + if (MDOC_BLOCK == n->type && n->prev) term_vspace(p); return(1); } @@ -1179,12 +1169,10 @@ termp_rv_pre(DECL_ARGS) term_newln(p); term_word(p, "The"); - nn = node->child; - assert(nn); - for ( ; nn; nn = nn->next) { - p->bold++; + for (nn = n->child; nn; nn = nn->next) { + term_fontpush(p, TERMFONT_BOLD); term_word(p, nn->string); - p->bold--; + term_fontpop(p); p->flags |= TERMP_NOSPACE; if (nn->next && NULL == nn->next->next) term_word(p, "(), and"); @@ -1194,7 +1182,7 @@ termp_rv_pre(DECL_ARGS) term_word(p, "()"); } - if (node->child->next) + if (n->child->next) term_word(p, "functions return"); else term_word(p, "function returns"); @@ -1202,9 +1190,9 @@ termp_rv_pre(DECL_ARGS) term_word(p, "the value 0 if successful; otherwise the value " "-1 is returned and the global variable"); - p->under++; + term_fontpush(p, TERMFONT_UNDER); term_word(p, "errno"); - p->under--; + term_fontpop(p); term_word(p, "is set to indicate the error."); @@ -1220,12 +1208,10 @@ termp_ex_pre(DECL_ARGS) term_word(p, "The"); - nn = node->child; - assert(nn); - for ( ; nn; nn = nn->next) { - p->bold++; + for (nn = n->child; nn; nn = nn->next) { + term_fontpush(p, TERMFONT_BOLD); term_word(p, nn->string); - p->bold--; + term_fontpop(p); p->flags |= TERMP_NOSPACE; if (nn->next && NULL == nn->next->next) term_word(p, ", and"); @@ -1235,7 +1221,7 @@ termp_ex_pre(DECL_ARGS) p->flags &= ~TERMP_NOSPACE; } - if (node->child->next) + if (n->child->next) term_word(p, "utilities exit"); else term_word(p, "utility exits"); @@ -1251,7 +1237,7 @@ static int termp_nd_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); #if defined(__OpenBSD__) || defined(__linux__) @@ -1268,7 +1254,7 @@ static void termp_bl_post(DECL_ARGS) { - if (MDOC_BLOCK == node->type) + if (MDOC_BLOCK == n->type) term_newln(p); } @@ -1278,7 +1264,7 @@ static void termp_op_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; term_word(p, "\\(rB"); @@ -1289,34 +1275,50 @@ termp_op_post(DECL_ARGS) static int termp_xr_pre(DECL_ARGS) { - const struct mdoc_node *n; + const struct mdoc_node *nn; - assert(node->child && MDOC_TEXT == node->child->type); - n = node->child; + assert(n->child && MDOC_TEXT == n->child->type); + nn = n->child; - term_word(p, n->string); - if (NULL == (n = n->next)) + term_word(p, nn->string); + if (NULL == (nn = nn->next)) return(0); p->flags |= TERMP_NOSPACE; term_word(p, "("); p->flags |= TERMP_NOSPACE; - term_word(p, n->string); + term_word(p, nn->string); p->flags |= TERMP_NOSPACE; term_word(p, ")"); + return(0); } +static int +termp_vt_pre(DECL_ARGS) +{ + + if (MDOC_ELEM == n->type) + return(termp_under_pre(p, pair, m, n)); + else if (MDOC_HEAD == n->type) + return(0); + else if (MDOC_BLOCK == n->type) + return(1); + + return(termp_under_pre(p, pair, m, n)); +} + + /* ARGSUSED */ static void termp_vt_post(DECL_ARGS) { - if (node->sec != SEC_SYNOPSIS) + if (MDOC_BLOCK != n->type) return; - if (node->next && MDOC_Vt == node->next->tok) + if (n->next && MDOC_Vt == n->next->tok) term_newln(p); - else if (node->next) + else if (n->next) term_vspace(p); } @@ -1326,7 +1328,7 @@ static int termp_bold_pre(DECL_ARGS) { - p->bold++; + term_fontpush(p, TERMFONT_BOLD); return(1); } @@ -1336,11 +1338,11 @@ static void termp_fd_post(DECL_ARGS) { - if (node->sec != SEC_SYNOPSIS) + if (n->sec != SEC_SYNOPSIS) return; term_newln(p); - if (node->next && MDOC_Fd != node->next->tok) + if (n->next && MDOC_Fd != n->next->tok) term_vspace(p); } @@ -1349,19 +1351,18 @@ termp_fd_post(DECL_ARGS) static int termp_sh_pre(DECL_ARGS) { - /* - * XXX: undocumented: using two `Sh' macros in sequence has no - * vspace between calls, only a newline. - */ - switch (node->type) { + + /* No vspace between consecutive `Sh' calls. */ + + switch (n->type) { case (MDOC_BLOCK): - if (node->prev && MDOC_Sh == node->prev->tok) - if (NULL == node->prev->body->child) + if (n->prev && MDOC_Sh == n->prev->tok) + if (NULL == n->prev->body->child) break; term_vspace(p); break; case (MDOC_HEAD): - p->bold++; + term_fontpush(p, TERMFONT_BOLD); break; case (MDOC_BODY): p->offset = INDENT; @@ -1378,7 +1379,7 @@ static void termp_sh_post(DECL_ARGS) { - switch (node->type) { + switch (n->type) { case (MDOC_HEAD): term_newln(p); break; @@ -1397,7 +1398,7 @@ static int termp_op_pre(DECL_ARGS) { - switch (node->type) { + switch (n->type) { case (MDOC_BODY): term_word(p, "\\(lB"); p->flags |= TERMP_NOSPACE; @@ -1415,7 +1416,7 @@ termp_bt_pre(DECL_ARGS) { term_word(p, "is currently in beta test."); - return(1); + return(0); } @@ -1424,7 +1425,8 @@ static void termp_lb_post(DECL_ARGS) { - term_newln(p); + if (SEC_LIBRARY == n->sec) + term_newln(p); } @@ -1434,7 +1436,7 @@ termp_ud_pre(DECL_ARGS) { term_word(p, "currently under development."); - return(1); + return(0); } @@ -1443,7 +1445,7 @@ static int termp_d1_pre(DECL_ARGS) { - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return(1); term_newln(p); p->offset += (INDENT + 1); @@ -1456,7 +1458,7 @@ static void termp_d1_post(DECL_ARGS) { - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return; term_newln(p); } @@ -1467,7 +1469,7 @@ static int termp_aq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\\(la"); p->flags |= TERMP_NOSPACE; @@ -1480,7 +1482,7 @@ static void termp_aq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; term_word(p, "\\(ra"); @@ -1492,10 +1494,11 @@ static int termp_ft_pre(DECL_ARGS) { - if (SEC_SYNOPSIS == node->sec) - if (node->prev && MDOC_Fo == node->prev->tok) + if (SEC_SYNOPSIS == n->sec) + if (n->prev && MDOC_Fo == n->prev->tok) term_vspace(p); - p->under++; + + term_fontpush(p, TERMFONT_UNDER); return(1); } @@ -1505,7 +1508,7 @@ static void termp_ft_post(DECL_ARGS) { - if (SEC_SYNOPSIS == node->sec) + if (SEC_SYNOPSIS == n->sec) term_newln(p); } @@ -1514,30 +1517,27 @@ termp_ft_post(DECL_ARGS) static int termp_fn_pre(DECL_ARGS) { - const struct mdoc_node *n; + const struct mdoc_node *nn; - assert(node->child && MDOC_TEXT == node->child->type); + term_fontpush(p, TERMFONT_BOLD); + term_word(p, n->child->string); + term_fontpop(p); - /* FIXME: can be "type funcname" "type varname"... */ - - p->bold++; - term_word(p, node->child->string); - p->bold--; - p->flags |= TERMP_NOSPACE; term_word(p, "("); - for (n = node->child->next; n; n = n->next) { - p->under++; - term_word(p, n->string); - p->under--; - if (n->next) + for (nn = n->child->next; nn; nn = nn->next) { + term_fontpush(p, TERMFONT_UNDER); + term_word(p, nn->string); + term_fontpop(p); + + if (nn->next) term_word(p, ","); } term_word(p, ")"); - if (SEC_SYNOPSIS == node->sec) + if (SEC_SYNOPSIS == n->sec) term_word(p, ";"); return(0); @@ -1549,7 +1549,7 @@ static void termp_fn_post(DECL_ARGS) { - if (node->sec == SEC_SYNOPSIS && node->next) + if (n->sec == SEC_SYNOPSIS && n->next) term_vspace(p); } @@ -1558,22 +1558,23 @@ termp_fn_post(DECL_ARGS) static int termp_fa_pre(DECL_ARGS) { - struct mdoc_node *n; + const struct mdoc_node *nn; - if (node->parent->tok != MDOC_Fo) { - p->under++; + if (n->parent->tok != MDOC_Fo) { + term_fontpush(p, TERMFONT_UNDER); return(1); } - for (n = node->child; n; n = n->next) { - p->under++; - term_word(p, n->string); - p->under--; - if (n->next) + for (nn = n->child; nn; nn = nn->next) { + term_fontpush(p, TERMFONT_UNDER); + term_word(p, nn->string); + term_fontpop(p); + + if (nn->next) term_word(p, ","); } - if (node->child && node->next && node->next->tok == MDOC_Fa) + if (n->child && n->next && n->next->tok == MDOC_Fa) term_word(p, ","); return(0); @@ -1584,30 +1585,21 @@ termp_fa_pre(DECL_ARGS) static int termp_bd_pre(DECL_ARGS) { - int i, type; + int i, type; + const struct mdoc_node *nn; - /* - * This is fairly tricky due primarily to crappy documentation. - * If -ragged or -filled are specified, the block does nothing - * but change the indentation. - * - * If, on the other hand, -unfilled or -literal are specified, - * then the game changes. Text is printed exactly as entered in - * the display: if a macro line, a newline is appended to the - * line. Blank lines are allowed. - */ - - if (MDOC_BLOCK == node->type) { - fmt_block_vspace(p, node, node); + if (MDOC_BLOCK == n->type) { + print_bvspace(p, n, n); return(1); - } else if (MDOC_BODY != node->type) + } else if (MDOC_BODY != n->type) return(1); - assert(node->parent->args); + nn = n->parent; - for (type = -1, i = 0; -1 == type && - i < (int)node->parent->args->argc; i++) { - switch (node->parent->args->argv[i].arg) { + for (type = -1, i = 0; i < (int)nn->args->argc; i++) { + switch (nn->args->argv[i].arg) { + case (MDOC_Centred): + /* FALLTHROUGH */ case (MDOC_Ragged): /* FALLTHROUGH */ case (MDOC_Filled): @@ -1615,33 +1607,37 @@ termp_bd_pre(DECL_ARGS) case (MDOC_Unfilled): /* FALLTHROUGH */ case (MDOC_Literal): - type = node->parent->args->argv[i].arg; + type = nn->args->argv[i].arg; break; + case (MDOC_Offset): + p->offset += a2offs(&nn->args->argv[i]); + break; default: break; } } + + /* + * If -ragged or -filled are specified, the block does nothing + * but change the indentation. If -unfilled or -literal are + * specified, text is printed exactly as entered in the display: + * for macro lines, a newline is appended to the line. Blank + * lines are allowed. + */ assert(type > -1); - - i = arg_getattr(MDOC_Offset, node->parent); - if (-1 != i) - p->offset += arg_offset(&node->parent->args->argv[i]); - - switch (type) { - case (MDOC_Literal): - /* FALLTHROUGH */ - case (MDOC_Unfilled): - break; - default: + if (MDOC_Literal != type && MDOC_Unfilled != type) return(1); - } - for (node = node->child; node; node = node->next) { + for (nn = n->child; nn; nn = nn->next) { p->flags |= TERMP_NOSPACE; - print_node(p, pair, meta, node); - if (node->next) + print_mdoc_node(p, pair, m, nn); + if (NULL == nn->next) + continue; + if (nn->prev && nn->prev->line < nn->line) term_flushln(p); + else if (NULL == nn->prev) + term_flushln(p); } return(0); @@ -1653,7 +1649,7 @@ static void termp_bd_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; term_flushln(p); @@ -1665,7 +1661,7 @@ static int termp_qq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\""); p->flags |= TERMP_NOSPACE; @@ -1678,7 +1674,7 @@ static void termp_qq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; term_word(p, "\""); @@ -1690,7 +1686,7 @@ static void termp_bx_post(DECL_ARGS) { - if (node->child) + if (n->child) p->flags |= TERMP_NOSPACE; term_word(p, "BSD"); } @@ -1703,12 +1699,12 @@ termp_xx_pre(DECL_ARGS) const char *pp; pp = NULL; - switch (node->tok) { + switch (n->tok) { case (MDOC_Bsx): pp = "BSDI BSD/OS"; break; case (MDOC_Dx): - pp = "DragonFlyBSD"; + pp = "DragonFly"; break; case (MDOC_Fx): pp = "FreeBSD"; @@ -1737,7 +1733,7 @@ static int termp_sq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\\(oq"); p->flags |= TERMP_NOSPACE; @@ -1750,7 +1746,7 @@ static void termp_sq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; term_word(p, "\\(aq"); @@ -1782,14 +1778,14 @@ static int termp_ss_pre(DECL_ARGS) { - switch (node->type) { + switch (n->type) { case (MDOC_BLOCK): term_newln(p); - if (node->prev) + if (n->prev) term_vspace(p); break; case (MDOC_HEAD): - p->bold++; + term_fontpush(p, TERMFONT_BOLD); p->offset = HALFINDENT; break; default: @@ -1805,7 +1801,7 @@ static void termp_ss_post(DECL_ARGS) { - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) term_newln(p); } @@ -1815,7 +1811,7 @@ static int termp_cd_pre(DECL_ARGS) { - p->bold++; + term_fontpush(p, TERMFONT_BOLD); term_newln(p); return(1); } @@ -1826,8 +1822,8 @@ static int termp_in_pre(DECL_ARGS) { - p->bold++; - if (SEC_SYNOPSIS == node->sec) + term_fontpush(p, TERMFONT_BOLD); + if (SEC_SYNOPSIS == n->sec) term_word(p, "#include"); term_word(p, "<"); @@ -1841,11 +1837,12 @@ static void termp_in_post(DECL_ARGS) { - p->bold++; + term_fontpush(p, TERMFONT_BOLD); + p->flags |= TERMP_NOSPACE; term_word(p, ">"); - p->bold--; + term_fontpop(p); - if (SEC_SYNOPSIS != node->sec) + if (SEC_SYNOPSIS != n->sec) return; term_newln(p); @@ -1855,7 +1852,7 @@ termp_in_post(DECL_ARGS) * the ; mandoc asserts a vertical space. Since this * construction is rarely used, I think it's fine. */ - if (node->next && MDOC_In != node->next->tok) + if (n->next && MDOC_In != n->next->tok) term_vspace(p); } @@ -1864,11 +1861,11 @@ termp_in_post(DECL_ARGS) static int termp_sp_pre(DECL_ARGS) { - int i, len; + size_t i, len; - switch (node->type) { + switch (n->tok) { case (MDOC_sp): - len = node->child ? atoi(node->child->string) : 1; + len = n->child ? a2height(n->child) : 1; break; case (MDOC_br): len = 0; @@ -1892,7 +1889,7 @@ static int termp_brq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\\(lC"); p->flags |= TERMP_NOSPACE; @@ -1905,7 +1902,7 @@ static void termp_brq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; term_word(p, "\\(rC"); @@ -1917,7 +1914,7 @@ static int termp_bq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\\(lB"); p->flags |= TERMP_NOSPACE; @@ -1930,7 +1927,7 @@ static void termp_bq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; term_word(p, "\\(rB"); @@ -1942,7 +1939,7 @@ static int termp_pq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\\&("); p->flags |= TERMP_NOSPACE; @@ -1955,7 +1952,7 @@ static void termp_pq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; term_word(p, ")"); } @@ -1965,22 +1962,22 @@ termp_pq_post(DECL_ARGS) static int termp_fo_pre(DECL_ARGS) { - const struct mdoc_node *n; + const struct mdoc_node *nn; - if (MDOC_BODY == node->type) { + if (MDOC_BODY == n->type) { p->flags |= TERMP_NOSPACE; term_word(p, "("); p->flags |= TERMP_NOSPACE; return(1); - } else if (MDOC_HEAD != node->type) + } else if (MDOC_HEAD != n->type) return(1); - p->bold++; - for (n = node->child; n; n = n->next) { - assert(MDOC_TEXT == n->type); - term_word(p, n->string); + term_fontpush(p, TERMFONT_BOLD); + for (nn = n->child; nn; nn = nn->next) { + assert(MDOC_TEXT == nn->type); + term_word(p, nn->string); } - p->bold--; + term_fontpop(p); return(0); } @@ -1991,7 +1988,7 @@ static void termp_fo_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; term_word(p, ")"); @@ -2005,27 +2002,31 @@ termp_fo_post(DECL_ARGS) static int termp_bf_pre(DECL_ARGS) { - const struct mdoc_node *n; + const struct mdoc_node *nn; - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) return(0); - else if (MDOC_BLOCK != node->type) + else if (MDOC_BLOCK != n->type) return(1); - if (NULL == (n = node->head->child)) { - if (arg_hasattr(MDOC_Emphasis, node)) - p->under++; - else if (arg_hasattr(MDOC_Symbolic, node)) - p->bold++; + if (NULL == (nn = n->head->child)) { + if (arg_hasattr(MDOC_Emphasis, n)) + term_fontpush(p, TERMFONT_UNDER); + else if (arg_hasattr(MDOC_Symbolic, n)) + term_fontpush(p, TERMFONT_BOLD); + else + term_fontpush(p, TERMFONT_NONE); return(1); } - assert(MDOC_TEXT == n->type); - if (0 == strcmp("Em", n->string)) - p->under++; - else if (0 == strcmp("Sy", n->string)) - p->bold++; + assert(MDOC_TEXT == nn->type); + if (0 == strcmp("Em", nn->string)) + term_fontpush(p, TERMFONT_UNDER); + else if (0 == strcmp("Sy", nn->string)) + term_fontpush(p, TERMFONT_BOLD); + else + term_fontpush(p, TERMFONT_NONE); return(1); } @@ -2036,11 +2037,10 @@ static int termp_sm_pre(DECL_ARGS) { - assert(node->child && MDOC_TEXT == node->child->type); - if (0 == strcmp("on", node->child->string)) { + assert(n->child && MDOC_TEXT == n->child->type); + if (0 == strcmp("on", n->child->string)) p->flags &= ~TERMP_NONOSPACE; - p->flags &= ~TERMP_NOSPACE; - } else + else p->flags |= TERMP_NONOSPACE; return(0); @@ -2064,35 +2064,53 @@ static void termp____post(DECL_ARGS) { + /* TODO: %U. */ + p->flags |= TERMP_NOSPACE; - term_word(p, node->next ? "," : "."); + switch (n->tok) { + case (MDOC__T): + term_word(p, "\\(rq"); + p->flags |= TERMP_NOSPACE; + break; + default: + break; + } + term_word(p, n->next ? "," : "."); } /* ARGSUSED */ static int +termp_li_pre(DECL_ARGS) +{ + + term_fontpush(p, TERMFONT_NONE); + return(1); +} + + +/* ARGSUSED */ +static int termp_lk_pre(DECL_ARGS) { - const struct mdoc_node *n; + const struct mdoc_node *nn; - assert(node->child); - n = node->child; + term_fontpush(p, TERMFONT_UNDER); + nn = n->child; - if (NULL == n->next) { - p->under++; + if (NULL == nn->next) return(1); - } - p->under++; - term_word(p, n->string); + term_word(p, nn->string); + term_fontpop(p); + p->flags |= TERMP_NOSPACE; term_word(p, ":"); - p->under--; - p->bold++; - for (n = n->next; n; n = n->next) - term_word(p, n->string); - p->bold--; + term_fontpush(p, TERMFONT_BOLD); + for (nn = nn->next; nn; nn = nn->next) + term_word(p, nn->string); + term_fontpop(p); return(0); } @@ -2103,6 +2121,17 @@ static int termp_under_pre(DECL_ARGS) { - p->under++; + term_fontpush(p, TERMFONT_UNDER); + return(1); +} + + +/* ARGSUSED */ +static int +termp__t_pre(DECL_ARGS) +{ + + term_word(p, "\\(lq"); + p->flags |= TERMP_NOSPACE; return(1); }