=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.68 retrieving revision 1.102 diff -u -p -r1.68 -r1.102 --- mandoc/mdoc_term.c 2009/08/20 13:22:48 1.68 +++ mandoc/mdoc_term.c 2009/11/12 05:50:12 1.102 @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.68 2009/08/20 13:22:48 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.102 2009/11/12 05:50:12 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -18,70 +18,19 @@ #include #include -#include #include #include #include +#include "out.h" #include "term.h" #include "mdoc.h" +#include "chars.h" +#include "main.h" #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_REF_TITLE 22 -#define TTYPE_LIST 23 -#define TTYPE_NMAX 24 - -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_UNDER, /* TTYPE_REF_TITLE */ - TERMP_BOLD /* TTYPE_LIST */ -}; - struct termpair { struct termpair *ppair; int flag; @@ -90,14 +39,36 @@ 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); 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); + +#ifdef __linux__ +extern size_t strlcpy(char *, const char *, size_t); +extern size_t strlcat(char *, const char *, size_t); +#endif + static void termp____post(DECL_ARGS); static void termp_an_post(DECL_ARGS); static void termp_aq_post(DECL_ARGS); @@ -124,43 +95,34 @@ 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_li_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); @@ -170,22 +132,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 */ @@ -195,36 +154,36 @@ static const struct termact termacts[MDOC_MAX] = { { termp_it_pre, termp_it_post }, /* It */ { NULL, NULL }, /* Ad */ { termp_an_pre, termp_an_post }, /* An */ - { termp_ar_pre, NULL }, /* Ar */ + { 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_li_pre, 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 */ @@ -247,10 +206,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 */ @@ -269,8 +228,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 */ @@ -286,127 +245,107 @@ 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 */ + { 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(struct termp *, - const struct mdoc_meta *); -static void print_body(DECL_ARGS); -static void print_foot(struct termp *, - const struct mdoc_meta *); +void +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; -int -mdoc_run(struct termp *p, const struct mdoc *m) -{ - /* - * 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); + 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_mdoc_head(p, NULL, m, n); + if (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) - return; - 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 dochild; + int chld; + const void *font; struct termpair npair; size_t offset, rmargin; - dochild = 1; + chld = 1; offset = p->offset; rmargin = p->rmargin; + font = term_fontq(p); + memset(&npair, 0, sizeof(struct termpair)); npair.ppair = pair; - npair.flag = 0; - npair.count = 0; - /* - * 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. - */ + 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 (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); + if (chld && n->child) + print_mdoc_nodelist(p, &npair, m, n->child); - /* Children. */ + term_fontpopq(p, font); - p->flags |= npair.flag; + if (MDOC_TEXT != n->type) + if (termacts[n->tok].post) + (*termacts[n->tok].post)(p, &npair, m, n); - 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; + 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 @@ -415,18 +354,9 @@ print_foot(struct termp *p, const struct mdoc_meta *me * SYSTEM DATE SYSTEM */ - if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); - if (NULL == (os = malloc(p->rmargin))) - err(1, "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(1, "strftime"); - - (void)strlcpy(os, meta->os, p->rmargin); - term_vspace(p); p->offset = 0; @@ -454,25 +384,18 @@ print_foot(struct termp *p, const struct mdoc_meta *me p->offset = 0; p->rmargin = p->maxrmargin; p->flags = 0; - - free(buf); - free(os); } +/* ARGSUSED */ static void -print_head(struct termp *p, const struct mdoc_meta *meta) +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(1, "malloc"); - if (NULL == (title = malloc(p->rmargin))) - err(1, "malloc"); - /* * The header is strange. It has three components, which are * really two with the first duplicated. It goes like this: @@ -486,17 +409,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); + 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); } - (void)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; @@ -523,35 +445,34 @@ print_head(struct termp *p, const struct mdoc_meta *me p->offset = 0; p->rmargin = p->maxrmargin; p->flags &= ~TERMP_NOSPACE; - - free(title); - free(buf); } 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); + /* XXX: pachemu? */ + return(term_hspan(&su) + 2); } @@ -597,33 +518,22 @@ arg_listtype(const struct mdoc_node *n) 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)); } @@ -663,54 +573,43 @@ arg_getattrs(const int *keys, int *vals, } -/* ARGSUSED */ 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; } @@ -723,7 +622,7 @@ static int termp_dq_pre(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return(1); term_word(p, "\\(lq"); @@ -737,7 +636,7 @@ static void termp_dq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; p->flags |= TERMP_NOSPACE; @@ -749,17 +648,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) { - 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. */ @@ -784,7 +683,7 @@ termp_it_pre(DECL_ARGS) 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 @@ -795,26 +694,26 @@ termp_it_pre(DECL_ARGS) * the 0 will be adjusted to default 10 or, if in the * last column case, set to stretch to the margin). */ - for (i = 0, n = node->prev; n && n && - i < (int)bl->args[vals[2]].argv->sz; - n = n->prev, i++) - offset += arg_width + for (i = 0, nn = n->prev; nn && + i < (int)bl->args->argv[vals[2]].sz; + nn = nn->prev, i++) + offset += 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); + if (i < (int)bl->args->argv[vals[2]].sz) + width = a2width(&bl->args->argv[vals[2]], i); else width = 0; if (vals[1] >= 0) - offset += arg_offset(&bl->args->argv[vals[1]]); + offset += a2offs(&bl->args->argv[vals[1]]); break; default: if (vals[0] >= 0) - width = arg_width(&bl->args->argv[vals[0]], 0); + width = a2width(&bl->args->argv[vals[0]], 0); if (vals[1] >= 0) - offset += arg_offset(&bl->args->argv[vals[1]]); + offset += a2offs(&bl->args->argv[vals[1]]); break; } @@ -860,11 +759,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: @@ -873,14 +772,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) + term_fontpush(p, TERMFONT_BOLD); break; default: break; @@ -902,18 +797,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; /* @@ -922,38 +817,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: @@ -975,9 +870,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): @@ -990,7 +885,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; @@ -1002,8 +897,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: @@ -1015,19 +910,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; + term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\[bu]"); - p->flags &= ~TERMP_BOLD; + term_fontpop(p); break; case (MDOC_Dash): /* FALLTHROUGH */ case (MDOC_Hyphen): - p->flags |= TERMP_BOLD; + term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\(hy"); - p->flags &= ~TERMP_BOLD; + term_fontpop(p); break; case (MDOC_Enum): (pair->ppair->ppair->count)++; @@ -1053,11 +948,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: @@ -1074,10 +969,10 @@ 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) { @@ -1086,11 +981,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: @@ -1107,15 +1002,13 @@ 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]; + term_fontpush(p, TERMFONT_BOLD); - if (NULL == node->child) - term_word(p, meta->name); - + if (NULL == n->child) + term_word(p, m->name); return(1); } @@ -1125,8 +1018,7 @@ static int termp_fl_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_CMD_FLAG]; - p->flags |= ttypes[TTYPE_CMD_FLAG]; + term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\-"); p->flags |= TERMP_NOSPACE; return(1); @@ -1138,20 +1030,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); @@ -1175,13 +1066,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 { @@ -1194,16 +1085,6 @@ termp_an_post(DECL_ARGS) /* ARGSUSED */ static int -termp_ar_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_CMD_ARG]; - return(1); -} - - -/* ARGSUSED */ -static int termp_ns_pre(DECL_ARGS) { @@ -1214,20 +1095,12 @@ termp_ns_pre(DECL_ARGS) /* ARGSUSED */ static int -termp_pp_pre(DECL_ARGS) -{ - - term_vspace(p); - return(1); -} - - -/* ARGSUSED */ -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); } @@ -1242,12 +1115,10 @@ termp_rv_pre(DECL_ARGS) term_newln(p); term_word(p, "The"); - nn = node->child; - assert(nn); - for ( ; nn; nn = nn->next) { - p->flags |= ttypes[TTYPE_FUNC_NAME]; + for (nn = n->child; nn; nn = nn->next) { + term_fontpush(p, TERMFONT_BOLD); term_word(p, nn->string); - p->flags &= ~ttypes[TTYPE_FUNC_NAME]; + term_fontpop(p); p->flags |= TERMP_NOSPACE; if (nn->next && NULL == nn->next->next) term_word(p, "(), and"); @@ -1257,7 +1128,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"); @@ -1265,9 +1136,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->flags |= ttypes[TTYPE_VAR_DECL]; + term_fontpush(p, TERMFONT_UNDER); term_word(p, "errno"); - p->flags &= ~ttypes[TTYPE_VAR_DECL]; + term_fontpop(p); term_word(p, "is set to indicate the error."); @@ -1283,12 +1154,10 @@ termp_ex_pre(DECL_ARGS) term_word(p, "The"); - nn = node->child; - assert(nn); - for ( ; nn; nn = nn->next) { - p->flags |= ttypes[TTYPE_PROG]; + for (nn = n->child; nn; nn = nn->next) { + term_fontpush(p, TERMFONT_BOLD); term_word(p, nn->string); - p->flags &= ~ttypes[TTYPE_PROG]; + term_fontpop(p); p->flags |= TERMP_NOSPACE; if (nn->next && NULL == nn->next->next) term_word(p, ", and"); @@ -1298,7 +1167,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"); @@ -1314,7 +1183,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__) @@ -1331,7 +1200,7 @@ static void termp_bl_post(DECL_ARGS) { - if (MDOC_BLOCK == node->type) + if (MDOC_BLOCK == n->type) term_newln(p); } @@ -1341,7 +1210,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"); @@ -1352,55 +1221,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]; + term_fontpush(p, TERMFONT_BOLD); return(1); } @@ -1410,11 +1269,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); } @@ -1423,19 +1282,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): - pair->flag |= ttypes[TTYPE_SECTION]; + term_fontpush(p, TERMFONT_BOLD); break; case (MDOC_BODY): p->offset = INDENT; @@ -1452,7 +1310,7 @@ static void termp_sh_post(DECL_ARGS) { - switch (node->type) { + switch (n->type) { case (MDOC_HEAD): term_newln(p); break; @@ -1471,7 +1329,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; @@ -1489,7 +1347,7 @@ termp_bt_pre(DECL_ARGS) { term_word(p, "is currently in beta test."); - return(1); + return(0); } @@ -1498,7 +1356,8 @@ static void termp_lb_post(DECL_ARGS) { - term_newln(p); + if (SEC_LIBRARY == n->sec) + term_newln(p); } @@ -1508,7 +1367,7 @@ termp_ud_pre(DECL_ARGS) { term_word(p, "currently under development."); - return(1); + return(0); } @@ -1517,7 +1376,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); @@ -1530,7 +1389,7 @@ static void termp_d1_post(DECL_ARGS) { - if (MDOC_BLOCK != node->type) + if (MDOC_BLOCK != n->type) return; term_newln(p); } @@ -1541,7 +1400,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; @@ -1554,7 +1413,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"); @@ -1566,10 +1425,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); - pair->flag |= ttypes[TTYPE_FUNC_TYPE]; + + term_fontpush(p, TERMFONT_UNDER); return(1); } @@ -1579,7 +1439,7 @@ static void termp_ft_post(DECL_ARGS) { - if (SEC_SYNOPSIS == node->sec) + if (SEC_SYNOPSIS == n->sec) term_newln(p); } @@ -1588,30 +1448,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->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) { + 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); @@ -1623,41 +1480,32 @@ 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) { + term_fontpush(p, TERMFONT_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) { + 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); @@ -1666,42 +1514,23 @@ 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; + 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): @@ -1709,33 +1538,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); @@ -1747,7 +1580,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); @@ -1759,7 +1592,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; @@ -1772,7 +1605,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, "\""); @@ -1784,7 +1617,7 @@ static void termp_bx_post(DECL_ARGS) { - if (node->child) + if (n->child) p->flags |= TERMP_NOSPACE; term_word(p, "BSD"); } @@ -1797,12 +1630,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"; @@ -1831,7 +1664,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; @@ -1844,7 +1677,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"); @@ -1853,16 +1686,6 @@ termp_sq_post(DECL_ARGS) /* ARGSUSED */ static int -termp_pa_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_FILE]; - return(1); -} - - -/* ARGSUSED */ -static int termp_pf_pre(DECL_ARGS) { @@ -1886,14 +1709,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]; + term_fontpush(p, TERMFONT_BOLD); p->offset = HALFINDENT; break; default: @@ -1909,27 +1732,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_em_pre(DECL_ARGS) -{ - - pair->flag |= ttypes[TTYPE_EMPH]; - return(1); -} - - -/* ARGSUSED */ -static int termp_cd_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_CONFIG]; + term_fontpush(p, TERMFONT_BOLD); term_newln(p); return(1); } @@ -1937,33 +1750,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) + term_fontpush(p, TERMFONT_BOLD); + if (SEC_SYNOPSIS == n->sec) term_word(p, "#include"); term_word(p, "<"); @@ -1977,11 +1768,12 @@ static void termp_in_post(DECL_ARGS) { - p->flags |= TERMP_NOSPACE | ttypes[TTYPE_INCLUDE]; + term_fontpush(p, TERMFONT_BOLD); + p->flags |= TERMP_NOSPACE; term_word(p, ">"); - p->flags &= ~ttypes[TTYPE_INCLUDE]; + term_fontpop(p); - if (SEC_SYNOPSIS != node->sec) + if (SEC_SYNOPSIS != n->sec) return; term_newln(p); @@ -1991,7 +1783,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); } @@ -2000,14 +1792,20 @@ termp_in_post(DECL_ARGS) static int termp_sp_pre(DECL_ARGS) { - int i, len; + size_t i, len; - if (NULL == node->child) { - term_vspace(p); - return(0); + switch (n->tok) { + case (MDOC_sp): + len = n->child ? a2height(n->child) : 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++) @@ -2019,20 +1817,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; @@ -2045,7 +1833,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"); @@ -2057,7 +1845,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; @@ -2070,7 +1858,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"); @@ -2082,7 +1870,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; @@ -2095,7 +1883,7 @@ static void termp_pq_post(DECL_ARGS) { - if (MDOC_BODY != node->type) + if (MDOC_BODY != n->type) return; term_word(p, ")"); } @@ -2105,22 +1893,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); + term_fontpush(p, TERMFONT_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]; + term_fontpop(p); return(0); } @@ -2131,7 +1919,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, ")"); @@ -2145,27 +1933,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)) - 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)) + 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)) - 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)) + 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); } @@ -2173,32 +1965,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 @@ -2221,71 +1992,78 @@ termp_ap_pre(DECL_ARGS) /* ARGSUSED */ -static int -termp__j_pre(DECL_ARGS) +static void +termp____post(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_REF_JOURNAL]; - return(1); + /* TODO: %U. */ + + p->flags |= TERMP_NOSPACE; + 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__t_pre(DECL_ARGS) +termp_li_pre(DECL_ARGS) { - pair->flag |= ttypes[TTYPE_REF_TITLE]; + term_fontpush(p, TERMFONT_NONE); return(1); } /* ARGSUSED */ -static void -termp____post(DECL_ARGS) -{ - - p->flags |= TERMP_NOSPACE; - term_word(p, node->next ? "," : "."); -} - - -/* 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) { - pair->flag |= ttypes[TTYPE_LINK_ANCHOR]; + if (NULL == nn->next) return(1); - } - p->flags |= ttypes[TTYPE_LINK_ANCHOR]; - term_word(p, n->string); + term_word(p, nn->string); + term_fontpop(p); + p->flags |= TERMP_NOSPACE; term_word(p, ":"); - p->flags &= ~ttypes[TTYPE_LINK_ANCHOR]; - p->flags |= ttypes[TTYPE_LINK_TEXT]; - for (n = n->next; n; n = n->next) - term_word(p, n->string); + term_fontpush(p, TERMFONT_BOLD); + for (nn = nn->next; nn; nn = nn->next) + term_word(p, nn->string); + term_fontpop(p); - 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]; + 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); +}