version 1.328, 2015/10/06 18:32:19 |
version 1.329, 2015/10/12 00:08:16 |
Line 625 termp_it_pre(DECL_ARGS) |
|
Line 625 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; |
Line 637 termp_it_pre(DECL_ARGS) |
|
Line 634 termp_it_pre(DECL_ARGS) |
|
width = term_len(p, 8); |
width = term_len(p, 8); |
break; |
break; |
case LIST_column: |
case LIST_column: |
/* FALLTHROUGH */ |
|
case LIST_tag: |
case LIST_tag: |
width = term_len(p, 10); |
width = term_len(p, 10); |
break; |
break; |
Line 762 termp_it_pre(DECL_ARGS) |
|
Line 758 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 847 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 885 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, "\\(hy"); |
Line 918 termp_it_pre(DECL_ARGS) |
|
Line 906 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 936 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 1293 synopsis_pre(struct termp *p, const struct roff_node * |
|
Line 1275 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 1595 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 1837 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->nchild == 1 && |
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 1862 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 1894 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->nchild == 1 && |
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 1921 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; |