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.346 and 1.371

version 1.346, 2017/02/17 19:15:41

version 1.371, 2018/12/30 00:49:55

Line 1

/* $Id$ */

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

Line 29

#include <string.h>

#include "mandoc_aux.h"

#include "mandoc.h"

#include "roff.h"

#include "mdoc.h"

#include "out.h"

Line 47 struct termpair {

Line 46 struct termpair {

const struct roff_meta *meta, \

struct roff_node *n

struct termact {

struct mdoc_term_act {

int (*pre)(DECL_ARGS);

void (*post)(DECL_ARGS);

};

Line 84 static void termp_xx_post(DECL_ARGS);

Line 83 static void termp_xx_post(DECL_ARGS);

static int termp__a_pre(DECL_ARGS);

static int termp__t_pre(DECL_ARGS);

static int termp_abort_pre(DECL_ARGS);

static int termp_an_pre(DECL_ARGS);

static int termp_ap_pre(DECL_ARGS);

static int termp_bd_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);

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

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

{ termp_nd_pre, NULL }, /* Nd */

{ termp_nm_pre, termp_nm_post }, /* Nm */

{ termp_quote_pre, termp_quote_post }, /* Op */

{ termp_ft_pre, NULL }, /* Ot */

{ termp_abort_pre, NULL }, /* Ot */

{ termp_under_pre, NULL }, /* Pa */

{ termp_ex_pre, NULL }, /* Rv */

{ NULL, NULL }, /* St */

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_abort_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 int fn_prio;

void

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

terminal_mdoc(void *arg, const struct roff_meta *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 271 terminal_mdoc(void *arg, const struct roff_man *mdoc)

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

if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {

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

print_mdoc_nodelist(p, NULL,

&mdoc->meta,

mdoc, n->child->next->child);

n->child->next->child);

term_newln(p);

break;

}

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

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

save_defindent = p->defindent;

if (p->defindent == 0)

p->defindent = 5;

term_begin(p, print_mdoc_head, print_mdoc_foot,

term_begin(p, print_mdoc_head, print_mdoc_foot, mdoc);

&mdoc->meta);

while (n != NULL &&

while (n != NULL && n->flags & NODE_NOPRT)

(n->type == ROFFT_COMMENT ||

n->flags & NODE_NOPRT))

n = n->next;

if (n != NULL) {

if (n->tok != MDOC_Sh)

term_vspace(p);

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

print_mdoc_nodelist(p, NULL, mdoc, n);

}

term_end(p);

p->defindent = save_defindent;

Line 309 print_mdoc_nodelist(DECL_ARGS)

Line 307 print_mdoc_nodelist(DECL_ARGS)

static void

print_mdoc_node(DECL_ARGS)

{

int chld;

const struct mdoc_term_act *act;

struct termpair npair;

size_t offset, rmargin;

int chld;

if (n->flags & NODE_NOPRT)

if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)

return;

chld = 1;

offset = p->offset;

offset = p->tcol->offset;

rmargin = p->rmargin;

rmargin = p->tcol->rmargin;

n->flags &= ~NODE_ENDED;

n->prev_font = p->fonti;

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

act = mdoc_term_acts + (n->tok - MDOC_Dd);

if (act->pre != NULL &&

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

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

chld = (*act->pre)(p, &npair, meta, n);

(p, &npair, meta, n);

break;

}

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 (act->post == NULL || n->flags & NODE_ENDED)

break;

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

(void)(*act->post)(p, &npair, meta, n);

* Explicit end tokens not only call the post

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->tcol->offset = offset;

p->rmargin = rmargin;

p->tcol->rmargin = rmargin;

}

static void

Line 424 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 434 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 451 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 492 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 501 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 529 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 561 print_bvspace(struct termp *p,

Line 567 print_bvspace(struct termp *p,

/* Do not vspace directly after Ss/Sh. */

nn = n;

while (nn->prev != NULL && nn->prev->flags & NODE_NOPRT)

while (nn->prev != NULL &&

(nn->prev->type == ROFFT_COMMENT ||

nn->prev->flags & NODE_NOPRT))

nn = nn->prev;

while (nn->prev == NULL) {

do {

Line 596 print_bvspace(struct termp *p,

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

Line 653 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 688 termp_it_pre(DECL_ARGS)

SCALE_HS_INIT(&su,

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

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

offset += term_hspan(p, &su) / 24 + dcol;

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

}

Line 706 termp_it_pre(DECL_ARGS)

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;

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

break;

default:

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

Line 718 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 768 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 806 termp_it_pre(DECL_ARGS)

Line 788 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 837 termp_it_pre(DECL_ARGS)

Line 819 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 923 termp_it_pre(DECL_ARGS)

Line 893 termp_it_pre(DECL_ARGS)

case LIST_column:

if (n->type == ROFFT_HEAD)

return 0;

p->minbl = 0;

break;

default:

break;

Line 963 termp_it_post(DECL_ARGS)

Line 934 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 979 termp_nm_pre(DECL_ARGS)

Line 949 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 988 termp_nm_pre(DECL_ARGS)

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

}

Line 1001 termp_nm_pre(DECL_ARGS)

Line 972 termp_nm_pre(DECL_ARGS)

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;

}

Line 1135 static void

Line 1106 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 1278 termp_sh_pre(DECL_ARGS)

Line 1255 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 1306 termp_sh_post(DECL_ARGS)

Line 1286 termp_sh_post(DECL_ARGS)

break;

case ROFFT_BODY:

term_newln(p);

p->offset = 0;

p->tcol->offset = 0;

break;

default:

break;

Line 1328 termp_d1_pre(DECL_ARGS)

Line 1308 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 1356 termp_fn_pre(DECL_ARGS)

Line 1339 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 1372 termp_fn_pre(DECL_ARGS)

Line 1355 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 1434 termp_fa_pre(DECL_ARGS)

Line 1418 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 1450 termp_bd_pre(DECL_ARGS)

Line 1434 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 1469 termp_bd_pre(DECL_ARGS)

Line 1453 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 1500 termp_bd_pre(DECL_ARGS)

Line 1484 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:

case MDOC_Lp:

case MDOC_Pp:

continue;

default:

Line 1519 termp_bd_pre(DECL_ARGS)

Line 1502 termp_bd_pre(DECL_ARGS)

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

Line 1580 termp_ss_pre(DECL_ARGS)

Line 1551 termp_ss_pre(DECL_ARGS)

case ROFFT_BLOCK:

term_newln(p);

for (nn = n->prev; nn != NULL; nn = nn->prev)

if ((nn->flags & NODE_NOPRT) == 0)

if (nn->type != ROFFT_COMMENT &&

(nn->flags & NODE_NOPRT) == 0)

break;

if (nn != NULL)

term_vspace(p);

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

Line 1625 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 1718 termp_quote_pre(DECL_ARGS)

Line 1666 termp_quote_pre(DECL_ARGS)

/* 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 1776 termp_quote_post(DECL_ARGS)

Line 1724 termp_quote_post(DECL_ARGS)

/* 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 1861 termp_fo_pre(DECL_ARGS)

Line 1809 termp_fo_pre(DECL_ARGS)

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 1873 termp_fo_pre(DECL_ARGS)

Line 1821 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 1992 termp_li_pre(DECL_ARGS)

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

}

Line 2129 termp_tag_pre(DECL_ARGS)

Line 2094 termp_tag_pre(DECL_ARGS)

n->parent->parent->parent->tok == MDOC_It)))

tag_put(n->child->string, 1, p->line);

return 1;

}

static int

termp_abort_pre(DECL_ARGS)

{

abort();

}

CVSweb