version 1.208, 2017/06/25 11:42:02 |
version 1.212, 2018/08/14 01:27:48 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 673 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->type == ROFFT_COMMENT || |
|
(n->tok == MAN_SS && n->body->child == NULL)) |
break; |
break; |
|
|
for (i = 0; i < mt->pardist; i++) |
for (i = 0; i < mt->pardist; i++) |
Line 735 pre_SH(DECL_ARGS) |
|
Line 736 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->type == ROFFT_COMMENT || |
|
(n->tok == MAN_SH && n->body->child == NULL)) |
break; |
break; |
|
|
for (i = 0; i < mt->pardist; i++) |
for (i = 0; i < mt->pardist; i++) |
Line 882 print_man_node(DECL_ARGS) |
|
Line 884 print_man_node(DECL_ARGS) |
|
} 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) |
term_newln(p); |
term_newln(p); |
|
else if (n->flags & NODE_DELIMC) |
|
p->flags |= TERMP_NOSPACE; |
|
|
term_word(p, n->string); |
term_word(p, n->string); |
goto out; |
goto out; |
|
case ROFFT_COMMENT: |
|
return; |
case ROFFT_EQN: |
case ROFFT_EQN: |
if ( ! (n->flags & NODE_LINE)) |
if ( ! (n->flags & NODE_LINE)) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 1029 print_man_foot(struct termp *p, const struct roff_meta |
|
Line 1034 print_man_foot(struct termp *p, const struct roff_meta |
|
|
|
term_word(p, title); |
term_word(p, title); |
term_flushln(p); |
term_flushln(p); |
|
|
|
/* |
|
* Reset the terminal state for more output after the footer: |
|
* Some output modes, in particular PostScript and PDF, print |
|
* the header and the footer into a buffer such that it can be |
|
* reused for multiple output pages, then go on to format the |
|
* main text. |
|
*/ |
|
|
|
p->tcol->offset = 0; |
|
p->flags = 0; |
|
|
free(title); |
free(title); |
} |
} |
|
|