version 1.340, 2017/01/10 23:36:34 |
version 1.347, 2017/04/14 18:25:04 |
Line 91 static int termp_bf_pre(DECL_ARGS); |
|
Line 91 static int termp_bf_pre(DECL_ARGS); |
|
static int termp_bk_pre(DECL_ARGS); |
static int termp_bk_pre(DECL_ARGS); |
static int termp_bl_pre(DECL_ARGS); |
static int termp_bl_pre(DECL_ARGS); |
static int termp_bold_pre(DECL_ARGS); |
static int termp_bold_pre(DECL_ARGS); |
static int termp_bt_pre(DECL_ARGS); |
|
static int termp_cd_pre(DECL_ARGS); |
static int termp_cd_pre(DECL_ARGS); |
static int termp_d1_pre(DECL_ARGS); |
static int termp_d1_pre(DECL_ARGS); |
static int termp_eo_pre(DECL_ARGS); |
static int termp_eo_pre(DECL_ARGS); |
Line 114 static int termp_nm_pre(DECL_ARGS); |
|
Line 113 static int termp_nm_pre(DECL_ARGS); |
|
static int termp_ns_pre(DECL_ARGS); |
static int termp_ns_pre(DECL_ARGS); |
static int termp_quote_pre(DECL_ARGS); |
static int termp_quote_pre(DECL_ARGS); |
static int termp_rs_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_sh_pre(DECL_ARGS); |
static int termp_skip_pre(DECL_ARGS); |
static int termp_skip_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
Line 123 static int termp_ss_pre(DECL_ARGS); |
|
Line 121 static int termp_ss_pre(DECL_ARGS); |
|
static int termp_sy_pre(DECL_ARGS); |
static int termp_sy_pre(DECL_ARGS); |
static int termp_tag_pre(DECL_ARGS); |
static int termp_tag_pre(DECL_ARGS); |
static int termp_under_pre(DECL_ARGS); |
static int termp_under_pre(DECL_ARGS); |
static int termp_ud_pre(DECL_ARGS); |
|
static int termp_vt_pre(DECL_ARGS); |
static int termp_vt_pre(DECL_ARGS); |
static int termp_xr_pre(DECL_ARGS); |
static int termp_xr_pre(DECL_ARGS); |
static int termp_xx_pre(DECL_ARGS); |
static int termp_xx_pre(DECL_ARGS); |
Line 165 static const struct termact termacts[MDOC_MAX] = { |
|
Line 162 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Op */ |
{ termp_quote_pre, termp_quote_post }, /* Op */ |
{ termp_ft_pre, NULL }, /* Ot */ |
{ termp_ft_pre, NULL }, /* Ot */ |
{ termp_under_pre, NULL }, /* Pa */ |
{ termp_under_pre, NULL }, /* Pa */ |
{ termp_rv_pre, NULL }, /* Rv */ |
{ termp_ex_pre, NULL }, /* Rv */ |
{ NULL, NULL }, /* St */ |
{ NULL, NULL }, /* St */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_under_pre, NULL }, /* Va */ |
{ termp_vt_pre, NULL }, /* Vt */ |
{ termp_vt_pre, NULL }, /* Vt */ |
Line 231 static const struct termact termacts[MDOC_MAX] = { |
|
Line 228 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Oc */ |
{ NULL, NULL }, /* Oc */ |
{ termp_bk_pre, termp_bk_post }, /* Bk */ |
{ termp_bk_pre, termp_bk_post }, /* Bk */ |
{ NULL, NULL }, /* Ek */ |
{ NULL, NULL }, /* Ek */ |
{ termp_bt_pre, NULL }, /* Bt */ |
{ NULL, NULL }, /* Bt */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
{ termp_under_pre, NULL }, /* Fr */ |
{ termp_under_pre, NULL }, /* Fr */ |
{ termp_ud_pre, NULL }, /* Ud */ |
{ NULL, NULL }, /* Ud */ |
{ NULL, termp_lb_post }, /* Lb */ |
{ NULL, termp_lb_post }, /* Lb */ |
{ termp_sp_pre, NULL }, /* Lp */ |
{ termp_sp_pre, NULL }, /* Lp */ |
{ termp_lk_pre, NULL }, /* Lk */ |
{ termp_lk_pre, NULL }, /* Lk */ |
Line 261 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 258 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
struct termp *p; |
struct termp *p; |
|
size_t save_defindent; |
|
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
p->overstep = 0; |
p->overstep = 0; |
Line 281 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 279 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
n = n->next; |
n = n->next; |
} |
} |
} else { |
} else { |
|
save_defindent = p->defindent; |
if (p->defindent == 0) |
if (p->defindent == 0) |
p->defindent = 5; |
p->defindent = 5; |
term_begin(p, print_mdoc_head, print_mdoc_foot, |
term_begin(p, print_mdoc_head, print_mdoc_foot, |
Line 293 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
Line 292 terminal_mdoc(void *arg, const struct roff_man *mdoc) |
|
print_mdoc_nodelist(p, NULL, &mdoc->meta, n); |
print_mdoc_nodelist(p, NULL, &mdoc->meta, n); |
} |
} |
term_end(p); |
term_end(p); |
|
p->defindent = save_defindent; |
} |
} |
} |
} |
|
|
Line 395 print_mdoc_node(DECL_ARGS) |
|
Line 395 print_mdoc_node(DECL_ARGS) |
|
*/ |
*/ |
if (ENDBODY_NOT != n->end) |
if (ENDBODY_NOT != n->end) |
n->body->flags |= NODE_ENDED; |
n->body->flags |= NODE_ENDED; |
|
|
/* |
|
* End of line terminating an implicit block |
|
* while an explicit block is still open. |
|
* Continue the explicit block without spacing. |
|
*/ |
|
if (ENDBODY_NOSPACE == n->end) |
|
p->flags |= TERMP_NOSPACE; |
|
break; |
break; |
} |
} |
|
|
Line 614 termp_ll_pre(DECL_ARGS) |
|
Line 606 termp_ll_pre(DECL_ARGS) |
|
static int |
static int |
termp_it_pre(DECL_ARGS) |
termp_it_pre(DECL_ARGS) |
{ |
{ |
|
struct roffsu su; |
char buf[24]; |
char buf[24]; |
const struct roff_node *bl, *nn; |
const struct roff_node *bl, *nn; |
size_t ncols, dcol; |
size_t ncols, dcol; |
Line 691 termp_it_pre(DECL_ARGS) |
|
Line 684 termp_it_pre(DECL_ARGS) |
|
|
|
for (i = 0, nn = n->prev; |
for (i = 0, nn = n->prev; |
nn->prev && i < (int)ncols; |
nn->prev && i < (int)ncols; |
nn = nn->prev, i++) |
nn = nn->prev, i++) { |
offset += dcol + a2width(p, |
SCALE_HS_INIT(&su, |
bl->norm->Bl.cols[i]); |
term_strlen(p, bl->norm->Bl.cols[i])); |
|
su.scale /= term_strlen(p, "0"); |
|
offset += term_hspan(p, &su) / 24 + dcol; |
|
} |
|
|
/* |
/* |
* When exceeding the declared number of columns, leave |
* When exceeding the declared number of columns, leave |
Line 708 termp_it_pre(DECL_ARGS) |
|
Line 704 termp_it_pre(DECL_ARGS) |
|
* Use the declared column widths, extended as explained |
* Use the declared column widths, extended as explained |
* in the preceding paragraph. |
* in the preceding paragraph. |
*/ |
*/ |
width = a2width(p, bl->norm->Bl.cols[i]) + dcol; |
SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i])); |
|
su.scale /= term_strlen(p, "0"); |
|
width = term_hspan(p, &su) / 24 + dcol; |
break; |
break; |
default: |
default: |
if (NULL == bl->norm->Bl.width) |
if (NULL == bl->norm->Bl.width) |
Line 996 termp_nm_pre(DECL_ARGS) |
|
Line 994 termp_nm_pre(DECL_ARGS) |
|
return 1; |
return 1; |
} |
} |
|
|
if (NULL == n->child && NULL == meta->name) |
if (n->child == NULL) |
return 0; |
return 0; |
|
|
if (n->type == ROFFT_HEAD) |
if (n->type == ROFFT_HEAD) |
Line 1020 termp_nm_pre(DECL_ARGS) |
|
Line 1018 termp_nm_pre(DECL_ARGS) |
|
} |
} |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
if (NULL == n->child) |
|
term_word(p, meta->name); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1113 termp_rs_pre(DECL_ARGS) |
|
Line 1109 termp_rs_pre(DECL_ARGS) |
|
} |
} |
|
|
static int |
static int |
termp_rv_pre(DECL_ARGS) |
|
{ |
|
struct roff_node *nch; |
|
|
|
term_newln(p); |
|
|
|
if (n->child != NULL) { |
|
term_word(p, "The"); |
|
|
|
for (nch = n->child; nch != NULL; nch = nch->next) { |
|
term_fontpush(p, TERMFONT_BOLD); |
|
term_word(p, nch->string); |
|
term_fontpop(p); |
|
|
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, "()"); |
|
|
|
if (nch->next == NULL) |
|
continue; |
|
|
|
if (nch->prev != NULL || nch->next->next != NULL) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ","); |
|
} |
|
if (nch->next->next == NULL) |
|
term_word(p, "and"); |
|
} |
|
|
|
if (n->child != NULL && n->child->next != NULL) |
|
term_word(p, "functions return"); |
|
else |
|
term_word(p, "function returns"); |
|
|
|
term_word(p, "the value\\~0 if successful;"); |
|
} else |
|
term_word(p, "Upon successful completion," |
|
" the value\\~0 is returned;"); |
|
|
|
term_word(p, "otherwise the value\\~\\-1 is returned" |
|
" and the global variable"); |
|
|
|
term_fontpush(p, TERMFONT_UNDER); |
|
term_word(p, "errno"); |
|
term_fontpop(p); |
|
|
|
term_word(p, "is set to indicate the error."); |
|
p->flags |= TERMP_SENTENCE; |
|
|
|
return 0; |
|
} |
|
|
|
static int |
|
termp_ex_pre(DECL_ARGS) |
termp_ex_pre(DECL_ARGS) |
{ |
{ |
struct roff_node *nch; |
|
|
|
term_newln(p); |
term_newln(p); |
term_word(p, "The"); |
return 1; |
|
|
for (nch = n->child; nch != NULL; nch = nch->next) { |
|
term_fontpush(p, TERMFONT_BOLD); |
|
term_word(p, nch->string); |
|
term_fontpop(p); |
|
|
|
if (nch->next == NULL) |
|
continue; |
|
|
|
if (nch->prev != NULL || nch->next->next != NULL) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ","); |
|
} |
|
|
|
if (nch->next->next == NULL) |
|
term_word(p, "and"); |
|
} |
|
|
|
if (n->child != NULL && n->child->next != NULL) |
|
term_word(p, "utilities exit\\~0"); |
|
else |
|
term_word(p, "utility exits\\~0"); |
|
|
|
term_word(p, "on success, and\\~>0 if an error occurs."); |
|
|
|
p->flags |= TERMP_SENTENCE; |
|
return 0; |
|
} |
} |
|
|
static int |
static int |
Line 1398 termp_sh_post(DECL_ARGS) |
|
Line 1313 termp_sh_post(DECL_ARGS) |
|
} |
} |
} |
} |
|
|
static int |
|
termp_bt_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "is currently in beta test."); |
|
p->flags |= TERMP_SENTENCE; |
|
return 0; |
|
} |
|
|
|
static void |
static void |
termp_lb_post(DECL_ARGS) |
termp_lb_post(DECL_ARGS) |
{ |
{ |
Line 1416 termp_lb_post(DECL_ARGS) |
|
Line 1322 termp_lb_post(DECL_ARGS) |
|
} |
} |
|
|
static int |
static int |
termp_ud_pre(DECL_ARGS) |
|
{ |
|
|
|
term_word(p, "currently under development."); |
|
p->flags |= TERMP_SENTENCE; |
|
return 0; |
|
} |
|
|
|
static int |
|
termp_d1_pre(DECL_ARGS) |
termp_d1_pre(DECL_ARGS) |
{ |
{ |
|
|
Line 1817 termp_quote_pre(DECL_ARGS) |
|
Line 1714 termp_quote_pre(DECL_ARGS) |
|
case MDOC_Bq: |
case MDOC_Bq: |
term_word(p, "["); |
term_word(p, "["); |
break; |
break; |
|
case MDOC__T: |
|
/* FALLTHROUGH */ |
case MDOC_Do: |
case MDOC_Do: |
case MDOC_Dq: |
case MDOC_Dq: |
term_word(p, "\\(Lq"); |
term_word(p, "\\(Lq"); |
Line 1831 termp_quote_pre(DECL_ARGS) |
|
Line 1730 termp_quote_pre(DECL_ARGS) |
|
case MDOC_Pq: |
case MDOC_Pq: |
term_word(p, "("); |
term_word(p, "("); |
break; |
break; |
case MDOC__T: |
|
case MDOC_Qo: |
case MDOC_Qo: |
case MDOC_Qq: |
case MDOC_Qq: |
term_word(p, "\""); |
term_word(p, "\""); |
Line 1874 termp_quote_post(DECL_ARGS) |
|
Line 1772 termp_quote_post(DECL_ARGS) |
|
case MDOC_Bq: |
case MDOC_Bq: |
term_word(p, "]"); |
term_word(p, "]"); |
break; |
break; |
|
case MDOC__T: |
|
/* FALLTHROUGH */ |
case MDOC_Do: |
case MDOC_Do: |
case MDOC_Dq: |
case MDOC_Dq: |
term_word(p, "\\(Rq"); |
term_word(p, "\\(Rq"); |
Line 1890 termp_quote_post(DECL_ARGS) |
|
Line 1790 termp_quote_post(DECL_ARGS) |
|
case MDOC_Pq: |
case MDOC_Pq: |
term_word(p, ")"); |
term_word(p, ")"); |
break; |
break; |
case MDOC__T: |
|
case MDOC_Qo: |
case MDOC_Qo: |
case MDOC_Qq: |
case MDOC_Qq: |
term_word(p, "\""); |
term_word(p, "\""); |
Line 2104 termp_lk_pre(DECL_ARGS) |
|
Line 2003 termp_lk_pre(DECL_ARGS) |
|
term_word(p, descr->string); |
term_word(p, descr->string); |
descr = descr->next; |
descr = descr->next; |
} |
} |
|
term_fontpop(p); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ":"); |
term_word(p, ":"); |
term_fontpop(p); |
|
} |
} |
|
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |