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.141 and 1.151

version 1.141, 2010/06/06 10:50:56

version 1.151, 2010/06/12 12:21:41

Line 54 struct termact {

static size_t a2width(const struct mdoc_argv *, int);

static size_t a2height(const struct mdoc_node *);

static size_t a2offs(const struct mdoc_argv *);

static size_t a2offs(const char *);

static int arg_hasattr(int, const struct mdoc_node *);

static int arg_getattrs(const int *, int *, size_t,

const struct mdoc_node *);

static int arg_getattr(int, const struct mdoc_node *);

static int arg_disptype(const struct mdoc_node *);

static void print_bvspace(struct termp *,

const struct mdoc_node *,

const struct mdoc_node *);

static void print_mdoc_node(DECL_ARGS);

static void print_mdoc_head(DECL_ARGS);

static void print_mdoc_nodelist(DECL_ARGS);

static void print_foot(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 termp____post(DECL_ARGS);

static void termp_an_post(DECL_ARGS);

Line 79 static void termp_brq_post(DECL_ARGS);

Line 80 static void termp_brq_post(DECL_ARGS);

static void termp_bx_post(DECL_ARGS);

static void termp_d1_post(DECL_ARGS);

static void termp_dq_post(DECL_ARGS);

static void termp_fd_post(DECL_ARGS);

static int termp_fd_pre(DECL_ARGS);

static void termp_fn_post(DECL_ARGS);

static void termp_fo_post(DECL_ARGS);

static void termp_in_post(DECL_ARGS);

static void termp_it_post(DECL_ARGS);

Line 92 static void termp_qq_post(DECL_ARGS);

static void termp_sh_post(DECL_ARGS);

static void termp_sq_post(DECL_ARGS);

static void termp_ss_post(DECL_ARGS);

static void termp_vt_post(DECL_ARGS);

static int termp_an_pre(DECL_ARGS);

static int termp_ap_pre(DECL_ARGS);

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

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

{ NULL, NULL }, /* Ev */

{ termp_ex_pre, NULL }, /* Ex */

{ termp_fa_pre, NULL }, /* Fa */

{ termp_bold_pre, termp_fd_post }, /* Fd */

{ termp_fd_pre, NULL }, /* Fd */

{ termp_fl_pre, NULL }, /* Fl */

{ termp_fn_pre, termp_fn_post }, /* Fn */

{ termp_fn_pre, NULL }, /* Fn */

{ termp_ft_pre, NULL }, /* Ft */

{ termp_bold_pre, NULL }, /* Ic */

{ termp_in_pre, termp_in_post }, /* In */

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

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

{ termp_rv_pre, NULL }, /* Rv */

{ NULL, NULL }, /* St */

{ termp_under_pre, NULL }, /* Va */

{ termp_vt_pre, termp_vt_post }, /* Vt */

{ termp_vt_pre, NULL }, /* Vt */

{ termp_xr_pre, NULL }, /* Xr */

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

{ termp_under_pre, termp____post }, /* %B */

Line 289 terminal_mdoc(void *arg, const struct mdoc *mdoc)

Line 288 terminal_mdoc(void *arg, const struct mdoc *mdoc)

n = mdoc_node(mdoc);

m = mdoc_meta(mdoc);

print_mdoc_head(p, NULL, m, n);

term_begin(p, print_mdoc_head, print_mdoc_foot, m);

if (n->child)

print_mdoc_nodelist(p, NULL, m, n->child);

print_foot(p, NULL, m, n);

term_end(p);

}

Line 346 print_mdoc_node(DECL_ARGS)

Line 347 print_mdoc_node(DECL_ARGS)

}

/* ARGSUSED */

static void

print_foot(DECL_ARGS)

print_mdoc_foot(struct termp *p, const void *arg)

{

char buf[DATESIZ], os[BUFSIZ];

const struct mdoc_meta *m;

m = (const struct mdoc_meta *)arg;

term_fontrepl(p, TERMFONT_NONE);

Line 395 print_foot(DECL_ARGS)

Line 398 print_foot(DECL_ARGS)

}

/* ARGSUSED */

static void

print_mdoc_head(DECL_ARGS)

print_mdoc_head(struct termp *p, const void *arg)

{

char buf[BUFSIZ], title[BUFSIZ];

const struct mdoc_meta *m;

m = (const struct mdoc_meta *)arg;

p->rmargin = p->maxrmargin;

p->offset = 0;

Line 483 a2width(const struct mdoc_argv *arg, int pos)

Line 488 a2width(const struct mdoc_argv *arg, int pos)

}

static int

arg_disptype(const struct mdoc_node *n)

{

int i, len;

assert(MDOC_BLOCK == n->type);

len = (int)(n->args ? n->args->argc : 0);

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

switch (n->args->argv[i].arg) {

case (MDOC_Centred):

/* FALLTHROUGH */

case (MDOC_Ragged):

/* FALLTHROUGH */

case (MDOC_Filled):

/* FALLTHROUGH */

case (MDOC_Unfilled):

/* FALLTHROUGH */

case (MDOC_Literal):

return(n->args->argv[i].arg);

default:

break;

}

return(-1);

}

static size_t

a2offs(const struct mdoc_argv *arg)

a2offs(const char *v)

{

struct roffsu su;

if ('\0' == arg->value[0][0])

if ('\0' == *v)

return(0);

else if (0 == strcmp(arg->value[0], "left"))

else if (0 == strcmp(v, "left"))

return(0);

else if (0 == strcmp(arg->value[0], "indent"))

else if (0 == strcmp(v, "indent"))

return(INDENT + 1);

else if (0 == strcmp(arg->value[0], "indent-two"))

else if (0 == strcmp(v, "indent-two"))

return((INDENT + 1) * 2);

else if ( ! a2roffsu(arg->value[0], &su, SCALE_MAX))

else if ( ! a2roffsu(v, &su, SCALE_MAX))

SCALE_HS_INIT(&su, strlen(arg->value[0]));

SCALE_HS_INIT(&su, strlen(v));

return(term_hspan(&su));

}

Line 595 print_bvspace(struct termp *p,

Line 571 print_bvspace(struct termp *p,

const struct mdoc_node *nn;

term_newln(p);

if (arg_hasattr(MDOC_Compact, bl))

if (MDOC_Bd == bl->tok && bl->data.Bd.comp)

return;

if (MDOC_Bl == bl->tok && bl->data.Bl.comp)

return;

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

Line 614 print_bvspace(struct termp *p,

Line 593 print_bvspace(struct termp *p,

/* A `-column' does not assert vspace within the list. */

if (MDOC_Bl == bl->tok && LIST_column == bl->data.list)

if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type)

if (n->prev && MDOC_It == n->prev->tok)

return;

/* A `-diag' without body does not vspace. */

if (MDOC_Bl == bl->tok && LIST_diag == bl->data.list)

if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type)

if (n->prev && MDOC_It == n->prev->tok) {

assert(n->prev->body);

if (NULL == n->prev->body->child)

Line 685 termp_it_pre(DECL_ARGS)

Line 664 termp_it_pre(DECL_ARGS)

arg_getattrs(keys, vals, 3, bl);

type = bl->data.list;

type = bl->data.Bl.type;

* First calculate width and offset. This is pretty easy unless

Line 696 termp_it_pre(DECL_ARGS)

Line 675 termp_it_pre(DECL_ARGS)

width = offset = 0;

if (vals[1] >= 0)

offset = a2offs(&bl->args->argv[vals[1]]);

offset = a2offs(bl->args->argv[vals[1]].value[0]);

switch (type) {

case (LIST_column):

Line 1013 termp_it_post(DECL_ARGS)

Line 992 termp_it_post(DECL_ARGS)

if (MDOC_BLOCK == n->type)

return;

type = n->parent->parent->parent->data.list;

type = n->parent->parent->parent->data.Bl.type;

switch (type) {

case (LIST_item):

Line 1055 termp_nm_pre(DECL_ARGS)

Line 1034 termp_nm_pre(DECL_ARGS)

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

return(1);

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

synopsis_pre(p, n);

term_newln(p);

term_fontpush(p, TERMFONT_BOLD);

if (NULL == n->child)

term_word(p, m->name);

return(1);

}

Line 1313 termp_xr_pre(DECL_ARGS)

Line 1289 termp_xr_pre(DECL_ARGS)

}

* This decides how to assert whitespace before any of the SYNOPSIS set

* of macros (which, as in the case of Ft/Fo and Ft/Fn, may contain

* macro combos).

static void

synopsis_pre(struct termp *p, const struct mdoc_node *n)

{

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

* exist, do nothing.

if (NULL == n->prev || SEC_SYNOPSIS != n->sec)

return;

* If we're the second in a pair of like elements, emit our

* newline and return. UNLESS we're `Fo', `Fn', `Fn', in which

* case we soldier on.

if (n->prev->tok == n->tok &&

MDOC_Ft != n->tok &&

MDOC_Fo != n->tok &&

MDOC_Fn != n->tok) {

term_newln(p);

return;

}

* If we're one of the SYNOPSIS set and non-like pair-wise after

* another (or Fn/Fo, which we've let slip through) then assert

* vertical space, else only newline and move on.

switch (n->prev->tok) {

case (MDOC_Fd):

/* FALLTHROUGH */

case (MDOC_Fn):

/* FALLTHROUGH */

case (MDOC_Fo):

/* FALLTHROUGH */

case (MDOC_In):

/* FALLTHROUGH */

case (MDOC_Vt):

term_vspace(p);

break;

case (MDOC_Ft):

if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {

term_vspace(p);

break;

}

/* FALLTHROUGH */

default:

term_newln(p);

break;

}

static int

termp_vt_pre(DECL_ARGS)

{

if (MDOC_ELEM == n->type)

if (MDOC_ELEM == n->type) {

synopsis_pre(p, n);

return(termp_under_pre(p, pair, m, n));

else if (MDOC_HEAD == n->type)

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

return(0);

synopsis_pre(p, n);

else if (MDOC_BLOCK == n->type)

return(1);

} else if (MDOC_HEAD == n->type)

return(0);

return(termp_under_pre(p, pair, m, n));

}

/* ARGSUSED */

static void

termp_vt_post(DECL_ARGS)

{

if (MDOC_BLOCK != n->type)

return;

if (n->next && MDOC_Vt == n->next->tok)

term_newln(p);

else if (n->next)

term_vspace(p);

}

/* ARGSUSED */

static int

termp_bold_pre(DECL_ARGS)

{

Line 1353 termp_bold_pre(DECL_ARGS)

Line 1375 termp_bold_pre(DECL_ARGS)

/* ARGSUSED */

static void

static int

termp_fd_post(DECL_ARGS)

termp_fd_pre(DECL_ARGS)

{

term_newln(p);

synopsis_pre(p, n);

return(termp_bold_pre(p, pair, m, n));

}

Line 1511 termp_ft_pre(DECL_ARGS)

Line 1534 termp_ft_pre(DECL_ARGS)

{

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

if (SEC_SYNOPSIS == n->sec && n->prev)

synopsis_pre(p, n);

term_vspace(p);

term_fontpush(p, TERMFONT_UNDER);

return(1);

}

Line 1525 termp_fn_pre(DECL_ARGS)

Line 1546 termp_fn_pre(DECL_ARGS)

{

const struct mdoc_node *nn;

/* NB: MDOC_LINE has no effect on this macro! */

synopsis_pre(p, n);

if (SEC_SYNOPSIS == n->sec) {

if (n->prev && MDOC_Ft == n->prev->tok)

term_newln(p);

else if (n->prev)

term_vspace(p);

}

term_fontpush(p, TERMFONT_BOLD);

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

Line 1559 termp_fn_pre(DECL_ARGS)

Line 1574 termp_fn_pre(DECL_ARGS)

/* ARGSUSED */

static void

termp_fn_post(DECL_ARGS)

{

/* NB: MDOC_LINE has no effect on this macro! */

if (SEC_SYNOPSIS == n->sec)

term_newln(p);

}

/* ARGSUSED */

static int

termp_fa_pre(DECL_ARGS)

{

Line 1601 static int

Line 1605 static int

termp_bd_pre(DECL_ARGS)

{

size_t tabwidth;

int i, type;

size_t rm, rmax;

const struct mdoc_node *nn;

Line 1611 termp_bd_pre(DECL_ARGS)

Line 1614 termp_bd_pre(DECL_ARGS)

} else if (MDOC_HEAD == n->type)

return(0);

nn = n->parent;

if (n->data.Bd.offs)

p->offset += a2offs(n->data.Bd.offs);

type = arg_disptype(nn);

assert(-1 != type);

if (-1 != (i = arg_getattr(MDOC_Offset, nn)))

p->offset += a2offs(&nn->args->argv[i]);

* If -ragged or -filled are specified, the block does nothing

* but change the indentation. If -unfilled or -literal are

Line 1627 termp_bd_pre(DECL_ARGS)

Line 1625 termp_bd_pre(DECL_ARGS)

* lines are allowed.

if (MDOC_Literal != type && MDOC_Unfilled != type)

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

DISP_unfilled != n->data.Bd.type)

return(1);

tabwidth = p->tabwidth;

Line 1644 termp_bd_pre(DECL_ARGS)

Line 1643 termp_bd_pre(DECL_ARGS)

NULL == nn->next)

term_flushln(p);

}

p->tabwidth = tabwidth;

p->rmargin = rm;

p->maxrmargin = rmax;

return(0);

Line 1656 termp_bd_pre(DECL_ARGS)

Line 1655 termp_bd_pre(DECL_ARGS)

static void

termp_bd_post(DECL_ARGS)

{

int type;

size_t rm, rmax;

if (MDOC_BODY != n->type)

return;

type = arg_disptype(n->parent);

assert(-1 != type);

rm = p->rmargin;

rmax = p->maxrmargin;

if (MDOC_Literal == type || MDOC_Unfilled == type)

if (DISP_literal == n->data.Bd.type ||

DISP_unfilled == n->data.Bd.type)

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

p->flags |= TERMP_NOSPACE;

Line 1834 static int

Line 1830 static int

termp_cd_pre(DECL_ARGS)

{

synopsis_pre(p, n);

term_fontpush(p, TERMFONT_BOLD);

term_newln(p);

return(1);

}

Line 1845 static int

Line 1841 static int

termp_in_pre(DECL_ARGS)

{

synopsis_pre(p, n);

if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {

term_fontpush(p, TERMFONT_BOLD);

term_word(p, "#include");

Line 1864 static void

Line 1862 static void

termp_in_post(DECL_ARGS)

{

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

if (SEC_SYNOPSIS == n->sec)

term_fontpush(p, TERMFONT_BOLD);

p->flags |= TERMP_NOSPACE;

term_word(p, ">");

if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {

if (SEC_SYNOPSIS == n->sec)

term_fontpop(p);

term_newln(p);

}

Line 1984 termp_fo_pre(DECL_ARGS)

Line 1980 termp_fo_pre(DECL_ARGS)

{

if (MDOC_BLOCK == n->type) {

/* NB: MDOC_LINE has no effect on this macro! */

synopsis_pre(p, n);

if (SEC_SYNOPSIS != n->sec)

return(1);

if (n->prev && MDOC_Ft == n->prev->tok)

term_newln(p);

else if (n->prev)

term_vspace(p);

return(1);

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

p->flags |= TERMP_NOSPACE;

Line 2014 static void

Line 2004 static void

termp_fo_post(DECL_ARGS)

{

if (MDOC_BLOCK == n->type) {

if (MDOC_BODY != n->type)

/* NB: MDOC_LINE has no effect on this macro! */

return;

if (SEC_SYNOPSIS == n->sec)

term_newln(p);

p->flags |= TERMP_NOSPACE;

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

term_word(p, ")");

if (SEC_SYNOPSIS == n->sec) {

p->flags |= TERMP_NOSPACE;

term_word(p, ")");

term_word(p, ";");

if (SEC_SYNOPSIS == n->sec) {

p->flags |= TERMP_NOSPACE;

term_word(p, ";");

}

CVSweb