mandoc/mdoc_term.c - diff

Return to mdoc_term.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_term.c between version 1.337 and 1.366

version 1.337, 2017/01/10 12:53:07

version 1.366, 2018/04/05 09:17:26

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

Line 80 static void termp_pf_post(DECL_ARGS);

static void termp_quote_post(DECL_ARGS);

static void termp_sh_post(DECL_ARGS);

static void termp_ss_post(DECL_ARGS);

static void termp_xx_post(DECL_ARGS);

static int termp__a_pre(DECL_ARGS);

static int termp__t_pre(DECL_ARGS);

Line 90 static int termp_bf_pre(DECL_ARGS);

Line 91 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_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);

Line 107 static int termp_ft_pre(DECL_ARGS);

Line 106 static int termp_ft_pre(DECL_ARGS);

static int termp_in_pre(DECL_ARGS);

static int termp_it_pre(DECL_ARGS);

static int termp_li_pre(DECL_ARGS);

static int termp_ll_pre(DECL_ARGS);

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_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_pp_pre(DECL_ARGS);

static int termp_ss_pre(DECL_ARGS);

static int termp_sy_pre(DECL_ARGS);

static int termp_tag_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] = {

static const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {

{ termp_ap_pre, NULL }, /* Ap */

{ NULL, NULL }, /* Dd */

{ NULL, NULL }, /* Dt */

{ NULL, NULL }, /* Os */

{ termp_sh_pre, termp_sh_post }, /* Sh */

{ termp_ss_pre, termp_ss_post }, /* Ss */

{ termp_sp_pre, NULL }, /* Pp */

{ 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 */

Line 145 static const struct termact termacts[MDOC_MAX] = {

Line 140 static const struct termact termacts[MDOC_MAX] = {

{ termp_it_pre, termp_it_post }, /* It */

{ 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_bold_pre, NULL }, /* Cm */

Line 165 static const struct termact termacts[MDOC_MAX] = {

Line 161 static const struct termact termacts[MDOC_MAX] = {

{ termp_quote_pre, termp_quote_post }, /* Op */

{ termp_ft_pre, NULL }, /* Ot */

{ termp_under_pre, NULL }, /* Pa */

{ termp_rv_pre, NULL }, /* Rv */

{ termp_ex_pre, NULL }, /* Rv */

{ NULL, NULL }, /* St */

{ termp_under_pre, NULL }, /* Va */

{ termp_vt_pre, NULL }, /* Vt */

Line 189 static const struct termact termacts[MDOC_MAX] = {

Line 185 static const struct termact termacts[MDOC_MAX] = {

{ 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_xx_pre, termp_xx_post }, /* Bsx */

{ termp_bx_pre, NULL }, /* Bx */

{ NULL, NULL }, /* Bx */

{ termp_skip_pre, NULL }, /* Db */

{ NULL, NULL }, /* Dc */

{ termp_quote_pre, termp_quote_post }, /* Do */

Line 199 static const struct termact termacts[MDOC_MAX] = {

Line 195 static const struct termact termacts[MDOC_MAX] = {

{ NULL, NULL }, /* Ef */

{ termp_em_pre, NULL }, /* Em */

{ termp_eo_pre, termp_eo_post }, /* Eo */

{ termp_xx_pre, NULL }, /* Fx */

{ 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, termp_xx_post }, /* Nx */

{ termp_xx_pre, NULL }, /* Ox */

{ termp_xx_pre, termp_xx_post }, /* Ox */

{ NULL, NULL }, /* Pc */

{ NULL, termp_pf_post }, /* Pf */

{ termp_quote_pre, termp_quote_post }, /* Po */

Line 222 static const struct termact termacts[MDOC_MAX] = {

Line 218 static const struct termact termacts[MDOC_MAX] = {

{ termp_under_pre, NULL }, /* Sx */

{ termp_sy_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 */

Line 231 static const struct termact termacts[MDOC_MAX] = {

Line 227 static const struct termact termacts[MDOC_MAX] = {

{ NULL, NULL }, /* Oc */

{ termp_bk_pre, termp_bk_post }, /* Bk */

{ NULL, NULL }, /* Ek */

{ termp_bt_pre, NULL }, /* Bt */

{ NULL, NULL }, /* Bt */

{ NULL, NULL }, /* Hf */

{ termp_under_pre, NULL }, /* Fr */

{ termp_ud_pre, NULL }, /* Ud */

{ NULL, NULL }, /* Ud */

{ NULL, termp_lb_post }, /* Lb */

{ termp_sp_pre, NULL }, /* Lp */

{ termp_pp_pre, NULL }, /* Lp */

{ termp_lk_pre, NULL }, /* Lk */

{ termp_under_pre, NULL }, /* Mt */

{ termp_quote_pre, termp_quote_post }, /* Brq */

Line 245 static const struct termact termacts[MDOC_MAX] = {

Line 241 static const struct termact termacts[MDOC_MAX] = {

{ NULL, termp____post }, /* %C */

{ termp_skip_pre, NULL }, /* Es */

{ termp_quote_pre, termp_quote_post }, /* En */

{ termp_xx_pre, NULL }, /* Dx */

{ termp_xx_pre, termp_xx_post }, /* Dx */

{ NULL, termp____post }, /* %Q */

{ termp_sp_pre, NULL }, /* br */

{ termp_sp_pre, NULL }, /* sp */

{ NULL, termp____post }, /* %U */

{ NULL, NULL }, /* Ta */

{ termp_ll_pre, NULL }, /* ll */

};

static const struct termact *const termacts = __termacts - MDOC_Dd;

static int fn_prio;

void

terminal_mdoc(void *arg, const struct roff_man *mdoc)

{

struct roff_node *n;

struct termp *p;

size_t save_defindent;

p = (struct termp *)arg;

p->overstep = 0;

p->tcol->rmargin = p->maxrmargin = p->defrmargin;

p->rmargin = p->maxrmargin = p->defrmargin;

term_tab_set(p, NULL);

p->tabwidth = term_len(p, 5);

term_tab_set(p, "T");

term_tab_set(p, ".5i");

n = mdoc->first->child;

if (p->synopsisonly) {

Line 281 terminal_mdoc(void *arg, const struct roff_man *mdoc)

Line 278 terminal_mdoc(void *arg, const struct roff_man *mdoc)

n = n->next;

}

} else {

save_defindent = p->defindent;

if (p->defindent == 0)

p->defindent = 5;

term_begin(p, print_mdoc_head, print_mdoc_foot,

Line 293 terminal_mdoc(void *arg, const struct roff_man *mdoc)

Line 291 terminal_mdoc(void *arg, const struct roff_man *mdoc)

print_mdoc_nodelist(p, NULL, &mdoc->meta, n);

}

term_end(p);

p->defindent = save_defindent;

}

Line 317 print_mdoc_node(DECL_ARGS)

Line 316 print_mdoc_node(DECL_ARGS)

return;

chld = 1;

offset = p->offset;

offset = p->tcol->offset;

rmargin = p->rmargin;

rmargin = p->tcol->rmargin;

n->flags &= ~MDOC_ENDED;

n->flags &= ~NODE_ENDED;

n->prev_font = p->fonti;

memset(&npair, 0, sizeof(struct termpair));

Line 330 print_mdoc_node(DECL_ARGS)

Line 329 print_mdoc_node(DECL_ARGS)

* invoked in a prior line, revert it to PREKEEP.

if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) {

if (p->flags & TERMP_KEEP && n->flags & NODE_LINE) {

p->flags &= ~TERMP_KEEP;

p->flags |= TERMP_PREKEEP;

}

Line 342 print_mdoc_node(DECL_ARGS)

Line 341 print_mdoc_node(DECL_ARGS)

switch (n->type) {

case ROFFT_TEXT:

if (' ' == *n->string && MDOC_LINE & n->flags)

if (*n->string == ' ' && n->flags & NODE_LINE &&

(p->flags & TERMP_NONEWLINE) == 0)

term_newln(p);

if (MDOC_DELIMC & n->flags)

if (NODE_DELIMC & n->flags)

p->flags |= TERMP_NOSPACE;

term_word(p, n->string);

if (MDOC_DELIMO & n->flags)

if (NODE_DELIMO & n->flags)

p->flags |= TERMP_NOSPACE;

break;

case ROFFT_EQN:

if ( ! (n->flags & MDOC_LINE))

if ( ! (n->flags & NODE_LINE))

p->flags |= TERMP_NOSPACE;

term_eqn(p, n->eqn);

if (n->next != NULL && ! (n->next->flags & MDOC_LINE))

if (n->next != NULL && ! (n->next->flags & NODE_LINE))

p->flags |= TERMP_NOSPACE;

break;

case ROFFT_TBL:

Line 363 print_mdoc_node(DECL_ARGS)

term_tbl(p, n->span);

break;

default:

if (termacts[n->tok].pre &&

if (n->tok < ROFF_MAX) {

roff_term_pre(p, n);

return;

}

assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);

if (termacts[n->tok].pre != NULL &&

(n->end == ENDBODY_NOT || n->child != NULL))

chld = (*termacts[n->tok].pre)

(p, &npair, meta, n);

Line 384 print_mdoc_node(DECL_ARGS)

Line 389 print_mdoc_node(DECL_ARGS)

case ROFFT_EQN:

break;

default:

if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)

if (termacts[n->tok].post == NULL || n->flags & NODE_ENDED)

break;

(void)(*termacts[n->tok].post)(p, &npair, meta, n);

Line 394 print_mdoc_node(DECL_ARGS)

Line 399 print_mdoc_node(DECL_ARGS)

* that it must not call the post handler again.

if (ENDBODY_NOT != n->end)

n->body->flags |= MDOC_ENDED;

n->body->flags |= NODE_ENDED;

* End of line terminating an implicit block

* while an explicit block is still open.

* Continue the explicit block without spacing.

if (ENDBODY_NOSPACE == n->end)

p->flags |= TERMP_NOSPACE;

break;

}

if (MDOC_EOS & n->flags)

if (NODE_EOS & n->flags)

p->flags |= TERMP_SENTENCE;

if (MDOC_ll != n->tok) {

if (n->type != ROFFT_TEXT)

p->offset = offset;

p->tcol->offset = offset;

p->rmargin = rmargin;

p->tcol->rmargin = rmargin;

}

static void

Line 432 print_mdoc_foot(struct termp *p, const struct roff_met

Line 428 print_mdoc_foot(struct termp *p, const struct roff_met

term_vspace(p);

p->offset = 0;

p->tcol->offset = 0;

sz = term_strlen(p, meta->date);

p->rmargin = p->maxrmargin > sz ?

p->tcol->rmargin = p->maxrmargin > sz ?

(p->maxrmargin + term_len(p, 1) - sz) / 2 : 0;

p->trailspace = 1;

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

Line 442 print_mdoc_foot(struct termp *p, const struct roff_met

Line 438 print_mdoc_foot(struct termp *p, const struct roff_met

term_word(p, meta->os);

term_flushln(p);

p->offset = p->rmargin;

p->tcol->offset = p->tcol->rmargin;

sz = term_strlen(p, meta->os);

p->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0;

p->tcol->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0;

p->flags |= TERMP_NOSPACE;

term_word(p, meta->date);

term_flushln(p);

p->offset = p->rmargin;

p->tcol->offset = p->tcol->rmargin;

p->rmargin = p->maxrmargin;

p->tcol->rmargin = p->maxrmargin;

p->trailspace = 0;

p->flags &= ~TERMP_NOBREAK;

p->flags |= TERMP_NOSPACE;

Line 459 print_mdoc_foot(struct termp *p, const struct roff_met

Line 455 print_mdoc_foot(struct termp *p, const struct roff_met

term_word(p, meta->os);

term_flushln(p);

p->offset = 0;

p->tcol->offset = 0;

p->rmargin = p->maxrmargin;

p->tcol->rmargin = p->maxrmargin;

p->flags = 0;

}

Line 500 print_mdoc_head(struct termp *p, const struct roff_met

Line 496 print_mdoc_head(struct termp *p, const struct roff_met

p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;

p->trailspace = 1;

p->offset = 0;

p->tcol->offset = 0;

p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?

p->tcol->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?

(p->maxrmargin - vollen + term_len(p, 1)) / 2 :

vollen < p->maxrmargin ? p->maxrmargin - vollen : 0;

Line 509 print_mdoc_head(struct termp *p, const struct roff_met

Line 505 print_mdoc_head(struct termp *p, const struct roff_met

term_flushln(p);

p->flags |= TERMP_NOSPACE;

p->offset = p->rmargin;

p->tcol->offset = p->tcol->rmargin;

p->rmargin = p->offset + vollen + titlen < p->maxrmargin ?

p->tcol->rmargin = p->tcol->offset + vollen + titlen <

p->maxrmargin - titlen : p->maxrmargin;

p->maxrmargin ? p->maxrmargin - titlen : p->maxrmargin;

term_word(p, volume);

term_flushln(p);

p->flags &= ~TERMP_NOBREAK;

p->trailspace = 0;

if (p->rmargin + titlen <= p->maxrmargin) {

if (p->tcol->rmargin + titlen <= p->maxrmargin) {

p->flags |= TERMP_NOSPACE;

p->offset = p->rmargin;

p->tcol->offset = p->tcol->rmargin;

p->rmargin = p->maxrmargin;

p->tcol->rmargin = p->maxrmargin;

term_word(p, title);

term_flushln(p);

}

p->flags &= ~TERMP_NOSPACE;

p->offset = 0;

p->tcol->offset = 0;

p->rmargin = p->maxrmargin;

p->tcol->rmargin = p->maxrmargin;

free(title);

free(volume);

}

Line 537 static int

Line 533 static int

a2width(const struct termp *p, const char *v)

{

struct roffsu su;

const char *end;

if (a2roffsu(v, &su, SCALE_MAX) < 2) {

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_hspan(p, &su) / 24;

return term_hen(p, &su);

}

Line 604 print_bvspace(struct termp *p,

Line 602 print_bvspace(struct termp *p,

static int

termp_ll_pre(DECL_ARGS)

{

term_setwidth(p, n->child != NULL ? n->child->string : NULL);

return 0;

}

static int

termp_it_pre(DECL_ARGS)

{

struct roffsu su;

char buf[24];

const struct roff_node *bl, *nn;

size_t ncols, dcol;

Line 660 termp_it_pre(DECL_ARGS)

Line 651 termp_it_pre(DECL_ARGS)

if (bl->norm->Bl.offs != NULL) {

offset = a2width(p, bl->norm->Bl.offs);

if (offset < 0 && (size_t)(-offset) > p->offset)

if (offset < 0 && (size_t)(-offset) > p->tcol->offset)

offset = -p->offset;

offset = -p->tcol->offset;

else if (offset > SHRT_MAX)

offset = 0;

}

Line 691 termp_it_pre(DECL_ARGS)

Line 682 termp_it_pre(DECL_ARGS)

for (i = 0, nn = n->prev;

nn->prev && i < (int)ncols;

nn = nn->prev, i++)

nn = nn->prev, i++) {

offset += dcol + a2width(p,

SCALE_HS_INIT(&su,

bl->norm->Bl.cols[i]);

term_strlen(p, bl->norm->Bl.cols[i]));

su.scale /= term_strlen(p, "0");

offset += term_hen(p, &su) + dcol;

}

* When exceeding the declared number of columns, leave

Line 708 termp_it_pre(DECL_ARGS)

Line 702 termp_it_pre(DECL_ARGS)

* Use the declared column widths, extended as explained

* in the preceding paragraph.

width = a2width(p, bl->norm->Bl.cols[i]) + dcol;

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 (NULL == bl->norm->Bl.width)

Line 720 termp_it_pre(DECL_ARGS)

Line 716 termp_it_pre(DECL_ARGS)

* 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->offset)

if (width < 0 && (size_t)(-width) > p->tcol->offset)

width = -p->offset;

width = -p->tcol->offset;

else if (width > SHRT_MAX)

width = 0;

break;

Line 770 termp_it_pre(DECL_ARGS)

Line 766 termp_it_pre(DECL_ARGS)

case LIST_bullet:

case LIST_dash:

case LIST_hyphen:

if (n->type == ROFFT_HEAD) {

* Weird special case.

p->flags |= TERMP_NOBREAK | TERMP_HANG;

* Some very narrow lists actually hang.

p->trailspace = 1;

} else if (width <= (int)term_len(p, 2))

if (width <= (int)term_len(p, 2))

p->flags |= TERMP_NOPAD;

p->flags |= TERMP_HANG;

if (n->type != ROFFT_HEAD)

break;

p->flags |= TERMP_NOBREAK;

p->trailspace = 1;

break;

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 (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_BRIND | TERMP_HANG;

p->trailspace = 1;

break;

Line 808 termp_it_pre(DECL_ARGS)

Line 786 termp_it_pre(DECL_ARGS)

p->trailspace = 2;

if (NULL == n->next || NULL == n->next->child)

p->flags |= TERMP_DANGLE;

p->flags |= TERMP_HANG;

break;

case LIST_column:

if (n->type == ROFFT_HEAD)

Line 839 termp_it_pre(DECL_ARGS)

Line 817 termp_it_pre(DECL_ARGS)

* necessarily lengthened. Everybody gets the offset.

p->offset += offset;

p->tcol->offset += offset;

switch (type) {

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 (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_dash:

case LIST_enum:

case LIST_hyphen:

case LIST_hang:

case LIST_tag:

if (n->type == ROFFT_HEAD)

p->rmargin = p->offset + width;

p->tcol->rmargin = p->tcol->offset + width;

else

p->offset += width;

p->tcol->offset += width;

break;

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 (n->type == ROFFT_HEAD)

break;

if (NULL == n->next && p->rmargin < p->maxrmargin)

if (n->next == NULL && p->tcol->rmargin < p->maxrmargin)

p->rmargin = p->maxrmargin;

p->tcol->rmargin = p->maxrmargin;

break;

default:

break;

Line 925 termp_it_pre(DECL_ARGS)

Line 891 termp_it_pre(DECL_ARGS)

case LIST_column:

if (n->type == ROFFT_HEAD)

return 0;

p->minbl = 0;

break;

default:

break;

Line 965 termp_it_post(DECL_ARGS)

Line 932 termp_it_post(DECL_ARGS)

* has munged them in the meanwhile.

p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND |

p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND | TERMP_HANG);

TERMP_DANGLE | TERMP_HANG);

p->trailspace = 0;

}

Line 981 termp_nm_pre(DECL_ARGS)

Line 947 termp_nm_pre(DECL_ARGS)

}

if (n->type == ROFFT_BODY) {

if (NULL == n->child)

if (n->child == NULL)

return 0;

p->flags |= TERMP_NOSPACE;

cp = NULL;

Line 990 termp_nm_pre(DECL_ARGS)

Line 956 termp_nm_pre(DECL_ARGS)

if (cp == NULL)

cp = meta->name;

if (cp == NULL)

p->offset += term_len(p, 6);

p->tcol->offset += term_len(p, 6);

else

p->offset += term_len(p, 1) + term_strlen(p, cp);

p->tcol->offset += term_len(p, 1) +

term_strlen(p, cp);

return 1;

}

if (NULL == n->child && NULL == meta->name)

if (n->child == NULL)

return 0;

if (n->type == ROFFT_HEAD)

synopsis_pre(p, n->parent);

if (n->type == ROFFT_HEAD &&

NULL != n->next && NULL != n->next->child) {

n->next != NULL && n->next->child != NULL) {

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;

p->trailspace = 1;

p->rmargin = p->offset + term_len(p, 1);

p->tcol->rmargin = p->tcol->offset + term_len(p, 1);

if (NULL == n->child) {

if (n->child == NULL)

p->rmargin += term_strlen(p, meta->name);

p->tcol->rmargin += term_strlen(p, meta->name);

} else if (n->child->type == ROFFT_TEXT) {

else if (n->child->type == ROFFT_TEXT) {

p->rmargin += term_strlen(p, n->child->string);

p->tcol->rmargin += term_strlen(p, n->child->string);

if (n->child->next)

if (n->child->next != NULL)

p->flags |= TERMP_HANG;

} else {

p->rmargin += term_len(p, 5);

p->tcol->rmargin += term_len(p, 5);

p->flags |= TERMP_HANG;

}

term_fontpush(p, TERMFONT_BOLD);

if (NULL == n->child)

term_word(p, meta->name);

return 1;

}

Line 1051 termp_fl_pre(DECL_ARGS)

Line 1016 termp_fl_pre(DECL_ARGS)

if (!(n->child == NULL &&

(n->next == NULL ||

n->next->type == ROFFT_TEXT ||

n->next->flags & MDOC_LINE)))

n->next->flags & NODE_LINE)))

p->flags |= TERMP_NOSPACE;

return 1;

Line 1096 static int

Line 1061 static int

termp_ns_pre(DECL_ARGS)

{

if ( ! (MDOC_LINE & n->flags))

if ( ! (NODE_LINE & n->flags))

p->flags |= TERMP_NOSPACE;

return 1;

}

Line 1113 termp_rs_pre(DECL_ARGS)

Line 1078 termp_rs_pre(DECL_ARGS)

}

static int

termp_rv_pre(DECL_ARGS)

{

struct roff_node *nch;

term_newln(p);

if (n->child != NULL) {

term_word(p, "The");

for (nch = n->child; nch != NULL; nch = nch->next) {

term_fontpush(p, TERMFONT_BOLD);

term_word(p, nch->string);

term_fontpop(p);

p->flags |= TERMP_NOSPACE;

term_word(p, "()");

if (nch->next == NULL)

continue;

if (nch->prev != NULL || nch->next->next != NULL) {

p->flags |= TERMP_NOSPACE;

term_word(p, ",");

}

if (nch->next->next == NULL)

term_word(p, "and");

}

if (n->child != NULL && n->child->next != NULL)

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, "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.");

p->flags |= TERMP_SENTENCE;

return 0;

}

static int

termp_ex_pre(DECL_ARGS)

{

struct roff_node *nch;

term_newln(p);

term_word(p, "The");

return 1;

for (nch = n->child; nch != NULL; nch = nch->next) {

term_fontpush(p, TERMFONT_BOLD);

term_word(p, nch->string);

term_fontpop(p);

if (nch->next == NULL)

continue;

if (nch->prev != NULL || nch->next->next != NULL) {

p->flags |= TERMP_NOSPACE;

term_word(p, ",");

}

if (nch->next->next == NULL)

term_word(p, "and");

}

if (n->child != NULL && n->child->next != NULL)

term_word(p, "utilities exit\\~0");

else

term_word(p, "utility exits\\~0");

term_word(p, "on success, and\\~>0 if an error occurs.");

p->flags |= TERMP_SENTENCE;

return 0;

}

static int

Line 1220 static void

Line 1104 static void

termp_bl_post(DECL_ARGS)

{

if (n->type == ROFFT_BLOCK)

if (n->type != ROFFT_BLOCK)

term_newln(p);

return;

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");

}

static int

Line 1262 synopsis_pre(struct termp *p, const struct roff_node *

Line 1152 synopsis_pre(struct termp *p, const struct roff_node *

* Obviously, if we're not in a SYNOPSIS or no prior macros

* exist, do nothing.

if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))

if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))

return;

Line 1363 termp_sh_pre(DECL_ARGS)

Line 1253 termp_sh_pre(DECL_ARGS)

term_fontpush(p, TERMFONT_BOLD);

break;

case ROFFT_BODY:

p->offset = term_len(p, p->defindent);

p->tcol->offset = term_len(p, p->defindent);

term_tab_set(p, NULL);

term_tab_set(p, "T");

term_tab_set(p, ".5i");

switch (n->sec) {

case SEC_DESCRIPTION:

fn_prio = 0;

Line 1391 termp_sh_post(DECL_ARGS)

Line 1284 termp_sh_post(DECL_ARGS)

break;

case ROFFT_BODY:

term_newln(p);

p->offset = 0;

p->tcol->offset = 0;

break;

default:

break;

}

static int

termp_bt_pre(DECL_ARGS)

{

term_word(p, "is currently in beta test.");

p->flags |= TERMP_SENTENCE;

return 0;

}

static void

termp_lb_post(DECL_ARGS)

{

if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)

if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags)

term_newln(p);

}

static int

termp_ud_pre(DECL_ARGS)

{

term_word(p, "currently under development.");

p->flags |= TERMP_SENTENCE;

return 0;

}

static int

termp_d1_pre(DECL_ARGS)

{

if (n->type != ROFFT_BLOCK)

return 1;

term_newln(p);

p->offset += term_len(p, p->defindent + 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;

}

Line 1439 static int

Line 1317 static int

termp_ft_pre(DECL_ARGS)

{

/* NB: MDOC_LINE does not effect this! */

/* NB: NODE_LINE does not effect this! */

synopsis_pre(p, n);

term_fontpush(p, TERMFONT_UNDER);

return 1;

Line 1451 termp_fn_pre(DECL_ARGS)

Line 1329 termp_fn_pre(DECL_ARGS)

size_t rmargin = 0;

int pretty;

pretty = MDOC_SYNPRETTY & n->flags;

pretty = NODE_SYNPRETTY & n->flags;

synopsis_pre(p, n);

Line 1459 termp_fn_pre(DECL_ARGS)

Line 1337 termp_fn_pre(DECL_ARGS)

return 0;

if (pretty) {

rmargin = p->rmargin;

rmargin = p->tcol->rmargin;

p->rmargin = p->offset + term_len(p, 4);

p->tcol->rmargin = p->tcol->offset + term_len(p, 4);

p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;

}

Line 1475 termp_fn_pre(DECL_ARGS)

Line 1353 termp_fn_pre(DECL_ARGS)

if (pretty) {

term_flushln(p);

p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);

p->offset = p->rmargin;

p->flags |= TERMP_NOPAD;

p->rmargin = rmargin;

p->tcol->offset = p->tcol->rmargin;

p->tcol->rmargin = rmargin;

}

p->flags |= TERMP_NOSPACE;

Line 1537 termp_fa_pre(DECL_ARGS)

Line 1416 termp_fa_pre(DECL_ARGS)

static int

termp_bd_pre(DECL_ARGS)

{

size_t tabwidth, lm, len, rm, rmax;

size_t lm, len;

struct roff_node *nn;

int offset;

Line 1553 termp_bd_pre(DECL_ARGS)

Line 1432 termp_bd_pre(DECL_ARGS)

! strcmp(n->norm->Bd.offs, "left"))

/* nothing */;

else if ( ! strcmp(n->norm->Bd.offs, "indent"))

p->offset += term_len(p, p->defindent + 1);

p->tcol->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);

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->offset)

if (offset < 0 && (size_t)(-offset) > p->tcol->offset)

p->offset = 0;

p->tcol->offset = 0;

else if (offset < SHRT_MAX)

p->offset += offset;

p->tcol->offset += offset;

}

Line 1572 termp_bd_pre(DECL_ARGS)

Line 1451 termp_bd_pre(DECL_ARGS)

* lines are allowed.

if (DISP_literal != n->norm->Bd.type &&

if (n->norm->Bd.type != DISP_literal &&

DISP_unfilled != n->norm->Bd.type &&

n->norm->Bd.type != DISP_unfilled &&

DISP_centered != n->norm->Bd.type)

n->norm->Bd.type != DISP_centered)

return 1;

tabwidth = p->tabwidth;

if (n->norm->Bd.type == DISP_literal) {

if (DISP_literal == n->norm->Bd.type)

term_tab_set(p, NULL);

p->tabwidth = term_len(p, 8);

term_tab_set(p, "T");

term_tab_set(p, "8n");

}

lm = p->offset;

lm = p->tcol->offset;

rm = p->rmargin;

p->flags |= TERMP_BRNEVER;

rmax = p->maxrmargin;

for (nn = n->child; nn != NULL; nn = nn->next) {

p->rmargin = p->maxrmargin = TERM_MAXMARGIN;

if (n->norm->Bd.type == DISP_centered) {

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 :

p->tcol->offset = len >= p->tcol->rmargin ?

lm + len >= rm ? rm - len :

0 : lm + len >= p->tcol->rmargin ?

(lm + rm - len) / 2;

p->tcol->rmargin - len :

(lm + p->tcol->rmargin - len) / 2;

} else

p->offset = lm;

p->tcol->offset = lm;

}

print_mdoc_node(p, pair, meta, nn);

Line 1603 termp_bd_pre(DECL_ARGS)

Line 1482 termp_bd_pre(DECL_ARGS)

* notion of selective eoln whitespace is pretty dumb

* anyway, so don't sweat it.

if (nn->tok < ROFF_MAX)

continue;

switch (nn->tok) {

case MDOC_Sm:

case MDOC_br:

case MDOC_sp:

case MDOC_Bl:

case MDOC_D1:

case MDOC_Dl:

Line 1617 termp_bd_pre(DECL_ARGS)

Line 1496 termp_bd_pre(DECL_ARGS)

break;

}

if (p->flags & TERMP_NONEWLINE ||

(nn->next && ! (nn->next->flags & MDOC_LINE)))

(nn->next && ! (nn->next->flags & NODE_LINE)))

continue;

term_flushln(p);

p->flags |= TERMP_NOSPACE;

}

p->flags &= ~TERMP_BRNEVER;

p->tabwidth = tabwidth;

p->rmargin = rm;

p->maxrmargin = rmax;

return 0;

}

static void

termp_bd_post(DECL_ARGS)

{

size_t rm, rmax;

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)

p->rmargin = p->maxrmargin = TERM_MAXMARGIN;

p->flags |= TERMP_BRNEVER;

p->flags |= TERMP_NOSPACE;

term_newln(p);

p->flags &= ~TERMP_BRNEVER;

p->rmargin = rm;

p->maxrmargin = rmax;

}

static int

termp_bx_pre(DECL_ARGS)

termp_xx_pre(DECL_ARGS)

{

if ((n->aux = p->flags & TERMP_PREKEEP) == 0)

if (NULL != (n = n->child)) {

p->flags |= TERMP_PREKEEP;

term_word(p, n->string);

return 1;

p->flags |= TERMP_NOSPACE;

term_word(p, "BSD");

} else {

term_word(p, "BSD");

return 0;

}

if (NULL != (n = n->next)) {

p->flags |= TERMP_NOSPACE;

term_word(p, "-");

p->flags |= TERMP_NOSPACE;

term_word(p, n->string);

}

return 0;

}

static int

static void

termp_xx_pre(DECL_ARGS)

termp_xx_post(DECL_ARGS)

{

const char *pp;

if (n->aux == 0)

int flags;

p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);

pp = NULL;

switch (n->tok) {

case MDOC_Bsx:

pp = "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:

abort();

}

term_word(p, pp);

if (n->child) {

flags = p->flags;

p->flags |= TERMP_KEEP;

term_word(p, n->child->string);

p->flags = flags;

}

return 0;

}

static void

termp_pf_post(DECL_ARGS)

{

if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))

if ( ! (n->next == NULL || n->next->flags & NODE_LINE))

p->flags |= TERMP_NOSPACE;

}

Line 1738 termp_ss_pre(DECL_ARGS)

Line 1557 termp_ss_pre(DECL_ARGS)

break;

case ROFFT_HEAD:

term_fontpush(p, TERMFONT_BOLD);

p->offset = term_len(p, (p->defindent+1)/2);

p->tcol->offset = term_len(p, (p->defindent+1)/2);

break;

case ROFFT_BODY:

p->offset = term_len(p, p->defindent);

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;

Line 1773 termp_in_pre(DECL_ARGS)

Line 1595 termp_in_pre(DECL_ARGS)

synopsis_pre(p, n);

if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) {

if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags) {

term_fontpush(p, TERMFONT_BOLD);

term_word(p, "#include");

term_word(p, "<");

Line 1790 static void

Line 1612 static void

termp_in_post(DECL_ARGS)

{

if (MDOC_SYNPRETTY & n->flags)

if (NODE_SYNPRETTY & n->flags)

term_fontpush(p, TERMFONT_BOLD);

p->flags |= TERMP_NOSPACE;

term_word(p, ">");

if (MDOC_SYNPRETTY & n->flags)

if (NODE_SYNPRETTY & n->flags)

term_fontpop(p);

}

static int

termp_sp_pre(DECL_ARGS)

termp_pp_pre(DECL_ARGS)

{

struct roffsu su;

fn_prio = 0;

int i, len;

term_vspace(p);

switch (n->tok) {

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:

len = 0;

break;

default:

len = 1;

fn_prio = 0;

break;

}

if (0 == len)

term_newln(p);

else if (len < 0)

p->skipvsp -= len;

else

for (i = 0; i < len; i++)

term_vspace(p);

return 0;

}

Line 1865 termp_quote_pre(DECL_ARGS)

Line 1660 termp_quote_pre(DECL_ARGS)

case MDOC_Bq:

term_word(p, "[");

break;

case MDOC__T:

/* FALLTHROUGH */

case MDOC_Do:

case MDOC_Dq:

term_word(p, "\\(Lq");

term_word(p, "\\(lq");

break;

case MDOC_En:

if (NULL == n->norm->Es ||

Line 1879 termp_quote_pre(DECL_ARGS)

Line 1676 termp_quote_pre(DECL_ARGS)

case MDOC_Pq:

term_word(p, "(");

break;

case MDOC__T:

case MDOC_Qo:

case MDOC_Qq:

term_word(p, "\"");

Line 1922 termp_quote_post(DECL_ARGS)

Line 1718 termp_quote_post(DECL_ARGS)

case MDOC_Bq:

term_word(p, "]");

break;

case MDOC__T:

/* FALLTHROUGH */

case MDOC_Do:

case MDOC_Dq:

term_word(p, "\\(Rq");

term_word(p, "\\(rq");

break;

case MDOC_En:

if (n->norm->Es == NULL ||

Line 1938 termp_quote_post(DECL_ARGS)

Line 1736 termp_quote_post(DECL_ARGS)

case MDOC_Pq:

term_word(p, ")");

break;

case MDOC__T:

case MDOC_Qo:

case MDOC_Qq:

term_word(p, "\"");

Line 2003 termp_fo_pre(DECL_ARGS)

Line 1800 termp_fo_pre(DECL_ARGS)

size_t rmargin = 0;

int pretty;

pretty = MDOC_SYNPRETTY & n->flags;

pretty = NODE_SYNPRETTY & n->flags;

if (n->type == ROFFT_BLOCK) {

synopsis_pre(p, n);

return 1;

} else if (n->type == ROFFT_BODY) {

if (pretty) {

rmargin = p->rmargin;

rmargin = p->tcol->rmargin;

p->rmargin = p->offset + term_len(p, 4);

p->tcol->rmargin = p->tcol->offset + term_len(p, 4);

p->flags |= TERMP_NOBREAK | TERMP_BRIND |

TERMP_HANG;

}

Line 2022 termp_fo_pre(DECL_ARGS)

Line 1819 termp_fo_pre(DECL_ARGS)

term_flushln(p);

p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |

TERMP_HANG);

p->offset = p->rmargin;

p->flags |= TERMP_NOPAD;

p->rmargin = rmargin;

p->tcol->offset = p->tcol->rmargin;

p->tcol->rmargin = rmargin;

}

return 1;

}

Line 2049 termp_fo_post(DECL_ARGS)

Line 1847 termp_fo_post(DECL_ARGS)

p->flags |= TERMP_NOSPACE;

term_word(p, ")");

if (MDOC_SYNPRETTY & n->flags) {

if (NODE_SYNPRETTY & n->flags) {

p->flags |= TERMP_NOSPACE;

term_word(p, ";");

term_flushln(p);

Line 2141 termp_li_pre(DECL_ARGS)

Line 1939 termp_li_pre(DECL_ARGS)

static int

termp_lk_pre(DECL_ARGS)

{

const struct roff_node *link, *descr;

const struct roff_node *link, *descr, *punct;

if (NULL == (link = n->child))

if ((link = n->child) == NULL)

return 0;

if (NULL != (descr = link->next)) {

/* Find beginning of trailing punctuation. */

punct = n->last;

while (punct != link && punct->flags & NODE_DELIMC)

punct = punct->prev;

punct = punct->next;

/* Link text. */

if ((descr = link->next) != NULL && descr != punct) {

term_fontpush(p, TERMFONT_UNDER);

while (NULL != descr) {

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, ":");

term_fontpop(p);

}

/* Link target. */

term_fontpush(p, TERMFONT_BOLD);

term_word(p, link->string);

term_fontpop(p);

/* Trailing punctuation. */

while (punct != NULL) {

p->flags |= TERMP_NOSPACE;

term_word(p, punct->string);

punct = punct->next;

}

return 0;

}

CVSweb