version 1.226, 2019/01/05 00:36:50 |
version 1.227, 2019/01/05 01:29:32 |
Line 88 static void post_IP(DECL_ARGS); |
|
Line 88 static void post_IP(DECL_ARGS); |
|
static void post_HP(DECL_ARGS); |
static void post_HP(DECL_ARGS); |
static void post_RS(DECL_ARGS); |
static void post_RS(DECL_ARGS); |
static void post_SH(DECL_ARGS); |
static void post_SH(DECL_ARGS); |
static void post_SS(DECL_ARGS); |
|
static void post_SY(DECL_ARGS); |
static void post_SY(DECL_ARGS); |
static void post_TP(DECL_ARGS); |
static void post_TP(DECL_ARGS); |
static void post_UR(DECL_ARGS); |
static void post_UR(DECL_ARGS); |
Line 96 static void post_UR(DECL_ARGS); |
|
Line 95 static void post_UR(DECL_ARGS); |
|
static const struct man_term_act man_term_acts[MAN_MAX - MAN_TH] = { |
static const struct man_term_act man_term_acts[MAN_MAX - MAN_TH] = { |
{ NULL, NULL, 0 }, /* TH */ |
{ NULL, NULL, 0 }, /* TH */ |
{ pre_SH, post_SH, 0 }, /* SH */ |
{ pre_SH, post_SH, 0 }, /* SH */ |
{ pre_SS, post_SS, 0 }, /* SS */ |
{ pre_SS, post_SH, 0 }, /* SS */ |
{ pre_TP, post_TP, 0 }, /* TP */ |
{ pre_TP, post_TP, 0 }, /* TP */ |
{ pre_TP, post_TP, 0 }, /* TQ */ |
{ pre_TP, post_TP, 0 }, /* TQ */ |
{ pre_abort, NULL, 0 }, /* LP */ |
{ pre_abort, NULL, 0 }, /* LP */ |
Line 145 man_term_act(enum roff_tok tok) |
|
Line 144 man_term_act(enum roff_tok tok) |
|
void |
void |
terminal_man(void *arg, const struct roff_meta *man) |
terminal_man(void *arg, const struct roff_meta *man) |
{ |
{ |
|
struct mtermp mt; |
struct termp *p; |
struct termp *p; |
struct roff_node *n; |
struct roff_node *n; |
struct mtermp mt; |
|
size_t save_defindent; |
size_t save_defindent; |
|
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
Line 159 terminal_man(void *arg, const struct roff_meta *man) |
|
Line 158 terminal_man(void *arg, const struct roff_meta *man) |
|
term_tab_set(p, "T"); |
term_tab_set(p, "T"); |
term_tab_set(p, ".5i"); |
term_tab_set(p, ".5i"); |
|
|
memset(&mt, 0, sizeof(struct mtermp)); |
memset(&mt, 0, sizeof(mt)); |
mt.lmargin[mt.lmargincur] = term_len(p, p->defindent); |
mt.lmargin[mt.lmargincur] = term_len(p, p->defindent); |
mt.offset = term_len(p, p->defindent); |
mt.offset = term_len(p, p->defindent); |
mt.pardist = 1; |
mt.pardist = 1; |
Line 203 print_bvspace(struct termp *p, const struct roff_node |
|
Line 202 print_bvspace(struct termp *p, const struct roff_node |
|
|
|
term_newln(p); |
term_newln(p); |
|
|
if (n->body && n->body->child) |
if (n->body != NULL && n->body->child != NULL) |
if (n->body->child->type == ROFFT_TBL) |
if (n->body->child->type == ROFFT_TBL) |
return; |
return; |
|
|
if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS) |
if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS) |
if (NULL == n->prev) |
if (n->prev == NULL) |
return; |
return; |
|
|
for (i = 0; i < pardist; i++) |
for (i = 0; i < pardist; i++) |
Line 225 pre_abort(DECL_ARGS) |
|
Line 224 pre_abort(DECL_ARGS) |
|
static int |
static int |
pre_ign(DECL_ARGS) |
pre_ign(DECL_ARGS) |
{ |
{ |
|
|
return 0; |
return 0; |
} |
} |
|
|
static int |
static int |
pre_I(DECL_ARGS) |
pre_I(DECL_ARGS) |
{ |
{ |
|
|
term_fontrepl(p, TERMFONT_UNDER); |
term_fontrepl(p, TERMFONT_UNDER); |
return 1; |
return 1; |
} |
} |
Line 314 pre_alternate(DECL_ARGS) |
|
Line 311 pre_alternate(DECL_ARGS) |
|
term_word(p, nn->string); |
term_word(p, nn->string); |
if (nn->flags & NODE_EOS) |
if (nn->flags & NODE_EOS) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
if (nn->next) |
if (nn->next != NULL) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
return 0; |
return 0; |
Line 323 pre_alternate(DECL_ARGS) |
|
Line 320 pre_alternate(DECL_ARGS) |
|
static int |
static int |
pre_B(DECL_ARGS) |
pre_B(DECL_ARGS) |
{ |
{ |
|
|
term_fontrepl(p, TERMFONT_BOLD); |
term_fontrepl(p, TERMFONT_BOLD); |
return 1; |
return 1; |
} |
} |
Line 331 pre_B(DECL_ARGS) |
|
Line 327 pre_B(DECL_ARGS) |
|
static int |
static int |
pre_OP(DECL_ARGS) |
pre_OP(DECL_ARGS) |
{ |
{ |
|
|
term_word(p, "["); |
term_word(p, "["); |
p->flags |= TERMP_KEEP | TERMP_NOSPACE; |
p->flags |= TERMP_KEEP | TERMP_NOSPACE; |
|
|
if (NULL != (n = n->child)) { |
if ((n = n->child) != NULL) { |
term_fontrepl(p, TERMFONT_BOLD); |
term_fontrepl(p, TERMFONT_BOLD); |
term_word(p, n->string); |
term_word(p, n->string); |
} |
} |
if (NULL != n && NULL != n->next) { |
if (n != NULL && n->next != NULL) { |
term_fontrepl(p, TERMFONT_UNDER); |
term_fontrepl(p, TERMFONT_UNDER); |
term_word(p, n->next->string); |
term_word(p, n->next->string); |
} |
} |
|
|
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
p->flags &= ~TERMP_KEEP; |
p->flags &= ~TERMP_KEEP; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 369 pre_in(DECL_ARGS) |
|
Line 363 pre_in(DECL_ARGS) |
|
cp = n->child->string; |
cp = n->child->string; |
less = 0; |
less = 0; |
|
|
if ('-' == *cp) |
if (*cp == '-') |
less = -1; |
less = -1; |
else if ('+' == *cp) |
else if (*cp == '+') |
less = 1; |
less = 1; |
else |
else |
cp--; |
cp--; |
Line 413 pre_HP(DECL_ARGS) |
|
Line 407 pre_HP(DECL_ARGS) |
|
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
print_bvspace(p, n, mt->pardist); |
print_bvspace(p, n, mt->pardist); |
return 1; |
return 1; |
|
case ROFFT_HEAD: |
|
return 0; |
case ROFFT_BODY: |
case ROFFT_BODY: |
break; |
break; |
default: |
default: |
return 0; |
abort(); |
} |
} |
|
|
if (n->child == NULL) |
if (n->child == NULL) |
Line 448 pre_HP(DECL_ARGS) |
|
Line 444 pre_HP(DECL_ARGS) |
|
static void |
static void |
post_HP(DECL_ARGS) |
post_HP(DECL_ARGS) |
{ |
{ |
|
|
switch (n->type) { |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
case ROFFT_HEAD: |
|
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
term_newln(p); |
term_newln(p); |
|
|
Line 469 post_HP(DECL_ARGS) |
|
Line 467 post_HP(DECL_ARGS) |
|
p->tcol->rmargin = p->maxrmargin; |
p->tcol->rmargin = p->maxrmargin; |
break; |
break; |
default: |
default: |
break; |
abort(); |
} |
} |
} |
} |
|
|
static int |
static int |
pre_PP(DECL_ARGS) |
pre_PP(DECL_ARGS) |
{ |
{ |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent); |
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent); |
print_bvspace(p, n, mt->pardist); |
print_bvspace(p, n, mt->pardist); |
break; |
break; |
default: |
case ROFFT_HEAD: |
|
return 0; |
|
case ROFFT_BODY: |
p->tcol->offset = mt->offset; |
p->tcol->offset = mt->offset; |
break; |
break; |
|
default: |
|
abort(); |
} |
} |
|
return 1; |
return n->type != ROFFT_HEAD; |
|
} |
} |
|
|
static int |
static int |
Line 498 pre_IP(DECL_ARGS) |
|
Line 498 pre_IP(DECL_ARGS) |
|
int len; |
int len; |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BODY: |
case ROFFT_BLOCK: |
p->flags |= TERMP_NOSPACE; |
print_bvspace(p, n, mt->pardist); |
break; |
return 1; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
p->trailspace = 1; |
p->trailspace = 1; |
break; |
break; |
case ROFFT_BLOCK: |
case ROFFT_BODY: |
print_bvspace(p, n, mt->pardist); |
p->flags |= TERMP_NOSPACE; |
/* FALLTHROUGH */ |
break; |
default: |
default: |
return 1; |
abort(); |
} |
} |
|
|
/* Calculate the offset from the optional second argument. */ |
/* Calculate the offset from the optional second argument. */ |
Line 529 pre_IP(DECL_ARGS) |
|
Line 529 pre_IP(DECL_ARGS) |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
p->tcol->offset = mt->offset; |
p->tcol->offset = mt->offset; |
p->tcol->rmargin = mt->offset + len; |
p->tcol->rmargin = mt->offset + len; |
if (n->child) |
if (n->child != NULL) |
print_man_node(p, mt, n->child, meta); |
print_man_node(p, mt, n->child, meta); |
return 0; |
return 0; |
case ROFFT_BODY: |
case ROFFT_BODY: |
Line 537 pre_IP(DECL_ARGS) |
|
Line 537 pre_IP(DECL_ARGS) |
|
p->tcol->rmargin = p->maxrmargin; |
p->tcol->rmargin = p->maxrmargin; |
break; |
break; |
default: |
default: |
break; |
abort(); |
} |
} |
return 1; |
return 1; |
} |
} |
|
|
post_IP(DECL_ARGS) |
post_IP(DECL_ARGS) |
{ |
{ |
switch (n->type) { |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
break; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
Line 557 post_IP(DECL_ARGS) |
|
Line 559 post_IP(DECL_ARGS) |
|
p->tcol->offset = mt->offset; |
p->tcol->offset = mt->offset; |
break; |
break; |
default: |
default: |
break; |
abort(); |
} |
} |
} |
} |
|
|
Line 569 pre_TP(DECL_ARGS) |
|
Line 571 pre_TP(DECL_ARGS) |
|
int len; |
int len; |
|
|
switch (n->type) { |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
if (n->tok == MAN_TP) |
|
print_bvspace(p, n, mt->pardist); |
|
return 1; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
p->flags |= TERMP_NOBREAK | TERMP_BRTRSP; |
p->flags |= TERMP_NOBREAK | TERMP_BRTRSP; |
p->trailspace = 1; |
p->trailspace = 1; |
Line 576 pre_TP(DECL_ARGS) |
|
Line 582 pre_TP(DECL_ARGS) |
|
case ROFFT_BODY: |
case ROFFT_BODY: |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
break; |
break; |
case ROFFT_BLOCK: |
|
if (n->tok == MAN_TP) |
|
print_bvspace(p, n, mt->pardist); |
|
/* FALLTHROUGH */ |
|
default: |
default: |
return 1; |
abort(); |
} |
} |
|
|
/* Calculate offset. */ |
/* Calculate offset. */ |
Line 605 pre_TP(DECL_ARGS) |
|
Line 607 pre_TP(DECL_ARGS) |
|
|
|
/* Don't print same-line elements. */ |
/* Don't print same-line elements. */ |
nn = n->child; |
nn = n->child; |
while (NULL != nn && 0 == (NODE_LINE & nn->flags)) |
while (nn != NULL && (nn->flags & NODE_LINE) == 0) |
nn = nn->next; |
nn = nn->next; |
|
|
while (NULL != nn) { |
while (nn != NULL) { |
print_man_node(p, mt, nn, meta); |
print_man_node(p, mt, nn, meta); |
nn = nn->next; |
nn = nn->next; |
} |
} |
Line 620 pre_TP(DECL_ARGS) |
|
Line 622 pre_TP(DECL_ARGS) |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP); |
break; |
break; |
default: |
default: |
break; |
abort(); |
} |
} |
return 1; |
return 1; |
} |
} |
|
|
post_TP(DECL_ARGS) |
post_TP(DECL_ARGS) |
{ |
{ |
switch (n->type) { |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
break; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
term_flushln(p); |
term_flushln(p); |
break; |
break; |
Line 637 post_TP(DECL_ARGS) |
|
Line 641 post_TP(DECL_ARGS) |
|
p->tcol->offset = mt->offset; |
p->tcol->offset = mt->offset; |
break; |
break; |
default: |
default: |
break; |
abort(); |
} |
} |
} |
} |
|
|
Line 683 pre_SS(DECL_ARGS) |
|
Line 687 pre_SS(DECL_ARGS) |
|
default: |
default: |
break; |
break; |
} |
} |
|
|
return 1; |
return 1; |
} |
} |
|
|
static void |
|
post_SS(DECL_ARGS) |
|
{ |
|
|
|
switch (n->type) { |
|
case ROFFT_HEAD: |
|
term_newln(p); |
|
break; |
|
case ROFFT_BODY: |
|
term_newln(p); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
static int |
static int |
pre_SH(DECL_ARGS) |
pre_SH(DECL_ARGS) |
{ |
{ |
Line 743 pre_SH(DECL_ARGS) |
|
Line 730 pre_SH(DECL_ARGS) |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND); |
break; |
break; |
default: |
default: |
break; |
abort(); |
} |
} |
|
|
return 1; |
return 1; |
} |
} |
|
|
static void |
static void |
post_SH(DECL_ARGS) |
post_SH(DECL_ARGS) |
{ |
{ |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_HEAD: |
case ROFFT_BLOCK: |
term_newln(p); |
|
break; |
break; |
|
case ROFFT_HEAD: |
case ROFFT_BODY: |
case ROFFT_BODY: |
term_newln(p); |
term_newln(p); |
break; |
break; |
default: |
default: |
break; |
abort(); |
} |
} |
} |
} |
|
|
Line 776 pre_RS(DECL_ARGS) |
|
Line 761 pre_RS(DECL_ARGS) |
|
return 1; |
return 1; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
return 0; |
return 0; |
default: |
case ROFFT_BODY: |
break; |
break; |
|
default: |
|
abort(); |
} |
} |
|
|
n = n->parent->head; |
n = n->parent->head; |
Line 805 pre_RS(DECL_ARGS) |
|
Line 792 pre_RS(DECL_ARGS) |
|
static void |
static void |
post_RS(DECL_ARGS) |
post_RS(DECL_ARGS) |
{ |
{ |
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
return; |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
return; |
return; |
default: |
case ROFFT_BODY: |
term_newln(p); |
|
break; |
break; |
|
default: |
|
abort(); |
} |
} |
|
term_newln(p); |
mt->offset -= n->parent->head->aux; |
mt->offset -= n->parent->head->aux; |
p->tcol->offset = mt->offset; |
p->tcol->offset = mt->offset; |
|
|
if (--mt->lmarginsz < MAXMARGINS) |
if (--mt->lmarginsz < MAXMARGINS) |
mt->lmargincur = mt->lmarginsz; |
mt->lmargincur = mt->lmarginsz; |
} |
} |
|
|
post_SY(DECL_ARGS) |
post_SY(DECL_ARGS) |
{ |
{ |
switch (n->type) { |
switch (n->type) { |
|
case ROFFT_BLOCK: |
|
break; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
Line 876 post_SY(DECL_ARGS) |
|
Line 863 post_SY(DECL_ARGS) |
|
p->tcol->offset = mt->offset; |
p->tcol->offset = mt->offset; |
break; |
break; |
default: |
default: |
break; |
abort(); |
} |
} |
} |
} |
|
|
static int |
static int |
pre_UR(DECL_ARGS) |
pre_UR(DECL_ARGS) |
{ |
{ |
|
|
return n->type != ROFFT_HEAD; |
return n->type != ROFFT_HEAD; |
} |
} |
|
|
static void |
static void |
post_UR(DECL_ARGS) |
post_UR(DECL_ARGS) |
{ |
{ |
|
|
if (n->type != ROFFT_BLOCK) |
if (n->type != ROFFT_BLOCK) |
return; |
return; |
|
|
term_word(p, "<"); |
term_word(p, "<"); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
if (NULL != n->child->child) |
if (n->child->child != NULL) |
print_man_node(p, mt, n->child->child, meta); |
print_man_node(p, mt, n->child->child, meta); |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 962 print_man_node(DECL_ARGS) |
|
Line 947 print_man_node(DECL_ARGS) |
|
if (act->pre != NULL) |
if (act->pre != NULL) |
c = (*act->pre)(p, mt, n, meta); |
c = (*act->pre)(p, mt, n, meta); |
|
|
if (c && n->child) |
if (c && n->child != NULL) |
print_man_nodelist(p, mt, n->child, meta); |
print_man_nodelist(p, mt, n->child, meta); |
|
|
if (act->post != NULL) |
if (act->post != NULL) |
|
|
p->tcol->rmargin = p->maxrmargin; |
p->tcol->rmargin = p->maxrmargin; |
} |
} |
} |
} |
if (NODE_EOS & n->flags) |
if (n->flags & NODE_EOS) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
} |
} |
|
|
|
|
static void |
static void |
print_man_nodelist(DECL_ARGS) |
print_man_nodelist(DECL_ARGS) |
{ |
{ |
|
|
while (n != NULL) { |
while (n != NULL) { |
print_man_node(p, mt, n, meta); |
print_man_node(p, mt, n, meta); |
n = n->next; |
n = n->next; |
Line 1036 print_man_foot(struct termp *p, const struct roff_meta |
|
Line 1019 print_man_foot(struct termp *p, const struct roff_meta |
|
} |
} |
mandoc_asprintf(&title, "%s(%s)", |
mandoc_asprintf(&title, "%s(%s)", |
meta->title, meta->msec); |
meta->title, meta->msec); |
} else if (meta->os) { |
} else if (meta->os != NULL) { |
title = mandoc_strdup(meta->os); |
title = mandoc_strdup(meta->os); |
} else { |
} else { |
title = mandoc_strdup(""); |
title = mandoc_strdup(""); |