version 1.328, 2015/10/06 18:32:19 |
version 1.334, 2016/11/08 16:23:58 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 95 static int termp_bx_pre(DECL_ARGS); |
|
Line 95 static int termp_bx_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); |
|
static int termp_em_pre(DECL_ARGS); |
static int termp_er_pre(DECL_ARGS); |
static int termp_er_pre(DECL_ARGS); |
static int termp_ex_pre(DECL_ARGS); |
static int termp_ex_pre(DECL_ARGS); |
static int termp_fa_pre(DECL_ARGS); |
static int termp_fa_pre(DECL_ARGS); |
Line 119 static int termp_skip_pre(DECL_ARGS); |
|
Line 120 static int termp_skip_pre(DECL_ARGS); |
|
static int termp_sm_pre(DECL_ARGS); |
static int termp_sm_pre(DECL_ARGS); |
static int termp_sp_pre(DECL_ARGS); |
static int termp_sp_pre(DECL_ARGS); |
static int termp_ss_pre(DECL_ARGS); |
static int termp_ss_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_ud_pre(DECL_ARGS); |
Line 195 static const struct termact termacts[MDOC_MAX] = { |
|
Line 197 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Dq */ |
{ termp_quote_pre, termp_quote_post }, /* Dq */ |
{ NULL, NULL }, /* Ec */ /* FIXME: no space */ |
{ NULL, NULL }, /* Ec */ /* FIXME: no space */ |
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Ef */ |
{ termp_under_pre, NULL }, /* Em */ |
{ termp_em_pre, NULL }, /* Em */ |
{ termp_eo_pre, termp_eo_post }, /* Eo */ |
{ termp_eo_pre, termp_eo_post }, /* Eo */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_bold_pre, NULL }, /* Ms */ |
Line 218 static const struct termact termacts[MDOC_MAX] = { |
|
Line 220 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Sq */ |
{ termp_quote_pre, termp_quote_post }, /* Sq */ |
{ termp_sm_pre, NULL }, /* Sm */ |
{ termp_sm_pre, NULL }, /* Sm */ |
{ termp_under_pre, NULL }, /* Sx */ |
{ termp_under_pre, NULL }, /* Sx */ |
{ termp_bold_pre, NULL }, /* Sy */ |
{ termp_sy_pre, NULL }, /* Sy */ |
{ NULL, NULL }, /* Tn */ |
{ NULL, NULL }, /* Tn */ |
{ termp_xx_pre, NULL }, /* Ux */ |
{ termp_xx_pre, NULL }, /* Ux */ |
{ NULL, NULL }, /* Xc */ |
{ NULL, NULL }, /* Xc */ |
Line 357 print_mdoc_node(DECL_ARGS) |
|
Line 359 print_mdoc_node(DECL_ARGS) |
|
break; |
break; |
default: |
default: |
if (termacts[n->tok].pre && |
if (termacts[n->tok].pre && |
(n->end == ENDBODY_NOT || n->nchild)) |
(n->end == ENDBODY_NOT || n->child != NULL)) |
chld = (*termacts[n->tok].pre) |
chld = (*termacts[n->tok].pre) |
(p, &npair, meta, n); |
(p, &npair, meta, n); |
break; |
break; |
|
|
termp_ll_pre(DECL_ARGS) |
termp_ll_pre(DECL_ARGS) |
{ |
{ |
|
|
term_setwidth(p, n->nchild ? n->child->string : NULL); |
term_setwidth(p, n->child != NULL ? n->child->string : NULL); |
return 0; |
return 0; |
} |
} |
|
|
Line 625 termp_it_pre(DECL_ARGS) |
|
Line 627 termp_it_pre(DECL_ARGS) |
|
|
|
switch (type) { |
switch (type) { |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
|
case LIST_dash: |
case LIST_dash: |
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
case LIST_hyphen: |
/* FALLTHROUGH */ |
|
case LIST_enum: |
case LIST_enum: |
width = term_len(p, 2); |
width = term_len(p, 2); |
break; |
break; |
case LIST_hang: |
case LIST_hang: |
|
case LIST_tag: |
width = term_len(p, 8); |
width = term_len(p, 8); |
break; |
break; |
case LIST_column: |
case LIST_column: |
/* FALLTHROUGH */ |
|
case LIST_tag: |
|
width = term_len(p, 10); |
width = term_len(p, 10); |
break; |
break; |
default: |
default: |
Line 735 termp_it_pre(DECL_ARGS) |
|
Line 733 termp_it_pre(DECL_ARGS) |
|
term_word(p, "\\ \\ "); |
term_word(p, "\\ \\ "); |
break; |
break; |
case LIST_inset: |
case LIST_inset: |
if (n->type == ROFFT_BODY && n->parent->head->nchild) |
if (n->type == ROFFT_BODY && n->parent->head->child != NULL) |
term_word(p, "\\ "); |
term_word(p, "\\ "); |
break; |
break; |
default: |
default: |
Line 762 termp_it_pre(DECL_ARGS) |
|
Line 760 termp_it_pre(DECL_ARGS) |
|
|
|
switch (type) { |
switch (type) { |
case LIST_enum: |
case LIST_enum: |
|
case LIST_bullet: |
|
case LIST_dash: |
|
case LIST_hyphen: |
/* |
/* |
* Weird special case. |
* Weird special case. |
* Some very narrow lists actually hang. |
* Some very narrow lists actually hang. |
*/ |
*/ |
/* FALLTHROUGH */ |
|
case LIST_bullet: |
|
/* FALLTHROUGH */ |
|
case LIST_dash: |
|
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
|
if (width <= (int)term_len(p, 2)) |
if (width <= (int)term_len(p, 2)) |
p->flags |= TERMP_HANG; |
p->flags |= TERMP_HANG; |
if (n->type != ROFFT_HEAD) |
if (n->type != ROFFT_HEAD) |
Line 854 termp_it_pre(DECL_ARGS) |
|
Line 849 termp_it_pre(DECL_ARGS) |
|
break; |
break; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
|
case LIST_dash: |
case LIST_dash: |
/* FALLTHROUGH */ |
|
case LIST_enum: |
case LIST_enum: |
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
case LIST_hyphen: |
/* FALLTHROUGH */ |
|
case LIST_tag: |
case LIST_tag: |
if (n->type == ROFFT_HEAD) |
if (n->type == ROFFT_HEAD) |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
Line 896 termp_it_pre(DECL_ARGS) |
|
Line 887 termp_it_pre(DECL_ARGS) |
|
term_fontpop(p); |
term_fontpop(p); |
break; |
break; |
case LIST_dash: |
case LIST_dash: |
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
case LIST_hyphen: |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "\\(hy"); |
term_word(p, "-"); |
term_fontpop(p); |
term_fontpop(p); |
break; |
break; |
case LIST_enum: |
case LIST_enum: |
Line 918 termp_it_pre(DECL_ARGS) |
|
Line 908 termp_it_pre(DECL_ARGS) |
|
|
|
switch (type) { |
switch (type) { |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
|
case LIST_item: |
case LIST_item: |
/* FALLTHROUGH */ |
|
case LIST_dash: |
case LIST_dash: |
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
case LIST_hyphen: |
/* FALLTHROUGH */ |
|
case LIST_enum: |
case LIST_enum: |
if (n->type == ROFFT_HEAD) |
if (n->type == ROFFT_HEAD) |
return 0; |
return 0; |
Line 952 termp_it_post(DECL_ARGS) |
|
Line 938 termp_it_post(DECL_ARGS) |
|
|
|
switch (type) { |
switch (type) { |
case LIST_item: |
case LIST_item: |
/* FALLTHROUGH */ |
|
case LIST_diag: |
case LIST_diag: |
/* FALLTHROUGH */ |
|
case LIST_inset: |
case LIST_inset: |
if (n->type == ROFFT_BODY) |
if (n->type == ROFFT_BODY) |
term_newln(p); |
term_newln(p); |
Line 1057 termp_fl_pre(DECL_ARGS) |
|
Line 1041 termp_fl_pre(DECL_ARGS) |
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "\\-"); |
term_word(p, "\\-"); |
|
|
if ( ! (n->nchild == 0 && |
if (!(n->child == NULL && |
(n->next == NULL || |
(n->next == NULL || |
n->next->type == ROFFT_TEXT || |
n->next->type == ROFFT_TEXT || |
n->next->flags & MDOC_LINE))) |
n->next->flags & MDOC_LINE))) |
Line 1124 termp_rs_pre(DECL_ARGS) |
|
Line 1108 termp_rs_pre(DECL_ARGS) |
|
static int |
static int |
termp_rv_pre(DECL_ARGS) |
termp_rv_pre(DECL_ARGS) |
{ |
{ |
int nchild; |
struct roff_node *nch; |
|
|
term_newln(p); |
term_newln(p); |
|
|
nchild = n->nchild; |
if (n->child != NULL) { |
if (nchild > 0) { |
|
term_word(p, "The"); |
term_word(p, "The"); |
|
|
for (n = n->child; n; n = n->next) { |
for (nch = n->child; nch != NULL; nch = nch->next) { |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, n->string); |
term_word(p, nch->string); |
term_fontpop(p); |
term_fontpop(p); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, "()"); |
term_word(p, "()"); |
|
|
if (n->next == NULL) |
if (nch->next == NULL) |
continue; |
continue; |
|
|
if (nchild > 2) { |
if (nch->prev != NULL || nch->next->next != NULL) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ","); |
term_word(p, ","); |
} |
} |
if (n->next->next == NULL) |
if (nch->next->next == NULL) |
term_word(p, "and"); |
term_word(p, "and"); |
} |
} |
|
|
if (nchild > 1) |
if (n->child != NULL && n->child->next != NULL) |
term_word(p, "functions return"); |
term_word(p, "functions return"); |
else |
else |
term_word(p, "function returns"); |
term_word(p, "function returns"); |
Line 1177 termp_rv_pre(DECL_ARGS) |
|
Line 1160 termp_rv_pre(DECL_ARGS) |
|
static int |
static int |
termp_ex_pre(DECL_ARGS) |
termp_ex_pre(DECL_ARGS) |
{ |
{ |
int nchild; |
struct roff_node *nch; |
|
|
term_newln(p); |
term_newln(p); |
term_word(p, "The"); |
term_word(p, "The"); |
|
|
nchild = n->nchild; |
for (nch = n->child; nch != NULL; nch = nch->next) { |
for (n = n->child; n; n = n->next) { |
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, n->string); |
term_word(p, nch->string); |
term_fontpop(p); |
term_fontpop(p); |
|
|
if (nchild > 2 && n->next) { |
if (nch->next == NULL) |
|
continue; |
|
|
|
if (nch->prev != NULL || nch->next->next != NULL) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ","); |
term_word(p, ","); |
} |
} |
|
|
if (n->next && NULL == n->next->next) |
if (nch->next->next == NULL) |
term_word(p, "and"); |
term_word(p, "and"); |
} |
} |
|
|
if (nchild > 1) |
if (n->child != NULL && n->child->next != NULL) |
term_word(p, "utilities exit\\~0"); |
term_word(p, "utilities exit\\~0"); |
else |
else |
term_word(p, "utility exits\\~0"); |
term_word(p, "utility exits\\~0"); |
Line 1293 synopsis_pre(struct termp *p, const struct roff_node * |
|
Line 1278 synopsis_pre(struct termp *p, const struct roff_node * |
|
*/ |
*/ |
switch (n->prev->tok) { |
switch (n->prev->tok) { |
case MDOC_Fd: |
case MDOC_Fd: |
/* FALLTHROUGH */ |
|
case MDOC_Fn: |
case MDOC_Fn: |
/* FALLTHROUGH */ |
|
case MDOC_Fo: |
case MDOC_Fo: |
/* FALLTHROUGH */ |
|
case MDOC_In: |
case MDOC_In: |
/* FALLTHROUGH */ |
|
case MDOC_Vt: |
case MDOC_Vt: |
term_vspace(p); |
term_vspace(p); |
break; |
break; |
Line 1617 termp_bd_pre(DECL_ARGS) |
|
Line 1598 termp_bd_pre(DECL_ARGS) |
|
*/ |
*/ |
switch (nn->tok) { |
switch (nn->tok) { |
case MDOC_Sm: |
case MDOC_Sm: |
/* FALLTHROUGH */ |
|
case MDOC_br: |
case MDOC_br: |
/* FALLTHROUGH */ |
|
case MDOC_sp: |
case MDOC_sp: |
/* FALLTHROUGH */ |
|
case MDOC_Bl: |
case MDOC_Bl: |
/* FALLTHROUGH */ |
|
case MDOC_D1: |
case MDOC_D1: |
/* FALLTHROUGH */ |
|
case MDOC_Dl: |
case MDOC_Dl: |
/* FALLTHROUGH */ |
|
case MDOC_Lp: |
case MDOC_Lp: |
/* FALLTHROUGH */ |
|
case MDOC_Pp: |
case MDOC_Pp: |
continue; |
continue; |
default: |
default: |
Line 1866 termp_quote_pre(DECL_ARGS) |
|
Line 1840 termp_quote_pre(DECL_ARGS) |
|
|
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
|
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, n->nchild == 1 && |
term_word(p, n->child != NULL && n->child->next == NULL && |
n->child->tok == MDOC_Mt ? "<" : "\\(la"); |
n->child->tok == MDOC_Mt ? "<" : "\\(la"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
|
case MDOC_Brq: |
case MDOC_Brq: |
term_word(p, "{"); |
term_word(p, "{"); |
break; |
break; |
case MDOC_Oo: |
case MDOC_Oo: |
/* FALLTHROUGH */ |
|
case MDOC_Op: |
case MDOC_Op: |
/* FALLTHROUGH */ |
|
case MDOC_Bo: |
case MDOC_Bo: |
/* FALLTHROUGH */ |
|
case MDOC_Bq: |
case MDOC_Bq: |
term_word(p, "["); |
term_word(p, "["); |
break; |
break; |
case MDOC_Do: |
case MDOC_Do: |
/* FALLTHROUGH */ |
|
case MDOC_Dq: |
case MDOC_Dq: |
term_word(p, "\\(Lq"); |
term_word(p, "\\(Lq"); |
break; |
break; |
Line 1897 termp_quote_pre(DECL_ARGS) |
|
Line 1865 termp_quote_pre(DECL_ARGS) |
|
term_word(p, n->norm->Es->child->string); |
term_word(p, n->norm->Es->child->string); |
break; |
break; |
case MDOC_Po: |
case MDOC_Po: |
/* FALLTHROUGH */ |
|
case MDOC_Pq: |
case MDOC_Pq: |
term_word(p, "("); |
term_word(p, "("); |
break; |
break; |
case MDOC__T: |
case MDOC__T: |
/* FALLTHROUGH */ |
|
case MDOC_Qo: |
case MDOC_Qo: |
/* FALLTHROUGH */ |
|
case MDOC_Qq: |
case MDOC_Qq: |
term_word(p, "\""); |
term_word(p, "\""); |
break; |
break; |
case MDOC_Ql: |
case MDOC_Ql: |
/* FALLTHROUGH */ |
|
case MDOC_So: |
case MDOC_So: |
/* FALLTHROUGH */ |
|
case MDOC_Sq: |
case MDOC_Sq: |
term_word(p, "\\(oq"); |
term_word(p, "\\(oq"); |
break; |
break; |
Line 1934 termp_quote_post(DECL_ARGS) |
|
Line 1897 termp_quote_post(DECL_ARGS) |
|
|
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
|
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, n->nchild == 1 && |
term_word(p, n->child != NULL && n->child->next == NULL && |
n->child->tok == MDOC_Mt ? ">" : "\\(ra"); |
n->child->tok == MDOC_Mt ? ">" : "\\(ra"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
|
case MDOC_Brq: |
case MDOC_Brq: |
term_word(p, "}"); |
term_word(p, "}"); |
break; |
break; |
case MDOC_Oo: |
case MDOC_Oo: |
/* FALLTHROUGH */ |
|
case MDOC_Op: |
case MDOC_Op: |
/* FALLTHROUGH */ |
|
case MDOC_Bo: |
case MDOC_Bo: |
/* FALLTHROUGH */ |
|
case MDOC_Bq: |
case MDOC_Bq: |
term_word(p, "]"); |
term_word(p, "]"); |
break; |
break; |
case MDOC_Do: |
case MDOC_Do: |
/* FALLTHROUGH */ |
|
case MDOC_Dq: |
case MDOC_Dq: |
term_word(p, "\\(Rq"); |
term_word(p, "\\(Rq"); |
break; |
break; |
Line 1967 termp_quote_post(DECL_ARGS) |
|
Line 1924 termp_quote_post(DECL_ARGS) |
|
term_word(p, n->norm->Es->child->next->string); |
term_word(p, n->norm->Es->child->next->string); |
break; |
break; |
case MDOC_Po: |
case MDOC_Po: |
/* FALLTHROUGH */ |
|
case MDOC_Pq: |
case MDOC_Pq: |
term_word(p, ")"); |
term_word(p, ")"); |
break; |
break; |
case MDOC__T: |
case MDOC__T: |
/* FALLTHROUGH */ |
|
case MDOC_Qo: |
case MDOC_Qo: |
/* FALLTHROUGH */ |
|
case MDOC_Qq: |
case MDOC_Qq: |
term_word(p, "\""); |
term_word(p, "\""); |
break; |
break; |
case MDOC_Ql: |
case MDOC_Ql: |
/* FALLTHROUGH */ |
|
case MDOC_So: |
case MDOC_So: |
/* FALLTHROUGH */ |
|
case MDOC_Sq: |
case MDOC_Sq: |
term_word(p, "\\(cq"); |
term_word(p, "\\(cq"); |
break; |
break; |
Line 2210 termp_bk_pre(DECL_ARGS) |
|
Line 2162 termp_bk_pre(DECL_ARGS) |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
return 0; |
return 0; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (n->parent->args || 0 == n->prev->nchild) |
if (n->parent->args != NULL || n->prev->child == NULL) |
p->flags |= TERMP_PREKEEP; |
p->flags |= TERMP_PREKEEP; |
break; |
break; |
default: |
default: |
Line 2268 termp_under_pre(DECL_ARGS) |
|
Line 2220 termp_under_pre(DECL_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
termp_em_pre(DECL_ARGS) |
|
{ |
|
if (n->child != NULL && |
|
n->child->type == ROFFT_TEXT) |
|
tag_put(n->child->string, 0, p->line); |
|
term_fontpush(p, TERMFONT_UNDER); |
|
return 1; |
|
} |
|
|
|
static int |
|
termp_sy_pre(DECL_ARGS) |
|
{ |
|
if (n->child != NULL && |
|
n->child->type == ROFFT_TEXT) |
|
tag_put(n->child->string, 0, p->line); |
|
term_fontpush(p, TERMFONT_BOLD); |
|
return 1; |
|
} |
|
|
|
static int |
termp_er_pre(DECL_ARGS) |
termp_er_pre(DECL_ARGS) |
{ |
{ |
|
|
Line 2285 termp_tag_pre(DECL_ARGS) |
|
Line 2257 termp_tag_pre(DECL_ARGS) |
|
|
|
if (n->child != NULL && |
if (n->child != NULL && |
n->child->type == ROFFT_TEXT && |
n->child->type == ROFFT_TEXT && |
n->prev == NULL && |
(n->prev == NULL || |
|
(n->prev->type == ROFFT_TEXT && |
|
strcmp(n->prev->string, "|") == 0)) && |
(n->parent->tok == MDOC_It || |
(n->parent->tok == MDOC_It || |
(n->parent->tok == MDOC_Xo && |
(n->parent->tok == MDOC_Xo && |
n->parent->parent->prev == NULL && |
n->parent->parent->prev == NULL && |