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.174 and 1.196

version 1.174, 2010/07/16 00:03:37

version 1.196, 2010/12/05 15:37:30

Line 69 static void synopsis_pre(struct termp *,

static void termp____post(DECL_ARGS);

static void termp_an_post(DECL_ARGS);

static void termp_aq_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_bq_post(DECL_ARGS);

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

static void termp_fo_post(DECL_ARGS);

static void termp_in_post(DECL_ARGS);

static void termp_it_post(DECL_ARGS);

static void termp_lb_post(DECL_ARGS);

static void termp_nm_post(DECL_ARGS);

static void termp_op_post(DECL_ARGS);

static void termp_pf_post(DECL_ARGS);

static void termp_pq_post(DECL_ARGS);

static void termp_quote_post(DECL_ARGS);

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

static int termp_an_pre(DECL_ARGS);

static int termp_ap_pre(DECL_ARGS);

static int termp_aq_pre(DECL_ARGS);

static int termp_bd_pre(DECL_ARGS);

static int termp_bf_pre(DECL_ARGS);

static int termp_bk_pre(DECL_ARGS);

static int termp_bl_pre(DECL_ARGS);

static int termp_bold_pre(DECL_ARGS);

static int termp_bq_pre(DECL_ARGS);

static int termp_brq_pre(DECL_ARGS);

static int termp_bt_pre(DECL_ARGS);

static int termp_cd_pre(DECL_ARGS);

static int termp_d1_pre(DECL_ARGS);

static int termp_dq_pre(DECL_ARGS);

static int termp_ex_pre(DECL_ARGS);

static int termp_fa_pre(DECL_ARGS);

static int termp_fd_pre(DECL_ARGS);

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 119 static int termp_lk_pre(DECL_ARGS);

Line 110 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_op_pre(DECL_ARGS);

static int termp_quote_pre(DECL_ARGS);

static int termp_pf_pre(DECL_ARGS);

static int termp_pq_pre(DECL_ARGS);

static int termp_qq_pre(DECL_ARGS);

static int termp_rs_pre(DECL_ARGS);

static int termp_rv_pre(DECL_ARGS);

static int termp_sh_pre(DECL_ARGS);

static int termp_sm_pre(DECL_ARGS);

static int termp_sp_pre(DECL_ARGS);

static int termp_sq_pre(DECL_ARGS);

static int termp_ss_pre(DECL_ARGS);

static int termp_under_pre(DECL_ARGS);

static int termp_ud_pre(DECL_ARGS);

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

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

{ termp_bl_pre, termp_bl_post }, /* Bl */

{ NULL, NULL }, /* El */

{ termp_it_pre, termp_it_post }, /* It */

{ NULL, NULL }, /* Ad */

{ termp_under_pre, NULL }, /* Ad */

{ termp_an_pre, termp_an_post }, /* An */

{ termp_under_pre, NULL }, /* Ar */

{ termp_cd_pre, NULL }, /* Cd */

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

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

{ termp_li_pre, NULL }, /* Li */

{ termp_nd_pre, NULL }, /* Nd */

{ termp_nm_pre, termp_nm_post }, /* Nm */

{ termp_op_pre, termp_op_post }, /* Op */

{ termp_quote_pre, termp_quote_post }, /* Op */

{ NULL, NULL }, /* Ot */

{ termp_under_pre, NULL }, /* Pa */

{ termp_rv_pre, NULL }, /* Rv */

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

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

{ termp_under_pre, NULL }, /* Va */

{ termp_vt_pre, NULL }, /* Vt */

{ termp_xr_pre, NULL }, /* Xr */

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

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

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

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

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

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

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

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

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

{ NULL, NULL }, /* Ac */

{ termp_aq_pre, termp_aq_post }, /* Ao */

{ termp_quote_pre, termp_quote_post }, /* Ao */

{ termp_aq_pre, termp_aq_post }, /* Aq */

{ termp_quote_pre, termp_quote_post }, /* Aq */

{ NULL, NULL }, /* At */

{ NULL, NULL }, /* Bc */

{ termp_bf_pre, NULL }, /* Bf */

{ termp_bq_pre, termp_bq_post }, /* Bo */

{ termp_quote_pre, termp_quote_post }, /* Bo */

{ termp_bq_pre, termp_bq_post }, /* Bq */

{ termp_quote_pre, termp_quote_post }, /* Bq */

{ termp_xx_pre, NULL }, /* Bsx */

{ NULL, termp_bx_post }, /* Bx */

{ NULL, NULL }, /* Db */

{ NULL, NULL }, /* Dc */

{ termp_dq_pre, termp_dq_post }, /* Do */

{ termp_quote_pre, termp_quote_post }, /* Do */

{ termp_dq_pre, termp_dq_post }, /* Dq */

{ termp_quote_pre, termp_quote_post }, /* Dq */

{ NULL, NULL }, /* Ec */ /* FIXME: no space */

{ NULL, NULL }, /* Ef */

{ termp_under_pre, NULL }, /* Em */

{ NULL, NULL }, /* Eo */

{ termp_xx_pre, NULL }, /* Fx */

{ termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */

{ 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_pq_pre, termp_pq_post }, /* Po */

{ termp_quote_pre, termp_quote_post }, /* Po */

{ termp_pq_pre, termp_pq_post }, /* Pq */

{ termp_quote_pre, termp_quote_post }, /* Pq */

{ NULL, NULL }, /* Qc */

{ termp_sq_pre, termp_sq_post }, /* Ql */

{ termp_quote_pre, termp_quote_post }, /* Ql */

{ termp_qq_pre, termp_qq_post }, /* Qo */

{ termp_quote_pre, termp_quote_post }, /* Qo */

{ termp_qq_pre, termp_qq_post }, /* Qq */

{ termp_quote_pre, termp_quote_post }, /* Qq */

{ NULL, NULL }, /* Re */

{ termp_rs_pre, NULL }, /* Rs */

{ NULL, NULL }, /* Sc */

{ termp_sq_pre, termp_sq_post }, /* So */

{ termp_quote_pre, termp_quote_post }, /* So */

{ termp_sq_pre, termp_sq_post }, /* Sq */

{ termp_quote_pre, termp_quote_post }, /* Sq */

{ termp_sm_pre, NULL }, /* Sm */

{ termp_under_pre, NULL }, /* Sx */

{ termp_bold_pre, NULL }, /* Sy */

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

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

{ NULL, NULL }, /* Xo */

{ termp_fo_pre, termp_fo_post }, /* Fo */

{ NULL, NULL }, /* Fc */

{ termp_op_pre, termp_op_post }, /* Oo */

{ termp_quote_pre, termp_quote_post }, /* Oo */

{ NULL, NULL }, /* Oc */

{ termp_bk_pre, termp_bk_post }, /* Bk */

{ NULL, NULL }, /* Ek */

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

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

{ termp_sp_pre, NULL }, /* Lp */

{ termp_lk_pre, NULL }, /* Lk */

{ termp_under_pre, NULL }, /* Mt */

{ termp_brq_pre, termp_brq_post }, /* Brq */

{ termp_quote_pre, termp_quote_post }, /* Brq */

{ termp_brq_pre, termp_brq_post }, /* Bro */

{ termp_quote_pre, termp_quote_post }, /* Bro */

{ NULL, NULL }, /* Brc */

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

{ NULL, NULL }, /* Es */ /* TODO */

Line 596 print_bvspace(struct termp *p,

Line 583 print_bvspace(struct termp *p,

/* ARGSUSED */

static int

termp_dq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

term_word(p, "\\(lq");

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_dq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, "\\(rq");

}

/* ARGSUSED */

static int

termp_it_pre(DECL_ARGS)

{

const struct mdoc_node *bl, *nn;

Line 1026 termp_nm_pre(DECL_ARGS)

Line 986 termp_nm_pre(DECL_ARGS)

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

return(0);

synopsis_pre(p, n);

if (MDOC_HEAD == n->type)

synopsis_pre(p, n->parent);

if (MDOC_HEAD == n->type && n->next->child) {

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_HANG;

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

p->rmargin = p->offset + term_len(p, 1) +

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

(NULL == n->child ? term_strlen(p, m->name) :

if (NULL == n->child) {

MDOC_TEXT == n->child->type ?

p->rmargin += term_strlen(p, m->name);

term_strlen(p, n->child->string) :

} else if (MDOC_TEXT == n->child->type) {

term_len(p, 5));

p->rmargin += term_strlen(p, n->child->string);

if (n->child->next)

p->flags |= TERMP_HANG;

} else {

p->rmargin += term_len(p, 5);

p->flags |= TERMP_HANG;

}

term_fontpush(p, TERMFONT_BOLD);

Line 1078 termp_fl_pre(DECL_ARGS)

Line 1045 termp_fl_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp__a_pre(DECL_ARGS)

{

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

if (NULL == n->next || MDOC__A != n->next->tok)

term_word(p, "and");

return(1);

}

/* ARGSUSED */

static int

termp_an_pre(DECL_ARGS)

{

Line 1268 termp_bl_post(DECL_ARGS)

Line 1248 termp_bl_post(DECL_ARGS)

/* ARGSUSED */

static void

termp_op_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, "\\(rB");

}

/* ARGSUSED */

static int

termp_xr_pre(DECL_ARGS)

{

Line 1296 termp_xr_pre(DECL_ARGS)

Line 1264 termp_xr_pre(DECL_ARGS)

return(0);

p->flags |= TERMP_NOSPACE;

term_word(p, "(");

p->flags |= TERMP_NOSPACE;

term_word(p, nn->string);

p->flags |= TERMP_NOSPACE;

term_word(p, ")");

return(0);

Line 1448 termp_sh_post(DECL_ARGS)

Line 1414 termp_sh_post(DECL_ARGS)

/* ARGSUSED */

static int

termp_op_pre(DECL_ARGS)

{

switch (n->type) {

case (MDOC_BODY):

term_word(p, "\\(lB");

p->flags |= TERMP_NOSPACE;

break;

default:

break;

}

return(1);

}

/* ARGSUSED */

static int

termp_bt_pre(DECL_ARGS)

{

Line 1521 termp_d1_post(DECL_ARGS)

Line 1470 termp_d1_post(DECL_ARGS)

/* ARGSUSED */

static int

termp_aq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

term_word(p, "\\(la");

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_aq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, "\\(ra");

}

/* ARGSUSED */

static int

termp_ft_pre(DECL_ARGS)

{

Line 1620 termp_fa_pre(DECL_ARGS)

Line 1544 termp_fa_pre(DECL_ARGS)

static int

termp_bd_pre(DECL_ARGS)

{

size_t tabwidth;

size_t tabwidth, rm, rmax;

size_t rm, rmax;

const struct mdoc_node *nn;

if (MDOC_BLOCK == n->type) {

Line 1653 termp_bd_pre(DECL_ARGS)

Line 1576 termp_bd_pre(DECL_ARGS)

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

for (nn = n->child; nn; nn = nn->next) {

p->flags |= TERMP_NOSPACE;

print_mdoc_node(p, pair, m, nn);

if (NULL == nn->prev ||

nn->prev->line < nn->line ||

* If the printed node flushes its own line, then we

NULL == nn->next)

* needn't do it here as well. This is hacky, but the

term_flushln(p);

* notion of selective eoln whitespace is pretty dumb

* 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):

continue;

default:

break;

}

if (nn->next && nn->next->line == nn->line)

continue;

term_flushln(p);

p->flags |= TERMP_NOSPACE;

}

p->tabwidth = tabwidth;

Line 1694 termp_bd_post(DECL_ARGS)

Line 1642 termp_bd_post(DECL_ARGS)

/* ARGSUSED */

static int

termp_qq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

term_word(p, "\"");

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_qq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, "\"");

}

/* ARGSUSED */

static void

termp_bx_post(DECL_ARGS)

{

Line 1738 termp_xx_pre(DECL_ARGS)

Line 1661 termp_xx_pre(DECL_ARGS)

pp = NULL;

switch (n->tok) {

case (MDOC_Bsx):

pp = "BSDI BSD/OS";

pp = "BSD/OS";

break;

case (MDOC_Dx):

pp = "DragonFly";

Line 1767 termp_xx_pre(DECL_ARGS)

Line 1690 termp_xx_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp_sq_pre(DECL_ARGS)

termp_igndelim_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

term_word(p, "\\(oq");

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_sq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, "\\(aq");

}

/* ARGSUSED */

static int

termp_pf_pre(DECL_ARGS)

{

p->flags |= TERMP_IGNDELIM;

return(1);

}

Line 1805 static void

Line 1703 static void

termp_pf_post(DECL_ARGS)

{

p->flags &= ~TERMP_IGNDELIM;

p->flags |= TERMP_NOSPACE;

}

Line 1905 termp_sp_pre(DECL_ARGS)

Line 1802 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 1920 termp_sp_pre(DECL_ARGS)

Line 1822 termp_sp_pre(DECL_ARGS)

/* ARGSUSED */

static int

termp_brq_pre(DECL_ARGS)

termp_quote_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

term_word(p, "\\(lC");

p->flags |= TERMP_NOSPACE;

return(1);

}

switch (n->tok) {

case (MDOC_Ao):

/* FALLTHROUGH */

case (MDOC_Aq):

term_word(p, "<");

break;

case (MDOC_Bro):

/* FALLTHROUGH */

case (MDOC_Brq):

term_word(p, "{");

break;

case (MDOC_Oo):

/* FALLTHROUGH */

case (MDOC_Op):

/* FALLTHROUGH */

case (MDOC_Bo):

/* FALLTHROUGH */

case (MDOC_Bq):

term_word(p, "[");

break;

case (MDOC_Do):

/* FALLTHROUGH */

case (MDOC_Dq):

term_word(p, "``");

break;

case (MDOC_Po):

/* FALLTHROUGH */

case (MDOC_Pq):

term_word(p, "(");

break;

case (MDOC_Qo):

/* FALLTHROUGH */

case (MDOC_Qq):

term_word(p, "\"");

break;

case (MDOC_Ql):

/* FALLTHROUGH */

case (MDOC_So):

/* FALLTHROUGH */

case (MDOC_Sq):

term_word(p, "`");

break;

default:

abort();

/* NOTREACHED */

}

/* ARGSUSED */

static void

termp_brq_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, "\\(rC");

}

/* ARGSUSED */

static int

termp_bq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

term_word(p, "\\(lB");

p->flags |= TERMP_NOSPACE;

return(1);

}

/* ARGSUSED */

static void

termp_bq_post(DECL_ARGS)

termp_quote_post(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, "\\(rB");

}

/* ARGSUSED */

static int

termp_pq_pre(DECL_ARGS)

{

if (MDOC_BODY != n->type)

return(1);

term_word(p, "\\&(");

p->flags |= TERMP_NOSPACE;

return(1);

}

switch (n->tok) {

/* ARGSUSED */

case (MDOC_Ao):

static void

/* FALLTHROUGH */

termp_pq_post(DECL_ARGS)

case (MDOC_Aq):

{

term_word(p, ">");

break;

if (MDOC_BODY != n->type)

case (MDOC_Bro):

return;

/* FALLTHROUGH */

term_word(p, ")");

case (MDOC_Brq):

term_word(p, "}");

break;

case (MDOC_Oo):

/* FALLTHROUGH */

case (MDOC_Op):

/* FALLTHROUGH */

case (MDOC_Bo):

/* FALLTHROUGH */

case (MDOC_Bq):

term_word(p, "]");

break;

case (MDOC_Do):

/* FALLTHROUGH */

case (MDOC_Dq):

term_word(p, "''");

break;

case (MDOC_Po):

/* FALLTHROUGH */

case (MDOC_Pq):

term_word(p, ")");

break;

case (MDOC_Qo):

/* FALLTHROUGH */

case (MDOC_Qq):

term_word(p, "\"");

break;

case (MDOC_Ql):

/* FALLTHROUGH */

case (MDOC_So):

/* FALLTHROUGH */

case (MDOC_Sq):

term_word(p, "'");

break;

default:

abort();

/* NOTREACHED */

}

Line 2003 termp_fo_pre(DECL_ARGS)

Line 1950 termp_fo_pre(DECL_ARGS)

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

p->flags |= TERMP_NOSPACE;

term_word(p, "(");

p->flags |= TERMP_NOSPACE;

return(1);

}

Line 2027 termp_fo_post(DECL_ARGS)

Line 1973 termp_fo_post(DECL_ARGS)

if (MDOC_BODY != n->type)

return;

p->flags |= TERMP_NOSPACE;

term_word(p, ")");

if (MDOC_SYNPRETTY & n->flags) {

if (MDOC_SYNPRETTY & n->flags)

p->flags |= TERMP_NOSPACE;

term_word(p, ";");

}

Line 2083 termp_ap_pre(DECL_ARGS)

Line 2026 termp_ap_pre(DECL_ARGS)

{

p->flags |= TERMP_NOSPACE;

term_word(p, "\\(aq");

term_word(p, "'");

p->flags |= TERMP_NOSPACE;

return(1);

}

Line 2094 static void

Line 2037 static void

termp____post(DECL_ARGS)

{

* Handle lists of authors. In general, print each followed by

* a comma. Don't print the comma if there are only two

* authors.

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

if (NULL == n->next->next || MDOC__A != n->next->next->tok)

if (NULL == n->prev || MDOC__A != n->prev->tok)

return;

/* TODO: %U. */

p->flags |= TERMP_NOSPACE;

if (NULL == n->parent || MDOC_Rs != n->parent->tok)

term_word(p, n->next ? "," : ".");

return;

if (NULL == n->next) {

term_word(p, ".");

p->flags |= TERMP_SENTENCE;

} else

term_word(p, ",");

}

Line 2115 termp_li_pre(DECL_ARGS)

Line 2074 termp_li_pre(DECL_ARGS)

static int

termp_lk_pre(DECL_ARGS)

{

const struct mdoc_node *nn;

const struct mdoc_node *nn, *sv;

term_fontpush(p, TERMFONT_UNDER);

nn = n->child;

if (NULL == nn->next)

nn = sv = n->child;

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

return(1);

term_word(p, nn->string);

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

term_word(p, nn->string);

term_fontpop(p);

p->flags |= TERMP_NOSPACE;

term_word(p, ":");

term_fontpush(p, TERMFONT_BOLD);

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

term_word(p, sv->string);

term_word(p, nn->string);

term_fontpop(p);

return(0);

CVSweb