version 1.235, 2020/03/13 15:32:28 |
version 1.239, 2022/08/15 18:46:30 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2010-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2015,2017-2020,2022 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 121 static const struct man_term_act man_term_acts[MAN_MAX |
|
Line 121 static const struct man_term_act man_term_acts[MAN_MAX |
|
{ pre_alternate, NULL, 0 }, /* RI */ |
{ pre_alternate, NULL, 0 }, /* RI */ |
{ NULL, NULL, 0 }, /* RE */ |
{ NULL, NULL, 0 }, /* RE */ |
{ pre_RS, post_RS, 0 }, /* RS */ |
{ pre_RS, post_RS, 0 }, /* RS */ |
{ pre_DT, NULL, 0 }, /* DT */ |
{ pre_DT, NULL, MAN_NOTEXT }, /* DT */ |
{ pre_ign, NULL, MAN_NOTEXT }, /* UC */ |
{ pre_ign, NULL, MAN_NOTEXT }, /* UC */ |
{ pre_PD, NULL, MAN_NOTEXT }, /* PD */ |
{ pre_PD, NULL, MAN_NOTEXT }, /* PD */ |
{ pre_ign, NULL, 0 }, /* AT */ |
{ pre_ign, NULL, MAN_NOTEXT }, /* AT */ |
{ pre_in, NULL, MAN_NOTEXT }, /* in */ |
{ pre_in, NULL, MAN_NOTEXT }, /* in */ |
{ pre_SY, post_SY, 0 }, /* SY */ |
{ pre_SY, post_SY, 0 }, /* SY */ |
{ NULL, NULL, 0 }, /* YS */ |
{ NULL, NULL, 0 }, /* YS */ |
Line 517 pre_IP(DECL_ARGS) |
|
Line 517 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 591 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 900 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 |
|
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 964 print_man_node(DECL_ARGS) |
|
Line 977 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; |
|
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; |
Line 1021 print_man_foot(struct termp *p, const struct roff_meta |
|
Line 1018 print_man_foot(struct termp *p, const struct roff_meta |
|
*/ |
*/ |
|
|
if ( ! p->mdocstyle) { |
if ( ! p->mdocstyle) { |
if (meta->hasbody) { |
|
term_vspace(p); |
|
term_vspace(p); |
|
} |
|
mandoc_asprintf(&title, "%s(%s)", |
mandoc_asprintf(&title, "%s(%s)", |
meta->title, meta->msec); |
meta->title, meta->msec); |
} else if (meta->os != NULL) { |
} else if (meta->os != NULL) { |
Line 1143 print_man_head(struct termp *p, const struct roff_meta |
|
Line 1136 print_man_head(struct termp *p, const struct roff_meta |
|
*/ |
*/ |
|
|
term_vspace(p); |
term_vspace(p); |
if ( ! p->mdocstyle) { |
|
term_vspace(p); |
|
term_vspace(p); |
|
} |
|
free(title); |
free(title); |
} |
} |