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.190 and 1.219

version 1.190, 2010/09/27 11:21:39

version 1.219, 2011/02/09 09:52:47

Line 1

/* $Id$ */

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

Line 68 static void synopsis_pre(struct termp *,

const struct mdoc_node *);

static void termp____post(DECL_ARGS);

static void termp__t_post(DECL_ARGS);

static void termp_an_post(DECL_ARGS);

static void termp_bd_post(DECL_ARGS);

static void termp_bk_post(DECL_ARGS);

static void termp_bl_post(DECL_ARGS);

static void termp_bx_post(DECL_ARGS);

static void termp_d1_post(DECL_ARGS);

static void termp_fo_post(DECL_ARGS);

static void termp_in_post(DECL_ARGS);

Line 81 static void termp_lb_post(DECL_ARGS);

static void termp_nm_post(DECL_ARGS);

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 int termp__a_pre(DECL_ARGS);

static int termp__t_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 94 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_ex_pre(DECL_ARGS);

Line 103 static int termp_fl_pre(DECL_ARGS);

Line 104 static int termp_fl_pre(DECL_ARGS);

static int termp_fn_pre(DECL_ARGS);

static int termp_fo_pre(DECL_ARGS);

static int termp_ft_pre(DECL_ARGS);

static int termp_igndelim_pre(DECL_ARGS);

static int termp_in_pre(DECL_ARGS);

static int termp_it_pre(DECL_ARGS);

static int termp_li_pre(DECL_ARGS);

Line 110 static int termp_lk_pre(DECL_ARGS);

Line 112 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_pf_pre(DECL_ARGS);

static int termp_quote_pre(DECL_ARGS);

static int termp_rs_pre(DECL_ARGS);

static int termp_rv_pre(DECL_ARGS);

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

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

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

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

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

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

{ termp__t_pre, termp__t_post }, /* %T */

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

{ NULL, NULL }, /* Ac */

{ termp_quote_pre, termp_quote_post }, /* Ao */

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

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

{ termp_quote_pre, termp_quote_post }, /* Bo */

{ termp_quote_pre, termp_quote_post }, /* Bq */

{ termp_xx_pre, NULL }, /* Bsx */

{ NULL, termp_bx_post }, /* Bx */

{ termp_bx_pre, NULL }, /* Bx */

{ NULL, NULL }, /* Db */

{ NULL, NULL }, /* Dc */

{ termp_quote_pre, termp_quote_post }, /* Do */

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

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

{ NULL, NULL }, /* Eo */

{ termp_xx_pre, NULL }, /* Fx */

{ termp_bold_pre, NULL }, /* Ms */

{ NULL, NULL }, /* No */

{ termp_igndelim_pre, NULL }, /* No */

{ termp_ns_pre, NULL }, /* Ns */

{ termp_xx_pre, NULL }, /* Nx */

{ termp_xx_pre, NULL }, /* Ox */

{ NULL, NULL }, /* Pc */

{ termp_pf_pre, termp_pf_post }, /* Pf */

{ termp_igndelim_pre, termp_pf_post }, /* Pf */

{ termp_quote_pre, termp_quote_post }, /* Po */

{ termp_quote_pre, termp_quote_post }, /* Pq */

{ NULL, NULL }, /* Qc */

Line 312 print_mdoc_node(DECL_ARGS)

Line 313 print_mdoc_node(DECL_ARGS)

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

npair.ppair = pair;

if (MDOC_TEXT == n->type)

term_word(p, n->string);

else if (termacts[n->tok].pre && ENDBODY_NOT == n->end)

chld = (*termacts[n->tok].pre)(p, &npair, m, n);

* Keeps only work until the end of a line. If a keep was

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

* Also let SYNPRETTY sections behave as if they were wrapped

* in a `Bk' block.

if (TERMP_KEEP & p->flags) {

if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {

if (n->prev && n->prev->line != n->line) {

p->flags &= ~TERMP_KEEP;

p->flags |= TERMP_PREKEEP;

Line 334 print_mdoc_node(DECL_ARGS)

Line 333 print_mdoc_node(DECL_ARGS)

}

* Since SYNPRETTY sections aren't "turned off" with `Ek',

* we have to intuit whether we should disable formatting.

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

((n->prev && MDOC_SYNPRETTY & n->prev->flags) ||

(n->parent && MDOC_SYNPRETTY & n->parent->flags)))

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

* After the keep flags have been set up, we may now

* produce output. Note that some pre-handlers do so.

switch (n->type) {

case (MDOC_TEXT):

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

term_newln(p);

term_word(p, n->string);

break;

case (MDOC_EQN):

term_word(p, n->eqn->data);

break;

case (MDOC_TBL):

term_tbl(p, n->span);

break;

default:

if (termacts[n->tok].pre && ENDBODY_NOT == n->end)

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

(p, &npair, m, n);

break;

}

if (chld && n->child)

print_mdoc_nodelist(p, &npair, m, n->child);

term_fontpopq(p, font);

if (MDOC_TEXT != n->type && termacts[n->tok].post &&

switch (n->type) {

! (MDOC_ENDED & n->flags)) {

case (MDOC_TEXT):

break;

case (MDOC_TBL):

break;

case (MDOC_EQN):

break;

default:

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

break;

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

Line 358 print_mdoc_node(DECL_ARGS)

Line 399 print_mdoc_node(DECL_ARGS)

if (ENDBODY_NOSPACE == n->end)

p->flags |= TERMP_NOSPACE;

break;

}

if (MDOC_EOS & n->flags)

Line 544 print_bvspace(struct termp *p,

Line 586 print_bvspace(struct termp *p,

term_newln(p);

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

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

return;

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

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

return;

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

Line 565 print_bvspace(struct termp *p,

Line 607 print_bvspace(struct termp *p,

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

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

if (MDOC_Bl == bl->tok && LIST_column == bl->norm->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.Bl->type)

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

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

assert(n->prev->body);

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

Line 598 termp_it_pre(DECL_ARGS)

Line 640 termp_it_pre(DECL_ARGS)

}

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

assert(bl->data.Bl);

type = bl->norm->Bl.type;

type = bl->data.Bl->type;

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

Line 609 termp_it_pre(DECL_ARGS)

Line 650 termp_it_pre(DECL_ARGS)

width = offset = 0;

if (bl->data.Bl->offs)

if (bl->norm->Bl.offs)

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

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

switch (type) {

case (LIST_column):

Line 626 termp_it_pre(DECL_ARGS)

Line 667 termp_it_pre(DECL_ARGS)

* column.

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

ncols = bl->data.Bl->ncols;

ncols = bl->norm->Bl.ncols;

/* LINTED */

dcol = ncols < 5 ? term_len(p, 4) :

Line 641 termp_it_pre(DECL_ARGS)

Line 682 termp_it_pre(DECL_ARGS)

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

nn = nn->prev, i++)

offset += dcol + a2width

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

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

* When exceeding the declared number of columns, leave

Line 656 termp_it_pre(DECL_ARGS)

Line 697 termp_it_pre(DECL_ARGS)

* Use the declared column widths, extended as explained

* in the preceding paragraph.

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

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

break;

default:

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

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

break;

Line 667 termp_it_pre(DECL_ARGS)

Line 708 termp_it_pre(DECL_ARGS)

* number for buffering single arguments. See the above

* handling for column for how this changes.

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

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

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

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

break;

}

Line 930 termp_it_post(DECL_ARGS)

Line 971 termp_it_post(DECL_ARGS)

if (MDOC_BLOCK == n->type)

return;

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

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

switch (type) {

case (LIST_item):

Line 1104 termp_an_post(DECL_ARGS)

Line 1145 termp_an_post(DECL_ARGS)

return;

}

if (AUTH_split == n->data.An.auth) {

if (AUTH_split == n->norm->An.auth) {

p->flags &= ~TERMP_NOSPLIT;

p->flags |= TERMP_SPLIT;

} else if (AUTH_nosplit == n->data.An.auth) {

} else if (AUTH_nosplit == n->norm->An.auth) {

p->flags &= ~TERMP_SPLIT;

p->flags |= TERMP_NOSPLIT;

}

Line 1120 static int

Line 1161 static int

termp_ns_pre(DECL_ARGS)

{

p->flags |= TERMP_NOSPACE;

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

p->flags |= TERMP_NOSPACE;

return(1);

}

Line 1554 termp_bd_pre(DECL_ARGS)

Line 1596 termp_bd_pre(DECL_ARGS)

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

return(0);

assert(n->data.Bd);

if (n->norm->Bd.offs)

if (n->data.Bd->offs)

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

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

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

Line 1566 termp_bd_pre(DECL_ARGS)

Line 1607 termp_bd_pre(DECL_ARGS)

* lines are allowed.

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

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

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

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

return(1);

tabwidth = p->tabwidth;

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

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

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

rm = p->rmargin;

rmax = p->maxrmargin;

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

Line 1585 termp_bd_pre(DECL_ARGS)

Line 1628 termp_bd_pre(DECL_ARGS)

* anyway, so don't sweat it.

switch (nn->tok) {

case (MDOC_Sm):

/* FALLTHROUGH */

case (MDOC_br):

/* FALLTHROUGH */

case (MDOC_sp):

/* FALLTHROUGH */

case (MDOC_Bl):

/* FALLTHROUGH */

case (MDOC_D1):

/* FALLTHROUGH */

case (MDOC_Dl):

/* FALLTHROUGH */

case (MDOC_Lp):

/* FALLTHROUGH */

case (MDOC_Pp):

Line 1623 termp_bd_post(DECL_ARGS)

Line 1672 termp_bd_post(DECL_ARGS)

rm = p->rmargin;

rmax = p->maxrmargin;

assert(n->data.Bd);

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

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

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

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

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

p->flags |= TERMP_NOSPACE;

Line 1637 termp_bd_post(DECL_ARGS)

Line 1685 termp_bd_post(DECL_ARGS)

/* ARGSUSED */

static void

static int

termp_bx_post(DECL_ARGS)

termp_bx_pre(DECL_ARGS)

{

if (n->child)

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

term_word(p, n->string);

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

}

Line 1652 static int

Line 1714 static int

termp_xx_pre(DECL_ARGS)

{

const char *pp;

int flags;

pp = NULL;

switch (n->tok) {

case (MDOC_Bsx):

pp = "BSDI BSD/OS";

pp = "BSD/OS";

break;

case (MDOC_Dx):

pp = "DragonFly";

Line 1677 termp_xx_pre(DECL_ARGS)

Line 1740 termp_xx_pre(DECL_ARGS)

break;

}

assert(pp);

term_word(p, pp);

return(1);

if (n->child) {

flags = p->flags;

p->flags |= TERMP_KEEP;

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

p->flags = flags;

}

return(0);

}

/* ARGSUSED */

static int

termp_pf_pre(DECL_ARGS)

termp_igndelim_pre(DECL_ARGS)

{

p->flags |= TERMP_IGNDELIM;

Line 1698 static void

Line 1766 static void

termp_pf_post(DECL_ARGS)

{

p->flags &= ~TERMP_IGNDELIM;

p->flags |= TERMP_NOSPACE;

}

Line 1798 termp_sp_pre(DECL_ARGS)

Line 1865 termp_sp_pre(DECL_ARGS)

len = 0;

break;

default:

assert(n->parent);

if ((NULL == n->next || NULL == n->prev) &&

(MDOC_Ss == n->parent->tok ||

MDOC_Sh == n->parent->tok))

return(0);

len = 1;

break;

}

Line 1821 static int

Line 1883 static int

termp_quote_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

if (MDOC_BODY != n->type && MDOC_ELEM != n->type)

return(1);

switch (n->tok) {

Line 1854 termp_quote_pre(DECL_ARGS)

Line 1916 termp_quote_pre(DECL_ARGS)

case (MDOC_Pq):

term_word(p, "(");

break;

case (MDOC__T):

/* FALLTHROUGH */

case (MDOC_Qo):

/* FALLTHROUGH */

case (MDOC_Qq):

Line 1881 static void

Line 1945 static void

termp_quote_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

if (MDOC_BODY != n->type && MDOC_ELEM != n->type)

return;

p->flags |= TERMP_NOSPACE;

Line 1916 termp_quote_post(DECL_ARGS)

Line 1980 termp_quote_post(DECL_ARGS)

case (MDOC_Pq):

term_word(p, ")");

break;

case (MDOC__T):

/* FALLTHROUGH */

case (MDOC_Qo):

/* FALLTHROUGH */

case (MDOC_Qq):

Line 1986 termp_bf_pre(DECL_ARGS)

Line 2052 termp_bf_pre(DECL_ARGS)

else if (MDOC_BLOCK != n->type)

return(1);

assert(n->data.Bf);

if (FONT_Em == n->norm->Bf.font)

if (FONT_Em == n->data.Bf->font)

term_fontpush(p, TERMFONT_UNDER);

else if (FONT_Sy == n->data.Bf->font)

else if (FONT_Sy == n->norm->Bf.font)

term_fontpush(p, TERMFONT_BOLD);

else

term_fontpush(p, TERMFONT_NONE);

Line 2076 termp_lk_pre(DECL_ARGS)

Line 2140 termp_lk_pre(DECL_ARGS)

nn = sv = n->child;

if (NULL == nn->next)

if (NULL == nn || NULL == nn->next)

return(1);

for (nn = nn->next; nn; nn = nn->next)

Line 2105 termp_bk_pre(DECL_ARGS)

Line 2169 termp_bk_pre(DECL_ARGS)

case (MDOC_HEAD):

return(0);

case (MDOC_BODY):

p->flags |= TERMP_PREKEEP;

if (n->parent->args || 0 == n->prev->nchild)

p->flags |= TERMP_PREKEEP;

break;

default:

abort();

Line 2123 termp_bk_post(DECL_ARGS)

Line 2188 termp_bk_post(DECL_ARGS)

if (MDOC_BODY == n->type)

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

}

/* ARGSUSED */

static void

termp__t_post(DECL_ARGS)

{

* If we're in an `Rs' and there's a journal present, then quote

* us instead of underlining us (for disambiguation).

if (n->parent && MDOC_Rs == n->parent->tok &&

n->parent->norm->Rs.quote_T)

termp_quote_post(p, pair, m, n);

termp____post(p, pair, m, n);

}

/* ARGSUSED */

static int

termp__t_pre(DECL_ARGS)

{

* If we're in an `Rs' and there's a journal present, then quote

* us instead of underlining us (for disambiguation).

if (n->parent && MDOC_Rs == n->parent->tok &&

n->parent->norm->Rs.quote_T)

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

term_fontpush(p, TERMFONT_UNDER);

return(1);

}

/* ARGSUSED */

CVSweb