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.344 and 1.360

version 1.344, 2017/02/16 03:00:23

version 1.360, 2017/06/04 18:50:35

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

Line 116 static int termp_rs_pre(DECL_ARGS);

Line 115 static int termp_rs_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);

Line 125 static int termp_vt_pre(DECL_ARGS);

Line 124 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 142 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 233 static const struct termact termacts[MDOC_MAX] = {

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

{ termp_under_pre, NULL }, /* Fr */

{ 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 244 static const struct termact termacts[MDOC_MAX] = {

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

{ termp_quote_pre, termp_quote_post }, /* En */

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

{

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

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

size_t save_defindent;

p = (struct termp *)arg;

p->overstep = 0;

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

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

term_tab_set(p, NULL);

term_tab_set(p, "T");

term_tab_set(p, ".5i");

n = mdoc->first->child;

if (p->synopsisonly) {

Line 342 print_mdoc_node(DECL_ARGS)

Line 341 print_mdoc_node(DECL_ARGS)

switch (n->type) {

case ROFFT_TEXT:

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

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

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

term_newln(p);

if (NODE_DELIMC & n->flags)

p->flags |= TERMP_NOSPACE;

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 || NODE_ENDED & n->flags)

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

break;

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

Line 401 print_mdoc_node(DECL_ARGS)

Line 406 print_mdoc_node(DECL_ARGS)

if (NODE_EOS & n->flags)

p->flags |= TERMP_SENTENCE;

if (MDOC_ll != n->tok) {

if (n->type != ROFFT_TEXT)

p->offset = offset;

p->rmargin = rmargin;

}

static void

Line 596 print_bvspace(struct termp *p,

Line 600 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 683 termp_it_pre(DECL_ARGS)

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

}

* When exceeding the declared number of columns, leave

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

break;

default:

if (NULL == bl->norm->Bl.width)

Line 762 termp_it_pre(DECL_ARGS)

Line 764 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 800 termp_it_pre(DECL_ARGS)

Line 784 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 834 termp_it_pre(DECL_ARGS)

Line 818 termp_it_pre(DECL_ARGS)

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

Line 917 termp_it_pre(DECL_ARGS)

Line 889 termp_it_pre(DECL_ARGS)

case LIST_column:

if (n->type == ROFFT_HEAD)

return 0;

p->minbl = 0;

break;

default:

break;

Line 957 termp_it_post(DECL_ARGS)

Line 930 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 1129 static void

Line 1101 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 1273 termp_sh_pre(DECL_ARGS)

Line 1251 termp_sh_pre(DECL_ARGS)

break;

case ROFFT_BODY:

p->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 1323 termp_d1_pre(DECL_ARGS)

Line 1304 termp_d1_pre(DECL_ARGS)

return 1;

term_newln(p);

p->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 1366 termp_fn_pre(DECL_ARGS)

Line 1350 termp_fn_pre(DECL_ARGS)

if (pretty) {

term_flushln(p);

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

p->flags |= TERMP_NOPAD;

p->offset = p->rmargin;

p->rmargin = rmargin;

}

Line 1428 termp_fa_pre(DECL_ARGS)

Line 1413 termp_fa_pre(DECL_ARGS)

static int

termp_bd_pre(DECL_ARGS)

{

size_t tabwidth, lm, len, rm, rmax;

size_t lm, len, rm, rmax;

struct roff_node *nn;

int offset;

Line 1468 termp_bd_pre(DECL_ARGS)

Line 1453 termp_bd_pre(DECL_ARGS)

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

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;

rm = p->rmargin;

Line 1494 termp_bd_pre(DECL_ARGS)

Line 1481 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 1514 termp_bd_pre(DECL_ARGS)

Line 1501 termp_bd_pre(DECL_ARGS)

p->flags |= TERMP_NOSPACE;

}

p->tabwidth = tabwidth;

p->rmargin = rm;

p->maxrmargin = rmax;

return 0;

Line 1585 termp_ss_pre(DECL_ARGS)

Line 1571 termp_ss_pre(DECL_ARGS)

break;

case ROFFT_BODY:

p->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 1644 termp_in_post(DECL_ARGS)

Line 1633 termp_in_post(DECL_ARGS)

}

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 1708 termp_quote_pre(DECL_ARGS)

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

Line 1722 termp_quote_pre(DECL_ARGS)

Line 1686 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 1765 termp_quote_post(DECL_ARGS)

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

Line 1781 termp_quote_post(DECL_ARGS)

Line 1746 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 1865 termp_fo_pre(DECL_ARGS)

Line 1829 termp_fo_pre(DECL_ARGS)

term_flushln(p);

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

TERMP_HANG);

p->flags |= TERMP_NOPAD;

p->offset = p->rmargin;

p->rmargin = rmargin;

}

Line 1984 termp_li_pre(DECL_ARGS)

Line 1949 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;

int display;

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

display = term_strlen(p, link->string) >= 26;

if (display) {

term_newln(p);

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

}

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;

}

if (display)

term_newln(p);

return 0;

}

CVSweb