version 1.205, 2017/06/14 17:51:15 |
version 1.209, 2017/07/31 15:19:06 |
Line 128 static const struct termact __termacts[MAN_MAX - MAN_T |
|
Line 128 static const struct termact __termacts[MAN_MAX - MAN_T |
|
{ pre_literal, NULL, 0 }, /* EE */ |
{ pre_literal, NULL, 0 }, /* EE */ |
{ pre_UR, post_UR, 0 }, /* UR */ |
{ pre_UR, post_UR, 0 }, /* UR */ |
{ NULL, NULL, 0 }, /* UE */ |
{ NULL, NULL, 0 }, /* UE */ |
|
{ pre_UR, post_UR, 0 }, /* MT */ |
|
{ NULL, NULL, 0 }, /* ME */ |
}; |
}; |
static const struct termact *termacts = __termacts - MAN_TH; |
static const struct termact *termacts = __termacts - MAN_TH; |
|
|
Line 141 terminal_man(void *arg, const struct roff_man *man) |
|
Line 143 terminal_man(void *arg, const struct roff_man *man) |
|
size_t save_defindent; |
size_t save_defindent; |
|
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
|
save_defindent = p->defindent; |
|
if (p->synopsisonly == 0 && p->defindent == 0) |
|
p->defindent = 7; |
p->tcol->rmargin = p->maxrmargin = p->defrmargin; |
p->tcol->rmargin = p->maxrmargin = p->defrmargin; |
term_tab_set(p, NULL); |
term_tab_set(p, NULL); |
term_tab_set(p, "T"); |
term_tab_set(p, "T"); |
Line 167 terminal_man(void *arg, const struct roff_man *man) |
|
Line 172 terminal_man(void *arg, const struct roff_man *man) |
|
n = n->next; |
n = n->next; |
} |
} |
} else { |
} else { |
save_defindent = p->defindent; |
|
if (p->defindent == 0) |
|
p->defindent = 7; |
|
term_begin(p, print_man_head, print_man_foot, &man->meta); |
term_begin(p, print_man_head, print_man_foot, &man->meta); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
if (n != NULL) |
if (n != NULL) |
print_man_nodelist(p, &mt, n, &man->meta); |
print_man_nodelist(p, &mt, n, &man->meta); |
term_end(p); |
term_end(p); |
p->defindent = save_defindent; |
|
} |
} |
|
p->defindent = save_defindent; |
} |
} |
|
|
/* |
/* |
Line 671 pre_SS(DECL_ARGS) |
|
Line 673 pre_SS(DECL_ARGS) |
|
|
|
do { |
do { |
n = n->prev; |
n = n->prev; |
} while (n != NULL && n->tok != TOKEN_NONE && |
} while (n != NULL && n->tok >= MAN_TH && |
termacts[n->tok].flags & MAN_NOTEXT); |
termacts[n->tok].flags & MAN_NOTEXT); |
if (n == NULL || (n->tok == MAN_SS && n->body->child == NULL)) |
if (n == NULL || (n->tok == MAN_SS && n->body->child == NULL)) |
break; |
break; |
Line 733 pre_SH(DECL_ARGS) |
|
Line 735 pre_SH(DECL_ARGS) |
|
|
|
do { |
do { |
n = n->prev; |
n = n->prev; |
} while (n != NULL && n->tok != TOKEN_NONE && |
} while (n != NULL && n->tok >= MAN_TH && |
termacts[n->tok].flags & MAN_NOTEXT); |
termacts[n->tok].flags & MAN_NOTEXT); |
if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL)) |
if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL)) |
break; |
break; |
Line 872 print_man_node(DECL_ARGS) |
|
Line 874 print_man_node(DECL_ARGS) |
|
* before printing the line's data. |
* before printing the line's data. |
*/ |
*/ |
if (*n->string == '\0') { |
if (*n->string == '\0') { |
term_vspace(p); |
if (p->flags & TERMP_NONEWLINE) |
|
term_newln(p); |
|
else |
|
term_vspace(p); |
return; |
return; |
} else if (*n->string == ' ' && n->flags & NODE_LINE && |
} else if (*n->string == ' ' && n->flags & NODE_LINE && |
(p->flags & TERMP_NONEWLINE) == 0) |
(p->flags & TERMP_NONEWLINE) == 0) |