version 1.238, 2022/08/15 13:04:43 |
version 1.242, 2023/04/28 20:23:19 |
Line 83 static int pre_SS(DECL_ARGS); |
|
Line 83 static int pre_SS(DECL_ARGS); |
|
static int pre_SY(DECL_ARGS); |
static int pre_SY(DECL_ARGS); |
static int pre_TP(DECL_ARGS); |
static int pre_TP(DECL_ARGS); |
static int pre_UR(DECL_ARGS); |
static int pre_UR(DECL_ARGS); |
static int pre_abort(DECL_ARGS); |
|
static int pre_alternate(DECL_ARGS); |
static int pre_alternate(DECL_ARGS); |
static int pre_ign(DECL_ARGS); |
static int pre_ign(DECL_ARGS); |
static int pre_in(DECL_ARGS); |
static int pre_in(DECL_ARGS); |
Line 103 static const struct man_term_act man_term_acts[MAN_MAX |
|
Line 102 static const struct man_term_act man_term_acts[MAN_MAX |
|
{ pre_SS, post_SH, 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_PP, NULL, 0 }, /* LP */ |
{ pre_PP, NULL, 0 }, /* PP */ |
{ pre_PP, NULL, 0 }, /* PP */ |
{ pre_abort, NULL, 0 }, /* P */ |
{ pre_PP, NULL, 0 }, /* P */ |
{ pre_IP, post_IP, 0 }, /* IP */ |
{ pre_IP, post_IP, 0 }, /* IP */ |
{ pre_HP, post_HP, 0 }, /* HP */ |
{ pre_HP, post_HP, 0 }, /* HP */ |
{ NULL, NULL, 0 }, /* SM */ |
{ NULL, NULL, 0 }, /* SM */ |
Line 225 print_bvspace(struct termp *p, struct roff_node *n, in |
|
Line 224 print_bvspace(struct termp *p, struct roff_node *n, in |
|
term_vspace(p); |
term_vspace(p); |
} |
} |
|
|
|
|
static int |
static int |
pre_abort(DECL_ARGS) |
|
{ |
|
abort(); |
|
} |
|
|
|
static int |
|
pre_ign(DECL_ARGS) |
pre_ign(DECL_ARGS) |
{ |
{ |
return 0; |
return 0; |
Line 517 pre_IP(DECL_ARGS) |
|
Line 509 pre_IP(DECL_ARGS) |
|
p->trailspace = 1; |
p->trailspace = 1; |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE | TERMP_NONEWLINE; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 591 pre_TP(DECL_ARGS) |
|
Line 583 pre_TP(DECL_ARGS) |
|
p->trailspace = 1; |
p->trailspace = 1; |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE | TERMP_NONEWLINE; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 900 print_man_node(DECL_ARGS) |
|
Line 892 print_man_node(DECL_ARGS) |
|
const struct man_term_act *act; |
const struct man_term_act *act; |
int c; |
int c; |
|
|
|
/* |
|
* In no-fill mode, break the output line at the beginning |
|
* of new input lines except after \c, and nowhere else. |
|
*/ |
|
|
|
if (n->flags & NODE_NOFILL) { |
|
if (n->flags & NODE_LINE && |
|
(p->flags & TERMP_NONEWLINE) == 0) |
|
term_newln(p); |
|
p->flags |= TERMP_BRNEVER; |
|
} else { |
|
if (n->flags & NODE_LINE) |
|
term_tab_ref(p); |
|
p->flags &= ~TERMP_BRNEVER; |
|
} |
|
|
if (n->flags & NODE_ID) |
if (n->flags & NODE_ID) |
term_tag_write(n, p->line); |
term_tag_write(n, p->line); |
|
|
Line 935 print_man_node(DECL_ARGS) |
|
Line 943 print_man_node(DECL_ARGS) |
|
return; |
return; |
case ROFFT_TBL: |
case ROFFT_TBL: |
if (p->tbl.cols == NULL) |
if (p->tbl.cols == NULL) |
term_vspace(p); |
term_newln(p); |
term_tbl(p, n->span); |
term_tbl(p, n->span); |
return; |
return; |
default: |
default: |
Line 964 print_man_node(DECL_ARGS) |
|
Line 972 print_man_node(DECL_ARGS) |
|
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
|
|
out: |
out: |
/* |
if (n->parent->tok == MAN_HP && n->parent->type == ROFFT_BODY && |
* If we're in a literal context, make sure that words |
n->prev == NULL && n->flags & NODE_NOFILL) { |
* together on the same line stay together. This is a |
term_newln(p); |
* POST-printing call, so we check the NEXT word. Since |
p->tcol->offset = p->tcol->rmargin; |
* -man doesn't have nested macros, we don't need to be |
p->tcol->rmargin = p->maxrmargin; |
* more specific than this. |
|
*/ |
|
if (n->flags & NODE_NOFILL && |
|
! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) && |
|
(n->next == NULL || n->next->flags & NODE_LINE)) { |
|
p->flags |= TERMP_BRNEVER | TERMP_NOSPACE; |
|
p->tcol->taboff = 0; |
|
if (n->string != NULL && *n->string != '\0') |
|
term_flushln(p); |
|
else |
|
term_newln(p); |
|
p->flags &= ~TERMP_BRNEVER; |
|
if (p->tcol->rmargin < p->maxrmargin && |
|
n->parent->tok == MAN_HP) { |
|
p->tcol->offset = p->tcol->rmargin; |
|
p->tcol->rmargin = p->maxrmargin; |
|
} |
|
} |
} |
if (n->flags & NODE_EOS) |
if (n->flags & NODE_EOS) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |