version 1.274, 2014/07/30 17:06:26 |
version 1.278, 2014/08/17 16:44:41 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
Line 476 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 474 print_mdoc_head(struct termp *p, const void *arg) |
|
meta->vol, meta->arch); |
meta->vol, meta->arch); |
vollen = term_strlen(p, volume); |
vollen = term_strlen(p, volume); |
|
|
mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec); |
if (NULL == meta->msec) |
|
title = mandoc_strdup(meta->title); |
|
else |
|
mandoc_asprintf(&title, "%s(%s)", |
|
meta->title, meta->msec); |
titlen = term_strlen(p, title); |
titlen = term_strlen(p, title); |
|
|
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
Line 804 termp_it_pre(DECL_ARGS) |
|
Line 806 termp_it_pre(DECL_ARGS) |
|
* the "overstep" effect in term_flushln() and treat |
* the "overstep" effect in term_flushln() and treat |
* this as a `-ohang' list instead. |
* this as a `-ohang' list instead. |
*/ |
*/ |
if (n->next->child && |
if (NULL != n->next && |
|
NULL != n->next->child && |
(MDOC_Bl == n->next->child->tok || |
(MDOC_Bl == n->next->child->tok || |
MDOC_Bd == n->next->child->tok)) |
MDOC_Bd == n->next->child->tok)) |
break; |
break; |
Line 860 termp_it_pre(DECL_ARGS) |
|
Line 863 termp_it_pre(DECL_ARGS) |
|
* don't want to recalculate rmargin and offsets when |
* don't want to recalculate rmargin and offsets when |
* using `Bd' or `Bl' within `-hang' overstep lists. |
* using `Bd' or `Bl' within `-hang' overstep lists. |
*/ |
*/ |
if (MDOC_HEAD == n->type && n->next->child && |
if (MDOC_HEAD == n->type && |
|
NULL != n->next && |
|
NULL != n->next->child && |
(MDOC_Bl == n->next->child->tok || |
(MDOC_Bl == n->next->child->tok || |
MDOC_Bd == n->next->child->tok)) |
MDOC_Bd == n->next->child->tok)) |
break; |
break; |
Line 1025 termp_nm_pre(DECL_ARGS) |
|
Line 1030 termp_nm_pre(DECL_ARGS) |
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
synopsis_pre(p, n->parent); |
synopsis_pre(p, n->parent); |
|
|
if (MDOC_HEAD == n->type && n->next->child) { |
if (MDOC_HEAD == n->type && |
|
NULL != n->next && NULL != n->next->child) { |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND; |
p->trailspace = 1; |
p->trailspace = 1; |
p->rmargin = p->offset + term_len(p, 1); |
p->rmargin = p->offset + term_len(p, 1); |
Line 1053 termp_nm_post(DECL_ARGS) |
|
Line 1059 termp_nm_post(DECL_ARGS) |
|
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
} else if (MDOC_HEAD == n->type && n->next->child) { |
} else if (MDOC_HEAD == n->type && |
|
NULL != n->next && NULL != n->next->child) { |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); |
p->trailspace = 0; |
p->trailspace = 0; |