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.157

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

version 1.157, 2010/06/25 18:53:14

Line 1

/* $Id$ */

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

* purpose with or without fee is hereby granted, provided that the above

Line 52 struct termact {

void (*post)(DECL_ARGS);

};

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

static size_t a2width(const struct termp *, const char *);

static size_t a2height(const struct mdoc_node *);

static size_t a2height(const struct termp *, const char *);

static size_t a2offs(const struct mdoc_argv *);

static size_t a2offs(const struct termp *, 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 78 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);

Line 90 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 159 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 174 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 274 terminal_mdoc(void *arg, const struct mdoc *mdoc)

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

p->overstep = 0;

p->maxrmargin = p->defrmargin;

p->tabwidth = 5;

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

if (NULL == p->symtab)

switch (p->enc) {

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

Line 286 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 345 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 368 print_foot(DECL_ARGS)

Line 369 print_foot(DECL_ARGS)

term_vspace(p);

p->offset = 0;

p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;

p->rmargin = (p->maxrmargin -

term_strlen(p, buf) + term_len(p, 1)) / 2;

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

term_word(p, os);

term_flushln(p);

p->offset = p->rmargin;

p->rmargin = p->maxrmargin - strlen(os);

p->rmargin = p->maxrmargin - term_strlen(p, os);

p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;

term_word(p, buf);

Line 395 print_foot(DECL_ARGS)

Line 397 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 429 print_mdoc_head(DECL_ARGS)

Line 433 print_mdoc_head(DECL_ARGS)

snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);

p->offset = 0;

p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;

p->rmargin = (p->maxrmargin -

term_strlen(p, buf) + term_len(p, 1)) / 2;

p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;

term_word(p, title);

term_flushln(p);

p->offset = p->rmargin;

p->rmargin = p->maxrmargin - strlen(title);

p->rmargin = p->maxrmargin - term_strlen(p, title);

p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;

term_word(p, buf);

Line 457 print_mdoc_head(DECL_ARGS)

Line 462 print_mdoc_head(DECL_ARGS)

static size_t

a2height(const struct mdoc_node *n)

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

{

struct roffsu su;

assert(MDOC_TEXT == n->type);

assert(v);

assert(n->string);

if ( ! a2roffsu(v, &su, SCALE_VS))

if ( ! a2roffsu(n->string, &su, SCALE_VS))

SCALE_VS_INIT(&su, term_len(p, 1));

SCALE_VS_INIT(&su, strlen(n->string));

return(term_vspan(&su));

return(term_vspan(p, &su));

}

static size_t

a2width(const struct mdoc_argv *arg, int pos)

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

{

struct roffsu su;

assert(arg->value[pos]);

assert(v);

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

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

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

SCALE_HS_INIT(&su, term_strlen(p, v));

return(term_hspan(&su));

return(term_hspan(p, &su));

}

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 struct termp *p, 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);

return(term_len(p, INDENT + 1));

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

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

return((INDENT + 1) * 2);

return(term_len(p, (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, term_strlen(p, v));

return(term_hspan(&su));

return(term_hspan(p, &su));

}

Line 546 arg_hasattr(int arg, const struct mdoc_node *n)

Line 521 arg_hasattr(int arg, const struct mdoc_node *n)

* Get the index of an argument in a node's argument list or -1 if it

* does not exist. See arg_getattrs().

* does not exist.

static int

arg_getattr(int v, const struct mdoc_node *n)

{

int val;

int i;

return(arg_getattrs(&v, &val, 1, n) ? val : -1);

}

* Walk through the argument list for a node and fill an array "vals"

* with the positions of the argument structures listed in "keys".

* Return the number of elements that were written into "vals", which

* can be zero.

static int

arg_getattrs(const int *keys, int *vals,

size_t sz, const struct mdoc_node *n)

{

int i, j, k;

if (NULL == n->args)

return(0);

for (k = i = 0; i < (int)n->args->argc; i++)

for (i = 0; i < (int)n->args->argc; i++)

for (j = 0; j < (int)sz; j++)

if (n->args->argv[i].arg == v)

if (n->args->argv[i].arg == keys[j]) {

return(i);

vals[j] = i;

k++;

return(-1);

}

return(k);

}

Line 595 print_bvspace(struct termp *p,

Line 552 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 574 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 664 termp_it_pre(DECL_ARGS)

Line 624 termp_it_pre(DECL_ARGS)

{

const struct mdoc_node *bl, *nn;

char buf[7];

int i, keys[3], vals[3];

int i, col;

size_t width, offset, ncols, dcol;

enum mdoc_list type;

Line 674 termp_it_pre(DECL_ARGS)

Line 634 termp_it_pre(DECL_ARGS)

}

bl = n->parent->parent->parent;

type = bl->data.Bl.type;

/* Get list width, offset, and list type from argument list. */

keys[0] = MDOC_Width;

keys[1] = MDOC_Offset;

keys[2] = MDOC_Column;

vals[0] = vals[1] = vals[2] = -1;

arg_getattrs(keys, vals, 3, bl);

type = bl->data.list;

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

* we're a -column list, in which case all prior columns must

Line 695 termp_it_pre(DECL_ARGS)

Line 644 termp_it_pre(DECL_ARGS)

width = offset = 0;

if (vals[1] >= 0)

if (bl->data.Bl.offs)

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

offset = a2offs(p, bl->data.Bl.offs);

switch (type) {

case (LIST_column):

if (MDOC_HEAD == n->type)

break;

col = arg_getattr(MDOC_Column, bl);

* Imitate groff's column handling:

* - For each earlier column, add its width.

Line 711 termp_it_pre(DECL_ARGS)

Line 663 termp_it_pre(DECL_ARGS)

* column.

* - For more than 5 columns, add only one column.

ncols = bl->args->argv[vals[2]].sz;

ncols = bl->args->argv[col].sz;

/* LINTED */

dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1;

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,

Line 724 termp_it_pre(DECL_ARGS)

Line 677 termp_it_pre(DECL_ARGS)

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

nn = nn->prev, i++)

offset += dcol + a2width

(&bl->args->argv[vals[2]], i);

(p, bl->args->argv[col].value[i]);

* When exceeding the declared number of columns, leave

* the remaining widths at 0. This will later be

Line 740 termp_it_pre(DECL_ARGS)

Line 692 termp_it_pre(DECL_ARGS)

* Use the declared column widths, extended as explained

* in the preceding paragraph.

width = a2width(&bl->args->argv[vals[2]], i) + dcol;

width = a2width(p, bl->args->argv[col].value[i]) + dcol;

break;

default:

if (vals[0] < 0)

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

break;

Line 751 termp_it_pre(DECL_ARGS)

Line 703 termp_it_pre(DECL_ARGS)

* number for buffering single arguments. See the above

* handling for column for how this changes.

width = a2width(&bl->args->argv[vals[0]], 0) + 2;

assert(bl->data.Bl.width);

width = a2width(p, bl->data.Bl.width) + term_len(p, 2);

break;

}

Line 767 termp_it_pre(DECL_ARGS)

Line 720 termp_it_pre(DECL_ARGS)

case (LIST_dash):

/* FALLTHROUGH */

case (LIST_hyphen):

if (width < 4)

if (width < term_len(p, 4))

width = 4;

width = term_len(p, 4);

break;

case (LIST_enum):

if (width < 5)

if (width < term_len(p, 5))

width = 5;

width = term_len(p, 5);

break;

case (LIST_hang):

if (0 == width)

width = 8;

width = term_len(p, 8);

break;

case (LIST_column):

/* FALLTHROUGH */

case (LIST_tag):

if (0 == width)

width = 10;

width = term_len(p, 10);

break;

default:

break;

Line 1013 termp_it_post(DECL_ARGS)

Line 966 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 1008 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 1263 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 1349 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 1379 termp_sh_pre(DECL_ARGS)

Line 1376 termp_sh_pre(DECL_ARGS)

term_fontpush(p, TERMFONT_BOLD);

break;

case (MDOC_BODY):

p->offset = INDENT;

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

break;

default:

break;

Line 1464 termp_d1_pre(DECL_ARGS)

Line 1461 termp_d1_pre(DECL_ARGS)

if (MDOC_BLOCK != n->type)

return(1);

term_newln(p);

p->offset += (INDENT + 1);

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

return(1);

}

Line 1511 termp_ft_pre(DECL_ARGS)

Line 1508 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 1520 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 1548 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 1579 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 1588 termp_bd_pre(DECL_ARGS)

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

return(0);

nn = n->parent;

if (n->data.Bd.offs)

p->offset += a2offs(p, 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 1599 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;

p->tabwidth = 8;

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

rm = p->rmargin;

rmax = p->maxrmargin;

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

Line 1644 termp_bd_pre(DECL_ARGS)

Line 1617 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 1629 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 1809 termp_ss_pre(DECL_ARGS)

Line 1779 termp_ss_pre(DECL_ARGS)

break;

case (MDOC_HEAD):

term_fontpush(p, TERMFONT_BOLD);

p->offset = HALFINDENT;

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

break;

default:

break;

Line 1834 static int

Line 1804 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 1815 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 1836 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 1885 termp_sp_pre(DECL_ARGS)

Line 1855 termp_sp_pre(DECL_ARGS)

switch (n->tok) {

case (MDOC_sp):

len = n->child ? a2height(n->child) : 1;

len = n->child ? a2height(p, n->child->string) : 1;

break;

case (MDOC_br):

len = 0;

Line 1984 termp_fo_pre(DECL_ARGS)

Line 1954 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 1978 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