version 1.127, 2010/05/22 20:41:48 |
version 1.138, 2010/06/04 21:49:39 |
Line 260 static const struct termact termacts[MDOC_MAX] = { |
|
Line 260 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 274 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
Line 275 terminal_mdoc(void *arg, const struct mdoc *mdoc) |
|
|
|
p->overstep = 0; |
p->overstep = 0; |
p->maxrmargin = p->defrmargin; |
p->maxrmargin = p->defrmargin; |
|
p->tabwidth = 5; |
|
|
if (NULL == p->symtab) |
if (NULL == p->symtab) |
switch (p->enc) { |
switch (p->enc) { |
Line 613 print_bvspace(struct termp *p, |
|
Line 615 print_bvspace(struct termp *p, |
|
|
|
/* A `-column' does not assert vspace within the list. */ |
/* A `-column' does not assert vspace within the list. */ |
|
|
if (MDOC_Bl == bl->tok && LIST_diag == bl->data.list) |
if (MDOC_Bl == bl->tok && LIST_column == bl->data.list) |
if (n->prev && MDOC_It == n->prev->tok) |
if (n->prev && MDOC_It == n->prev->tok) |
return; |
return; |
|
|
Line 699 termp_it_pre(DECL_ARGS) |
|
Line 701 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 714 termp_it_pre(DECL_ARGS) |
|
Line 716 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 868 termp_it_pre(DECL_ARGS) |
|
Line 875 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 928 termp_it_pre(DECL_ARGS) |
|
Line 938 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 984 termp_it_pre(DECL_ARGS) |
|
Line 994 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 1013 termp_it_post(DECL_ARGS) |
|
Line 1023 termp_it_post(DECL_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_inset): |
case (LIST_inset): |
if (MDOC_BODY == n->type) |
if (MDOC_BODY == n->type) |
term_flushln(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: |
term_flushln(p); |
term_newln(p); |
break; |
break; |
} |
} |
|
|
Line 1191 termp_rv_pre(DECL_ARGS) |
|
Line 1201 termp_rv_pre(DECL_ARGS) |
|
term_fontpop(p); |
term_fontpop(p); |
|
|
term_word(p, "is set to indicate the error."); |
term_word(p, "is set to indicate the error."); |
|
p->flags |= TERMP_SENTENCE; |
|
|
return(0); |
return(0); |
} |
} |
Line 1223 termp_ex_pre(DECL_ARGS) |
|
Line 1234 termp_ex_pre(DECL_ARGS) |
|
term_word(p, "utility exits"); |
term_word(p, "utility exits"); |
|
|
term_word(p, "0 on success, and >0 if an error occurs."); |
term_word(p, "0 on success, and >0 if an error occurs."); |
|
p->flags |= TERMP_SENTENCE; |
|
|
return(0); |
return(0); |
} |
} |
|
|
termp_fd_post(DECL_ARGS) |
termp_fd_post(DECL_ARGS) |
{ |
{ |
|
|
if (n->sec != SEC_SYNOPSIS || ! (MDOC_LINE & n->flags)) |
|
return; |
|
|
|
term_newln(p); |
term_newln(p); |
if (n->next && MDOC_Fd != n->next->tok) |
|
term_vspace(p); |
|
} |
} |
|
|
|
|
Line 1424 termp_bt_pre(DECL_ARGS) |
|
Line 1431 termp_bt_pre(DECL_ARGS) |
|
{ |
{ |
|
|
term_word(p, "is currently in beta test."); |
term_word(p, "is currently in beta test."); |
|
p->flags |= TERMP_SENTENCE; |
return(0); |
return(0); |
} |
} |
|
|
Line 1444 termp_ud_pre(DECL_ARGS) |
|
Line 1452 termp_ud_pre(DECL_ARGS) |
|
{ |
{ |
|
|
term_word(p, "currently under development."); |
term_word(p, "currently under development."); |
|
p->flags |= TERMP_SENTENCE; |
return(0); |
return(0); |
} |
} |
|
|
Line 1593 termp_fa_pre(DECL_ARGS) |
|
Line 1602 termp_fa_pre(DECL_ARGS) |
|
static int |
static int |
termp_bd_pre(DECL_ARGS) |
termp_bd_pre(DECL_ARGS) |
{ |
{ |
|
size_t tabwidth; |
int i, type; |
int i, type; |
size_t rm, rmax; |
size_t rm, rmax; |
const struct mdoc_node *nn; |
const struct mdoc_node *nn; |
Line 1622 termp_bd_pre(DECL_ARGS) |
|
Line 1632 termp_bd_pre(DECL_ARGS) |
|
if (MDOC_Literal != type && MDOC_Unfilled != type) |
if (MDOC_Literal != type && MDOC_Unfilled != type) |
return(1); |
return(1); |
|
|
|
tabwidth = p->tabwidth; |
|
p->tabwidth = 8; |
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
Line 1629 termp_bd_pre(DECL_ARGS) |
|
Line 1641 termp_bd_pre(DECL_ARGS) |
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
print_mdoc_node(p, pair, m, nn); |
print_mdoc_node(p, pair, m, nn); |
if (NULL == nn->next) |
if (NULL == nn->prev || |
continue; |
nn->prev->line < nn->line || |
if (nn->prev && nn->prev->line < nn->line) |
NULL == nn->next) |
term_flushln(p); |
term_flushln(p); |
else if (NULL == nn->prev) |
|
term_flushln(p); |
|
} |
} |
|
p->tabwidth = tabwidth; |
|
|
p->rmargin = rm; |
p->rmargin = rm; |
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
Line 1663 termp_bd_post(DECL_ARGS) |
|
Line 1674 termp_bd_post(DECL_ARGS) |
|
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_flushln(p); |
term_newln(p); |
|
|
p->rmargin = rm; |
p->rmargin = rm; |
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
|
|
termp_in_pre(DECL_ARGS) |
termp_in_pre(DECL_ARGS) |
{ |
{ |
|
|
term_fontpush(p, TERMFONT_BOLD); |
if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { |
if (SEC_SYNOPSIS == n->sec) |
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 && MDOC_LINE & n->flags) |
|
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 && MDOC_LINE & n->flags) { |
return; |
term_fontpop(p); |
|
term_newln(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); |
|
} |
} |
|
|
|
|