=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.51 retrieving revision 1.89 diff -u -p -r1.51 -r1.89 --- mandoc/mdoc_term.c 2009/07/21 13:34:13 1.51 +++ mandoc/mdoc_term.c 2009/10/13 10:57:25 1.89 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.51 2009/07/21 13:34:13 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.89 2009/10/13 10:57:25 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -25,60 +25,12 @@ #include "term.h" #include "mdoc.h" +#include "chars.h" +#include "main.h" -/* FIXME: macro arguments can be escaped. */ +#define INDENT 5 +#define HALFINDENT 3 -#define TTYPE_PROG 0 -#define TTYPE_CMD_FLAG 1 -#define TTYPE_CMD_ARG 2 -#define TTYPE_SECTION 3 -#define TTYPE_FUNC_DECL 4 -#define TTYPE_VAR_DECL 5 -#define TTYPE_FUNC_TYPE 6 -#define TTYPE_FUNC_NAME 7 -#define TTYPE_FUNC_ARG 8 -#define TTYPE_LINK 9 -#define TTYPE_SSECTION 10 -#define TTYPE_FILE 11 -#define TTYPE_EMPH 12 -#define TTYPE_CONFIG 13 -#define TTYPE_CMD 14 -#define TTYPE_INCLUDE 15 -#define TTYPE_SYMB 16 -#define TTYPE_SYMBOL 17 -#define TTYPE_DIAG 18 -#define TTYPE_LINK_ANCHOR 19 -#define TTYPE_LINK_TEXT 20 -#define TTYPE_REF_JOURNAL 21 -#define TTYPE_LIST 22 -#define TTYPE_NMAX 23 - -const int ttypes[TTYPE_NMAX] = { - TERMP_BOLD, /* TTYPE_PROG */ - TERMP_BOLD, /* TTYPE_CMD_FLAG */ - TERMP_UNDER, /* TTYPE_CMD_ARG */ - TERMP_BOLD, /* TTYPE_SECTION */ - TERMP_BOLD, /* TTYPE_FUNC_DECL */ - TERMP_UNDER, /* TTYPE_VAR_DECL */ - TERMP_UNDER, /* TTYPE_FUNC_TYPE */ - TERMP_BOLD, /* TTYPE_FUNC_NAME */ - TERMP_UNDER, /* TTYPE_FUNC_ARG */ - TERMP_UNDER, /* TTYPE_LINK */ - TERMP_BOLD, /* TTYPE_SSECTION */ - TERMP_UNDER, /* TTYPE_FILE */ - TERMP_UNDER, /* TTYPE_EMPH */ - TERMP_BOLD, /* TTYPE_CONFIG */ - TERMP_BOLD, /* TTYPE_CMD */ - TERMP_BOLD, /* TTYPE_INCLUDE */ - TERMP_BOLD, /* TTYPE_SYMB */ - TERMP_BOLD, /* TTYPE_SYMBOL */ - TERMP_BOLD, /* TTYPE_DIAG */ - TERMP_UNDER, /* TTYPE_LINK_ANCHOR */ - TERMP_BOLD, /* TTYPE_LINK_TEXT */ - TERMP_UNDER, /* TTYPE_REF_JOURNAL */ - TERMP_BOLD /* TTYPE_LIST */ -}; - struct termpair { struct termpair *ppair; int flag; @@ -87,8 +39,8 @@ struct termpair { #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); @@ -96,7 +48,7 @@ struct termact { }; static void termp____post(DECL_ARGS); -static void termp__t_post(DECL_ARGS); +static void termp_an_post(DECL_ARGS); static void termp_aq_post(DECL_ARGS); static void termp_bd_post(DECL_ARGS); static void termp_bl_post(DECL_ARGS); @@ -121,42 +73,33 @@ static void termp_sq_post(DECL_ARGS); static void termp_ss_post(DECL_ARGS); static void termp_vt_post(DECL_ARGS); -static int termp__j_pre(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); -static int termp_ar_pre(DECL_ARGS); static int termp_bd_pre(DECL_ARGS); static int termp_bf_pre(DECL_ARGS); +static int termp_bold_pre(DECL_ARGS); static int termp_bq_pre(DECL_ARGS); -static int termp_br_pre(DECL_ARGS); static int termp_brq_pre(DECL_ARGS); static int termp_bt_pre(DECL_ARGS); static int termp_cd_pre(DECL_ARGS); -static int termp_cm_pre(DECL_ARGS); static int termp_d1_pre(DECL_ARGS); static int termp_dq_pre(DECL_ARGS); -static int termp_em_pre(DECL_ARGS); static int termp_ex_pre(DECL_ARGS); static int termp_fa_pre(DECL_ARGS); -static int termp_fd_pre(DECL_ARGS); static int termp_fl_pre(DECL_ARGS); static int termp_fn_pre(DECL_ARGS); static int termp_fo_pre(DECL_ARGS); static int termp_ft_pre(DECL_ARGS); -static int termp_ic_pre(DECL_ARGS); static int termp_in_pre(DECL_ARGS); static int termp_it_pre(DECL_ARGS); static int termp_lk_pre(DECL_ARGS); -static int termp_ms_pre(DECL_ARGS); -static int termp_mt_pre(DECL_ARGS); static int termp_nd_pre(DECL_ARGS); static int termp_nm_pre(DECL_ARGS); static int termp_ns_pre(DECL_ARGS); static int termp_op_pre(DECL_ARGS); -static int termp_pa_pre(DECL_ARGS); static int termp_pf_pre(DECL_ARGS); -static int termp_pp_pre(DECL_ARGS); static int termp_pq_pre(DECL_ARGS); static int termp_qq_pre(DECL_ARGS); static int termp_rs_pre(DECL_ARGS); @@ -166,22 +109,19 @@ static int termp_sm_pre(DECL_ARGS); static int termp_sp_pre(DECL_ARGS); static int termp_sq_pre(DECL_ARGS); static int termp_ss_pre(DECL_ARGS); -static int termp_sx_pre(DECL_ARGS); -static int termp_sy_pre(DECL_ARGS); +static int termp_under_pre(DECL_ARGS); static int termp_ud_pre(DECL_ARGS); -static int termp_va_pre(DECL_ARGS); -static int termp_vt_pre(DECL_ARGS); static int termp_xr_pre(DECL_ARGS); static int termp_xx_pre(DECL_ARGS); -static const struct termact termacts[MDOC_MAX] = { +static const struct termact termacts[MDOC_MAX] = { { termp_ap_pre, NULL }, /* Ap */ { NULL, NULL }, /* Dd */ { NULL, NULL }, /* Dt */ { NULL, NULL }, /* Os */ { termp_sh_pre, termp_sh_post }, /* Sh */ { termp_ss_pre, termp_ss_post }, /* Ss */ - { termp_pp_pre, NULL }, /* Pp */ + { termp_sp_pre, NULL }, /* Pp */ { termp_d1_pre, termp_d1_post }, /* D1 */ { termp_d1_pre, termp_d1_post }, /* Dl */ { termp_bd_pre, termp_bd_post }, /* Bd */ @@ -190,42 +130,42 @@ static const struct termact termacts[MDOC_MAX] = { { NULL, NULL }, /* El */ { termp_it_pre, termp_it_post }, /* It */ { NULL, NULL }, /* Ad */ - { NULL, NULL }, /* An */ - { termp_ar_pre, NULL }, /* Ar */ + { termp_an_pre, termp_an_post }, /* An */ + { termp_under_pre, NULL }, /* Ar */ { termp_cd_pre, NULL }, /* Cd */ - { termp_cm_pre, NULL }, /* Cm */ + { termp_bold_pre, NULL }, /* Cm */ { NULL, NULL }, /* Dv */ { NULL, NULL }, /* Er */ { NULL, NULL }, /* Ev */ { termp_ex_pre, NULL }, /* Ex */ { termp_fa_pre, NULL }, /* Fa */ - { termp_fd_pre, termp_fd_post }, /* Fd */ + { termp_bold_pre, termp_fd_post }, /* Fd */ { termp_fl_pre, NULL }, /* Fl */ { termp_fn_pre, termp_fn_post }, /* Fn */ { termp_ft_pre, termp_ft_post }, /* Ft */ - { termp_ic_pre, NULL }, /* Ic */ + { termp_bold_pre, NULL }, /* Ic */ { termp_in_pre, termp_in_post }, /* In */ { NULL, NULL }, /* Li */ { termp_nd_pre, NULL }, /* Nd */ { termp_nm_pre, NULL }, /* Nm */ { termp_op_pre, termp_op_post }, /* Op */ { NULL, NULL }, /* Ot */ - { termp_pa_pre, NULL }, /* Pa */ + { termp_under_pre, NULL }, /* Pa */ { termp_rv_pre, NULL }, /* Rv */ { NULL, NULL }, /* St */ - { termp_va_pre, NULL }, /* Va */ - { termp_vt_pre, termp_vt_post }, /* Vt */ + { termp_under_pre, NULL }, /* Va */ + { termp_under_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__j_pre, termp____post }, /* %J */ + { 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__t_pre, termp__t_post }, /* %T */ + { termp__t_pre, termp____post }, /* %T */ { NULL, termp____post }, /* %V */ { NULL, NULL }, /* Ac */ { termp_aq_pre, termp_aq_post }, /* Ao */ @@ -243,10 +183,10 @@ static const struct termact termacts[MDOC_MAX] = { { termp_dq_pre, termp_dq_post }, /* Dq */ { NULL, NULL }, /* Ec */ { NULL, NULL }, /* Ef */ - { termp_em_pre, NULL }, /* Em */ + { termp_under_pre, NULL }, /* Em */ { NULL, NULL }, /* Eo */ { termp_xx_pre, NULL }, /* Fx */ - { termp_ms_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 */ @@ -265,8 +205,8 @@ static const struct termact termacts[MDOC_MAX] = { { termp_sq_pre, termp_sq_post }, /* So */ { termp_sq_pre, termp_sq_post }, /* Sq */ { termp_sm_pre, NULL }, /* Sm */ - { termp_sx_pre, NULL }, /* Sx */ - { termp_sy_pre, NULL }, /* Sy */ + { termp_under_pre, NULL }, /* Sx */ + { termp_bold_pre, NULL }, /* Sy */ { NULL, NULL }, /* Tn */ { termp_xx_pre, NULL }, /* Ux */ { NULL, NULL }, /* Xc */ @@ -282,18 +222,18 @@ static const struct termact termacts[MDOC_MAX] = { { NULL, NULL }, /* Fr */ { termp_ud_pre, NULL }, /* Ud */ { NULL, termp_lb_post }, /* Lb */ - { termp_pp_pre, NULL }, /* Lp */ + { termp_sp_pre, NULL }, /* Lp */ { termp_lk_pre, NULL }, /* Lk */ - { termp_mt_pre, NULL }, /* Mt */ + { termp_under_pre, NULL }, /* Mt */ { 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 */ - { termp_br_pre, NULL }, /* br */ + { NULL, termp____post }, /* %Q */ + { termp_sp_pre, NULL }, /* br */ { termp_sp_pre, NULL }, /* sp */ }; @@ -309,31 +249,41 @@ 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 int fmt_block_vspace(struct termp *, +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(struct termp *, - const struct mdoc_meta *); +static void print_head(DECL_ARGS); static void print_body(DECL_ARGS); -static void print_foot(struct termp *, - const struct mdoc_meta *); +static void print_foot(DECL_ARGS); -int -mdoc_run(struct termp *p, const struct mdoc *m) +void +terminal_mdoc(void *arg, const struct mdoc *mdoc) { - /* - * Main output function. When this is called, assume that the - * tree is properly formed. - */ - print_head(p, mdoc_meta(m)); - assert(mdoc_node(m)); - assert(MDOC_ROOT == mdoc_node(m)->type); - if (mdoc_node(m)->child) - print_body(p, NULL, mdoc_meta(m), mdoc_node(m)->child); - print_foot(p, mdoc_meta(m)); - return(1); + const struct mdoc_node *n; + const struct mdoc_meta *m; + struct termp *p; + + p = (struct termp *)arg; + + 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); + if (n->child) + print_body(p, NULL, m, n->child); + print_foot(p, NULL, m, n); } @@ -341,64 +291,58 @@ static void print_body(DECL_ARGS) { - print_node(p, pair, meta, node); - if ( ! node->next) - return; - print_body(p, pair, meta, node->next); + print_node(p, pair, m, n); + if (n->next) + print_body(p, pair, m, n->next); } +/* ARGSUSED */ static void print_node(DECL_ARGS) { - int dochild; + int chld, bold, under; struct termpair npair; size_t offset, rmargin; - dochild = 1; + chld = 1; offset = p->offset; rmargin = p->rmargin; + bold = p->bold; + under = p->under; + bzero(&npair, sizeof(struct termpair)); npair.ppair = pair; - npair.flag = 0; - npair.count = 0; + if (MDOC_TEXT != n->type) { + if (termacts[n->tok].pre) + chld = (*termacts[n->tok].pre)(p, &npair, m, n); + } else + term_word(p, n->string); + if (chld && n->child) + print_body(p, &npair, m, n->child); + /* - * Note on termpair. This allows a pre function to set a termp - * flag that is automatically unset after the body, but before - * the post function. Thus, if a pre uses a termpair flag, it - * must be reapplied in the post for use. + * 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. */ - if (MDOC_TEXT != node->type) { - if (termacts[node->tok].pre) - if ( ! (*termacts[node->tok].pre)(p, &npair, meta, node)) - dochild = 0; - } else /* MDOC_TEXT == node->type */ - term_word(p, node->string); + p->bold = bold; + p->under = under; - /* Children. */ + if (MDOC_TEXT != n->type) + if (termacts[n->tok].post) + (*termacts[n->tok].post)(p, &npair, m, n); - p->flags |= npair.flag; - - if (dochild && node->child) - print_body(p, &npair, meta, node->child); - - p->flags &= ~npair.flag; - - /* Post-processing. */ - - if (MDOC_TEXT != node->type) - if (termacts[node->tok].post) - (*termacts[node->tok].post)(p, &npair, meta, node); - p->offset = offset; p->rmargin = rmargin; } +/* ARGSUSED */ static void -print_foot(struct termp *p, const struct mdoc_meta *meta) +print_foot(DECL_ARGS) { struct tm *tm; char *buf, *os; @@ -412,16 +356,16 @@ print_foot(struct termp *p, const struct mdoc_meta *me */ if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); + err(EXIT_FAILURE, "malloc"); if (NULL == (os = malloc(p->rmargin))) - err(1, "malloc"); + err(EXIT_FAILURE, "malloc"); - tm = localtime(&meta->date); + tm = localtime(&m->date); if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm)) - err(1, "strftime"); + err(EXIT_FAILURE, "strftime"); - (void)strlcpy(os, meta->os, p->rmargin); + (void)strlcpy(os, m->os, p->rmargin); term_vspace(p); @@ -456,8 +400,10 @@ print_foot(struct termp *p, const struct mdoc_meta *me } +/* FIXME: put in utility library. */ +/* ARGSUSED */ static void -print_head(struct termp *p, const struct mdoc_meta *meta) +print_head(DECL_ARGS) { char *buf, *title; @@ -465,9 +411,9 @@ print_head(struct termp *p, const struct mdoc_meta *me p->offset = 0; if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); + err(EXIT_FAILURE, "malloc"); if (NULL == (title = malloc(p->rmargin))) - err(1, "malloc"); + err(EXIT_FAILURE, "malloc"); /* * The header is strange. It has three components, which are @@ -482,17 +428,16 @@ print_head(struct termp *p, const struct mdoc_meta *me * switches on the manual section. */ - assert(meta->vol); - (void)strlcpy(buf, meta->vol, p->rmargin); + assert(m->vol); + (void)strlcpy(buf, m->vol, p->rmargin); - if (meta->arch) { + if (m->arch) { (void)strlcat(buf, " (", p->rmargin); - (void)strlcat(buf, meta->arch, p->rmargin); + (void)strlcat(buf, m->arch, p->rmargin); (void)strlcat(buf, ")", p->rmargin); } - (void)snprintf(title, p->rmargin, "%s(%d)", - meta->title, meta->msec); + snprintf(title, p->rmargin, "%s(%d)", m->title, m->msec); p->offset = 0; p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; @@ -525,6 +470,7 @@ print_head(struct termp *p, const struct mdoc_meta *me } +/* FIXME: put in utility file for front-ends. */ static size_t arg_width(const struct mdoc_argv *arg, int pos) { @@ -551,6 +497,7 @@ arg_width(const struct mdoc_argv *arg, int pos) } +/* FIXME: put in utility file for front-ends. */ static int arg_listtype(const struct mdoc_node *n) { @@ -592,6 +539,7 @@ 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) { @@ -660,35 +608,47 @@ arg_getattrs(const int *keys, int *vals, /* ARGSUSED */ -static int +static void fmt_block_vspace(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 (arg_hasattr(MDOC_Compact, bl)) - return(1); - /* XXX - not documented! */ - else if (arg_hasattr(MDOC_Column, bl)) - return(1); + return; - for (n = node; n; n = n->parent) { - if (MDOC_BLOCK != n->type) + /* Do not vspace directly after Ss/Sh. */ + + for (nn = n; nn; nn = nn->parent) { + if (MDOC_BLOCK != nn->type) continue; - if (MDOC_Ss == n->tok) - break; - if (MDOC_Sh == n->tok) - break; - if (NULL == n->prev) + if (MDOC_Ss == nn->tok) + return; + if (MDOC_Sh == nn->tok) + return; + if (NULL == nn->prev) continue; - term_vspace(p); break; } - return(1); + /* A `-column' does not assert vspace within the list. */ + + if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Column, bl)) + if (n->prev && MDOC_It == n->prev->tok) + return; + + /* A `-diag' without body does not vspace. */ + + if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Diag, bl)) + if (n->prev && MDOC_It == n->prev->tok) { + assert(n->prev->body); + if (NULL == n->prev->body->child) + return; + } + + term_vspace(p); } @@ -697,7 +657,7 @@ static int termp_dq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\\(lq"); @@ -711,7 +671,7 @@ static void termp_dq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; @@ -723,15 +683,17 @@ 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; - if (MDOC_BLOCK == node->type) - return(fmt_block_vspace(p, node->parent->parent, node)); + if (MDOC_BLOCK == n->type) { + fmt_block_vspace(p, n->parent->parent, n); + return(1); + } - bl = node->parent->parent->parent; + bl = n->parent->parent->parent; /* Save parent attributes. */ @@ -756,13 +718,29 @@ termp_it_pre(DECL_ARGS) switch (type) { case (MDOC_Column): - if (MDOC_BODY == node->type) + if (MDOC_BODY == n->type) break; - for (i = 0, n = node->prev; n; n = n->prev, i++) + /* + * 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). + */ + for (i = 0, nn = n->prev; nn && + i < (int)bl->args->argv[vals[2]].sz; + nn = nn->prev, i++) offset += arg_width (&bl->args->argv[vals[2]], i); - assert(i < (int)bl->args->argv[vals[2]].sz); - width = arg_width(&bl->args->argv[vals[2]], i); + + /* Whether exceeds maximum column. */ + if (i < (int)bl->args->argv[vals[2]].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]]); break; @@ -777,7 +755,7 @@ termp_it_pre(DECL_ARGS) /* * List-type can override the width in the case of fixed-head * values (bullet, dash/hyphen, enum). Tags need a non-zero - * offset. FIXME: double-check that correct. + * offset. */ switch (type) { @@ -816,10 +794,11 @@ termp_it_pre(DECL_ARGS) switch (type) { case (MDOC_Diag): - term_word(p, "\\ \\ "); + 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: @@ -828,14 +807,10 @@ termp_it_pre(DECL_ARGS) p->flags |= TERMP_NOSPACE; - /* - * Style flags. Diagnostic heads need TTYPE_DIAG. - */ - switch (type) { case (MDOC_Diag): - if (MDOC_HEAD == node->type) - p->flags |= ttypes[TTYPE_DIAG]; + if (MDOC_HEAD == n->type) + p->bold++; break; default: break; @@ -857,44 +832,58 @@ 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; + + /* + * This is ugly. If `-hang' is specified and the body + * is a `Bl' or `Bd', then we want basically to nullify + * the "overstep" effect in term_flushln() and treat + * this as a `-ohang' list instead. + */ + 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: @@ -910,6 +899,17 @@ termp_it_pre(DECL_ARGS) p->offset += offset; switch (type) { + case (MDOC_Hang): + /* + * Same stipulation as above, regarding `-hang'. We + * don't want to recalculate rmargin and offsets when + * using `Bd' or `Bl' within `-hang' overstep lists. + */ + 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): /* FALLTHROUGH */ case (MDOC_Dash): @@ -918,11 +918,9 @@ termp_it_pre(DECL_ARGS) /* FALLTHROUGH */ case (MDOC_Hyphen): /* FALLTHROUGH */ - case (MDOC_Hang): - /* 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; @@ -934,8 +932,8 @@ 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; break; default: @@ -947,19 +945,19 @@ 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->flags |= TERMP_BOLD; + p->bold++; term_word(p, "\\[bu]"); - p->flags &= ~TERMP_BOLD; + p->bold--; break; case (MDOC_Dash): /* FALLTHROUGH */ case (MDOC_Hyphen): - p->flags |= TERMP_BOLD; + p->bold++; term_word(p, "\\(hy"); - p->flags &= ~TERMP_BOLD; + p->bold--; break; case (MDOC_Enum): (pair->ppair->ppair->count)++; @@ -985,11 +983,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: @@ -1006,21 +1004,23 @@ termp_it_post(DECL_ARGS) { int type; - if (MDOC_BODY != node->type && MDOC_HEAD != node->type) + if (MDOC_BODY != n->type && MDOC_HEAD != n->type) return; - type = arg_listtype(node->parent->parent->parent); + type = arg_listtype(n->parent->parent->parent); assert(-1 != type); switch (type) { case (MDOC_Item): /* FALLTHROUGH */ + 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: @@ -1037,15 +1037,11 @@ static int termp_nm_pre(DECL_ARGS) { - if (SEC_SYNOPSIS == node->sec) + if (SEC_SYNOPSIS == n->sec) term_newln(p); - - pair->flag |= ttypes[TTYPE_PROG]; - p->flags |= ttypes[TTYPE_PROG]; - - if (NULL == node->child) - term_word(p, meta->name); - + p->bold++; + if (NULL == n->child) + term_word(p, m->name); return(1); } @@ -1055,8 +1051,7 @@ static int termp_fl_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_CMD_FLAG]; - p->flags |= ttypes[TTYPE_CMD_FLAG]; + p->bold++; term_word(p, "\\-"); p->flags |= TERMP_NOSPACE; return(1); @@ -1065,30 +1060,68 @@ termp_fl_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_ar_pre(DECL_ARGS) +termp_an_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_CMD_ARG]; + if (NULL == n->child) + return(1); + + /* + * 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 (n->sec == SEC_AUTHORS) { + if ( ! (TERMP_ANPREC & p->flags)) { + if (TERMP_SPLIT & p->flags) + term_newln(p); + return(1); + } + if (TERMP_NOSPLIT & p->flags) + return(1); + term_newln(p); + return(1); + } + + if (TERMP_SPLIT & p->flags) + term_newln(p); + return(1); } /* ARGSUSED */ -static int -termp_ns_pre(DECL_ARGS) +static void +termp_an_post(DECL_ARGS) { - p->flags |= TERMP_NOSPACE; - return(1); + if (n->child) { + if (SEC_AUTHORS == n->sec) + p->flags |= TERMP_ANPREC; + return; + } + + if (arg_getattr(MDOC_Split, n) > -1) { + p->flags &= ~TERMP_NOSPLIT; + p->flags |= TERMP_SPLIT; + } else { + p->flags &= ~TERMP_SPLIT; + p->flags |= TERMP_NOSPLIT; + } + } /* ARGSUSED */ static int -termp_pp_pre(DECL_ARGS) +termp_ns_pre(DECL_ARGS) { - term_vspace(p); + p->flags |= TERMP_NOSPACE; return(1); } @@ -1098,7 +1131,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); } @@ -1108,31 +1143,39 @@ termp_rs_pre(DECL_ARGS) static int termp_rv_pre(DECL_ARGS) { - int i; + const struct mdoc_node *nn; - i = arg_getattr(MDOC_Std, node); - assert(-1 != i); - assert(node->args->argv[i].sz); - term_newln(p); term_word(p, "The"); - p->flags |= ttypes[TTYPE_FUNC_NAME]; - term_word(p, *node->args->argv[i].value); - p->flags &= ~ttypes[TTYPE_FUNC_NAME]; - p->flags |= TERMP_NOSPACE; + for (nn = n->child; nn; nn = nn->next) { + p->bold++; + term_word(p, nn->string); + p->bold--; + p->flags |= TERMP_NOSPACE; + if (nn->next && NULL == nn->next->next) + term_word(p, "(), and"); + else if (nn->next) + term_word(p, "(),"); + else + term_word(p, "()"); + } - term_word(p, "() function returns the value 0 if successful;"); - term_word(p, "otherwise the value -1 is returned and the"); - term_word(p, "global variable"); + if (n->child->next) + term_word(p, "functions return"); + else + term_word(p, "function returns"); - p->flags |= ttypes[TTYPE_VAR_DECL]; + term_word(p, "the value 0 if successful; otherwise the value " + "-1 is returned and the global variable"); + + p->under++; term_word(p, "errno"); - p->flags &= ~ttypes[TTYPE_VAR_DECL]; + p->under--; term_word(p, "is set to indicate the error."); - return(1); + return(0); } @@ -1140,19 +1183,31 @@ termp_rv_pre(DECL_ARGS) static int termp_ex_pre(DECL_ARGS) { - int i; + const struct mdoc_node *nn; - i = arg_getattr(MDOC_Std, node); - assert(-1 != i); - assert(node->args->argv[i].sz); - term_word(p, "The"); - p->flags |= ttypes[TTYPE_PROG]; - term_word(p, *node->args->argv[i].value); - p->flags &= ~ttypes[TTYPE_PROG]; - term_word(p, "utility exits 0 on success, and >0 if an error occurs."); - return(1); + for (nn = n->child; nn; nn = nn->next) { + p->bold++; + term_word(p, nn->string); + p->bold--; + p->flags |= TERMP_NOSPACE; + if (nn->next && NULL == nn->next->next) + term_word(p, ", and"); + else if (nn->next) + term_word(p, ","); + else + p->flags &= ~TERMP_NOSPACE; + } + + if (n->child->next) + term_word(p, "utilities exit"); + else + term_word(p, "utility exits"); + + term_word(p, "0 on success, and >0 if an error occurs."); + + return(0); } @@ -1161,7 +1216,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__) @@ -1178,7 +1233,7 @@ static void termp_bl_post(DECL_ARGS) { - if (MDOC_BLOCK == node->type) + if (MDOC_BLOCK == n->type) term_newln(p); } @@ -1188,7 +1243,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"); @@ -1199,55 +1254,45 @@ 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); } /* ARGSUSED */ -static int -termp_vt_pre(DECL_ARGS) -{ - - /* FIXME: this can be "type name". */ - pair->flag |= ttypes[TTYPE_VAR_DECL]; - return(1); -} - - -/* ARGSUSED */ static void termp_vt_post(DECL_ARGS) { - if (node->sec != SEC_SYNOPSIS) + if (n->sec != SEC_SYNOPSIS) 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); } /* ARGSUSED */ static int -termp_fd_pre(DECL_ARGS) +termp_bold_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_FUNC_DECL]; + p->bold++; return(1); } @@ -1257,11 +1302,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); } @@ -1271,11 +1316,18 @@ static int termp_sh_pre(DECL_ARGS) { - switch (node->type) { - case (MDOC_HEAD): + /* No vspace between consecutive `Sh' calls. */ + + switch (n->type) { + case (MDOC_BLOCK): + if (n->prev && MDOC_Sh == n->prev->tok) + if (NULL == n->prev->body->child) + break; term_vspace(p); - pair->flag |= ttypes[TTYPE_SECTION]; break; + case (MDOC_HEAD): + p->bold++; + break; case (MDOC_BODY): p->offset = INDENT; break; @@ -1291,7 +1343,7 @@ static void termp_sh_post(DECL_ARGS) { - switch (node->type) { + switch (n->type) { case (MDOC_HEAD): term_newln(p); break; @@ -1310,7 +1362,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; @@ -1328,7 +1380,7 @@ termp_bt_pre(DECL_ARGS) { term_word(p, "is currently in beta test."); - return(1); + return(0); } @@ -1337,7 +1389,8 @@ static void termp_lb_post(DECL_ARGS) { - term_newln(p); + if (SEC_LIBRARY == n->sec) + term_newln(p); } @@ -1347,7 +1400,7 @@ termp_ud_pre(DECL_ARGS) { term_word(p, "currently under development."); - return(1); + return(0); } @@ -1356,7 +1409,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); @@ -1369,7 +1422,7 @@ static void termp_d1_post(DECL_ARGS) { - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return; term_newln(p); } @@ -1380,7 +1433,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; @@ -1393,7 +1446,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"); @@ -1405,10 +1458,10 @@ 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); - pair->flag |= ttypes[TTYPE_FUNC_TYPE]; + p->under++; return(1); } @@ -1418,7 +1471,7 @@ static void termp_ft_post(DECL_ARGS) { - if (SEC_SYNOPSIS == node->sec) + if (SEC_SYNOPSIS == n->sec) term_newln(p); } @@ -1427,30 +1480,26 @@ 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); + p->bold++; + term_word(p, n->child->string); + p->bold--; - /* FIXME: can be "type funcname" "type varname"... */ - - p->flags |= ttypes[TTYPE_FUNC_NAME]; - term_word(p, node->child->string); - p->flags &= ~ttypes[TTYPE_FUNC_NAME]; - p->flags |= TERMP_NOSPACE; term_word(p, "("); - for (n = node->child->next; n; n = n->next) { - p->flags |= ttypes[TTYPE_FUNC_ARG]; - term_word(p, n->string); - p->flags &= ~ttypes[TTYPE_FUNC_ARG]; - if (n->next) + for (nn = n->child->next; nn; nn = nn->next) { + p->under++; + term_word(p, nn->string); + p->under--; + if (nn->next) term_word(p, ","); } term_word(p, ")"); - if (SEC_SYNOPSIS == node->sec) + if (SEC_SYNOPSIS == n->sec) term_word(p, ";"); return(0); @@ -1462,41 +1511,31 @@ static void termp_fn_post(DECL_ARGS) { - if (node->sec == SEC_SYNOPSIS && node->next) + if (n->sec == SEC_SYNOPSIS && n->next) term_vspace(p); } /* ARGSUSED */ static int -termp_sx_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_LINK]; - return(1); -} - - -/* ARGSUSED */ -static int termp_fa_pre(DECL_ARGS) { - struct mdoc_node *n; + const struct mdoc_node *nn; - if (node->parent->tok != MDOC_Fo) { - pair->flag |= ttypes[TTYPE_FUNC_ARG]; + if (n->parent->tok != MDOC_Fo) { + p->under++; return(1); } - for (n = node->child; n; n = n->next) { - p->flags |= ttypes[TTYPE_FUNC_ARG]; - term_word(p, n->string); - p->flags &= ~ttypes[TTYPE_FUNC_ARG]; - if (n->next) + for (nn = n->child; nn; nn = nn->next) { + p->under++; + term_word(p, nn->string); + p->under--; + 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); @@ -1505,44 +1544,21 @@ termp_fa_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_va_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_VAR_DECL]; - return(1); -} - - -/* ARGSUSED */ -static int termp_bd_pre(DECL_ARGS) { - int i, type, ln; + 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) - return(fmt_block_vspace(p, node, node)); - else if (MDOC_BODY != node->type) + if (MDOC_BLOCK == n->type) { + fmt_block_vspace(p, n, n); return(1); + } else if (MDOC_BODY != n->type) + return(1); - /* FIXME: display type should be mandated by parser. */ + nn = n->parent; - if (NULL == node->parent->args) - errx(1, "missing display type"); - - for (type = -1, i = 0; - 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_Ragged): /* FALLTHROUGH */ case (MDOC_Filled): @@ -1550,48 +1566,37 @@ termp_bd_pre(DECL_ARGS) case (MDOC_Unfilled): /* FALLTHROUGH */ case (MDOC_Literal): - type = node->parent->args->argv[i].arg; - i = (int)node->parent->args->argc; + type = nn->args->argv[i].arg; break; + case (MDOC_Offset): + p->offset += arg_offset(&nn->args->argv[i]); + break; default: break; } } - if (NULL == node->parent->args) - errx(1, "missing display type"); - - i = arg_getattr(MDOC_Offset, node->parent); - if (-1 != i) { - if (1 != node->parent->args->argv[i].sz) - errx(1, "expected single value"); - p->offset += arg_offset(&node->parent->args->argv[i]); - } - - switch (type) { - case (MDOC_Literal): - /* FALLTHROUGH */ - case (MDOC_Unfilled): - break; - default: - return(1); - } - /* - * Tricky. Iterate through all children. If we're on a - * different parse line, append a newline and then the contents. - * Ew. + * 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); + if (MDOC_Literal != type && MDOC_Unfilled != type) + return(1); - ln = node->child ? node->child->line : 0; - - for (node = node->child; node; node = node->next) { - if (ln < node->line) { + for (nn = n->child; nn; nn = nn->next) { + p->flags |= TERMP_NOSPACE; + print_node(p, pair, m, nn); + if (NULL == nn->next) + continue; + if (nn->prev && nn->prev->line < nn->line) term_flushln(p); - p->flags |= TERMP_NOSPACE; - } - ln = node->line; - print_node(p, pair, meta, node); + else if (NULL == nn->prev) + term_flushln(p); } return(0); @@ -1603,8 +1608,9 @@ 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); } @@ -1614,7 +1620,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; @@ -1627,7 +1633,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, "\""); @@ -1639,7 +1645,7 @@ static void termp_bx_post(DECL_ARGS) { - if (node->child) + if (n->child) p->flags |= TERMP_NOSPACE; term_word(p, "BSD"); } @@ -1652,7 +1658,7 @@ termp_xx_pre(DECL_ARGS) const char *pp; pp = NULL; - switch (node->tok) { + switch (n->tok) { case (MDOC_Bsx): pp = "BSDI BSD/OS"; break; @@ -1686,7 +1692,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; @@ -1699,7 +1705,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"); @@ -1731,14 +1737,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): - pair->flag |= ttypes[TTYPE_SSECTION]; + p->bold++; p->offset = HALFINDENT; break; default: @@ -1754,37 +1760,17 @@ static void termp_ss_post(DECL_ARGS) { - if (MDOC_HEAD == node->type) + if (MDOC_HEAD == n->type) term_newln(p); } /* ARGSUSED */ static int -termp_pa_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_FILE]; - return(1); -} - - -/* ARGSUSED */ -static int -termp_em_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_EMPH]; - return(1); -} - - -/* ARGSUSED */ -static int termp_cd_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_CONFIG]; + p->bold++; term_newln(p); return(1); } @@ -1792,33 +1778,11 @@ termp_cd_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_cm_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_CMD_FLAG]; - return(1); -} - - -/* ARGSUSED */ -static int -termp_ic_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_CMD]; - return(1); -} - - -/* ARGSUSED */ -static int termp_in_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_INCLUDE]; - p->flags |= ttypes[TTYPE_INCLUDE]; - - if (SEC_SYNOPSIS == node->sec) + p->bold++; + if (SEC_SYNOPSIS == n->sec) term_word(p, "#include"); term_word(p, "<"); @@ -1832,11 +1796,12 @@ static void termp_in_post(DECL_ARGS) { - p->flags |= TERMP_NOSPACE | ttypes[TTYPE_INCLUDE]; + p->bold++; + p->flags |= TERMP_NOSPACE; term_word(p, ">"); - p->flags &= ~ttypes[TTYPE_INCLUDE]; + p->bold--; - if (SEC_SYNOPSIS != node->sec) + if (SEC_SYNOPSIS != n->sec) return; term_newln(p); @@ -1846,7 +1811,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); } @@ -1857,12 +1822,18 @@ termp_sp_pre(DECL_ARGS) { int i, len; - if (NULL == node->child) { - term_vspace(p); - return(0); + switch (n->tok) { + case (MDOC_sp): + len = n->child ? atoi(n->child->string) : 1; + break; + case (MDOC_br): + len = 0; + break; + default: + len = 1; + break; } - len = atoi(node->child->string); if (0 == len) term_newln(p); for (i = 0; i < len; i++) @@ -1874,20 +1845,10 @@ termp_sp_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_br_pre(DECL_ARGS) -{ - - term_newln(p); - return(1); -} - - -/* ARGSUSED */ -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; @@ -1900,7 +1861,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"); @@ -1912,7 +1873,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; @@ -1925,7 +1886,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"); @@ -1937,7 +1898,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; @@ -1950,7 +1911,7 @@ static void termp_pq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; term_word(p, ")"); } @@ -1960,22 +1921,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->flags |= ttypes[TTYPE_FUNC_NAME]; - for (n = node->child; n; n = n->next) { - assert(MDOC_TEXT == n->type); - term_word(p, n->string); + p->bold++; + for (nn = n->child; nn; nn = nn->next) { + assert(MDOC_TEXT == nn->type); + term_word(p, nn->string); } - p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + p->bold--; return(0); } @@ -1986,7 +1947,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, ")"); @@ -2000,27 +1961,27 @@ 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)) - pair->flag |= ttypes[TTYPE_EMPH]; - else if (arg_hasattr(MDOC_Symbolic, node)) - pair->flag |= ttypes[TTYPE_SYMB]; + if (NULL == (nn = n->head->child)) { + if (arg_hasattr(MDOC_Emphasis, n)) + p->under++; + else if (arg_hasattr(MDOC_Symbolic, n)) + p->bold++; return(1); } - assert(MDOC_TEXT == n->type); - if (0 == strcmp("Em", n->string)) - pair->flag |= ttypes[TTYPE_EMPH]; - else if (0 == strcmp("Sy", n->string)) - pair->flag |= ttypes[TTYPE_SYMB]; + assert(MDOC_TEXT == nn->type); + if (0 == strcmp("Em", nn->string)) + p->under++; + else if (0 == strcmp("Sy", nn->string)) + p->bold++; return(1); } @@ -2028,32 +1989,11 @@ termp_bf_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_sy_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_SYMB]; - return(1); -} - - -/* ARGSUSED */ -static int -termp_ms_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_SYMBOL]; - return(1); -} - - - -/* ARGSUSED */ -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 @@ -2076,44 +2016,20 @@ termp_ap_pre(DECL_ARGS) /* ARGSUSED */ -static int -termp__j_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_REF_JOURNAL]; - return(1); -} - - -/* ARGSUSED */ -static int -termp__t_pre(DECL_ARGS) -{ - - term_word(p, "\""); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ static void -termp__t_post(DECL_ARGS) -{ - - p->flags |= TERMP_NOSPACE; - term_word(p, "\""); - termp____post(p, pair, meta, node); -} - - -/* ARGSUSED */ -static void termp____post(DECL_ARGS) { 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 ? "," : "."); } @@ -2121,38 +2037,44 @@ termp____post(DECL_ARGS) static int termp_lk_pre(DECL_ARGS) { - const struct mdoc_node *n; + const struct mdoc_node *nn; - assert(node->child); - n = node->child; - - if (NULL == n->next) { - pair->flag |= ttypes[TTYPE_LINK_ANCHOR]; + if (NULL == (nn = n->child->next)) { + p->under++; return(1); } - p->flags |= ttypes[TTYPE_LINK_ANCHOR]; - term_word(p, n->string); + p->under++; + term_word(p, nn->string); p->flags |= TERMP_NOSPACE; term_word(p, ":"); - p->flags &= ~ttypes[TTYPE_LINK_ANCHOR]; + p->under--; - p->flags |= ttypes[TTYPE_LINK_TEXT]; - for (n = n->next; n; n = n->next) - term_word(p, n->string); + p->bold++; + for (nn = nn->next; nn; nn = nn->next) + term_word(p, nn->string); + p->bold--; - p->flags &= ~ttypes[TTYPE_LINK_TEXT]; return(0); } /* ARGSUSED */ static int -termp_mt_pre(DECL_ARGS) +termp_under_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_LINK_ANCHOR]; + p->under++; return(1); } +/* ARGSUSED */ +static int +termp__t_pre(DECL_ARGS) +{ + + term_word(p, "\\(lq"); + p->flags |= TERMP_NOSPACE; + return(1); +}