version 1.132, 2010/05/29 18:47:54 |
version 1.144, 2010/06/07 20:57:09 |
Line 65 static void print_bvspace(struct termp *, |
|
Line 65 static void print_bvspace(struct termp *, |
|
const struct mdoc_node *, |
const struct mdoc_node *, |
const struct mdoc_node *); |
const struct mdoc_node *); |
static void print_mdoc_node(DECL_ARGS); |
static void print_mdoc_node(DECL_ARGS); |
static void print_mdoc_head(DECL_ARGS); |
static void print_mdoc_head(struct termp *, const void *); |
static void print_mdoc_nodelist(DECL_ARGS); |
static void print_mdoc_nodelist(DECL_ARGS); |
static void print_foot(DECL_ARGS); |
static void print_foot(struct termp *, const void *); |
|
static void synopsis_pre(struct termp *, |
|
const struct mdoc_node *); |
|
|
static void termp____post(DECL_ARGS); |
static void termp____post(DECL_ARGS); |
static void termp_an_post(DECL_ARGS); |
static void termp_an_post(DECL_ARGS); |
Line 79 static void termp_brq_post(DECL_ARGS); |
|
Line 81 static void termp_brq_post(DECL_ARGS); |
|
static void termp_bx_post(DECL_ARGS); |
static void termp_bx_post(DECL_ARGS); |
static void termp_d1_post(DECL_ARGS); |
static void termp_d1_post(DECL_ARGS); |
static void termp_dq_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_fo_post(DECL_ARGS); |
static void termp_ft_post(DECL_ARGS); |
|
static void termp_in_post(DECL_ARGS); |
static void termp_in_post(DECL_ARGS); |
static void termp_it_post(DECL_ARGS); |
static void termp_it_post(DECL_ARGS); |
static void termp_lb_post(DECL_ARGS); |
static void termp_lb_post(DECL_ARGS); |
Line 93 static void termp_qq_post(DECL_ARGS); |
|
Line 93 static void termp_qq_post(DECL_ARGS); |
|
static void termp_sh_post(DECL_ARGS); |
static void termp_sh_post(DECL_ARGS); |
static void termp_sq_post(DECL_ARGS); |
static void termp_sq_post(DECL_ARGS); |
static void termp_ss_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_an_pre(DECL_ARGS); |
static int termp_ap_pre(DECL_ARGS); |
static int termp_ap_pre(DECL_ARGS); |
Line 163 static const struct termact termacts[MDOC_MAX] = { |
|
Line 162 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ termp_ex_pre, NULL }, /* Ex */ |
{ termp_ex_pre, NULL }, /* Ex */ |
{ termp_fa_pre, NULL }, /* Fa */ |
{ termp_fa_pre, NULL }, /* Fa */ |
{ termp_bold_pre, termp_fd_post }, /* Fd */ |
{ termp_fd_pre, NULL }, /* Fd */ |
{ termp_fl_pre, NULL }, /* Fl */ |
{ termp_fl_pre, NULL }, /* Fl */ |
{ termp_fn_pre, termp_fn_post }, /* Fn */ |
{ termp_fn_pre, NULL }, /* Fn */ |
{ termp_ft_pre, termp_ft_post }, /* Ft */ |
{ termp_ft_pre, NULL }, /* Ft */ |
{ termp_bold_pre, NULL }, /* Ic */ |
{ termp_bold_pre, NULL }, /* Ic */ |
{ termp_in_pre, termp_in_post }, /* In */ |
{ termp_in_pre, termp_in_post }, /* In */ |
{ termp_li_pre, NULL }, /* Li */ |
{ termp_li_pre, NULL }, /* Li */ |
Line 178 static const struct termact termacts[MDOC_MAX] = { |
|
Line 177 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_rv_pre, NULL }, /* Rv */ |
{ termp_rv_pre, NULL }, /* Rv */ |
{ NULL, NULL }, /* St */ |
{ NULL, NULL }, /* St */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_vt_pre, termp_vt_post }, /* Vt */ |
{ termp_vt_pre, NULL }, /* Vt */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ termp_xr_pre, NULL }, /* Xr */ |
{ NULL, termp____post }, /* %A */ |
{ NULL, termp____post }, /* %A */ |
{ termp_under_pre, termp____post }, /* %B */ |
{ termp_under_pre, termp____post }, /* %B */ |
Line 260 static const struct termact termacts[MDOC_MAX] = { |
|
Line 259 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_sp_pre, NULL }, /* br */ |
{ termp_sp_pre, NULL }, /* br */ |
{ termp_sp_pre, NULL }, /* sp */ |
{ termp_sp_pre, NULL }, /* sp */ |
{ termp_under_pre, termp____post }, /* %U */ |
{ termp_under_pre, termp____post }, /* %U */ |
|
{ NULL, NULL }, /* Ta */ |
}; |
}; |
|
|
|
|
Line 276 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
Line 276 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
p->maxrmargin = p->defrmargin; |
p->maxrmargin = p->defrmargin; |
p->tabwidth = 5; |
p->tabwidth = 5; |
|
|
|
term_begin(p, print_mdoc_head, print_foot, mdoc_meta(mdoc)); |
|
|
if (NULL == p->symtab) |
if (NULL == p->symtab) |
switch (p->enc) { |
switch (p->enc) { |
case (TERMENC_ASCII): |
case (TERMENC_ASCII): |
Line 289 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
Line 291 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
n = mdoc_node(mdoc); |
n = mdoc_node(mdoc); |
m = mdoc_meta(mdoc); |
m = mdoc_meta(mdoc); |
|
|
print_mdoc_head(p, NULL, m, n); |
|
if (n->child) |
if (n->child) |
print_mdoc_nodelist(p, NULL, m, n->child); |
print_mdoc_nodelist(p, NULL, m, n->child); |
print_foot(p, NULL, m, n); |
|
|
term_end(p); |
} |
} |
|
|
|
|
Line 348 print_mdoc_node(DECL_ARGS) |
|
Line 350 print_mdoc_node(DECL_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
static void |
print_foot(DECL_ARGS) |
print_foot(struct termp *p, const void *arg) |
{ |
{ |
char buf[DATESIZ], os[BUFSIZ]; |
char buf[DATESIZ], os[BUFSIZ]; |
|
const struct mdoc_meta *m; |
|
|
|
m = (const struct mdoc_meta *)arg; |
|
|
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
|
|
/* |
/* |
Line 397 print_foot(DECL_ARGS) |
|
Line 402 print_foot(DECL_ARGS) |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
static void |
print_mdoc_head(DECL_ARGS) |
print_mdoc_head(struct termp *p, const void *arg) |
{ |
{ |
char buf[BUFSIZ], title[BUFSIZ]; |
char buf[BUFSIZ], title[BUFSIZ]; |
|
const struct mdoc_meta *m; |
|
|
|
m = (const struct mdoc_meta *)arg; |
|
|
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->offset = 0; |
p->offset = 0; |
|
|
Line 700 termp_it_pre(DECL_ARGS) |
|
Line 708 termp_it_pre(DECL_ARGS) |
|
|
|
switch (type) { |
switch (type) { |
case (LIST_column): |
case (LIST_column): |
if (MDOC_BODY == n->type) |
if (MDOC_HEAD == n->type) |
break; |
break; |
/* |
/* |
* Imitate groff's column handling: |
* Imitate groff's column handling: |
Line 715 termp_it_pre(DECL_ARGS) |
|
Line 723 termp_it_pre(DECL_ARGS) |
|
/* LINTED */ |
/* LINTED */ |
dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1; |
dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1; |
|
|
|
/* |
|
* Calculate the offset by applying all prior MDOC_BODY, |
|
* so we stop at the MDOC_HEAD (NULL == nn->prev). |
|
*/ |
|
|
for (i = 0, nn = n->prev; |
for (i = 0, nn = n->prev; |
nn && i < (int)ncols; |
nn->prev && i < (int)ncols; |
nn = nn->prev, i++) |
nn = nn->prev, i++) |
offset += dcol + a2width |
offset += dcol + a2width |
(&bl->args->argv[vals[2]], i); |
(&bl->args->argv[vals[2]], i); |
Line 869 termp_it_pre(DECL_ARGS) |
|
Line 882 termp_it_pre(DECL_ARGS) |
|
p->flags |= TERMP_DANGLE; |
p->flags |= TERMP_DANGLE; |
break; |
break; |
case (LIST_column): |
case (LIST_column): |
if (MDOC_HEAD == n->type) { |
if (MDOC_HEAD == n->type) |
assert(n->next); |
break; |
if (MDOC_BODY == n->next->type) |
|
p->flags &= ~TERMP_NOBREAK; |
if (NULL == n->next) |
else |
p->flags &= ~TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
else |
if (n->prev) |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOLPAD; |
|
} |
assert(n->prev); |
|
if (MDOC_BODY == n->prev->type) |
|
p->flags |= TERMP_NOLPAD; |
|
|
break; |
break; |
case (LIST_diag): |
case (LIST_diag): |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
Line 929 termp_it_pre(DECL_ARGS) |
|
Line 945 termp_it_pre(DECL_ARGS) |
|
* XXX - this behaviour is not documented: the |
* XXX - this behaviour is not documented: the |
* right-most column is filled to the right margin. |
* right-most column is filled to the right margin. |
*/ |
*/ |
if (MDOC_HEAD == n->type && |
if (MDOC_HEAD == n->type) |
MDOC_BODY == n->next->type && |
break; |
p->rmargin < p->maxrmargin) |
if (NULL == n->next && p->rmargin < p->maxrmargin) |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
break; |
break; |
default: |
default: |
Line 985 termp_it_pre(DECL_ARGS) |
|
Line 1001 termp_it_pre(DECL_ARGS) |
|
return(0); |
return(0); |
break; |
break; |
case (LIST_column): |
case (LIST_column): |
if (MDOC_BODY == n->type) |
if (MDOC_HEAD == n->type) |
return(0); |
return(0); |
break; |
break; |
default: |
default: |
Line 1017 termp_it_post(DECL_ARGS) |
|
Line 1033 termp_it_post(DECL_ARGS) |
|
term_newln(p); |
term_newln(p); |
break; |
break; |
case (LIST_column): |
case (LIST_column): |
if (MDOC_HEAD == n->type) |
if (MDOC_BODY == n->type) |
term_flushln(p); |
term_flushln(p); |
break; |
break; |
default: |
default: |
Line 1047 termp_nm_pre(DECL_ARGS) |
|
Line 1063 termp_nm_pre(DECL_ARGS) |
|
if (NULL == n->child && NULL == m->name) |
if (NULL == n->child && NULL == m->name) |
return(1); |
return(1); |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
synopsis_pre(p, n); |
term_newln(p); |
|
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
|
|
if (NULL == n->child) |
if (NULL == n->child) |
term_word(p, m->name); |
term_word(p, m->name); |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 1305 termp_xr_pre(DECL_ARGS) |
|
Line 1318 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 |
static int |
termp_vt_pre(DECL_ARGS) |
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)); |
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); |
return(1); |
|
} else if (MDOC_HEAD == n->type) |
|
return(0); |
|
|
return(termp_under_pre(p, pair, m, n)); |
return(termp_under_pre(p, pair, m, n)); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* 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 |
static int |
termp_bold_pre(DECL_ARGS) |
termp_bold_pre(DECL_ARGS) |
{ |
{ |
Line 1345 termp_bold_pre(DECL_ARGS) |
|
Line 1404 termp_bold_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
static int |
termp_fd_post(DECL_ARGS) |
termp_fd_pre(DECL_ARGS) |
{ |
{ |
|
|
if (n->sec != SEC_SYNOPSIS || ! (MDOC_LINE & n->flags)) |
synopsis_pre(p, n); |
return; |
return(termp_bold_pre(p, pair, m, n)); |
|
|
term_newln(p); |
|
if (n->next && MDOC_Fd != n->next->tok) |
|
term_vspace(p); |
|
} |
} |
|
|
|
|
|
|
termp_ft_pre(DECL_ARGS) |
termp_ft_pre(DECL_ARGS) |
{ |
{ |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
/* NB: MDOC_LINE does not effect this! */ |
if (n->prev && MDOC_Fo == n->prev->tok) |
synopsis_pre(p, n); |
term_vspace(p); |
|
|
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
return(1); |
return(1); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
|
termp_ft_post(DECL_ARGS) |
|
{ |
|
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) |
|
term_newln(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
termp_fn_pre(DECL_ARGS) |
termp_fn_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
|
|
|
synopsis_pre(p, n); |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, n->child->string); |
term_word(p, n->child->string); |
term_fontpop(p); |
term_fontpop(p); |
Line 1558 termp_fn_pre(DECL_ARGS) |
|
Line 1603 termp_fn_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static void |
|
termp_fn_post(DECL_ARGS) |
|
{ |
|
|
|
if (n->sec == SEC_SYNOPSIS && n->next && MDOC_LINE & n->flags) |
|
term_vspace(p); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
static int |
termp_fa_pre(DECL_ARGS) |
termp_fa_pre(DECL_ARGS) |
{ |
{ |
|
|
termp_cd_pre(DECL_ARGS) |
termp_cd_pre(DECL_ARGS) |
{ |
{ |
|
|
|
synopsis_pre(p, n); |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_newln(p); |
|
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_in_pre(DECL_ARGS) |
termp_in_pre(DECL_ARGS) |
{ |
{ |
|
|
term_fontpush(p, TERMFONT_BOLD); |
synopsis_pre(p, n); |
if (SEC_SYNOPSIS == n->sec) |
|
|
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
|
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "#include"); |
term_word(p, "#include"); |
|
term_word(p, "<"); |
|
} else { |
|
term_word(p, "<"); |
|
term_fontpush(p, TERMFONT_UNDER); |
|
} |
|
|
term_word(p, "<"); |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
} |
} |
|
|
termp_in_post(DECL_ARGS) |
termp_in_post(DECL_ARGS) |
{ |
{ |
|
|
term_fontpush(p, TERMFONT_BOLD); |
if (SEC_SYNOPSIS == n->sec) |
|
term_fontpush(p, TERMFONT_BOLD); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ">"); |
term_word(p, ">"); |
term_fontpop(p); |
|
|
|
if (SEC_SYNOPSIS != n->sec && ! (MDOC_LINE & n->flags)) |
if (SEC_SYNOPSIS == n->sec) |
return; |
term_fontpop(p); |
|
|
term_newln(p); |
|
/* |
|
* XXX Not entirely correct. If `.In foo bar' is specified in |
|
* the SYNOPSIS section, then it produces a single break after |
|
* the <foo>; mandoc asserts a vertical space. Since this |
|
* construction is rarely used, I think it's fine. |
|
*/ |
|
if (n->next && MDOC_In != n->next->tok) |
|
term_vspace(p); |
|
} |
} |
|
|
|
|
Line 1983 termp_pq_post(DECL_ARGS) |
|
Line 2015 termp_pq_post(DECL_ARGS) |
|
static int |
static int |
termp_fo_pre(DECL_ARGS) |
termp_fo_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *nn; |
|
|
|
if (MDOC_BODY == n->type) { |
if (MDOC_BLOCK == n->type) { |
|
synopsis_pre(p, n); |
|
return(1); |
|
} else if (MDOC_BODY == n->type) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, "("); |
term_word(p, "("); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
return(1); |
return(1); |
} else if (MDOC_HEAD != n->type) |
} |
return(1); |
|
|
|
term_fontpush(p, TERMFONT_BOLD); |
/* XXX: we drop non-initial arguments as per groff. */ |
for (nn = n->child; nn; nn = nn->next) { |
|
assert(MDOC_TEXT == nn->type); |
|
term_word(p, nn->string); |
|
} |
|
term_fontpop(p); |
|
|
|
|
assert(n->child); |
|
assert(n->child->string); |
|
term_fontpush(p, TERMFONT_BOLD); |
|
term_word(p, n->child->string); |
return(0); |
return(0); |
} |
} |
|
|
|
|
termp_fo_post(DECL_ARGS) |
termp_fo_post(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type) |
return; |
return; |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ")"); |
term_word(p, ")"); |
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ";"); |
if (SEC_SYNOPSIS == n->sec) { |
term_newln(p); |
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ";"); |
|
} |
} |
} |
|
|
|
|
Line 2098 termp_li_pre(DECL_ARGS) |
|
Line 2133 termp_li_pre(DECL_ARGS) |
|
{ |
{ |
|
|
term_fontpush(p, TERMFONT_NONE); |
term_fontpush(p, TERMFONT_NONE); |
if (NULL == n->child) |
|
term_word(p, ""); |
|
return(1); |
return(1); |
} |
} |
|
|