=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.103 retrieving revision 1.379 diff -u -p -r1.103 -r1.379 --- mandoc/mdoc_term.c 2010/01/01 13:17:59 1.103 +++ mandoc/mdoc_term.c 2020/03/13 15:32:28 1.379 @@ -1,115 +1,102 @@ -/* $Id: mdoc_term.c,v 1.103 2010/01/01 13:17:59 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.379 2020/03/13 15:32:28 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2010, 2012-2020 Ingo Schwarze + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2013 Franco Fichtner * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Plain text formatter for mdoc(7), used by mandoc(1) + * for ASCII, UTF-8, PostScript, and PDF output. */ +#include "config.h" + #include #include #include +#include +#include #include #include #include +#include "mandoc_aux.h" +#include "roff.h" +#include "mdoc.h" #include "out.h" #include "term.h" -#include "mdoc.h" -#include "chars.h" +#include "term_tag.h" #include "main.h" -#define INDENT 5 -#define HALFINDENT 3 - struct termpair { struct termpair *ppair; - int flag; int count; }; #define DECL_ARGS struct termp *p, \ struct termpair *pair, \ - const struct mdoc_meta *m, \ - const struct mdoc_node *n + const struct roff_meta *meta, \ + struct roff_node *n -struct termact { +struct mdoc_term_act { 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 a2width(const struct termp *, const char *); -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); + struct roff_node *, struct roff_node *); +static void print_mdoc_node(DECL_ARGS); static void print_mdoc_nodelist(DECL_ARGS); -static void print_foot(DECL_ARGS); +static void print_mdoc_head(struct termp *, const struct roff_meta *); +static void print_mdoc_foot(struct termp *, const struct roff_meta *); +static void synopsis_pre(struct termp *, struct roff_node *); -#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); +static void termp__t_post(DECL_ARGS); static void termp_bd_post(DECL_ARGS); +static void termp_bk_post(DECL_ARGS); static void termp_bl_post(DECL_ARGS); -static void termp_bq_post(DECL_ARGS); -static void termp_brq_post(DECL_ARGS); -static void termp_bx_post(DECL_ARGS); -static void termp_d1_post(DECL_ARGS); -static void termp_dq_post(DECL_ARGS); +static void termp_eo_post(DECL_ARGS); static void termp_fd_post(DECL_ARGS); -static void termp_fn_post(DECL_ARGS); static void termp_fo_post(DECL_ARGS); -static void termp_ft_post(DECL_ARGS); static void termp_in_post(DECL_ARGS); static void termp_it_post(DECL_ARGS); static void termp_lb_post(DECL_ARGS); -static void termp_op_post(DECL_ARGS); +static void termp_nm_post(DECL_ARGS); static void termp_pf_post(DECL_ARGS); -static void termp_pq_post(DECL_ARGS); -static void termp_qq_post(DECL_ARGS); +static void termp_quote_post(DECL_ARGS); static void termp_sh_post(DECL_ARGS); -static void termp_sq_post(DECL_ARGS); static void termp_ss_post(DECL_ARGS); -static void termp_vt_post(DECL_ARGS); +static void termp_xx_post(DECL_ARGS); +static int termp__a_pre(DECL_ARGS); static int termp__t_pre(DECL_ARGS); +static int termp_abort_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_bd_pre(DECL_ARGS); static int termp_bf_pre(DECL_ARGS); +static int termp_bk_pre(DECL_ARGS); +static int termp_bl_pre(DECL_ARGS); static int termp_bold_pre(DECL_ARGS); -static int termp_bq_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_d1_pre(DECL_ARGS); -static int termp_dq_pre(DECL_ARGS); +static int termp_eo_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); @@ -121,65 +108,61 @@ static int termp_lk_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_pf_pre(DECL_ARGS); -static int termp_pq_pre(DECL_ARGS); -static int termp_qq_pre(DECL_ARGS); +static int termp_quote_pre(DECL_ARGS); static int termp_rs_pre(DECL_ARGS); -static int termp_rv_pre(DECL_ARGS); static int termp_sh_pre(DECL_ARGS); +static int termp_skip_pre(DECL_ARGS); static int termp_sm_pre(DECL_ARGS); -static int termp_sp_pre(DECL_ARGS); -static int termp_sq_pre(DECL_ARGS); +static int termp_pp_pre(DECL_ARGS); static int termp_ss_pre(DECL_ARGS); static int termp_under_pre(DECL_ARGS); -static int termp_ud_pre(DECL_ARGS); +static int termp_vt_pre(DECL_ARGS); static int termp_xr_pre(DECL_ARGS); static int termp_xx_pre(DECL_ARGS); -static const struct termact termacts[MDOC_MAX] = { - { termp_ap_pre, NULL }, /* Ap */ +static const struct mdoc_term_act mdoc_term_acts[MDOC_MAX - MDOC_Dd] = { { NULL, NULL }, /* Dd */ { NULL, NULL }, /* Dt */ { NULL, NULL }, /* Os */ { termp_sh_pre, termp_sh_post }, /* Sh */ - { termp_ss_pre, termp_ss_post }, /* Ss */ - { termp_sp_pre, NULL }, /* Pp */ - { termp_d1_pre, termp_d1_post }, /* D1 */ - { termp_d1_pre, termp_d1_post }, /* Dl */ + { termp_ss_pre, termp_ss_post }, /* Ss */ + { termp_pp_pre, NULL }, /* Pp */ + { termp_d1_pre, termp_bl_post }, /* D1 */ + { termp_d1_pre, termp_bl_post }, /* Dl */ { termp_bd_pre, termp_bd_post }, /* Bd */ { NULL, NULL }, /* Ed */ - { NULL, termp_bl_post }, /* Bl */ + { termp_bl_pre, termp_bl_post }, /* Bl */ { NULL, NULL }, /* El */ { termp_it_pre, termp_it_post }, /* It */ - { NULL, NULL }, /* Ad */ - { termp_an_pre, termp_an_post }, /* An */ + { termp_under_pre, NULL }, /* Ad */ + { termp_an_pre, NULL }, /* An */ + { termp_ap_pre, NULL }, /* Ap */ { termp_under_pre, NULL }, /* Ar */ - { termp_cd_pre, NULL }, /* Cd */ + { termp_fd_pre, NULL }, /* Cd */ { termp_bold_pre, NULL }, /* Cm */ - { NULL, NULL }, /* Dv */ - { NULL, NULL }, /* Er */ - { NULL, NULL }, /* Ev */ + { termp_li_pre, NULL }, /* Dv */ + { NULL, NULL }, /* Er */ + { NULL, NULL }, /* Ev */ { termp_ex_pre, NULL }, /* Ex */ - { termp_fa_pre, NULL }, /* Fa */ - { termp_bold_pre, termp_fd_post }, /* Fd */ + { termp_fa_pre, NULL }, /* Fa */ + { termp_fd_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_bold_pre, NULL }, /* Ic */ - { termp_in_pre, termp_in_post }, /* In */ + { termp_fn_pre, NULL }, /* Fn */ + { termp_ft_pre, NULL }, /* Ft */ + { termp_bold_pre, NULL }, /* Ic */ + { termp_in_pre, termp_in_post }, /* In */ { 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_nd_pre, NULL }, /* Nd */ + { termp_nm_pre, termp_nm_post }, /* Nm */ + { termp_quote_pre, termp_quote_post }, /* Op */ + { termp_abort_pre, NULL }, /* Ot */ { termp_under_pre, NULL }, /* Pa */ - { termp_rv_pre, NULL }, /* Rv */ - { NULL, NULL }, /* St */ + { termp_ex_pre, NULL }, /* Rv */ + { NULL, NULL }, /* St */ { termp_under_pre, NULL }, /* Va */ - { termp_under_pre, termp_vt_post }, /* Vt */ + { termp_vt_pre, NULL }, /* Vt */ { termp_xr_pre, NULL }, /* Xr */ - { NULL, termp____post }, /* %A */ + { termp__a_pre, termp____post }, /* %A */ { termp_under_pre, termp____post }, /* %B */ { NULL, termp____post }, /* %D */ { termp_under_pre, termp____post }, /* %I */ @@ -188,165 +171,282 @@ static const struct termact termacts[MDOC_MAX] = { { NULL, termp____post }, /* %O */ { NULL, termp____post }, /* %P */ { NULL, termp____post }, /* %R */ - { termp__t_pre, termp____post }, /* %T */ + { termp__t_pre, termp__t_post }, /* %T */ { NULL, termp____post }, /* %V */ { NULL, NULL }, /* Ac */ - { termp_aq_pre, termp_aq_post }, /* Ao */ - { termp_aq_pre, termp_aq_post }, /* Aq */ + { termp_quote_pre, termp_quote_post }, /* Ao */ + { termp_quote_pre, termp_quote_post }, /* Aq */ { NULL, NULL }, /* At */ { NULL, NULL }, /* Bc */ - { termp_bf_pre, NULL }, /* Bf */ - { termp_bq_pre, termp_bq_post }, /* Bo */ - { termp_bq_pre, termp_bq_post }, /* Bq */ - { termp_xx_pre, NULL }, /* Bsx */ - { NULL, termp_bx_post }, /* Bx */ - { NULL, NULL }, /* Db */ + { termp_bf_pre, NULL }, /* Bf */ + { termp_quote_pre, termp_quote_post }, /* Bo */ + { termp_quote_pre, termp_quote_post }, /* Bq */ + { termp_xx_pre, termp_xx_post }, /* Bsx */ + { NULL, NULL }, /* Bx */ + { termp_skip_pre, NULL }, /* Db */ { NULL, NULL }, /* Dc */ - { termp_dq_pre, termp_dq_post }, /* Do */ - { termp_dq_pre, termp_dq_post }, /* Dq */ - { NULL, NULL }, /* Ec */ + { termp_quote_pre, termp_quote_post }, /* Do */ + { termp_quote_pre, termp_quote_post }, /* Dq */ + { NULL, NULL }, /* Ec */ /* FIXME: no space */ { NULL, NULL }, /* Ef */ - { termp_under_pre, NULL }, /* Em */ - { NULL, NULL }, /* Eo */ - { termp_xx_pre, NULL }, /* Fx */ - { termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */ - { NULL, NULL }, /* No */ + { termp_under_pre, NULL }, /* Em */ + { termp_eo_pre, termp_eo_post }, /* Eo */ + { termp_xx_pre, termp_xx_post }, /* Fx */ + { termp_bold_pre, NULL }, /* Ms */ + { termp_li_pre, NULL }, /* No */ { termp_ns_pre, NULL }, /* Ns */ - { termp_xx_pre, NULL }, /* Nx */ - { termp_xx_pre, NULL }, /* Ox */ + { termp_xx_pre, termp_xx_post }, /* Nx */ + { termp_xx_pre, termp_xx_post }, /* Ox */ { NULL, NULL }, /* Pc */ - { termp_pf_pre, termp_pf_post }, /* Pf */ - { termp_pq_pre, termp_pq_post }, /* Po */ - { termp_pq_pre, termp_pq_post }, /* Pq */ + { NULL, termp_pf_post }, /* Pf */ + { termp_quote_pre, termp_quote_post }, /* Po */ + { termp_quote_pre, termp_quote_post }, /* Pq */ { NULL, NULL }, /* Qc */ - { termp_sq_pre, termp_sq_post }, /* Ql */ - { termp_qq_pre, termp_qq_post }, /* Qo */ - { termp_qq_pre, termp_qq_post }, /* Qq */ + { termp_quote_pre, termp_quote_post }, /* Ql */ + { termp_quote_pre, termp_quote_post }, /* Qo */ + { termp_quote_pre, termp_quote_post }, /* Qq */ { NULL, NULL }, /* Re */ { termp_rs_pre, NULL }, /* Rs */ { NULL, NULL }, /* Sc */ - { termp_sq_pre, termp_sq_post }, /* So */ - { termp_sq_pre, termp_sq_post }, /* Sq */ + { termp_quote_pre, termp_quote_post }, /* So */ + { termp_quote_pre, termp_quote_post }, /* Sq */ { termp_sm_pre, NULL }, /* Sm */ { termp_under_pre, NULL }, /* Sx */ { termp_bold_pre, NULL }, /* Sy */ { NULL, NULL }, /* Tn */ - { termp_xx_pre, NULL }, /* Ux */ + { termp_xx_pre, termp_xx_post }, /* Ux */ { NULL, NULL }, /* Xc */ { NULL, NULL }, /* Xo */ - { termp_fo_pre, termp_fo_post }, /* Fo */ - { NULL, NULL }, /* Fc */ - { termp_op_pre, termp_op_post }, /* Oo */ + { termp_fo_pre, termp_fo_post }, /* Fo */ + { NULL, NULL }, /* Fc */ + { termp_quote_pre, termp_quote_post }, /* Oo */ { NULL, NULL }, /* Oc */ - { NULL, NULL }, /* Bk */ + { termp_bk_pre, termp_bk_post }, /* Bk */ { NULL, NULL }, /* Ek */ - { termp_bt_pre, NULL }, /* Bt */ + { NULL, NULL }, /* Bt */ { NULL, NULL }, /* Hf */ - { NULL, NULL }, /* Fr */ - { termp_ud_pre, NULL }, /* Ud */ + { termp_under_pre, NULL }, /* Fr */ + { NULL, NULL }, /* Ud */ { NULL, termp_lb_post }, /* Lb */ - { termp_sp_pre, NULL }, /* Lp */ - { termp_lk_pre, NULL }, /* Lk */ - { termp_under_pre, NULL }, /* Mt */ - { termp_brq_pre, termp_brq_post }, /* Brq */ - { termp_brq_pre, termp_brq_post }, /* Bro */ - { NULL, NULL }, /* Brc */ - { NULL, termp____post }, /* %C */ - { NULL, NULL }, /* Es */ /* TODO */ - { NULL, NULL }, /* En */ /* TODO */ - { termp_xx_pre, NULL }, /* Dx */ - { NULL, termp____post }, /* %Q */ - { termp_sp_pre, NULL }, /* br */ - { termp_sp_pre, NULL }, /* sp */ - { termp_under_pre, termp____post }, /* %U */ + { termp_abort_pre, NULL }, /* Lp */ + { termp_lk_pre, NULL }, /* Lk */ + { termp_under_pre, NULL }, /* Mt */ + { termp_quote_pre, termp_quote_post }, /* Brq */ + { termp_quote_pre, termp_quote_post }, /* Bro */ + { NULL, NULL }, /* Brc */ + { NULL, termp____post }, /* %C */ + { termp_skip_pre, NULL }, /* Es */ + { termp_quote_pre, termp_quote_post }, /* En */ + { termp_xx_pre, termp_xx_post }, /* Dx */ + { NULL, termp____post }, /* %Q */ + { NULL, termp____post }, /* %U */ + { NULL, NULL }, /* Ta */ + { termp_skip_pre, NULL }, /* Tg */ }; void -terminal_mdoc(void *arg, const struct mdoc *mdoc) +terminal_mdoc(void *arg, const struct roff_meta *mdoc) { - const struct mdoc_node *n; - const struct mdoc_meta *m; + struct roff_node *n, *nn; struct termp *p; + size_t save_defindent; p = (struct termp *)arg; + p->tcol->rmargin = p->maxrmargin = p->defrmargin; + term_tab_set(p, NULL); + term_tab_set(p, "T"); + term_tab_set(p, ".5i"); - if (NULL == p->symtab) - switch (p->enc) { - case (TERMENC_ASCII): - p->symtab = chars_init(CHARS_ASCII); - break; - default: - abort(); - /* NOTREACHED */ + n = mdoc->first->child; + if (p->synopsisonly) { + for (nn = NULL; n != NULL; n = n->next) { + if (n->tok != MDOC_Sh) + continue; + if (n->sec == SEC_SYNOPSIS) + break; + if (nn == NULL && n->sec == SEC_NAME) + nn = n; } - - 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); + if (n == NULL) + n = nn; + p->flags |= TERMP_NOSPACE; + if (n != NULL && (n = n->child->next->child) != NULL) + print_mdoc_nodelist(p, NULL, mdoc, n); + term_newln(p); + } else { + save_defindent = p->defindent; + if (p->defindent == 0) + p->defindent = 5; + term_begin(p, print_mdoc_head, print_mdoc_foot, mdoc); + while (n != NULL && + (n->type == ROFFT_COMMENT || + n->flags & NODE_NOPRT)) + n = n->next; + if (n != NULL) { + if (n->tok != MDOC_Sh) + term_vspace(p); + print_mdoc_nodelist(p, NULL, mdoc, n); + } + term_end(p); + p->defindent = save_defindent; + } } - static void print_mdoc_nodelist(DECL_ARGS) { - - print_mdoc_node(p, pair, m, n); - if (n->next) - print_mdoc_nodelist(p, pair, m, n->next); + while (n != NULL) { + print_mdoc_node(p, pair, meta, n); + n = n->next; + } } - -/* ARGSUSED */ static void print_mdoc_node(DECL_ARGS) { - int chld; - const void *font; + const struct mdoc_term_act *act; struct termpair npair; size_t offset, rmargin; + int chld; + /* + * In no-fill mode, break the output line at the beginning + * of new input lines except after \c, and nowhere else. + */ + + if (n->flags & NODE_NOFILL) { + if (n->flags & NODE_LINE && + (p->flags & TERMP_NONEWLINE) == 0) + term_newln(p); + p->flags |= TERMP_BRNEVER; + } else + p->flags &= ~TERMP_BRNEVER; + + if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT) + return; + chld = 1; - offset = p->offset; - rmargin = p->rmargin; - font = term_fontq(p); + offset = p->tcol->offset; + rmargin = p->tcol->rmargin; + n->flags &= ~NODE_ENDED; + n->prev_font = p->fonti; memset(&npair, 0, sizeof(struct termpair)); npair.ppair = pair; - 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 (n->flags & NODE_ID) + term_tag_write(n, p->line); + /* + * Keeps only work until the end of a line. If a keep was + * invoked in a prior line, revert it to PREKEEP. + */ + + if (p->flags & TERMP_KEEP && n->flags & NODE_LINE) { + p->flags &= ~TERMP_KEEP; + p->flags |= TERMP_PREKEEP; + } + + /* + * After the keep flags have been set up, we may now + * produce output. Note that some pre-handlers do so. + */ + + act = NULL; + switch (n->type) { + case ROFFT_TEXT: + if (n->flags & NODE_LINE) { + switch (*n->string) { + case '\0': + if (p->flags & TERMP_NONEWLINE) + term_newln(p); + else + term_vspace(p); + return; + case ' ': + if ((p->flags & TERMP_NONEWLINE) == 0) + term_newln(p); + break; + default: + break; + } + } + if (NODE_DELIMC & n->flags) + p->flags |= TERMP_NOSPACE; + term_word(p, n->string); + if (NODE_DELIMO & n->flags) + p->flags |= TERMP_NOSPACE; + break; + case ROFFT_EQN: + if ( ! (n->flags & NODE_LINE)) + p->flags |= TERMP_NOSPACE; + term_eqn(p, n->eqn); + if (n->next != NULL && ! (n->next->flags & NODE_LINE)) + p->flags |= TERMP_NOSPACE; + break; + case ROFFT_TBL: + if (p->tbl.cols == NULL) + term_newln(p); + term_tbl(p, n->span); + break; + default: + if (n->tok < ROFF_MAX) { + roff_term_pre(p, n); + return; + } + assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); + act = mdoc_term_acts + (n->tok - MDOC_Dd); + if (act->pre != NULL && + (n->end == ENDBODY_NOT || n->child != NULL)) + chld = (*act->pre)(p, &npair, meta, n); + break; + } + if (chld && n->child) - print_mdoc_nodelist(p, &npair, m, n->child); + print_mdoc_nodelist(p, &npair, meta, n->child); - term_fontpopq(p, font); + term_fontpopq(p, + (ENDBODY_NOT == n->end ? n : n->body)->prev_font); - if (MDOC_TEXT != n->type) - if (termacts[n->tok].post) - (*termacts[n->tok].post)(p, &npair, m, n); + switch (n->type) { + case ROFFT_TEXT: + break; + case ROFFT_TBL: + break; + case ROFFT_EQN: + break; + default: + if (act->post == NULL || n->flags & NODE_ENDED) + break; + (void)(*act->post)(p, &npair, meta, n); - p->offset = offset; - p->rmargin = rmargin; -} + /* + * Explicit end tokens not only call the post + * handler, but also tell the respective block + * that it must not call the post handler again. + */ + if (ENDBODY_NOT != n->end) + n->body->flags |= NODE_ENDED; + break; + } + if (NODE_EOS & n->flags) + p->flags |= TERMP_SENTENCE; -/* ARGSUSED */ + if (n->type != ROFFT_TEXT) + p->tcol->offset = offset; + p->tcol->rmargin = rmargin; +} + static void -print_foot(DECL_ARGS) +print_mdoc_foot(struct termp *p, const struct roff_meta *meta) { - char buf[DATESIZ], os[BUFSIZ]; + size_t sz; 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 * being the operating system: @@ -354,48 +454,46 @@ print_foot(DECL_ARGS) * SYSTEM DATE SYSTEM */ - time2a(m->date, buf, DATESIZ); - strlcpy(os, m->os, BUFSIZ); - term_vspace(p); - p->offset = 0; - p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; + p->tcol->offset = 0; + sz = term_strlen(p, meta->date); + p->tcol->rmargin = p->maxrmargin > sz ? + (p->maxrmargin + term_len(p, 1) - sz) / 2 : 0; + p->trailspace = 1; p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; - term_word(p, os); + term_word(p, meta->os); term_flushln(p); - p->offset = p->rmargin; - p->rmargin = p->maxrmargin - strlen(os); - p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; + p->tcol->offset = p->tcol->rmargin; + sz = term_strlen(p, meta->os); + p->tcol->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0; + p->flags |= TERMP_NOSPACE; - term_word(p, buf); + term_word(p, meta->date); term_flushln(p); - p->offset = p->rmargin; - p->rmargin = p->maxrmargin; + p->tcol->offset = p->tcol->rmargin; + p->tcol->rmargin = p->maxrmargin; + p->trailspace = 0; p->flags &= ~TERMP_NOBREAK; - p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; + p->flags |= TERMP_NOSPACE; - term_word(p, os); + term_word(p, meta->os); term_flushln(p); - p->offset = 0; - p->rmargin = p->maxrmargin; + p->tcol->offset = 0; + p->tcol->rmargin = p->maxrmargin; p->flags = 0; } - -/* ARGSUSED */ static void -print_mdoc_head(DECL_ARGS) +print_mdoc_head(struct termp *p, const struct roff_meta *meta) { - char buf[BUFSIZ], title[BUFSIZ]; + char *volume, *title; + size_t vollen, titlen; - p->rmargin = p->maxrmargin; - p->offset = 0; - /* * The header is strange. It has three components, which are * really two with the first duplicated. It goes like this: @@ -409,348 +507,240 @@ print_mdoc_head(DECL_ARGS) * switches on the manual section. */ - assert(m->vol); - strlcpy(buf, m->vol, BUFSIZ); + assert(meta->vol); + if (NULL == meta->arch) + volume = mandoc_strdup(meta->vol); + else + mandoc_asprintf(&volume, "%s (%s)", + meta->vol, meta->arch); + vollen = term_strlen(p, volume); - if (m->arch) { - strlcat(buf, " (", BUFSIZ); - strlcat(buf, m->arch, BUFSIZ); - strlcat(buf, ")", BUFSIZ); - } + if (NULL == meta->msec) + title = mandoc_strdup(meta->title); + else + mandoc_asprintf(&title, "%s(%s)", + meta->title, meta->msec); + titlen = term_strlen(p, title); - snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec); - - p->offset = 0; - p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; + p->trailspace = 1; + p->tcol->offset = 0; + p->tcol->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ? + (p->maxrmargin - vollen + term_len(p, 1)) / 2 : + vollen < p->maxrmargin ? p->maxrmargin - vollen : 0; term_word(p, title); term_flushln(p); - p->offset = p->rmargin; - p->rmargin = p->maxrmargin - strlen(title); - p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; + p->flags |= TERMP_NOSPACE; + p->tcol->offset = p->tcol->rmargin; + p->tcol->rmargin = p->tcol->offset + vollen + titlen < + p->maxrmargin ? p->maxrmargin - titlen : p->maxrmargin; - term_word(p, buf); + term_word(p, volume); term_flushln(p); - p->offset = p->rmargin; - p->rmargin = p->maxrmargin; p->flags &= ~TERMP_NOBREAK; - p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; + p->trailspace = 0; + if (p->tcol->rmargin + titlen <= p->maxrmargin) { + p->flags |= TERMP_NOSPACE; + p->tcol->offset = p->tcol->rmargin; + p->tcol->rmargin = p->maxrmargin; + term_word(p, title); + term_flushln(p); + } - term_word(p, title); - term_flushln(p); - - p->offset = 0; - p->rmargin = p->maxrmargin; p->flags &= ~TERMP_NOSPACE; + p->tcol->offset = 0; + p->tcol->rmargin = p->maxrmargin; + free(title); + free(volume); } - -static size_t -a2height(const struct mdoc_node *n) -{ - struct roffsu su; - - assert(MDOC_TEXT == n->type); - assert(n->string); - if ( ! a2roffsu(n->string, &su, SCALE_VS)) - SCALE_VS_INIT(&su, strlen(n->string)); - - return(term_vspan(&su)); -} - - -static size_t -a2width(const struct mdoc_argv *arg, int pos) -{ - struct roffsu su; - - assert(arg->value[pos]); - if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX)) - SCALE_HS_INIT(&su, strlen(arg->value[pos])); - - /* XXX: pachemu? */ - return(term_hspan(&su) + 2); -} - - static int -arg_listtype(const struct mdoc_node *n) +a2width(const struct termp *p, const char *v) { - int i, len; - - assert(MDOC_BLOCK == n->type); - - len = (int)(n->args ? n->args->argc : 0); - - for (i = 0; i < len; i++) - switch (n->args->argv[i].arg) { - case (MDOC_Bullet): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Tag): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Hang): - /* FALLTHROUGH */ - case (MDOC_Ohang): - return(n->args->argv[i].arg); - default: - break; - } - - return(-1); -} - - -static size_t -a2offs(const struct mdoc_argv *arg) -{ struct roffsu su; + const char *end; - if ('\0' == arg->value[0][0]) - return(0); - else if (0 == strcmp(arg->value[0], "left")) - return(0); - else if (0 == strcmp(arg->value[0], "indent")) - return(INDENT + 1); - 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])); - - return(term_hspan(&su)); + end = a2roffsu(v, &su, SCALE_MAX); + if (end == NULL || *end != '\0') { + SCALE_HS_INIT(&su, term_strlen(p, v)); + su.scale /= term_strlen(p, "0"); + } + return term_hen(p, &su); } - -static int -arg_hasattr(int arg, const struct mdoc_node *n) -{ - - return(-1 != arg_getattr(arg, n)); -} - - -static int -arg_getattr(int v, const struct mdoc_node *n) -{ - int val; - - return(arg_getattrs(&v, &val, 1, n) ? val : -1); -} - - -static int -arg_getattrs(const int *keys, int *vals, - size_t sz, const struct mdoc_node *n) -{ - int i, j, k; - - if (NULL == n->args) - return(0); - - for (k = i = 0; i < (int)n->args->argc; i++) - for (j = 0; j < (int)sz; j++) - if (n->args->argv[i].arg == keys[j]) { - vals[j] = i; - k++; - } - return(k); -} - - +/* + * Determine how much space to print out before block elements of `It' + * (and thus `Bl') and `Bd'. And then go ahead and print that space, + * too. + */ static void -print_bvspace(struct termp *p, - const struct mdoc_node *bl, - const struct mdoc_node *n) +print_bvspace(struct termp *p, struct roff_node *bl, struct roff_node *n) { - const struct mdoc_node *nn; + struct roff_node *nn; term_newln(p); - if (arg_hasattr(MDOC_Compact, bl)) + + if ((bl->tok == MDOC_Bd && bl->norm->Bd.comp) || + (bl->tok == MDOC_Bl && bl->norm->Bl.comp)) return; /* Do not vspace directly after Ss/Sh. */ - for (nn = n; nn; nn = nn->parent) { - if (MDOC_BLOCK != nn->type) - continue; - if (MDOC_Ss == nn->tok) + nn = n; + while (roff_node_prev(nn) == NULL) { + do { + nn = nn->parent; + if (nn->type == ROFFT_ROOT) + return; + } while (nn->type != ROFFT_BLOCK); + if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss) return; - if (MDOC_Sh == nn->tok) - return; - if (NULL == nn->prev) - continue; - break; + if (nn->tok == MDOC_It && + nn->parent->parent->norm->Bl.type != LIST_item) + break; } - /* A `-column' does not assert vspace within the list. */ + /* + * No vertical space after: + * items in .Bl -column + * items without a body in .Bl -diag + */ - 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); + if (bl->tok != MDOC_Bl || + n->prev == NULL || n->prev->tok != MDOC_It || + (bl->norm->Bl.type != LIST_column && + (bl->norm->Bl.type != LIST_diag || + n->prev->body->child != NULL))) + term_vspace(p); } -/* ARGSUSED */ static int -termp_dq_pre(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - - term_word(p, "\\(lq"); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -termp_dq_post(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - - p->flags |= TERMP_NOSPACE; - term_word(p, "\\(rq"); -} - - -/* ARGSUSED */ -static int termp_it_pre(DECL_ARGS) { - const struct mdoc_node *bl, *nn; - char buf[7]; - int i, type, keys[3], vals[3]; - size_t width, offset; + struct roffsu su; + char buf[24]; + const struct roff_node *bl, *nn; + size_t ncols, dcol; + int i, offset, width; + enum mdoc_list type; - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { print_bvspace(p, n->parent->parent, n); - return(1); + return 1; } bl = n->parent->parent->parent; + type = bl->norm->Bl.type; - /* Save parent attributes. */ + /* + * Defaults for specific list types. + */ - pair->flag = p->flags; + switch (type) { + case LIST_bullet: + case LIST_dash: + case LIST_hyphen: + case LIST_enum: + width = term_len(p, 2); + break; + case LIST_hang: + case LIST_tag: + width = term_len(p, 8); + break; + case LIST_column: + width = term_len(p, 10); + break; + default: + width = 0; + break; + } + offset = 0; - /* Get list width and offset. */ + /* + * First calculate width and offset. This is pretty easy unless + * we're a -column list, in which case all prior columns must + * be accounted for. + */ - keys[0] = MDOC_Width; - keys[1] = MDOC_Offset; - keys[2] = MDOC_Column; + if (bl->norm->Bl.offs != NULL) { + offset = a2width(p, bl->norm->Bl.offs); + if (offset < 0 && (size_t)(-offset) > p->tcol->offset) + offset = -p->tcol->offset; + else if (offset > SHRT_MAX) + offset = 0; + } - vals[0] = vals[1] = vals[2] = -1; + switch (type) { + case LIST_column: + if (n->type == ROFFT_HEAD) + break; - width = offset = 0; + /* + * Imitate groff's column handling: + * - For each earlier column, add its width. + * - For less than 5 columns, add four more blanks per + * column. + * - For exactly 5 columns, add three more blank per + * column. + * - For more than 5 columns, add only one column. + */ + ncols = bl->norm->Bl.ncols; + dcol = ncols < 5 ? term_len(p, 4) : + ncols == 5 ? term_len(p, 3) : term_len(p, 1); - (void)arg_getattrs(keys, vals, 3, bl); + /* + * Calculate the offset by applying all prior ROFFT_BODY, + * so we stop at the ROFFT_HEAD (nn->prev == NULL). + */ - type = arg_listtype(bl); - assert(-1 != type); + for (i = 0, nn = n->prev; + nn->prev && i < (int)ncols; + nn = nn->prev, i++) { + SCALE_HS_INIT(&su, + term_strlen(p, bl->norm->Bl.cols[i])); + su.scale /= term_strlen(p, "0"); + offset += term_hen(p, &su) + dcol; + } - /* Calculate real width and offset. */ - - switch (type) { - case (MDOC_Column): - if (MDOC_BODY == n->type) - break; - /* - * Work around groff's column handling. The offset is - * equal to the sum of all widths leading to the current - * column (plus the -offset value). If this column - * exceeds the stated number of columns, the width is - * set as 0, else it's the stated column width (later - * the 0 will be adjusted to default 10 or, if in the - * last column case, set to stretch to the margin). + /* + * When exceeding the declared number of columns, leave + * the remaining widths at 0. This will later be + * adjusted to the default width of 10, or, for the last + * column, stretched to the right margin. */ - 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); + if (i >= (int)ncols) + break; - /* Whether exceeds maximum column. */ - 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 += a2offs(&bl->args->argv[vals[1]]); + /* + * Use the declared column widths, extended as explained + * in the preceding paragraph. + */ + SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i])); + su.scale /= term_strlen(p, "0"); + width = term_hen(p, &su) + dcol; break; default: - if (vals[0] >= 0) - width = a2width(&bl->args->argv[vals[0]], 0); - if (vals[1] >= 0) - offset += a2offs(&bl->args->argv[vals[1]]); - break; - } + if (NULL == bl->norm->Bl.width) + break; - /* - * List-type can override the width in the case of fixed-head - * values (bullet, dash/hyphen, enum). Tags need a non-zero - * offset. - */ - - switch (type) { - case (MDOC_Bullet): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - if (width < 4) - width = 4; + /* + * Note: buffer the width by 2, which is groff's magic + * number for buffering single arguments. See the above + * handling for column for how this changes. + */ + width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); + if (width < 0 && (size_t)(-width) > p->tcol->offset) + width = -p->tcol->offset; + else if (width > SHRT_MAX) + width = 0; break; - case (MDOC_Enum): - if (width < 5) - width = 5; - break; - case (MDOC_Hang): - if (0 == width) - width = 8; - break; - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Tag): - if (0 == width) - width = 10; - break; - default: - break; } - /* + /* * Whitespace control. Inset bodies need an initial space, * while diagonal bodies need two. */ @@ -758,12 +748,12 @@ termp_it_pre(DECL_ARGS) p->flags |= TERMP_NOSPACE; switch (type) { - case (MDOC_Diag): - if (MDOC_BODY == n->type) + case LIST_diag: + if (n->type == ROFFT_BODY) term_word(p, "\\ \\ "); break; - case (MDOC_Inset): - if (MDOC_BODY == n->type) + case LIST_inset: + if (n->type == ROFFT_BODY && n->parent->head->child != NULL) term_word(p, "\\ "); break; default: @@ -773,8 +763,8 @@ termp_it_pre(DECL_ARGS) p->flags |= TERMP_NOSPACE; switch (type) { - case (MDOC_Diag): - if (MDOC_HEAD == n->type) + case LIST_diag: + if (n->type == ROFFT_HEAD) term_fontpush(p, TERMFONT_BOLD); break; default: @@ -782,1303 +772,1184 @@ termp_it_pre(DECL_ARGS) } /* - * Pad and break control. This is the tricker part. Lists with - * set right-margins for the head get TERMP_NOBREAK because, if - * they overrun the margin, they wrap to the new margin. - * Correspondingly, the body for these types don't left-pad, as - * the head will pad out to to the right. + * Pad and break control. This is the tricky part. These flags + * are documented in term_flushln() in term.c. Note that we're + * going to unset all of these flags in termp_it_post() when we + * exit. */ switch (type) { - case (MDOC_Bullet): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - if (MDOC_HEAD == n->type) - p->flags |= TERMP_NOBREAK; - else - p->flags |= TERMP_NOLPAD; + case LIST_enum: + case LIST_bullet: + case LIST_dash: + case LIST_hyphen: + if (n->type == ROFFT_HEAD) { + p->flags |= TERMP_NOBREAK | TERMP_HANG; + p->trailspace = 1; + } else if (width <= (int)term_len(p, 2)) + p->flags |= TERMP_NOPAD; break; - case (MDOC_Hang): - if (MDOC_HEAD == n->type) - p->flags |= TERMP_NOBREAK; - else - p->flags |= TERMP_NOLPAD; - - if (MDOC_HEAD != n->type) + case LIST_hang: + if (n->type != ROFFT_HEAD) 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; + p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG; + p->trailspace = 1; break; - case (MDOC_Tag): - if (MDOC_HEAD == n->type) - p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE; - else - p->flags |= TERMP_NOLPAD; - - if (MDOC_HEAD != n->type) + case LIST_tag: + if (n->type != ROFFT_HEAD) break; + + p->flags |= TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND; + p->trailspace = 2; + if (NULL == n->next || NULL == n->next->child) - p->flags |= TERMP_DANGLE; + p->flags |= TERMP_HANG; break; - case (MDOC_Column): - if (MDOC_HEAD == n->type) { - assert(n->next); - if (MDOC_BODY == n->next->type) - p->flags &= ~TERMP_NOBREAK; - else - p->flags |= TERMP_NOBREAK; - if (n->prev) - p->flags |= TERMP_NOLPAD; + case LIST_column: + if (n->type == ROFFT_HEAD) + break; + + if (NULL == n->next) { + p->flags &= ~TERMP_NOBREAK; + p->trailspace = 0; + } else { + p->flags |= TERMP_NOBREAK; + p->trailspace = 1; } + break; - case (MDOC_Diag): - if (MDOC_HEAD == n->type) - p->flags |= TERMP_NOBREAK; + case LIST_diag: + if (n->type != ROFFT_HEAD) + break; + p->flags |= TERMP_NOBREAK | TERMP_BRIND; + p->trailspace = 1; break; default: break; } - /* + /* * Margin control. Set-head-width lists have their right * margins shortened. The body for these lists has the offset * necessarily lengthened. Everybody gets the offset. */ - p->offset += offset; + p->tcol->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): - /* FALLTHROUGH */ - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Tag): - assert(width); - if (MDOC_HEAD == n->type) - p->rmargin = p->offset + width; - else - p->offset += width; + case LIST_bullet: + case LIST_dash: + case LIST_enum: + case LIST_hyphen: + case LIST_hang: + case LIST_tag: + if (n->type == ROFFT_HEAD) + p->tcol->rmargin = p->tcol->offset + width; + else + p->tcol->offset += width; break; - case (MDOC_Column): + case LIST_column: assert(width); - p->rmargin = p->offset + width; - /* + p->tcol->rmargin = p->tcol->offset + width; + /* * XXX - this behaviour is not documented: the * right-most column is filled to the right margin. */ - if (MDOC_HEAD == n->type && - MDOC_BODY == n->next->type) - p->rmargin = p->maxrmargin; + if (n->type == ROFFT_HEAD) + break; + if (n->next == NULL && p->tcol->rmargin < p->maxrmargin) + p->tcol->rmargin = p->maxrmargin; break; default: break; } - /* + /* * The dash, hyphen, bullet and enum lists all have a special - * HEAD character (temporarily bold, in some cases). + * HEAD character (temporarily bold, in some cases). */ - if (MDOC_HEAD == n->type) + if (n->type == ROFFT_HEAD) switch (type) { - case (MDOC_Bullet): + case LIST_bullet: term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\[bu]"); term_fontpop(p); break; - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): + case LIST_dash: + case LIST_hyphen: term_fontpush(p, TERMFONT_BOLD); - term_word(p, "\\(hy"); + term_word(p, "-"); term_fontpop(p); break; - case (MDOC_Enum): + case LIST_enum: (pair->ppair->ppair->count)++; - (void)snprintf(buf, sizeof(buf), "%d.", - pair->ppair->ppair->count); + (void)snprintf(buf, sizeof(buf), "%d.", + pair->ppair->ppair->count); term_word(p, buf); break; default: break; } - /* + /* * If we're not going to process our children, indicate so here. */ switch (type) { - case (MDOC_Bullet): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Enum): - if (MDOC_HEAD == n->type) - return(0); + case LIST_bullet: + case LIST_item: + case LIST_dash: + case LIST_hyphen: + case LIST_enum: + if (n->type == ROFFT_HEAD) + return 0; break; - case (MDOC_Column): - if (MDOC_BODY == n->type) - return(0); + case LIST_column: + if (n->type == ROFFT_HEAD) + return 0; + p->minbl = 0; break; default: break; } - return(1); + return 1; } - -/* ARGSUSED */ static void termp_it_post(DECL_ARGS) { - int type; + enum mdoc_list type; - if (MDOC_BODY != n->type && MDOC_HEAD != n->type) + if (n->type == ROFFT_BLOCK) return; - type = arg_listtype(n->parent->parent->parent); - assert(-1 != type); + type = n->parent->parent->parent->norm->Bl.type; switch (type) { - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Inset): - if (MDOC_BODY == n->type) - term_flushln(p); + case LIST_item: + case LIST_diag: + case LIST_inset: + if (n->type == ROFFT_BODY) + term_newln(p); break; - case (MDOC_Column): - if (MDOC_HEAD == n->type) + case LIST_column: + if (n->type == ROFFT_BODY) term_flushln(p); break; default: - term_flushln(p); + term_newln(p); break; } - p->flags = pair->flag; + /* + * Now that our output is flushed, we can reset our tags. Since + * only `It' sets these flags, we're free to assume that nobody + * has munged them in the meanwhile. + */ + + p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND | TERMP_HANG); + p->trailspace = 0; } - -/* ARGSUSED */ static int termp_nm_pre(DECL_ARGS) { + const char *cp; - if (SEC_SYNOPSIS == n->sec) - term_newln(p); + if (n->type == ROFFT_BLOCK) { + p->flags |= TERMP_PREKEEP; + return 1; + } - term_fontpush(p, TERMFONT_BOLD); + if (n->type == ROFFT_BODY) { + if (n->child == NULL) + return 0; + p->flags |= TERMP_NOSPACE; + cp = NULL; + if (n->prev->child != NULL) + cp = n->prev->child->string; + if (cp == NULL) + cp = meta->name; + if (cp == NULL) + p->tcol->offset += term_len(p, 6); + else + p->tcol->offset += term_len(p, 1) + + term_strlen(p, cp); + return 1; + } - if (NULL == n->child) - term_word(p, m->name); - return(1); + if (n->child == NULL) + return 0; + + if (n->type == ROFFT_HEAD) + synopsis_pre(p, n->parent); + + if (n->type == ROFFT_HEAD && + n->next != NULL && n->next->child != NULL) { + p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND; + p->trailspace = 1; + p->tcol->rmargin = p->tcol->offset + term_len(p, 1); + if (n->child == NULL) + p->tcol->rmargin += term_strlen(p, meta->name); + else if (n->child->type == ROFFT_TEXT) { + p->tcol->rmargin += term_strlen(p, n->child->string); + if (n->child->next != NULL) + p->flags |= TERMP_HANG; + } else { + p->tcol->rmargin += term_len(p, 5); + p->flags |= TERMP_HANG; + } + } + return termp_bold_pre(p, pair, meta, n); } +static void +termp_nm_post(DECL_ARGS) +{ + switch (n->type) { + case ROFFT_BLOCK: + p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); + break; + case ROFFT_HEAD: + if (n->next == NULL || n->next->child == NULL) + break; + term_flushln(p); + p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); + p->trailspace = 0; + break; + case ROFFT_BODY: + if (n->child != NULL) + term_flushln(p); + break; + default: + break; + } +} -/* ARGSUSED */ static int termp_fl_pre(DECL_ARGS) { + struct roff_node *nn; term_fontpush(p, TERMFONT_BOLD); - - /* A zero-length child shouldn't get a dash. */ - - if (n->child) { - assert(MDOC_TEXT == n->child->type); - assert(n->child->string); - if ('\0' == *n->child->string) - return(0); - } - term_word(p, "\\-"); - /* A blank `Fl' should incur a subsequent space. */ - - if (n->child) + if (n->child != NULL || + ((nn = roff_node_next(n)) != NULL && + nn->type != ROFFT_TEXT && + (nn->flags & NODE_LINE) == 0)) p->flags |= TERMP_NOSPACE; - return(1); + return 1; } - -/* ARGSUSED */ static int -termp_an_pre(DECL_ARGS) +termp__a_pre(DECL_ARGS) { + struct roff_node *nn; - if (NULL == n->child) - return(1); + if ((nn = roff_node_prev(n)) != NULL && nn->tok == MDOC__A && + ((nn = roff_node_next(n)) == NULL || nn->tok != MDOC__A)) + term_word(p, "and"); - /* - * 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); + return 1; } - -/* ARGSUSED */ -static void -termp_an_post(DECL_ARGS) +static int +termp_an_pre(DECL_ARGS) { - if (n->child) { - if (SEC_AUTHORS == n->sec) - p->flags |= TERMP_ANPREC; - return; - } - - if (arg_getattr(MDOC_Split, n) > -1) { + if (n->norm->An.auth == AUTH_split) { p->flags &= ~TERMP_NOSPLIT; p->flags |= TERMP_SPLIT; - } else { + return 0; + } + if (n->norm->An.auth == AUTH_nosplit) { p->flags &= ~TERMP_SPLIT; p->flags |= TERMP_NOSPLIT; + return 0; } -} + if (p->flags & TERMP_SPLIT) + term_newln(p); + if (n->sec == SEC_AUTHORS && ! (p->flags & TERMP_NOSPLIT)) + p->flags |= TERMP_SPLIT; -/* ARGSUSED */ + return 1; +} + static int termp_ns_pre(DECL_ARGS) { - p->flags |= TERMP_NOSPACE; - return(1); + if ( ! (NODE_LINE & n->flags)) + p->flags |= TERMP_NOSPACE; + return 1; } - -/* ARGSUSED */ static int termp_rs_pre(DECL_ARGS) { - if (SEC_SEE_ALSO != n->sec) - return(1); - if (MDOC_BLOCK == n->type && n->prev) + return 1; + if (n->type == ROFFT_BLOCK && roff_node_prev(n) != NULL) term_vspace(p); - return(1); + return 1; } - -/* ARGSUSED */ static int -termp_rv_pre(DECL_ARGS) +termp_ex_pre(DECL_ARGS) { - const struct mdoc_node *nn; - term_newln(p); - term_word(p, "The"); - - for (nn = n->child; nn; nn = nn->next) { - term_fontpush(p, TERMFONT_BOLD); - term_word(p, nn->string); - term_fontpop(p); - 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, "()"); - } - - if (n->child->next) - term_word(p, "functions return"); - else - term_word(p, "function returns"); - - term_word(p, "the value 0 if successful; otherwise the value " - "-1 is returned and the global variable"); - - term_fontpush(p, TERMFONT_UNDER); - term_word(p, "errno"); - term_fontpop(p); - - term_word(p, "is set to indicate the error."); - - return(0); + return 1; } - -/* ARGSUSED */ static int -termp_ex_pre(DECL_ARGS) +termp_nd_pre(DECL_ARGS) { - const struct mdoc_node *nn; - term_word(p, "The"); - - for (nn = n->child; nn; nn = nn->next) { - term_fontpush(p, TERMFONT_BOLD); - term_word(p, nn->string); - term_fontpop(p); - 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); + if (n->type == ROFFT_BODY) + term_word(p, "\\(en"); + return 1; } - -/* ARGSUSED */ static int -termp_nd_pre(DECL_ARGS) +termp_bl_pre(DECL_ARGS) { - if (MDOC_BODY != n->type) - return(1); - -#if defined(__OpenBSD__) || defined(__linux__) - term_word(p, "\\(en"); -#else - term_word(p, "\\(em"); -#endif - return(1); + return n->type != ROFFT_HEAD; } - -/* ARGSUSED */ static void termp_bl_post(DECL_ARGS) { - if (MDOC_BLOCK == n->type) - term_newln(p); -} - - -/* ARGSUSED */ -static void -termp_op_post(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) + if (n->type != ROFFT_BLOCK) return; - p->flags |= TERMP_NOSPACE; - term_word(p, "\\(rB"); + term_newln(p); + if (n->tok != MDOC_Bl || n->norm->Bl.type != LIST_column) + return; + term_tab_set(p, NULL); + term_tab_set(p, "T"); + term_tab_set(p, ".5i"); } - -/* ARGSUSED */ static int termp_xr_pre(DECL_ARGS) { - const struct mdoc_node *nn; - assert(n->child && MDOC_TEXT == n->child->type); - nn = n->child; + if (NULL == (n = n->child)) + return 0; - term_word(p, nn->string); - if (NULL == (nn = nn->next)) - return(0); + assert(n->type == ROFFT_TEXT); + term_word(p, n->string); + + if (NULL == (n = n->next)) + return 0; + p->flags |= TERMP_NOSPACE; term_word(p, "("); p->flags |= TERMP_NOSPACE; - term_word(p, nn->string); + + assert(n->type == ROFFT_TEXT); + term_word(p, n->string); + p->flags |= TERMP_NOSPACE; term_word(p, ")"); - return(0); + return 0; } - -/* ARGSUSED */ +/* + * This decides how to assert whitespace before any of the SYNOPSIS set + * of macros (which, as in the case of Ft/Fo and Ft/Fn, may contain + * macro combos). + */ static void -termp_vt_post(DECL_ARGS) +synopsis_pre(struct termp *p, struct roff_node *n) { + struct roff_node *np; - if (n->sec != SEC_SYNOPSIS) + if ((n->flags & NODE_SYNPRETTY) == 0 || + (np = roff_node_prev(n)) == NULL) return; - if (n->next && MDOC_Vt == n->next->tok) + + /* + * If we're the second in a pair of like elements, emit our + * newline and return. UNLESS we're `Fo', `Fn', `Fn', in which + * case we soldier on. + */ + if (np->tok == n->tok && + MDOC_Ft != n->tok && + MDOC_Fo != n->tok && + MDOC_Fn != n->tok) { term_newln(p); - else if (n->next) + return; + } + + /* + * If we're one of the SYNOPSIS set and non-like pair-wise after + * another (or Fn/Fo, which we've let slip through) then assert + * vertical space, else only newline and move on. + */ + switch (np->tok) { + case MDOC_Fd: + case MDOC_Fn: + case MDOC_Fo: + case MDOC_In: + case MDOC_Vt: term_vspace(p); + break; + case MDOC_Ft: + if (n->tok != MDOC_Fn && n->tok != MDOC_Fo) { + term_vspace(p); + break; + } + /* FALLTHROUGH */ + default: + term_newln(p); + break; + } } +static int +termp_vt_pre(DECL_ARGS) +{ + switch (n->type) { + case ROFFT_ELEM: + return termp_ft_pre(p, pair, meta, n); + case ROFFT_BLOCK: + synopsis_pre(p, n); + return 1; + case ROFFT_HEAD: + return 0; + default: + return termp_under_pre(p, pair, meta, n); + } +} -/* ARGSUSED */ static int termp_bold_pre(DECL_ARGS) { - term_fontpush(p, TERMFONT_BOLD); - return(1); + return 1; } +static int +termp_fd_pre(DECL_ARGS) +{ + synopsis_pre(p, n); + return termp_bold_pre(p, pair, meta, n); +} -/* ARGSUSED */ static void termp_fd_post(DECL_ARGS) { - - if (n->sec != SEC_SYNOPSIS) - return; - term_newln(p); - if (n->next && MDOC_Fd != n->next->tok) - term_vspace(p); } - -/* ARGSUSED */ static int termp_sh_pre(DECL_ARGS) { + struct roff_node *np; - /* 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); + case ROFFT_BLOCK: + /* + * Vertical space before sections, except + * when the previous section was empty. + */ + if ((np = roff_node_prev(n)) == NULL || + np->tok != MDOC_Sh || + (np->body != NULL && np->body->child != NULL)) + term_vspace(p); break; - case (MDOC_HEAD): - term_fontpush(p, TERMFONT_BOLD); + case ROFFT_HEAD: + return termp_bold_pre(p, pair, meta, n); + case ROFFT_BODY: + p->tcol->offset = term_len(p, p->defindent); + term_tab_set(p, NULL); + term_tab_set(p, "T"); + term_tab_set(p, ".5i"); + if (n->sec == SEC_AUTHORS) + p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT); break; - case (MDOC_BODY): - p->offset = INDENT; - break; default: break; } - return(1); + return 1; } - -/* ARGSUSED */ static void termp_sh_post(DECL_ARGS) { - switch (n->type) { - case (MDOC_HEAD): + case ROFFT_HEAD: term_newln(p); break; - case (MDOC_BODY): + case ROFFT_BODY: term_newln(p); - p->offset = 0; + p->tcol->offset = 0; break; default: break; } } - -/* ARGSUSED */ -static int -termp_op_pre(DECL_ARGS) -{ - - switch (n->type) { - case (MDOC_BODY): - term_word(p, "\\(lB"); - p->flags |= TERMP_NOSPACE; - break; - default: - break; - } - return(1); -} - - -/* ARGSUSED */ -static int -termp_bt_pre(DECL_ARGS) -{ - - term_word(p, "is currently in beta test."); - return(0); -} - - -/* ARGSUSED */ static void termp_lb_post(DECL_ARGS) { - - if (SEC_LIBRARY == n->sec) + if (n->sec == SEC_LIBRARY && n->flags & NODE_LINE) term_newln(p); } - -/* ARGSUSED */ static int -termp_ud_pre(DECL_ARGS) -{ - - term_word(p, "currently under development."); - return(0); -} - - -/* ARGSUSED */ -static int termp_d1_pre(DECL_ARGS) { - - if (MDOC_BLOCK != n->type) - return(1); + if (n->type != ROFFT_BLOCK) + return 1; term_newln(p); - p->offset += (INDENT + 1); - return(1); + p->tcol->offset += term_len(p, p->defindent + 1); + term_tab_set(p, NULL); + term_tab_set(p, "T"); + term_tab_set(p, ".5i"); + return 1; } - -/* ARGSUSED */ -static void -termp_d1_post(DECL_ARGS) -{ - - if (MDOC_BLOCK != n->type) - return; - term_newln(p); -} - - -/* ARGSUSED */ static int -termp_aq_pre(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - term_word(p, "\\(la"); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -termp_aq_post(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - p->flags |= TERMP_NOSPACE; - term_word(p, "\\(ra"); -} - - -/* ARGSUSED */ -static int termp_ft_pre(DECL_ARGS) { - - if (SEC_SYNOPSIS == n->sec) - if (n->prev && MDOC_Fo == n->prev->tok) - term_vspace(p); - - term_fontpush(p, TERMFONT_UNDER); - return(1); + synopsis_pre(p, n); + return termp_under_pre(p, pair, meta, n); } - -/* ARGSUSED */ -static void -termp_ft_post(DECL_ARGS) -{ - - if (SEC_SYNOPSIS == n->sec) - term_newln(p); -} - - -/* ARGSUSED */ static int termp_fn_pre(DECL_ARGS) { - const struct mdoc_node *nn; + size_t rmargin = 0; + int pretty; + synopsis_pre(p, n); + pretty = n->flags & NODE_SYNPRETTY; + if ((n = n->child) == NULL) + return 0; + + if (pretty) { + rmargin = p->tcol->rmargin; + p->tcol->rmargin = p->tcol->offset + term_len(p, 4); + p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG; + } + + assert(n->type == ROFFT_TEXT); term_fontpush(p, TERMFONT_BOLD); - term_word(p, n->child->string); + term_word(p, n->string); term_fontpop(p); + if (pretty) { + term_flushln(p); + p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); + p->flags |= TERMP_NOPAD; + p->tcol->offset = p->tcol->rmargin; + p->tcol->rmargin = rmargin; + } + p->flags |= TERMP_NOSPACE; term_word(p, "("); + p->flags |= TERMP_NOSPACE; - for (nn = n->child->next; nn; nn = nn->next) { + for (n = n->next; n; n = n->next) { + assert(n->type == ROFFT_TEXT); term_fontpush(p, TERMFONT_UNDER); - term_word(p, nn->string); + if (pretty) + p->flags |= TERMP_NBRWORD; + term_word(p, n->string); term_fontpop(p); - if (nn->next) + if (n->next) { + p->flags |= TERMP_NOSPACE; term_word(p, ","); + } } + p->flags |= TERMP_NOSPACE; term_word(p, ")"); - if (SEC_SYNOPSIS == n->sec) + if (pretty) { + p->flags |= TERMP_NOSPACE; term_word(p, ";"); - - return(0); + term_flushln(p); + } + return 0; } - -/* ARGSUSED */ -static void -termp_fn_post(DECL_ARGS) -{ - - if (n->sec == SEC_SYNOPSIS && n->next) - term_vspace(p); -} - - -/* ARGSUSED */ static int termp_fa_pre(DECL_ARGS) { - const struct mdoc_node *nn; + const struct roff_node *nn; - if (n->parent->tok != MDOC_Fo) { - term_fontpush(p, TERMFONT_UNDER); - return(1); - } + if (n->parent->tok != MDOC_Fo) + return termp_under_pre(p, pair, meta, n); - for (nn = n->child; nn; nn = nn->next) { + for (nn = n->child; nn != NULL; nn = nn->next) { term_fontpush(p, TERMFONT_UNDER); + p->flags |= TERMP_NBRWORD; term_word(p, nn->string); term_fontpop(p); - - if (nn->next) + if (nn->next != NULL) { + p->flags |= TERMP_NOSPACE; term_word(p, ","); + } } - - if (n->child && n->next && n->next->tok == MDOC_Fa) + if (n->child != NULL && + (nn = roff_node_next(n)) != NULL && + nn->tok == MDOC_Fa) { + p->flags |= TERMP_NOSPACE; term_word(p, ","); - - return(0); + } + return 0; } - -/* ARGSUSED */ static int termp_bd_pre(DECL_ARGS) { - int i, type; - const struct mdoc_node *nn; + int offset; - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { print_bvspace(p, n, n); - return(1); - } else if (MDOC_BODY != n->type) - return(1); + return 1; + } else if (n->type == ROFFT_HEAD) + return 0; - nn = n->parent; + /* Handle the -offset argument. */ - 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): - /* FALLTHROUGH */ - case (MDOC_Unfilled): - /* FALLTHROUGH */ - case (MDOC_Literal): - type = nn->args->argv[i].arg; - break; - case (MDOC_Offset): - p->offset += a2offs(&nn->args->argv[i]); - break; - default: - break; - } + if (n->norm->Bd.offs == NULL || + ! strcmp(n->norm->Bd.offs, "left")) + /* nothing */; + else if ( ! strcmp(n->norm->Bd.offs, "indent")) + p->tcol->offset += term_len(p, p->defindent + 1); + else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) + p->tcol->offset += term_len(p, (p->defindent + 1) * 2); + else { + offset = a2width(p, n->norm->Bd.offs); + if (offset < 0 && (size_t)(-offset) > p->tcol->offset) + p->tcol->offset = 0; + else if (offset < SHRT_MAX) + p->tcol->offset += offset; } - /* - * 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); - - for (nn = n->child; nn; nn = nn->next) { - p->flags |= TERMP_NOSPACE; - 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); + switch (n->norm->Bd.type) { + case DISP_literal: + term_tab_set(p, NULL); + term_tab_set(p, "T"); + term_tab_set(p, "8n"); + break; + case DISP_centered: + p->flags |= TERMP_CENTER; + break; + default: + break; } - - return(0); + return 1; } - -/* ARGSUSED */ static void termp_bd_post(DECL_ARGS) { - - if (MDOC_BODY != n->type) + if (n->type != ROFFT_BODY) return; + if (n->norm->Bd.type == DISP_unfilled || + n->norm->Bd.type == DISP_literal) + p->flags |= TERMP_BRNEVER; p->flags |= TERMP_NOSPACE; - term_flushln(p); + term_newln(p); + p->flags &= ~TERMP_BRNEVER; + if (n->norm->Bd.type == DISP_centered) + p->flags &= ~TERMP_CENTER; } - -/* ARGSUSED */ static int -termp_qq_pre(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - term_word(p, "\""); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -termp_qq_post(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - p->flags |= TERMP_NOSPACE; - term_word(p, "\""); -} - - -/* ARGSUSED */ -static void -termp_bx_post(DECL_ARGS) -{ - - if (n->child) - p->flags |= TERMP_NOSPACE; - term_word(p, "BSD"); -} - - -/* ARGSUSED */ -static int termp_xx_pre(DECL_ARGS) { - const char *pp; - - pp = NULL; - switch (n->tok) { - case (MDOC_Bsx): - pp = "BSDI BSD/OS"; - break; - case (MDOC_Dx): - pp = "DragonFly"; - break; - case (MDOC_Fx): - pp = "FreeBSD"; - break; - case (MDOC_Nx): - pp = "NetBSD"; - break; - case (MDOC_Ox): - pp = "OpenBSD"; - break; - case (MDOC_Ux): - pp = "UNIX"; - break; - default: - break; - } - - assert(pp); - term_word(p, pp); - return(1); + if ((n->aux = p->flags & TERMP_PREKEEP) == 0) + p->flags |= TERMP_PREKEEP; + return 1; } - -/* ARGSUSED */ -static int -termp_sq_pre(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - term_word(p, "\\(oq"); - p->flags |= TERMP_NOSPACE; - return(1); -} - - -/* ARGSUSED */ static void -termp_sq_post(DECL_ARGS) +termp_xx_post(DECL_ARGS) { - - if (MDOC_BODY != n->type) - return; - p->flags |= TERMP_NOSPACE; - term_word(p, "\\(aq"); + if (n->aux == 0) + p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); } - -/* ARGSUSED */ -static int -termp_pf_pre(DECL_ARGS) -{ - - p->flags |= TERMP_IGNDELIM; - return(1); -} - - -/* ARGSUSED */ static void termp_pf_post(DECL_ARGS) { - - p->flags &= ~TERMP_IGNDELIM; - p->flags |= TERMP_NOSPACE; + if (n->next != NULL && (n->next->flags & NODE_LINE) == 0) + p->flags |= TERMP_NOSPACE; } - -/* ARGSUSED */ static int termp_ss_pre(DECL_ARGS) { - switch (n->type) { - case (MDOC_BLOCK): - term_newln(p); - if (n->prev) + case ROFFT_BLOCK: + if (roff_node_prev(n) == NULL) + term_newln(p); + else term_vspace(p); break; - case (MDOC_HEAD): - term_fontpush(p, TERMFONT_BOLD); - p->offset = HALFINDENT; + case ROFFT_HEAD: + p->tcol->offset = term_len(p, (p->defindent+1)/2); + return termp_bold_pre(p, pair, meta, n); + case ROFFT_BODY: + p->tcol->offset = term_len(p, p->defindent); + term_tab_set(p, NULL); + term_tab_set(p, "T"); + term_tab_set(p, ".5i"); break; default: break; } - - return(1); + return 1; } - -/* ARGSUSED */ static void termp_ss_post(DECL_ARGS) { - - if (MDOC_HEAD == n->type) + if (n->type == ROFFT_HEAD || n->type == ROFFT_BODY) term_newln(p); } - -/* ARGSUSED */ static int -termp_cd_pre(DECL_ARGS) -{ - - term_fontpush(p, TERMFONT_BOLD); - term_newln(p); - return(1); -} - - -/* ARGSUSED */ -static int termp_in_pre(DECL_ARGS) { - - term_fontpush(p, TERMFONT_BOLD); - if (SEC_SYNOPSIS == n->sec) + synopsis_pre(p, n); + if (n->flags & NODE_SYNPRETTY && n->flags & NODE_LINE) { + term_fontpush(p, TERMFONT_BOLD); term_word(p, "#include"); - - term_word(p, "<"); + term_word(p, "<"); + } else { + term_word(p, "<"); + term_fontpush(p, TERMFONT_UNDER); + } p->flags |= TERMP_NOSPACE; - return(1); + return 1; } - -/* ARGSUSED */ static void termp_in_post(DECL_ARGS) { - - term_fontpush(p, TERMFONT_BOLD); + if (n->flags & NODE_SYNPRETTY) + term_fontpush(p, TERMFONT_BOLD); p->flags |= TERMP_NOSPACE; term_word(p, ">"); - term_fontpop(p); + if (n->flags & NODE_SYNPRETTY) + term_fontpop(p); +} - if (SEC_SYNOPSIS != n->sec) - return; +static int +termp_pp_pre(DECL_ARGS) +{ + term_vspace(p); + return 0; +} - term_newln(p); - /* - * XXX Not entirely correct. If `.In foo bar' is specified in - * the SYNOPSIS section, then it produces a single break after - * the ; mandoc asserts a vertical space. Since this - * construction is rarely used, I think it's fine. - */ - if (n->next && MDOC_In != n->next->tok) - term_vspace(p); +static int +termp_skip_pre(DECL_ARGS) +{ + return 0; } - -/* ARGSUSED */ static int -termp_sp_pre(DECL_ARGS) +termp_quote_pre(DECL_ARGS) { - size_t i, len; + if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM) + return 1; switch (n->tok) { - case (MDOC_sp): - len = n->child ? a2height(n->child) : 1; + case MDOC_Ao: + case MDOC_Aq: + term_word(p, n->child != NULL && n->child->next == NULL && + n->child->tok == MDOC_Mt ? "<" : "\\(la"); break; - case (MDOC_br): - len = 0; + case MDOC_Bro: + case MDOC_Brq: + term_word(p, "{"); break; - default: - len = 1; + case MDOC_Oo: + case MDOC_Op: + case MDOC_Bo: + case MDOC_Bq: + term_word(p, "["); break; + case MDOC__T: + /* FALLTHROUGH */ + case MDOC_Do: + case MDOC_Dq: + term_word(p, "\\(lq"); + break; + case MDOC_En: + if (NULL == n->norm->Es || + NULL == n->norm->Es->child) + return 1; + term_word(p, n->norm->Es->child->string); + break; + case MDOC_Po: + case MDOC_Pq: + term_word(p, "("); + break; + case MDOC_Qo: + case MDOC_Qq: + term_word(p, "\""); + break; + case MDOC_Ql: + case MDOC_So: + case MDOC_Sq: + term_word(p, "\\(oq"); + break; + default: + abort(); } - if (0 == len) - term_newln(p); - for (i = 0; i < len; i++) - term_vspace(p); - - return(0); -} - - -/* ARGSUSED */ -static int -termp_brq_pre(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - term_word(p, "\\(lC"); p->flags |= TERMP_NOSPACE; - return(1); + return 1; } - -/* ARGSUSED */ static void -termp_brq_post(DECL_ARGS) +termp_quote_post(DECL_ARGS) { - if (MDOC_BODY != n->type) + if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM) return; + p->flags |= TERMP_NOSPACE; - term_word(p, "\\(rC"); + + switch (n->tok) { + case MDOC_Ao: + case MDOC_Aq: + term_word(p, n->child != NULL && n->child->next == NULL && + n->child->tok == MDOC_Mt ? ">" : "\\(ra"); + break; + case MDOC_Bro: + case MDOC_Brq: + term_word(p, "}"); + break; + case MDOC_Oo: + case MDOC_Op: + case MDOC_Bo: + case MDOC_Bq: + term_word(p, "]"); + break; + case MDOC__T: + /* FALLTHROUGH */ + case MDOC_Do: + case MDOC_Dq: + term_word(p, "\\(rq"); + break; + case MDOC_En: + if (n->norm->Es == NULL || + n->norm->Es->child == NULL || + n->norm->Es->child->next == NULL) + p->flags &= ~TERMP_NOSPACE; + else + term_word(p, n->norm->Es->child->next->string); + break; + case MDOC_Po: + case MDOC_Pq: + term_word(p, ")"); + break; + case MDOC_Qo: + case MDOC_Qq: + term_word(p, "\""); + break; + case MDOC_Ql: + case MDOC_So: + case MDOC_Sq: + term_word(p, "\\(cq"); + break; + default: + abort(); + } } - -/* ARGSUSED */ static int -termp_bq_pre(DECL_ARGS) +termp_eo_pre(DECL_ARGS) { - if (MDOC_BODY != n->type) - return(1); - term_word(p, "\\(lB"); - p->flags |= TERMP_NOSPACE; - return(1); -} + if (n->type != ROFFT_BODY) + return 1; + if (n->end == ENDBODY_NOT && + n->parent->head->child == NULL && + n->child != NULL && + n->child->end != ENDBODY_NOT) + term_word(p, "\\&"); + else if (n->end != ENDBODY_NOT ? n->child != NULL : + n->parent->head->child != NULL && (n->child != NULL || + (n->parent->tail != NULL && n->parent->tail->child != NULL))) + p->flags |= TERMP_NOSPACE; -/* ARGSUSED */ + return 1; +} + static void -termp_bq_post(DECL_ARGS) +termp_eo_post(DECL_ARGS) { + int body, tail; - if (MDOC_BODY != n->type) + if (n->type != ROFFT_BODY) return; - p->flags |= TERMP_NOSPACE; - term_word(p, "\\(rB"); -} + if (n->end != ENDBODY_NOT) { + p->flags &= ~TERMP_NOSPACE; + return; + } -/* ARGSUSED */ -static int -termp_pq_pre(DECL_ARGS) -{ + body = n->child != NULL || n->parent->head->child != NULL; + tail = n->parent->tail != NULL && n->parent->tail->child != NULL; - if (MDOC_BODY != n->type) - return(1); - term_word(p, "\\&("); - p->flags |= TERMP_NOSPACE; - return(1); + if (body && tail) + p->flags |= TERMP_NOSPACE; + else if ( ! (body || tail)) + term_word(p, "\\&"); + else if ( ! tail) + p->flags &= ~TERMP_NOSPACE; } - -/* ARGSUSED */ -static void -termp_pq_post(DECL_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - term_word(p, ")"); -} - - -/* ARGSUSED */ static int termp_fo_pre(DECL_ARGS) { - const struct mdoc_node *nn; + size_t rmargin; - if (MDOC_BODY == n->type) { + switch (n->type) { + case ROFFT_BLOCK: + synopsis_pre(p, n); + return 1; + case ROFFT_BODY: + rmargin = p->tcol->rmargin; + if (n->flags & NODE_SYNPRETTY) { + p->tcol->rmargin = p->tcol->offset + term_len(p, 4); + p->flags |= TERMP_NOBREAK | TERMP_BRIND | + TERMP_HANG; + } p->flags |= TERMP_NOSPACE; term_word(p, "("); p->flags |= TERMP_NOSPACE; - return(1); - } else if (MDOC_HEAD != n->type) - return(1); - - term_fontpush(p, TERMFONT_BOLD); - for (nn = n->child; nn; nn = nn->next) { - assert(MDOC_TEXT == nn->type); - term_word(p, nn->string); + if (n->flags & NODE_SYNPRETTY) { + term_flushln(p); + p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | + TERMP_HANG); + p->flags |= TERMP_NOPAD; + p->tcol->offset = p->tcol->rmargin; + p->tcol->rmargin = rmargin; + } + return 1; + default: + return termp_bold_pre(p, pair, meta, n); } - term_fontpop(p); - - return(0); } - -/* ARGSUSED */ static void termp_fo_post(DECL_ARGS) { - - if (MDOC_BODY != n->type) + if (n->type != ROFFT_BODY) return; + p->flags |= TERMP_NOSPACE; term_word(p, ")"); - p->flags |= TERMP_NOSPACE; - term_word(p, ";"); - term_newln(p); + + if (n->flags & NODE_SYNPRETTY) { + p->flags |= TERMP_NOSPACE; + term_word(p, ";"); + term_flushln(p); + } } - -/* ARGSUSED */ static int termp_bf_pre(DECL_ARGS) { - const struct mdoc_node *nn; - - if (MDOC_HEAD == n->type) - return(0); - else if (MDOC_BLOCK != n->type) - return(1); - - 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 == 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); + switch (n->type) { + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + break; + default: + return 1; + } + switch (n->norm->Bf.font) { + case FONT_Em: + return termp_under_pre(p, pair, meta, n); + case FONT_Sy: + return termp_bold_pre(p, pair, meta, n); + default: + return termp_li_pre(p, pair, meta, n); + } } - -/* ARGSUSED */ static int termp_sm_pre(DECL_ARGS) { - - assert(n->child && MDOC_TEXT == n->child->type); - if (0 == strcmp("on", n->child->string)) { + if (n->child == NULL) + p->flags ^= TERMP_NONOSPACE; + else if (strcmp(n->child->string, "on") == 0) p->flags &= ~TERMP_NONOSPACE; - p->flags &= ~TERMP_NOSPACE; - } else + else p->flags |= TERMP_NONOSPACE; - return(0); + if (p->col && ! (TERMP_NONOSPACE & p->flags)) + p->flags &= ~TERMP_NOSPACE; + + return 0; } - -/* ARGSUSED */ static int termp_ap_pre(DECL_ARGS) { - p->flags |= TERMP_NOSPACE; - term_word(p, "\\(aq"); + term_word(p, "'"); p->flags |= TERMP_NOSPACE; - return(1); + return 1; } - -/* ARGSUSED */ static void termp____post(DECL_ARGS) { + struct roff_node *nn; + /* + * Handle lists of authors. In general, print each followed by + * a comma. Don't print the comma if there are only two + * authors. + */ + if (n->tok == MDOC__A && + (nn = roff_node_next(n)) != NULL && nn->tok == MDOC__A && + ((nn = roff_node_next(nn)) == NULL || nn->tok != MDOC__A) && + ((nn = roff_node_prev(n)) == NULL || nn->tok != MDOC__A)) + return; + /* TODO: %U. */ + if (n->parent == NULL || n->parent->tok != MDOC_Rs) + return; + 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 ? "," : "."); + if (roff_node_next(n) == NULL) { + term_word(p, "."); + p->flags |= TERMP_SENTENCE; + } else + term_word(p, ","); } - -/* ARGSUSED */ static int termp_li_pre(DECL_ARGS) { - term_fontpush(p, TERMFONT_NONE); - return(1); + return 1; } - -/* ARGSUSED */ static int termp_lk_pre(DECL_ARGS) { - const struct mdoc_node *nn; + const struct roff_node *link, *descr, *punct; - term_fontpush(p, TERMFONT_UNDER); - nn = n->child; + if ((link = n->child) == NULL) + return 0; - if (NULL == nn->next) - return(1); + /* Find beginning of trailing punctuation. */ + punct = n->last; + while (punct != link && punct->flags & NODE_DELIMC) + punct = punct->prev; + punct = punct->next; - term_word(p, nn->string); - term_fontpop(p); + /* Link text. */ + if ((descr = link->next) != NULL && descr != punct) { + term_fontpush(p, TERMFONT_UNDER); + while (descr != punct) { + if (descr->flags & (NODE_DELIMC | NODE_DELIMO)) + p->flags |= TERMP_NOSPACE; + term_word(p, descr->string); + descr = descr->next; + } + term_fontpop(p); + p->flags |= TERMP_NOSPACE; + term_word(p, ":"); + } - p->flags |= TERMP_NOSPACE; - term_word(p, ":"); - + /* Link target. */ term_fontpush(p, TERMFONT_BOLD); - for (nn = nn->next; nn; nn = nn->next) - term_word(p, nn->string); + term_word(p, link->string); term_fontpop(p); - return(0); + /* Trailing punctuation. */ + while (punct != NULL) { + p->flags |= TERMP_NOSPACE; + term_word(p, punct->string); + punct = punct->next; + } + return 0; } - -/* ARGSUSED */ static int -termp_under_pre(DECL_ARGS) +termp_bk_pre(DECL_ARGS) { + switch (n->type) { + case ROFFT_BLOCK: + break; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + if (n->parent->args != NULL || n->prev->child == NULL) + p->flags |= TERMP_PREKEEP; + break; + default: + abort(); + } + return 1; +} - term_fontpush(p, TERMFONT_UNDER); - return(1); +static void +termp_bk_post(DECL_ARGS) +{ + if (n->type == ROFFT_BODY) + p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); } +/* + * If we are in an `Rs' and there is a journal present, + * then quote us instead of underlining us (for disambiguation). + */ +static void +termp__t_post(DECL_ARGS) +{ + if (n->parent != NULL && n->parent->tok == MDOC_Rs && + n->parent->norm->Rs.quote_T) + termp_quote_post(p, pair, meta, n); + termp____post(p, pair, meta, n); +} -/* ARGSUSED */ static int termp__t_pre(DECL_ARGS) { + if (n->parent != NULL && n->parent->tok == MDOC_Rs && + n->parent->norm->Rs.quote_T) + return termp_quote_pre(p, pair, meta, n); + else + return termp_under_pre(p, pair, meta, n); +} - term_word(p, "\\(lq"); - p->flags |= TERMP_NOSPACE; - return(1); +static int +termp_under_pre(DECL_ARGS) +{ + term_fontpush(p, TERMFONT_UNDER); + return 1; +} + +static int +termp_abort_pre(DECL_ARGS) +{ + abort(); }