=================================================================== RCS file: /cvs/mandoc/mdoc_term.c,v retrieving revision 1.261 retrieving revision 1.318 diff -u -p -r1.261 -r1.318 --- mandoc/mdoc_term.c 2014/03/30 21:28:01 1.261 +++ mandoc/mdoc_term.c 2015/04/18 16:06:41 1.318 @@ -1,38 +1,39 @@ -/* $Id: mdoc_term.c,v 1.261 2014/03/30 21:28:01 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.318 2015/04/18 16:06:41 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze + * Copyright (c) 2010, 2012-2015 Ingo Schwarze * 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. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include #include +#include #include #include #include #include +#include "mandoc_aux.h" #include "mandoc.h" +#include "roff.h" +#include "mdoc.h" #include "out.h" #include "term.h" -#include "mdoc.h" #include "main.h" struct termpair { @@ -42,34 +43,32 @@ struct termpair { #define DECL_ARGS struct termp *p, \ struct termpair *pair, \ - const struct mdoc_meta *meta, \ - struct mdoc_node *n + const struct roff_meta *meta, \ + struct roff_node *n struct termact { int (*pre)(DECL_ARGS); void (*post)(DECL_ARGS); }; -static size_t a2width(const struct termp *, const char *); -static size_t a2height(const struct termp *, const char *); -static size_t a2offs(const struct termp *, const char *); +static int a2width(const struct termp *, const char *); static void print_bvspace(struct termp *, - const struct mdoc_node *, - const struct mdoc_node *); -static void print_mdoc_node(DECL_ARGS); + const struct roff_node *, + const struct roff_node *); +static void print_mdoc_node(DECL_ARGS); static void print_mdoc_nodelist(DECL_ARGS); -static void print_mdoc_head(struct termp *, const void *); -static void print_mdoc_foot(struct termp *, const void *); -static void synopsis_pre(struct termp *, - const struct mdoc_node *); +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 *, + const struct roff_node *); static void termp____post(DECL_ARGS); static void termp__t_post(DECL_ARGS); -static void termp_an_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_eo_post(DECL_ARGS); static void termp_fd_post(DECL_ARGS); static void termp_fo_post(DECL_ARGS); static void termp_in_post(DECL_ARGS); @@ -94,6 +93,7 @@ static int termp_bt_pre(DECL_ARGS); static int termp_bx_pre(DECL_ARGS); static int termp_cd_pre(DECL_ARGS); static int termp_d1_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); @@ -113,6 +113,7 @@ 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_ss_pre(DECL_ARGS); @@ -128,8 +129,8 @@ static const struct termact termacts[MDOC_MAX] = { { 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_ss_pre, termp_ss_post }, /* Ss */ + { termp_sp_pre, NULL }, /* Pp */ { termp_d1_pre, termp_bl_post }, /* D1 */ { termp_d1_pre, termp_bl_post }, /* Dl */ { termp_bd_pre, termp_bd_post }, /* Bd */ @@ -137,30 +138,30 @@ static const struct termact termacts[MDOC_MAX] = { { termp_bl_pre, termp_bl_post }, /* Bl */ { NULL, NULL }, /* El */ { termp_it_pre, termp_it_post }, /* It */ - { termp_under_pre, NULL }, /* Ad */ - { termp_an_pre, termp_an_post }, /* An */ + { termp_under_pre, NULL }, /* Ad */ + { termp_an_pre, NULL }, /* An */ { termp_under_pre, NULL }, /* Ar */ { termp_cd_pre, NULL }, /* Cd */ { termp_bold_pre, NULL }, /* Cm */ - { NULL, NULL }, /* Dv */ - { NULL, NULL }, /* Er */ - { NULL, NULL }, /* Ev */ + { 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_fa_pre, NULL }, /* Fa */ + { termp_fd_pre, termp_fd_post }, /* Fd */ { termp_fl_pre, NULL }, /* Fl */ - { termp_fn_pre, NULL }, /* Fn */ - { termp_ft_pre, NULL }, /* 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, termp_nm_post }, /* Nm */ + { termp_nd_pre, NULL }, /* Nd */ + { termp_nm_pre, termp_nm_post }, /* Nm */ { termp_quote_pre, termp_quote_post }, /* Op */ - { NULL, NULL }, /* Ot */ + { termp_ft_pre, NULL }, /* Ot */ { termp_under_pre, NULL }, /* Pa */ { termp_rv_pre, NULL }, /* Rv */ - { NULL, NULL }, /* St */ + { NULL, NULL }, /* St */ { termp_under_pre, NULL }, /* Va */ { termp_vt_pre, NULL }, /* Vt */ { termp_xr_pre, NULL }, /* Xr */ @@ -180,22 +181,22 @@ static const struct termact termacts[MDOC_MAX] = { { termp_quote_pre, termp_quote_post }, /* Aq */ { NULL, NULL }, /* At */ { NULL, NULL }, /* Bc */ - { termp_bf_pre, NULL }, /* Bf */ + { termp_bf_pre, NULL }, /* Bf */ { termp_quote_pre, termp_quote_post }, /* Bo */ { termp_quote_pre, termp_quote_post }, /* Bq */ { termp_xx_pre, NULL }, /* Bsx */ { termp_bx_pre, NULL }, /* Bx */ - { NULL, NULL }, /* Db */ + { termp_skip_pre, NULL }, /* Db */ { NULL, NULL }, /* Dc */ { 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 */ - { termp_quote_pre, termp_quote_post }, /* Eo */ + { termp_under_pre, NULL }, /* Em */ + { termp_eo_pre, termp_eo_post }, /* Eo */ { termp_xx_pre, NULL }, /* Fx */ { termp_bold_pre, NULL }, /* Ms */ - { NULL, NULL }, /* No */ + { termp_li_pre, NULL }, /* No */ { termp_ns_pre, NULL }, /* Ns */ { termp_xx_pre, NULL }, /* Nx */ { termp_xx_pre, NULL }, /* Ox */ @@ -219,78 +220,86 @@ static const struct termact termacts[MDOC_MAX] = { { termp_xx_pre, NULL }, /* Ux */ { NULL, NULL }, /* Xc */ { NULL, NULL }, /* Xo */ - { termp_fo_pre, termp_fo_post }, /* Fo */ - { NULL, NULL }, /* Fc */ + { termp_fo_pre, termp_fo_post }, /* Fo */ + { NULL, NULL }, /* Fc */ { termp_quote_pre, termp_quote_post }, /* Oo */ { NULL, NULL }, /* Oc */ { termp_bk_pre, termp_bk_post }, /* Bk */ { NULL, NULL }, /* Ek */ { termp_bt_pre, NULL }, /* Bt */ { NULL, NULL }, /* Hf */ - { NULL, NULL }, /* Fr */ + { termp_under_pre, NULL }, /* Fr */ { termp_ud_pre, NULL }, /* Ud */ { NULL, termp_lb_post }, /* Lb */ - { termp_sp_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 */ - { NULL, NULL }, /* Es */ /* TODO */ - { NULL, NULL }, /* En */ /* TODO */ - { termp_xx_pre, NULL }, /* Dx */ - { NULL, termp____post }, /* %Q */ + { termp_sp_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, NULL }, /* Dx */ + { NULL, termp____post }, /* %Q */ { termp_sp_pre, NULL }, /* br */ - { termp_sp_pre, NULL }, /* sp */ - { NULL, termp____post }, /* %U */ - { NULL, NULL }, /* Ta */ + { termp_sp_pre, NULL }, /* sp */ + { NULL, termp____post }, /* %U */ + { NULL, NULL }, /* Ta */ { termp_ll_pre, NULL }, /* ll */ }; void -terminal_mdoc(void *arg, const struct mdoc *mdoc) +terminal_mdoc(void *arg, const struct roff_man *mdoc) { - const struct mdoc_node *n; - const struct mdoc_meta *meta; + const struct roff_meta *meta; + struct roff_node *n; struct termp *p; p = (struct termp *)arg; - if (0 == p->defindent) - p->defindent = 5; - p->overstep = 0; - p->maxrmargin = p->defrmargin; + p->rmargin = p->maxrmargin = p->defrmargin; p->tabwidth = term_len(p, 5); - if (NULL == p->symtab) - p->symtab = mchars_alloc(); - - n = mdoc_node(mdoc); + n = mdoc_node(mdoc)->child; meta = mdoc_meta(mdoc); - term_begin(p, print_mdoc_head, print_mdoc_foot, meta); - - if (n->child) - print_mdoc_nodelist(p, NULL, meta, n->child); - - term_end(p); + if (p->synopsisonly) { + while (n != NULL) { + if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) { + if (n->child->next->child != NULL) + print_mdoc_nodelist(p, NULL, + meta, n->child->next->child); + term_newln(p); + break; + } + n = n->next; + } + } else { + if (p->defindent == 0) + p->defindent = 5; + term_begin(p, print_mdoc_head, print_mdoc_foot, meta); + if (n != NULL) { + if (n->tok != MDOC_Sh) + term_vspace(p); + print_mdoc_nodelist(p, NULL, meta, n); + } + term_end(p); + } } - static void print_mdoc_nodelist(DECL_ARGS) { - print_mdoc_node(p, pair, meta, n); - if (n->next) - print_mdoc_nodelist(p, pair, meta, n->next); + while (n != NULL) { + print_mdoc_node(p, pair, meta, n); + n = n->next; + } } - -/* ARGSUSED */ static void print_mdoc_node(DECL_ARGS) { @@ -301,7 +310,8 @@ print_mdoc_node(DECL_ARGS) chld = 1; offset = p->offset; rmargin = p->rmargin; - n->prev_font = term_fontq(p); + n->flags &= ~MDOC_ENDED; + n->prev_font = p->fonti; memset(&npair, 0, sizeof(struct termpair)); npair.ppair = pair; @@ -311,12 +321,9 @@ print_mdoc_node(DECL_ARGS) * invoked in a prior line, revert it to PREKEEP. */ - if (TERMP_KEEP & p->flags) { - if (n->prev ? (n->prev->lastline != n->line) : - (n->parent && n->parent->line != n->line)) { - p->flags &= ~TERMP_KEEP; - p->flags |= TERMP_PREKEEP; - } + if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) { + p->flags &= ~TERMP_KEEP; + p->flags |= TERMP_PREKEEP; } /* @@ -325,7 +332,7 @@ print_mdoc_node(DECL_ARGS) */ switch (n->type) { - case (MDOC_TEXT): + case ROFFT_TEXT: if (' ' == *n->string && MDOC_LINE & n->flags) term_newln(p); if (MDOC_DELIMC & n->flags) @@ -334,14 +341,21 @@ print_mdoc_node(DECL_ARGS) if (MDOC_DELIMO & n->flags) p->flags |= TERMP_NOSPACE; break; - case (MDOC_EQN): + case ROFFT_EQN: + if ( ! (n->flags & MDOC_LINE)) + p->flags |= TERMP_NOSPACE; term_eqn(p, n->eqn); + if (n->next != NULL && ! (n->next->flags & MDOC_LINE)) + p->flags |= TERMP_NOSPACE; break; - case (MDOC_TBL): + case ROFFT_TBL: + if (p->tbl.cols == NULL) + term_newln(p); term_tbl(p, n->span); break; default: - if (termacts[n->tok].pre && ENDBODY_NOT == n->end) + if (termacts[n->tok].pre && + (n->end == ENDBODY_NOT || n->nchild)) chld = (*termacts[n->tok].pre) (p, &npair, meta, n); break; @@ -351,14 +365,14 @@ print_mdoc_node(DECL_ARGS) print_mdoc_nodelist(p, &npair, meta, n->child); term_fontpopq(p, - (ENDBODY_NOT == n->end ? n : n->pending)->prev_font); + (ENDBODY_NOT == n->end ? n : n->body)->prev_font); switch (n->type) { - case (MDOC_TEXT): + case ROFFT_TEXT: break; - case (MDOC_TBL): + case ROFFT_TBL: break; - case (MDOC_EQN): + case ROFFT_EQN: break; default: if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags) @@ -371,7 +385,7 @@ print_mdoc_node(DECL_ARGS) * that it must not call the post handler again. */ if (ENDBODY_NOT != n->end) - n->pending->flags |= MDOC_ENDED; + n->body->flags |= MDOC_ENDED; /* * End of line terminating an implicit block @@ -392,17 +406,14 @@ print_mdoc_node(DECL_ARGS) } } - static void -print_mdoc_foot(struct termp *p, const void *arg) +print_mdoc_foot(struct termp *p, const struct roff_meta *meta) { - const struct mdoc_meta *meta; + size_t sz; - meta = (const struct mdoc_meta *)arg; - 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: @@ -413,8 +424,9 @@ print_mdoc_foot(struct termp *p, const void *arg) term_vspace(p); p->offset = 0; - p->rmargin = (p->maxrmargin - - term_strlen(p, meta->date) + term_len(p, 1)) / 2; + sz = term_strlen(p, meta->date); + p->rmargin = p->maxrmargin > sz ? + (p->maxrmargin + term_len(p, 1) - sz) / 2 : 0; p->trailspace = 1; p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; @@ -422,7 +434,8 @@ print_mdoc_foot(struct termp *p, const void *arg) term_flushln(p); p->offset = p->rmargin; - p->rmargin = p->maxrmargin - term_strlen(p, meta->os); + sz = term_strlen(p, meta->os); + p->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0; p->flags |= TERMP_NOSPACE; term_word(p, meta->date); @@ -442,16 +455,12 @@ print_mdoc_foot(struct termp *p, const void *arg) p->flags = 0; } - static void -print_mdoc_head(struct termp *p, const void *arg) +print_mdoc_head(struct termp *p, const struct roff_meta *meta) { - char buf[BUFSIZ], title[BUFSIZ]; - size_t buflen, titlen; - const struct mdoc_meta *meta; + char *volume, *title; + size_t vollen, titlen; - meta = (const struct mdoc_meta *)arg; - /* * The header is strange. It has three components, which are * really two with the first duplicated. It goes like this: @@ -465,39 +474,37 @@ print_mdoc_head(struct termp *p, const void *arg) * switches on the manual section. */ - p->offset = 0; - p->rmargin = p->maxrmargin; - assert(meta->vol); - strlcpy(buf, meta->vol, BUFSIZ); - buflen = term_strlen(p, buf); + 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 (meta->arch) { - strlcat(buf, " (", BUFSIZ); - strlcat(buf, meta->arch, BUFSIZ); - strlcat(buf, ")", BUFSIZ); - } - - snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec); + if (NULL == meta->msec) + title = mandoc_strdup(meta->title); + else + mandoc_asprintf(&title, "%s(%s)", + meta->title, meta->msec); titlen = term_strlen(p, title); p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; p->trailspace = 1; p->offset = 0; - p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ? - (p->maxrmargin - - term_strlen(p, buf) + term_len(p, 1)) / 2 : - p->maxrmargin - buflen; + p->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->flags |= TERMP_NOSPACE; p->offset = p->rmargin; - p->rmargin = p->offset + buflen + titlen < p->maxrmargin ? + p->rmargin = p->offset + vollen + titlen < p->maxrmargin ? p->maxrmargin - titlen : p->maxrmargin; - term_word(p, buf); + term_word(p, volume); term_flushln(p); p->flags &= ~TERMP_NOBREAK; @@ -513,67 +520,33 @@ print_mdoc_head(struct termp *p, const void *arg) p->flags &= ~TERMP_NOSPACE; p->offset = 0; p->rmargin = p->maxrmargin; + free(title); + free(volume); } - -static size_t -a2height(const struct termp *p, const char *v) -{ - struct roffsu su; - - - assert(v); - if ( ! a2roffsu(v, &su, SCALE_VS)) - SCALE_VS_INIT(&su, atoi(v)); - - return(term_vspan(p, &su)); -} - - -static size_t +static int a2width(const struct termp *p, const char *v) { struct roffsu su; - assert(v); - if ( ! a2roffsu(v, &su, SCALE_MAX)) + if (a2roffsu(v, &su, SCALE_MAX) < 2) { SCALE_HS_INIT(&su, term_strlen(p, v)); - - return(term_hspan(p, &su)); + su.scale /= term_strlen(p, "0"); + } + return(term_hspan(p, &su) / 24); } - -static size_t -a2offs(const struct termp *p, const char *v) -{ - struct roffsu su; - - if ('\0' == *v) - return(0); - else if (0 == strcmp(v, "left")) - return(0); - else if (0 == strcmp(v, "indent")) - return(term_len(p, p->defindent + 1)); - else if (0 == strcmp(v, "indent-two")) - return(term_len(p, (p->defindent + 1) * 2)); - else if ( ! a2roffsu(v, &su, SCALE_MAX)) - SCALE_HS_INIT(&su, term_strlen(p, v)); - - return(term_hspan(p, &su)); -} - - /* * 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, + const struct roff_node *bl, + const struct roff_node *n) { - const struct mdoc_node *nn; + const struct roff_node *nn; assert(n); @@ -586,16 +559,18 @@ print_bvspace(struct termp *p, /* 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 (nn->prev == 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. */ @@ -617,7 +592,6 @@ print_bvspace(struct termp *p, } -/* ARGSUSED */ static int termp_ll_pre(DECL_ARGS) { @@ -626,18 +600,16 @@ termp_ll_pre(DECL_ARGS) return(0); } - -/* ARGSUSED */ static int termp_it_pre(DECL_ARGS) { - const struct mdoc_node *bl, *nn; - char buf[7]; - int i; - size_t width, offset, ncols, dcol; + 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); } @@ -645,20 +617,51 @@ termp_it_pre(DECL_ARGS) bl = n->parent->parent->parent; type = bl->norm->Bl.type; - /* + /* + * Defaults for specific list types. + */ + + switch (type) { + case LIST_bullet: + /* FALLTHROUGH */ + case LIST_dash: + /* FALLTHROUGH */ + case LIST_hyphen: + /* FALLTHROUGH */ + case LIST_enum: + width = term_len(p, 2); + break; + case LIST_hang: + width = term_len(p, 8); + break; + case LIST_column: + /* FALLTHROUGH */ + case LIST_tag: + width = term_len(p, 10); + break; + default: + width = 0; + break; + } + offset = 0; + + /* * First calculate width and offset. This is pretty easy unless * we're a -column list, in which case all prior columns must * be accounted for. */ - width = offset = 0; + if (bl->norm->Bl.offs != NULL) { + offset = a2width(p, bl->norm->Bl.offs); + if (offset < 0 && (size_t)(-offset) > p->offset) + offset = -p->offset; + else if (offset > SHRT_MAX) + offset = 0; + } - if (bl->norm->Bl.offs) - offset = a2offs(p, bl->norm->Bl.offs); - switch (type) { - case (LIST_column): - if (MDOC_HEAD == n->type) + case LIST_column: + if (n->type == ROFFT_HEAD) break; /* @@ -671,21 +674,19 @@ termp_it_pre(DECL_ARGS) * - 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); - /* LINTED */ - dcol = ncols < 5 ? term_len(p, 4) : - ncols == 5 ? term_len(p, 3) : term_len(p, 1); - /* - * Calculate the offset by applying all prior MDOC_BODY, - * so we stop at the MDOC_HEAD (NULL == nn->prev). + * Calculate the offset by applying all prior ROFFT_BODY, + * so we stop at the ROFFT_HEAD (nn->prev == NULL). */ - for (i = 0, nn = n->prev; - nn->prev && i < (int)ncols; - nn = nn->prev, i++) - offset += dcol + a2width - (p, bl->norm->Bl.cols[i]); + for (i = 0, nn = n->prev; + nn->prev && i < (int)ncols; + nn = nn->prev, i++) + offset += dcol + a2width(p, + bl->norm->Bl.cols[i]); /* * When exceeding the declared number of columns, leave @@ -706,48 +707,20 @@ termp_it_pre(DECL_ARGS) if (NULL == bl->norm->Bl.width) break; - /* + /* * Note: buffer the width by 2, which is groff's magic * number for buffering single arguments. See the above * handling for column for how this changes. */ - assert(bl->norm->Bl.width); width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); + if (width < 0 && (size_t)(-width) > p->offset) + width = -p->offset; + else if (width > SHRT_MAX) + width = 0; 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 (LIST_bullet): - /* FALLTHROUGH */ - case (LIST_dash): - /* FALLTHROUGH */ - case (LIST_hyphen): - /* FALLTHROUGH */ - case (LIST_enum): - if (width < term_len(p, 2)) - width = term_len(p, 2); - break; - case (LIST_hang): - if (0 == width) - width = term_len(p, 8); - break; - case (LIST_column): - /* FALLTHROUGH */ - case (LIST_tag): - if (0 == width) - width = term_len(p, 10); - break; - default: - break; - } - - /* + /* * Whitespace control. Inset bodies need an initial space, * while diagonal bodies need two. */ @@ -755,12 +728,12 @@ termp_it_pre(DECL_ARGS) p->flags |= TERMP_NOSPACE; switch (type) { - case (LIST_diag): - if (MDOC_BODY == n->type) + case LIST_diag: + if (n->type == ROFFT_BODY) term_word(p, "\\ \\ "); break; - case (LIST_inset): - if (MDOC_BODY == n->type) + case LIST_inset: + if (n->type == ROFFT_BODY && n->parent->head->nchild) term_word(p, "\\ "); break; default: @@ -770,8 +743,8 @@ termp_it_pre(DECL_ARGS) p->flags |= TERMP_NOSPACE; switch (type) { - case (LIST_diag): - if (MDOC_HEAD == n->type) + case LIST_diag: + if (n->type == ROFFT_HEAD) term_fontpush(p, TERMFONT_BOLD); break; default: @@ -786,26 +759,26 @@ termp_it_pre(DECL_ARGS) */ switch (type) { - case (LIST_enum): + case LIST_enum: /* * Weird special case. - * Very narrow enum lists actually hang. + * Some very narrow lists actually hang. */ - if (width == term_len(p, 2)) - p->flags |= TERMP_HANG; /* FALLTHROUGH */ - case (LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case (LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case (LIST_hyphen): - if (MDOC_HEAD != n->type) + case LIST_hyphen: + if (width <= (int)term_len(p, 2)) + p->flags |= TERMP_HANG; + if (n->type != ROFFT_HEAD) break; p->flags |= TERMP_NOBREAK; p->trailspace = 1; break; - case (LIST_hang): - if (MDOC_HEAD != n->type) + case LIST_hang: + if (n->type != ROFFT_HEAD) break; /* @@ -814,26 +787,27 @@ termp_it_pre(DECL_ARGS) * 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)) + if (NULL != n->next && + NULL != n->next->child && + (MDOC_Bl == n->next->child->tok || + MDOC_Bd == n->next->child->tok)) break; - p->flags |= TERMP_NOBREAK | TERMP_HANG; + p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG; p->trailspace = 1; break; - case (LIST_tag): - if (MDOC_HEAD != n->type) + case LIST_tag: + if (n->type != ROFFT_HEAD) break; - p->flags |= TERMP_NOBREAK; + p->flags |= TERMP_NOBREAK | TERMP_BRIND; p->trailspace = 2; if (NULL == n->next || NULL == n->next->child) p->flags |= TERMP_DANGLE; break; - case (LIST_column): - if (MDOC_HEAD == n->type) + case LIST_column: + if (n->type == ROFFT_HEAD) break; if (NULL == n->next) { @@ -845,17 +819,17 @@ termp_it_pre(DECL_ARGS) } break; - case (LIST_diag): - if (MDOC_HEAD != n->type) + case LIST_diag: + if (n->type != ROFFT_HEAD) break; - p->flags |= TERMP_NOBREAK; + 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. @@ -864,43 +838,41 @@ termp_it_pre(DECL_ARGS) p->offset += offset; switch (type) { - case (LIST_hang): + case LIST_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)) + if (n->type == ROFFT_HEAD && + NULL != n->next && + NULL != n->next->child && + (MDOC_Bl == n->next->child->tok || + MDOC_Bd == n->next->child->tok)) break; /* FALLTHROUGH */ - case (LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case (LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case (LIST_enum): + case LIST_enum: /* FALLTHROUGH */ - case (LIST_hyphen): + case LIST_hyphen: /* FALLTHROUGH */ - case (LIST_tag): - assert(width); - if (MDOC_HEAD == n->type) + case LIST_tag: + if (n->type == ROFFT_HEAD) p->rmargin = p->offset + width; - else { + else p->offset += width; - if (p->rmargin < p->offset) - p->rmargin = p->offset; - } break; - case (LIST_column): + case LIST_column: assert(width); p->rmargin = p->offset + width; - /* + /* * XXX - this behaviour is not documented: the * right-most column is filled to the right margin. */ - if (MDOC_HEAD == n->type) + if (n->type == ROFFT_HEAD) break; if (NULL == n->next && p->rmargin < p->maxrmargin) p->rmargin = p->maxrmargin; @@ -909,54 +881,54 @@ termp_it_pre(DECL_ARGS) 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 (LIST_bullet): + case LIST_bullet: term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\[bu]"); term_fontpop(p); break; - case (LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case (LIST_hyphen): + case LIST_hyphen: term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\(hy"); term_fontpop(p); break; - case (LIST_enum): + case LIST_enum: (pair->ppair->ppair->count)++; - 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 (LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case (LIST_item): + case LIST_item: /* FALLTHROUGH */ - case (LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case (LIST_hyphen): + case LIST_hyphen: /* FALLTHROUGH */ - case (LIST_enum): - if (MDOC_HEAD == n->type) + case LIST_enum: + if (n->type == ROFFT_HEAD) return(0); break; - case (LIST_column): - if (MDOC_HEAD == n->type) + case LIST_column: + if (n->type == ROFFT_HEAD) return(0); break; default: @@ -966,29 +938,27 @@ termp_it_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static void termp_it_post(DECL_ARGS) { enum mdoc_list type; - if (MDOC_BLOCK == n->type) + if (n->type == ROFFT_BLOCK) return; type = n->parent->parent->parent->norm->Bl.type; switch (type) { - case (LIST_item): + case LIST_item: /* FALLTHROUGH */ - case (LIST_diag): + case LIST_diag: /* FALLTHROUGH */ - case (LIST_inset): - if (MDOC_BODY == n->type) + case LIST_inset: + if (n->type == ROFFT_BODY) term_newln(p); break; - case (LIST_column): - if (MDOC_BODY == n->type) + case LIST_column: + if (n->type == ROFFT_BODY) term_flushln(p); break; default: @@ -996,55 +966,57 @@ termp_it_post(DECL_ARGS) break; } - /* + /* * Now that our output is flushed, we can reset our tags. Since * only `It' sets these flags, we're free to assume that nobody * has munged them in the meanwhile. */ - p->flags &= ~TERMP_DANGLE; - p->flags &= ~TERMP_NOBREAK; - p->flags &= ~TERMP_HANG; + p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | + TERMP_DANGLE | TERMP_HANG); p->trailspace = 0; } - -/* ARGSUSED */ static int termp_nm_pre(DECL_ARGS) { + const char *cp; - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { p->flags |= TERMP_PREKEEP; return(1); } - if (MDOC_BODY == n->type) { + if (n->type == ROFFT_BODY) { if (NULL == n->child) return(0); p->flags |= TERMP_NOSPACE; - p->offset += term_len(p, 1) + - (NULL == n->prev->child ? - term_strlen(p, meta->name) : - MDOC_TEXT == n->prev->child->type ? - term_strlen(p, n->prev->child->string) : - term_len(p, 5)); + cp = NULL; + if (n->prev->child != NULL) + cp = n->prev->child->string; + if (cp == NULL) + cp = meta->name; + if (cp == NULL) + p->offset += term_len(p, 6); + else + p->offset += term_len(p, 1) + term_strlen(p, cp); return(1); } if (NULL == n->child && NULL == meta->name) return(0); - if (MDOC_HEAD == n->type) + if (n->type == ROFFT_HEAD) synopsis_pre(p, n->parent); - if (MDOC_HEAD == n->type && n->next->child) { - p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; + if (n->type == ROFFT_HEAD && + NULL != n->next && NULL != n->next->child) { + p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND; p->trailspace = 1; p->rmargin = p->offset + term_len(p, 1); if (NULL == n->child) { p->rmargin += term_strlen(p, meta->name); - } else if (MDOC_TEXT == n->child->type) { + } else if (n->child->type == ROFFT_TEXT) { p->rmargin += term_strlen(p, n->child->string); if (n->child->next) p->flags |= TERMP_HANG; @@ -1060,24 +1032,21 @@ termp_nm_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static void termp_nm_post(DECL_ARGS) { - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); - } else if (MDOC_HEAD == n->type && n->next->child) { + } else if (n->type == ROFFT_HEAD && + NULL != n->next && NULL != n->next->child) { term_flushln(p); - p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); + p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); p->trailspace = 0; - } else if (MDOC_BODY == n->type && n->child) + } else if (n->type == ROFFT_BODY && n->child != NULL) term_flushln(p); } - -/* ARGSUSED */ static int termp_fl_pre(DECL_ARGS) { @@ -1085,16 +1054,15 @@ termp_fl_pre(DECL_ARGS) term_fontpush(p, TERMFONT_BOLD); term_word(p, "\\-"); - if (n->child) + if ( ! (n->nchild == 0 && + (n->next == NULL || + n->next->type == ROFFT_TEXT || + n->next->flags & MDOC_LINE))) p->flags |= TERMP_NOSPACE; - else if (n->next && n->next->line == n->line) - p->flags |= TERMP_NOSPACE; return(1); } - -/* ARGSUSED */ static int termp__a_pre(DECL_ARGS) { @@ -1106,66 +1074,30 @@ termp__a_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static int termp_an_pre(DECL_ARGS) { - if (NULL == n->child) - return(1); - - /* - * If not in the AUTHORS section, `An -split' will cause - * newlines to occur before the author name. If in the AUTHORS - * section, by default, the first `An' invocation is nosplit, - * then all subsequent ones, regardless of whether interspersed - * with other macros/text, are split. -split, in this case, - * will override the condition of the implied first -nosplit. - */ - - if (n->sec == SEC_AUTHORS) { - if ( ! (TERMP_ANPREC & p->flags)) { - if (TERMP_SPLIT & p->flags) - term_newln(p); - return(1); - } - if (TERMP_NOSPLIT & p->flags) - return(1); - term_newln(p); - return(1); - } - - if (TERMP_SPLIT & p->flags) - term_newln(p); - - return(1); -} - - -/* ARGSUSED */ -static void -termp_an_post(DECL_ARGS) -{ - - if (n->child) { - if (SEC_AUTHORS == n->sec) - p->flags |= TERMP_ANPREC; - return; - } - - if (AUTH_split == n->norm->An.auth) { + if (n->norm->An.auth == AUTH_split) { p->flags &= ~TERMP_NOSPLIT; p->flags |= TERMP_SPLIT; - } else if (AUTH_nosplit == n->norm->An.auth) { + 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) { @@ -1175,67 +1107,70 @@ termp_ns_pre(DECL_ARGS) 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) + if (n->type == ROFFT_BLOCK && n->prev != NULL) term_vspace(p); return(1); } - -/* ARGSUSED */ static int termp_rv_pre(DECL_ARGS) { int nchild; term_newln(p); - term_word(p, "The"); nchild = n->nchild; - for (n = n->child; n; n = n->next) { - term_fontpush(p, TERMFONT_BOLD); - term_word(p, n->string); - term_fontpop(p); + if (nchild > 0) { + term_word(p, "The"); - p->flags |= TERMP_NOSPACE; - term_word(p, "()"); + for (n = n->child; n; n = n->next) { + term_fontpush(p, TERMFONT_BOLD); + term_word(p, n->string); + term_fontpop(p); - if (nchild > 2 && n->next) { p->flags |= TERMP_NOSPACE; - term_word(p, ","); + term_word(p, "()"); + + if (n->next == NULL) + continue; + + if (nchild > 2) { + p->flags |= TERMP_NOSPACE; + term_word(p, ","); + } + if (n->next->next == NULL) + term_word(p, "and"); } - if (n->next && NULL == n->next->next) - term_word(p, "and"); - } + if (nchild > 1) + term_word(p, "functions return"); + else + term_word(p, "function returns"); - if (nchild > 1) - term_word(p, "functions return"); - else - term_word(p, "function returns"); + term_word(p, "the value\\~0 if successful;"); + } else + term_word(p, "Upon successful completion," + " the value\\~0 is returned;"); - term_word(p, "the value 0 if successful; otherwise the value " - "-1 is returned and the global variable"); + term_word(p, "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."); + term_word(p, "is set to indicate the error."); p->flags |= TERMP_SENTENCE; return(0); } - -/* ARGSUSED */ static int termp_ex_pre(DECL_ARGS) { @@ -1260,53 +1195,40 @@ termp_ex_pre(DECL_ARGS) } if (nchild > 1) - term_word(p, "utilities exit"); + term_word(p, "utilities exit\\~0"); else - term_word(p, "utility exits"); + term_word(p, "utility exits\\~0"); - term_word(p, "0 on success, and >0 if an error occurs."); + term_word(p, "on success, and\\~>0 if an error occurs."); p->flags |= TERMP_SENTENCE; return(0); } - -/* ARGSUSED */ static int termp_nd_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 + if (n->type == ROFFT_BODY) + term_word(p, "\\(en"); return(1); } - -/* ARGSUSED */ static int termp_bl_pre(DECL_ARGS) { - return(MDOC_HEAD != n->type); + return(n->type != ROFFT_HEAD); } - -/* ARGSUSED */ static void termp_bl_post(DECL_ARGS) { - if (MDOC_BLOCK == n->type) + if (n->type == ROFFT_BLOCK) term_newln(p); } -/* ARGSUSED */ static int termp_xr_pre(DECL_ARGS) { @@ -1314,17 +1236,17 @@ termp_xr_pre(DECL_ARGS) if (NULL == (n = n->child)) return(0); - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); term_word(p, n->string); - if (NULL == (n = n->next)) + if (NULL == (n = n->next)) return(0); p->flags |= TERMP_NOSPACE; term_word(p, "("); p->flags |= TERMP_NOSPACE; - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); term_word(p, n->string); p->flags |= TERMP_NOSPACE; @@ -1339,9 +1261,9 @@ termp_xr_pre(DECL_ARGS) * macro combos). */ static void -synopsis_pre(struct termp *p, const struct mdoc_node *n) +synopsis_pre(struct termp *p, const struct roff_node *n) { - /* + /* * Obviously, if we're not in a SYNOPSIS or no prior macros * exist, do nothing. */ @@ -1353,10 +1275,10 @@ synopsis_pre(struct termp *p, const struct mdoc_node * * newline and return. UNLESS we're `Fo', `Fn', `Fn', in which * case we soldier on. */ - if (n->prev->tok == n->tok && - MDOC_Ft != n->tok && - MDOC_Fo != n->tok && - MDOC_Fn != n->tok) { + if (n->prev->tok == n->tok && + MDOC_Ft != n->tok && + MDOC_Fo != n->tok && + MDOC_Fn != n->tok) { term_newln(p); return; } @@ -1367,18 +1289,18 @@ synopsis_pre(struct termp *p, const struct mdoc_node * * vertical space, else only newline and move on. */ switch (n->prev->tok) { - case (MDOC_Fd): + case MDOC_Fd: /* FALLTHROUGH */ - case (MDOC_Fn): + case MDOC_Fn: /* FALLTHROUGH */ - case (MDOC_Fo): + case MDOC_Fo: /* FALLTHROUGH */ - case (MDOC_In): + case MDOC_In: /* FALLTHROUGH */ - case (MDOC_Vt): + case MDOC_Vt: term_vspace(p); break; - case (MDOC_Ft): + case MDOC_Ft: if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { term_vspace(p); break; @@ -1390,25 +1312,22 @@ synopsis_pre(struct termp *p, const struct mdoc_node * } } - static int termp_vt_pre(DECL_ARGS) { - if (MDOC_ELEM == n->type) { + if (n->type == ROFFT_ELEM) { synopsis_pre(p, n); return(termp_under_pre(p, pair, meta, n)); - } else if (MDOC_BLOCK == n->type) { + } else if (n->type == ROFFT_BLOCK) { synopsis_pre(p, n); return(1); - } else if (MDOC_HEAD == n->type) + } else if (n->type == ROFFT_HEAD) return(0); return(termp_under_pre(p, pair, meta, n)); } - -/* ARGSUSED */ static int termp_bold_pre(DECL_ARGS) { @@ -1417,8 +1336,6 @@ termp_bold_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static int termp_fd_pre(DECL_ARGS) { @@ -1427,8 +1344,6 @@ termp_fd_pre(DECL_ARGS) return(termp_bold_pre(p, pair, meta, n)); } - -/* ARGSUSED */ static void termp_fd_post(DECL_ARGS) { @@ -1436,25 +1351,26 @@ termp_fd_post(DECL_ARGS) term_newln(p); } - -/* ARGSUSED */ static int termp_sh_pre(DECL_ARGS) { - /* 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 (n->prev == NULL || + MDOC_Sh != n->prev->tok || + (n->prev->body != NULL && + n->prev->body->child != NULL)) + term_vspace(p); break; - case (MDOC_HEAD): + case ROFFT_HEAD: term_fontpush(p, TERMFONT_BOLD); break; - case (MDOC_BODY): + case ROFFT_BODY: p->offset = term_len(p, p->defindent); if (SEC_AUTHORS == n->sec) p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT); @@ -1465,17 +1381,15 @@ termp_sh_pre(DECL_ARGS) 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; break; @@ -1484,8 +1398,6 @@ termp_sh_post(DECL_ARGS) } } - -/* ARGSUSED */ static int termp_bt_pre(DECL_ARGS) { @@ -1495,8 +1407,6 @@ termp_bt_pre(DECL_ARGS) return(0); } - -/* ARGSUSED */ static void termp_lb_post(DECL_ARGS) { @@ -1505,8 +1415,6 @@ termp_lb_post(DECL_ARGS) term_newln(p); } - -/* ARGSUSED */ static int termp_ud_pre(DECL_ARGS) { @@ -1516,21 +1424,17 @@ termp_ud_pre(DECL_ARGS) return(0); } - -/* ARGSUSED */ static int termp_d1_pre(DECL_ARGS) { - if (MDOC_BLOCK != n->type) + if (n->type != ROFFT_BLOCK) return(1); term_newln(p); p->offset += term_len(p, p->defindent + 1); return(1); } - -/* ARGSUSED */ static int termp_ft_pre(DECL_ARGS) { @@ -1541,8 +1445,6 @@ termp_ft_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static int termp_fn_pre(DECL_ARGS) { @@ -1559,17 +1461,17 @@ termp_fn_pre(DECL_ARGS) if (pretty) { rmargin = p->rmargin; p->rmargin = p->offset + term_len(p, 4); - p->flags |= TERMP_NOBREAK | TERMP_HANG; + p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG; } - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); term_fontpush(p, TERMFONT_BOLD); term_word(p, n->string); term_fontpop(p); if (pretty) { term_flushln(p); - p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); + p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); p->offset = p->rmargin; p->rmargin = rmargin; } @@ -1579,7 +1481,7 @@ termp_fn_pre(DECL_ARGS) p->flags |= TERMP_NOSPACE; for (n = n->next; n; n = n->next) { - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); term_fontpush(p, TERMFONT_UNDER); if (pretty) p->flags |= TERMP_NBRWORD; @@ -1604,12 +1506,10 @@ termp_fn_pre(DECL_ARGS) return(0); } - -/* 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); @@ -1631,23 +1531,36 @@ termp_fa_pre(DECL_ARGS) return(0); } - -/* ARGSUSED */ static int termp_bd_pre(DECL_ARGS) { - size_t tabwidth, rm, rmax; - struct mdoc_node *nn; + size_t tabwidth, lm, len, rm, rmax; + struct roff_node *nn; + int offset; - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { print_bvspace(p, n, n); return(1); - } else if (MDOC_HEAD == n->type) + } else if (n->type == ROFFT_HEAD) return(0); - if (n->norm->Bd.offs) - p->offset += a2offs(p, n->norm->Bd.offs); + /* Handle the -offset argument. */ + if (n->norm->Bd.offs == NULL || + ! strcmp(n->norm->Bd.offs, "left")) + /* nothing */; + else if ( ! strcmp(n->norm->Bd.offs, "indent")) + p->offset += term_len(p, p->defindent + 1); + else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) + p->offset += term_len(p, (p->defindent + 1) * 2); + else { + offset = a2width(p, n->norm->Bd.offs); + if (offset < 0 && (size_t)(-offset) > p->offset) + p->offset = 0; + else if (offset < SHRT_MAX) + p->offset += offset; + } + /* * If -ragged or -filled are specified, the block does nothing * but change the indentation. If -unfilled or -literal are @@ -1655,20 +1568,31 @@ termp_bd_pre(DECL_ARGS) * for macro lines, a newline is appended to the line. Blank * lines are allowed. */ - - if (DISP_literal != n->norm->Bd.type && - DISP_unfilled != n->norm->Bd.type) + + if (DISP_literal != n->norm->Bd.type && + DISP_unfilled != n->norm->Bd.type && + DISP_centered != n->norm->Bd.type) return(1); tabwidth = p->tabwidth; if (DISP_literal == n->norm->Bd.type) p->tabwidth = term_len(p, 8); + lm = p->offset; rm = p->rmargin; rmax = p->maxrmargin; p->rmargin = p->maxrmargin = TERM_MAXMARGIN; for (nn = n->child; nn; nn = nn->next) { + if (DISP_centered == n->norm->Bd.type) { + if (nn->type == ROFFT_TEXT) { + len = term_strlen(p, nn->string); + p->offset = len >= rm ? 0 : + lm + len >= rm ? rm - len : + (lm + rm - len) / 2; + } else + p->offset = lm; + } print_mdoc_node(p, pair, meta, nn); /* * If the printed node flushes its own line, then we @@ -1677,26 +1601,27 @@ termp_bd_pre(DECL_ARGS) * anyway, so don't sweat it. */ switch (nn->tok) { - case (MDOC_Sm): + case MDOC_Sm: /* FALLTHROUGH */ - case (MDOC_br): + case MDOC_br: /* FALLTHROUGH */ - case (MDOC_sp): + case MDOC_sp: /* FALLTHROUGH */ - case (MDOC_Bl): + case MDOC_Bl: /* FALLTHROUGH */ - case (MDOC_D1): + case MDOC_D1: /* FALLTHROUGH */ - case (MDOC_Dl): + case MDOC_Dl: /* FALLTHROUGH */ - case (MDOC_Lp): + case MDOC_Lp: /* FALLTHROUGH */ - case (MDOC_Pp): + case MDOC_Pp: continue; default: break; } - if (nn->next && nn->next->line == nn->line) + if (p->flags & TERMP_NONEWLINE || + (nn->next && ! (nn->next->flags & MDOC_LINE))) continue; term_flushln(p); p->flags |= TERMP_NOSPACE; @@ -1708,21 +1633,19 @@ termp_bd_pre(DECL_ARGS) return(0); } - -/* ARGSUSED */ static void termp_bd_post(DECL_ARGS) { size_t rm, rmax; - if (MDOC_BODY != n->type) + if (n->type != ROFFT_BODY) return; rm = p->rmargin; rmax = p->maxrmargin; - if (DISP_literal == n->norm->Bd.type || - DISP_unfilled == n->norm->Bd.type) + if (DISP_literal == n->norm->Bd.type || + DISP_unfilled == n->norm->Bd.type) p->rmargin = p->maxrmargin = TERM_MAXMARGIN; p->flags |= TERMP_NOSPACE; @@ -1732,8 +1655,6 @@ termp_bd_post(DECL_ARGS) p->maxrmargin = rmax; } - -/* ARGSUSED */ static int termp_bx_pre(DECL_ARGS) { @@ -1757,8 +1678,6 @@ termp_bx_pre(DECL_ARGS) return(0); } - -/* ARGSUSED */ static int termp_xx_pre(DECL_ARGS) { @@ -1767,22 +1686,22 @@ termp_xx_pre(DECL_ARGS) pp = NULL; switch (n->tok) { - case (MDOC_Bsx): + case MDOC_Bsx: pp = "BSD/OS"; break; - case (MDOC_Dx): + case MDOC_Dx: pp = "DragonFly"; break; - case (MDOC_Fx): + case MDOC_Fx: pp = "FreeBSD"; break; - case (MDOC_Nx): + case MDOC_Nx: pp = "NetBSD"; break; - case (MDOC_Ox): + case MDOC_Ox: pp = "OpenBSD"; break; - case (MDOC_Ux): + case MDOC_Ux: pp = "UNIX"; break; default: @@ -1800,31 +1719,31 @@ termp_xx_pre(DECL_ARGS) return(0); } - -/* ARGSUSED */ static void termp_pf_post(DECL_ARGS) { - p->flags |= TERMP_NOSPACE; + if ( ! (n->next == NULL || n->next->flags & MDOC_LINE)) + p->flags |= TERMP_NOSPACE; } - -/* ARGSUSED */ static int termp_ss_pre(DECL_ARGS) { switch (n->type) { - case (MDOC_BLOCK): + case ROFFT_BLOCK: term_newln(p); if (n->prev) term_vspace(p); break; - case (MDOC_HEAD): + case ROFFT_HEAD: term_fontpush(p, TERMFONT_BOLD); p->offset = term_len(p, (p->defindent+1)/2); break; + case ROFFT_BODY: + p->offset = term_len(p, p->defindent); + break; default: break; } @@ -1832,18 +1751,14 @@ termp_ss_pre(DECL_ARGS) 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) { @@ -1853,8 +1768,6 @@ termp_cd_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static int termp_in_pre(DECL_ARGS) { @@ -1874,8 +1787,6 @@ termp_in_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static void termp_in_post(DECL_ARGS) { @@ -1890,18 +1801,22 @@ termp_in_post(DECL_ARGS) term_fontpop(p); } - -/* ARGSUSED */ static int termp_sp_pre(DECL_ARGS) { - size_t i, len; + struct roffsu su; + int i, len; switch (n->tok) { - case (MDOC_sp): - len = n->child ? a2height(p, n->child->string) : 1; + case MDOC_sp: + if (n->child) { + if ( ! a2roffsu(n->child->string, &su, SCALE_VS)) + su.scale = 1.0; + len = term_vspan(p, &su); + } else + len = 1; break; - case (MDOC_br): + case MDOC_br: len = 0; break; default: @@ -1911,65 +1826,78 @@ termp_sp_pre(DECL_ARGS) if (0 == len) term_newln(p); - for (i = 0; i < len; i++) - term_vspace(p); + else if (len < 0) + p->skipvsp -= len; + else + for (i = 0; i < len; i++) + term_vspace(p); return(0); } +static int +termp_skip_pre(DECL_ARGS) +{ -/* ARGSUSED */ + return(0); +} + static int termp_quote_pre(DECL_ARGS) { - if (MDOC_BODY != n->type && MDOC_ELEM != n->type) + if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM) return(1); switch (n->tok) { - case (MDOC_Ao): + case MDOC_Ao: /* FALLTHROUGH */ - case (MDOC_Aq): - term_word(p, "<"); + case MDOC_Aq: + term_word(p, n->nchild == 1 && + n->child->tok == MDOC_Mt ? "<" : "\\(la"); break; - case (MDOC_Bro): + case MDOC_Bro: /* FALLTHROUGH */ - case (MDOC_Brq): + case MDOC_Brq: term_word(p, "{"); break; - case (MDOC_Oo): + case MDOC_Oo: /* FALLTHROUGH */ - case (MDOC_Op): + case MDOC_Op: /* FALLTHROUGH */ - case (MDOC_Bo): + case MDOC_Bo: /* FALLTHROUGH */ - case (MDOC_Bq): + case MDOC_Bq: term_word(p, "["); break; - case (MDOC_Do): + case MDOC_Do: /* FALLTHROUGH */ - case (MDOC_Dq): - term_word(p, "\\(lq"); + case MDOC_Dq: + term_word(p, "\\(Lq"); break; - case (MDOC_Eo): + 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_Po: /* FALLTHROUGH */ - case (MDOC_Pq): + case MDOC_Pq: term_word(p, "("); break; - case (MDOC__T): + case MDOC__T: /* FALLTHROUGH */ - case (MDOC_Qo): + case MDOC_Qo: /* FALLTHROUGH */ - case (MDOC_Qq): + case MDOC_Qq: term_word(p, "\""); break; - case (MDOC_Ql): + case MDOC_Ql: /* FALLTHROUGH */ - case (MDOC_So): + case MDOC_So: /* FALLTHROUGH */ - case (MDOC_Sq): + case MDOC_Sq: term_word(p, "\\(oq"); break; default: @@ -1981,61 +1909,66 @@ termp_quote_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static void termp_quote_post(DECL_ARGS) { - if (MDOC_BODY != n->type && MDOC_ELEM != n->type) + if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM) return; p->flags |= TERMP_NOSPACE; switch (n->tok) { - case (MDOC_Ao): + case MDOC_Ao: /* FALLTHROUGH */ - case (MDOC_Aq): - term_word(p, ">"); + case MDOC_Aq: + term_word(p, n->nchild == 1 && + n->child->tok == MDOC_Mt ? ">" : "\\(ra"); break; - case (MDOC_Bro): + case MDOC_Bro: /* FALLTHROUGH */ - case (MDOC_Brq): + case MDOC_Brq: term_word(p, "}"); break; - case (MDOC_Oo): + case MDOC_Oo: /* FALLTHROUGH */ - case (MDOC_Op): + case MDOC_Op: /* FALLTHROUGH */ - case (MDOC_Bo): + case MDOC_Bo: /* FALLTHROUGH */ - case (MDOC_Bq): + case MDOC_Bq: term_word(p, "]"); break; - case (MDOC_Do): + case MDOC_Do: /* FALLTHROUGH */ - case (MDOC_Dq): - term_word(p, "\\(rq"); + case MDOC_Dq: + term_word(p, "\\(Rq"); break; - case (MDOC_Eo): + 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_Po: /* FALLTHROUGH */ - case (MDOC_Pq): + case MDOC_Pq: term_word(p, ")"); break; - case (MDOC__T): + case MDOC__T: /* FALLTHROUGH */ - case (MDOC_Qo): + case MDOC_Qo: /* FALLTHROUGH */ - case (MDOC_Qq): + case MDOC_Qq: term_word(p, "\""); break; - case (MDOC_Ql): + case MDOC_Ql: /* FALLTHROUGH */ - case (MDOC_So): + case MDOC_So: /* FALLTHROUGH */ - case (MDOC_Sq): + case MDOC_Sq: term_word(p, "\\(cq"); break; default: @@ -2044,8 +1977,50 @@ termp_quote_post(DECL_ARGS) } } +static int +termp_eo_pre(DECL_ARGS) +{ -/* ARGSUSED */ + 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; + + return(1); +} + +static void +termp_eo_post(DECL_ARGS) +{ + int body, tail; + + if (n->type != ROFFT_BODY) + return; + + if (n->end != ENDBODY_NOT) { + p->flags &= ~TERMP_NOSPACE; + return; + } + + body = n->child != NULL || n->parent->head->child != NULL; + tail = n->parent->tail != NULL && n->parent->tail->child != NULL; + + if (body && tail) + p->flags |= TERMP_NOSPACE; + else if ( ! (body || tail)) + term_word(p, "\\&"); + else if ( ! tail) + p->flags &= ~TERMP_NOSPACE; +} + static int termp_fo_pre(DECL_ARGS) { @@ -2054,21 +2029,23 @@ termp_fo_pre(DECL_ARGS) pretty = MDOC_SYNPRETTY & n->flags; - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { synopsis_pre(p, n); return(1); - } else if (MDOC_BODY == n->type) { + } else if (n->type == ROFFT_BODY) { if (pretty) { rmargin = p->rmargin; p->rmargin = p->offset + term_len(p, 4); - p->flags |= TERMP_NOBREAK | TERMP_HANG; + p->flags |= TERMP_NOBREAK | TERMP_BRIND | + TERMP_HANG; } p->flags |= TERMP_NOSPACE; term_word(p, "("); p->flags |= TERMP_NOSPACE; if (pretty) { term_flushln(p); - p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); + p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | + TERMP_HANG); p->offset = p->rmargin; p->rmargin = rmargin; } @@ -2086,13 +2063,11 @@ termp_fo_pre(DECL_ARGS) 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; @@ -2105,46 +2080,42 @@ termp_fo_post(DECL_ARGS) } } - -/* ARGSUSED */ static int termp_bf_pre(DECL_ARGS) { - if (MDOC_HEAD == n->type) + if (n->type == ROFFT_HEAD) return(0); - else if (MDOC_BODY != n->type) + else if (n->type != ROFFT_BODY) return(1); - if (FONT_Em == n->norm->Bf.font) + if (FONT_Em == n->norm->Bf.font) term_fontpush(p, TERMFONT_UNDER); - else if (FONT_Sy == n->norm->Bf.font) + else if (FONT_Sy == n->norm->Bf.font) term_fontpush(p, TERMFONT_BOLD); - else + else term_fontpush(p, TERMFONT_NONE); return(1); } - -/* ARGSUSED */ static int termp_sm_pre(DECL_ARGS) { - assert(n->child && MDOC_TEXT == n->child->type); - if (0 == strcmp("on", n->child->string)) { - if (p->col) - p->flags &= ~TERMP_NOSPACE; + if (NULL == n->child) + p->flags ^= TERMP_NONOSPACE; + else if (0 == strcmp("on", n->child->string)) p->flags &= ~TERMP_NONOSPACE; - } else + else p->flags |= TERMP_NONOSPACE; + if (p->col && ! (TERMP_NONOSPACE & p->flags)) + p->flags &= ~TERMP_NOSPACE; + return(0); } - -/* ARGSUSED */ static int termp_ap_pre(DECL_ARGS) { @@ -2155,8 +2126,6 @@ termp_ap_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static void termp____post(DECL_ARGS) { @@ -2184,8 +2153,6 @@ termp____post(DECL_ARGS) term_word(p, ","); } - -/* ARGSUSED */ static int termp_li_pre(DECL_ARGS) { @@ -2194,12 +2161,10 @@ termp_li_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static int termp_lk_pre(DECL_ARGS) { - const struct mdoc_node *link, *descr; + const struct roff_node *link, *descr; if (NULL == (link = n->child)) return(0); @@ -2222,18 +2187,16 @@ termp_lk_pre(DECL_ARGS) return(0); } - -/* ARGSUSED */ static int termp_bk_pre(DECL_ARGS) { switch (n->type) { - case (MDOC_BLOCK): + case ROFFT_BLOCK: break; - case (MDOC_HEAD): + case ROFFT_HEAD: return(0); - case (MDOC_BODY): + case ROFFT_BODY: if (n->parent->args || 0 == n->prev->nchild) p->flags |= TERMP_PREKEEP; break; @@ -2245,17 +2208,14 @@ termp_bk_pre(DECL_ARGS) return(1); } - -/* ARGSUSED */ static void termp_bk_post(DECL_ARGS) { - if (MDOC_BODY == n->type) + if (n->type == ROFFT_BODY) p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); } -/* ARGSUSED */ static void termp__t_post(DECL_ARGS) { @@ -2265,13 +2225,12 @@ termp__t_post(DECL_ARGS) * us instead of underlining us (for disambiguation). */ if (n->parent && MDOC_Rs == n->parent->tok && - n->parent->norm->Rs.quote_T) + 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) { @@ -2281,14 +2240,13 @@ termp__t_pre(DECL_ARGS) * us instead of underlining us (for disambiguation). */ if (n->parent && MDOC_Rs == n->parent->tok && - n->parent->norm->Rs.quote_T) + n->parent->norm->Rs.quote_T) return(termp_quote_pre(p, pair, meta, n)); term_fontpush(p, TERMFONT_UNDER); return(1); } -/* ARGSUSED */ static int termp_under_pre(DECL_ARGS) {