Print this page
5051 import mdocml-1.12.3
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: TBD
*** 1,9 ****
! /* $Id: man_term.c,v 1.127 2012/01/03 15:16:24 kristaps Exp $ */
/*
! * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
! * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
--- 1,9 ----
! /* $Id: man_term.c,v 1.139 2013/12/22 23:34:13 schwarze Exp $ */
/*
! * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
! * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
*** 33,57 ****
#include "term.h"
#include "main.h"
#define MAXMARGINS 64 /* maximum number of indented scopes */
- /* FIXME: have PD set the default vspace width. */
-
struct mtermp {
int fl;
#define MANT_LITERAL (1 << 0)
size_t lmargin[MAXMARGINS]; /* margins (incl. visible page) */
int lmargincur; /* index of current margin */
int lmarginsz; /* actual number of nested margins */
size_t offset; /* default offset to visible page */
};
#define DECL_ARGS struct termp *p, \
struct mtermp *mt, \
const struct man_node *n, \
! const struct man_meta *m
struct termact {
int (*pre)(DECL_ARGS);
void (*post)(DECL_ARGS);
int flags;
--- 33,56 ----
#include "term.h"
#include "main.h"
#define MAXMARGINS 64 /* maximum number of indented scopes */
struct mtermp {
int fl;
#define MANT_LITERAL (1 << 0)
size_t lmargin[MAXMARGINS]; /* margins (incl. visible page) */
int lmargincur; /* index of current margin */
int lmarginsz; /* actual number of nested margins */
size_t offset; /* default offset to visible page */
+ int pardist; /* vert. space before par., unit: [v] */
};
#define DECL_ARGS struct termp *p, \
struct mtermp *mt, \
const struct man_node *n, \
! const struct man_meta *meta
struct termact {
int (*pre)(DECL_ARGS);
void (*post)(DECL_ARGS);
int flags;
*** 64,85 ****
static void print_man_nodelist(DECL_ARGS);
static void print_man_node(DECL_ARGS);
static void print_man_head(struct termp *, const void *);
static void print_man_foot(struct termp *, const void *);
static void print_bvspace(struct termp *,
! const struct man_node *);
static int pre_B(DECL_ARGS);
static int pre_HP(DECL_ARGS);
static int pre_I(DECL_ARGS);
static int pre_IP(DECL_ARGS);
static int pre_OP(DECL_ARGS);
static int pre_PP(DECL_ARGS);
static int pre_RS(DECL_ARGS);
static int pre_SH(DECL_ARGS);
static int pre_SS(DECL_ARGS);
static int pre_TP(DECL_ARGS);
static int pre_alternate(DECL_ARGS);
static int pre_ft(DECL_ARGS);
static int pre_ign(DECL_ARGS);
static int pre_in(DECL_ARGS);
static int pre_literal(DECL_ARGS);
--- 63,86 ----
static void print_man_nodelist(DECL_ARGS);
static void print_man_node(DECL_ARGS);
static void print_man_head(struct termp *, const void *);
static void print_man_foot(struct termp *, const void *);
static void print_bvspace(struct termp *,
! const struct man_node *, int);
static int pre_B(DECL_ARGS);
static int pre_HP(DECL_ARGS);
static int pre_I(DECL_ARGS);
static int pre_IP(DECL_ARGS);
static int pre_OP(DECL_ARGS);
+ static int pre_PD(DECL_ARGS);
static int pre_PP(DECL_ARGS);
static int pre_RS(DECL_ARGS);
static int pre_SH(DECL_ARGS);
static int pre_SS(DECL_ARGS);
static int pre_TP(DECL_ARGS);
+ static int pre_UR(DECL_ARGS);
static int pre_alternate(DECL_ARGS);
static int pre_ft(DECL_ARGS);
static int pre_ign(DECL_ARGS);
static int pre_in(DECL_ARGS);
static int pre_literal(DECL_ARGS);
*** 89,98 ****
--- 90,100 ----
static void post_HP(DECL_ARGS);
static void post_RS(DECL_ARGS);
static void post_SH(DECL_ARGS);
static void post_SS(DECL_ARGS);
static void post_TP(DECL_ARGS);
+ static void post_UR(DECL_ARGS);
static const struct termact termacts[MAN_MAX] = {
{ pre_sp, NULL, MAN_NOTEXT }, /* br */
{ NULL, NULL, 0 }, /* TH */
{ pre_SH, post_SH, 0 }, /* SH */
*** 120,144 ****
{ pre_literal, NULL, 0 }, /* fi */
{ NULL, NULL, 0 }, /* RE */
{ pre_RS, post_RS, 0 }, /* RS */
{ pre_ign, NULL, 0 }, /* DT */
{ pre_ign, NULL, 0 }, /* UC */
! { pre_ign, NULL, 0 }, /* PD */
{ pre_ign, NULL, 0 }, /* AT */
{ pre_in, NULL, MAN_NOTEXT }, /* in */
{ pre_ft, NULL, MAN_NOTEXT }, /* ft */
{ pre_OP, NULL, 0 }, /* OP */
};
void
terminal_man(void *arg, const struct man *man)
{
struct termp *p;
const struct man_node *n;
! const struct man_meta *m;
struct mtermp mt;
p = (struct termp *)arg;
if (0 == p->defindent)
--- 122,150 ----
{ pre_literal, NULL, 0 }, /* fi */
{ NULL, NULL, 0 }, /* RE */
{ pre_RS, post_RS, 0 }, /* RS */
{ pre_ign, NULL, 0 }, /* DT */
{ pre_ign, NULL, 0 }, /* UC */
! { pre_PD, NULL, MAN_NOTEXT }, /* PD */
{ pre_ign, NULL, 0 }, /* AT */
{ pre_in, NULL, MAN_NOTEXT }, /* in */
{ pre_ft, NULL, MAN_NOTEXT }, /* ft */
{ pre_OP, NULL, 0 }, /* OP */
+ { pre_literal, NULL, 0 }, /* EX */
+ { pre_literal, NULL, 0 }, /* EE */
+ { pre_UR, post_UR, 0 }, /* UR */
+ { NULL, NULL, 0 }, /* UE */
};
void
terminal_man(void *arg, const struct man *man)
{
struct termp *p;
const struct man_node *n;
! const struct man_meta *meta;
struct mtermp mt;
p = (struct termp *)arg;
if (0 == p->defindent)
*** 150,171 ****
if (NULL == p->symtab)
p->symtab = mchars_alloc();
n = man_node(man);
! m = man_meta(man);
! term_begin(p, print_man_head, print_man_foot, m);
p->flags |= TERMP_NOSPACE;
memset(&mt, 0, sizeof(struct mtermp));
mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
mt.offset = term_len(p, p->defindent);
if (n->child)
! print_man_nodelist(p, &mt, n->child, m);
term_end(p);
}
--- 156,178 ----
if (NULL == p->symtab)
p->symtab = mchars_alloc();
n = man_node(man);
! meta = man_meta(man);
! term_begin(p, print_man_head, print_man_foot, meta);
p->flags |= TERMP_NOSPACE;
memset(&mt, 0, sizeof(struct mtermp));
mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
mt.offset = term_len(p, p->defindent);
+ mt.pardist = 1;
if (n->child)
! print_man_nodelist(p, &mt, n->child, meta);
term_end(p);
}
*** 199,210 ****
* on here. Basically, if we're the first within another block (SS/SH),
* then don't emit vertical space. If we are (RS), then do. If not the
* first, print it.
*/
static void
! print_bvspace(struct termp *p, const struct man_node *n)
{
term_newln(p);
if (n->body && n->body->child)
if (MAN_TBL == n->body->child->type)
--- 206,218 ----
* on here. Basically, if we're the first within another block (SS/SH),
* then don't emit vertical space. If we are (RS), then do. If not the
* first, print it.
*/
static void
! print_bvspace(struct termp *p, const struct man_node *n, int pardist)
{
+ int i;
term_newln(p);
if (n->body && n->body->child)
if (MAN_TBL == n->body->child->type)
*** 212,221 ****
--- 220,230 ----
if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok)
if (NULL == n->prev)
return;
+ for (i = 0; i < pardist; i++)
term_vspace(p);
}
/* ARGSUSED */
static int
*** 241,251 ****
pre_literal(DECL_ARGS)
{
term_newln(p);
! if (MAN_nf == n->tok)
mt->fl |= MANT_LITERAL;
else
mt->fl &= ~MANT_LITERAL;
/*
--- 250,260 ----
pre_literal(DECL_ARGS)
{
term_newln(p);
! if (MAN_nf == n->tok || MAN_EX == n->tok)
mt->fl |= MANT_LITERAL;
else
mt->fl &= ~MANT_LITERAL;
/*
*** 254,272 ****
* indentation has to be set up explicitly.
*/
if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) {
p->offset = p->rmargin;
p->rmargin = p->maxrmargin;
! p->flags &= ~(TERMP_NOBREAK | TERMP_TWOSPACE);
p->flags |= TERMP_NOSPACE;
}
return(0);
}
/* ARGSUSED */
static int
pre_alternate(DECL_ARGS)
{
enum termfont font[2];
const struct man_node *nn;
int savelit, i;
--- 263,297 ----
* indentation has to be set up explicitly.
*/
if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) {
p->offset = p->rmargin;
p->rmargin = p->maxrmargin;
! p->trailspace = 0;
! p->flags &= ~TERMP_NOBREAK;
p->flags |= TERMP_NOSPACE;
}
return(0);
}
/* ARGSUSED */
static int
+ pre_PD(DECL_ARGS)
+ {
+
+ n = n->child;
+ if (0 == n) {
+ mt->pardist = 1;
+ return(0);
+ }
+ assert(MAN_TEXT == n->type);
+ mt->pardist = atoi(n->string);
+ return(0);
+ }
+
+ /* ARGSUSED */
+ static int
pre_alternate(DECL_ARGS)
{
enum termfont font[2];
const struct man_node *nn;
int savelit, i;
*** 305,315 ****
for (i = 0, nn = n->child; nn; nn = nn->next, i = 1 - i) {
term_fontrepl(p, font[i]);
if (savelit && NULL == nn->next)
mt->fl |= MANT_LITERAL;
! print_man_node(p, mt, nn, m);
if (nn->next)
p->flags |= TERMP_NOSPACE;
}
return(0);
--- 330,340 ----
for (i = 0, nn = n->child; nn; nn = nn->next, i = 1 - i) {
term_fontrepl(p, font[i]);
if (savelit && NULL == nn->next)
mt->fl |= MANT_LITERAL;
! print_man_node(p, mt, nn, meta);
if (nn->next)
p->flags |= TERMP_NOSPACE;
}
return(0);
*** 436,465 ****
/* ARGSUSED */
static int
pre_sp(DECL_ARGS)
{
size_t i, len;
if ((NULL == n->prev && n->parent)) {
! if (MAN_SS == n->parent->tok)
return(0);
! if (MAN_SH == n->parent->tok)
! return(0);
}
switch (n->tok) {
case (MAN_br):
len = 0;
break;
default:
! len = n->child ? a2height(p, n->child->string) : 1;
break;
}
if (0 == len)
term_newln(p);
for (i = 0; i < len; i++)
term_vspace(p);
return(0);
}
--- 461,516 ----
/* ARGSUSED */
static int
pre_sp(DECL_ARGS)
{
+ char *s;
size_t i, len;
+ int neg;
if ((NULL == n->prev && n->parent)) {
! switch (n->parent->tok) {
! case (MAN_SH):
! /* FALLTHROUGH */
! case (MAN_SS):
! /* FALLTHROUGH */
! case (MAN_PP):
! /* FALLTHROUGH */
! case (MAN_LP):
! /* FALLTHROUGH */
! case (MAN_P):
! /* FALLTHROUGH */
return(0);
! default:
! break;
}
+ }
+ neg = 0;
switch (n->tok) {
case (MAN_br):
len = 0;
break;
default:
! if (NULL == n->child) {
! len = 1;
break;
}
+ s = n->child->string;
+ if ('-' == *s) {
+ neg = 1;
+ s++;
+ }
+ len = a2height(p, s);
+ break;
+ }
if (0 == len)
term_newln(p);
+ else if (neg)
+ p->skipvsp += len;
+ else
for (i = 0; i < len; i++)
term_vspace(p);
return(0);
}
*** 473,492 ****
int ival;
const struct man_node *nn;
switch (n->type) {
case (MAN_BLOCK):
! print_bvspace(p, n);
return(1);
case (MAN_BODY):
- p->flags |= TERMP_NOBREAK;
- p->flags |= TERMP_TWOSPACE;
break;
default:
return(0);
}
len = mt->lmargin[mt->lmargincur];
ival = -1;
/* Calculate offset. */
--- 524,546 ----
int ival;
const struct man_node *nn;
switch (n->type) {
case (MAN_BLOCK):
! print_bvspace(p, n, mt->pardist);
return(1);
case (MAN_BODY):
break;
default:
return(0);
}
+ if ( ! (MANT_LITERAL & mt->fl)) {
+ p->flags |= TERMP_NOBREAK;
+ p->trailspace = 2;
+ }
+
len = mt->lmargin[mt->lmargincur];
ival = -1;
/* Calculate offset. */
*** 512,528 ****
static void
post_HP(DECL_ARGS)
{
switch (n->type) {
- case (MAN_BLOCK):
- term_flushln(p);
- break;
case (MAN_BODY):
! term_flushln(p);
p->flags &= ~TERMP_NOBREAK;
! p->flags &= ~TERMP_TWOSPACE;
p->offset = mt->offset;
p->rmargin = p->maxrmargin;
break;
default:
break;
--- 566,579 ----
static void
post_HP(DECL_ARGS)
{
switch (n->type) {
case (MAN_BODY):
! term_newln(p);
p->flags &= ~TERMP_NOBREAK;
! p->trailspace = 0;
p->offset = mt->offset;
p->rmargin = p->maxrmargin;
break;
default:
break;
*** 536,546 ****
{
switch (n->type) {
case (MAN_BLOCK):
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
! print_bvspace(p, n);
break;
default:
p->offset = mt->offset;
break;
}
--- 587,597 ----
{
switch (n->type) {
case (MAN_BLOCK):
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
! print_bvspace(p, n, mt->pardist);
break;
default:
p->offset = mt->offset;
break;
}
*** 561,573 ****
case (MAN_BODY):
p->flags |= TERMP_NOSPACE;
break;
case (MAN_HEAD):
p->flags |= TERMP_NOBREAK;
break;
case (MAN_BLOCK):
! print_bvspace(p, n);
/* FALLTHROUGH */
default:
return(1);
}
--- 612,625 ----
case (MAN_BODY):
p->flags |= TERMP_NOSPACE;
break;
case (MAN_HEAD):
p->flags |= TERMP_NOBREAK;
+ p->trailspace = 1;
break;
case (MAN_BLOCK):
! print_bvspace(p, n, mt->pardist);
/* FALLTHROUGH */
default:
return(1);
}
*** 596,606 ****
savelit = MANT_LITERAL & mt->fl;
mt->fl &= ~MANT_LITERAL;
if (n->child)
! print_man_node(p, mt, n->child, m);
if (savelit)
mt->fl |= MANT_LITERAL;
return(0);
--- 648,658 ----
savelit = MANT_LITERAL & mt->fl;
mt->fl &= ~MANT_LITERAL;
if (n->child)
! print_man_node(p, mt, n->child, meta);
if (savelit)
mt->fl |= MANT_LITERAL;
return(0);
*** 623,636 ****
--- 675,690 ----
switch (n->type) {
case (MAN_HEAD):
term_flushln(p);
p->flags &= ~TERMP_NOBREAK;
+ p->trailspace = 0;
p->rmargin = p->maxrmargin;
break;
case (MAN_BODY):
term_newln(p);
+ p->offset = mt->offset;
break;
default:
break;
}
}
*** 645,660 ****
int savelit, ival;
switch (n->type) {
case (MAN_HEAD):
p->flags |= TERMP_NOBREAK;
break;
case (MAN_BODY):
p->flags |= TERMP_NOSPACE;
break;
case (MAN_BLOCK):
! print_bvspace(p, n);
/* FALLTHROUGH */
default:
return(1);
}
--- 699,715 ----
int savelit, ival;
switch (n->type) {
case (MAN_HEAD):
p->flags |= TERMP_NOBREAK;
+ p->trailspace = 1;
break;
case (MAN_BODY):
p->flags |= TERMP_NOSPACE;
break;
case (MAN_BLOCK):
! print_bvspace(p, n, mt->pardist);
/* FALLTHROUGH */
default:
return(1);
}
*** 681,691 ****
mt->fl &= ~MANT_LITERAL;
/* Don't print same-line elements. */
for (nn = n->child; nn; nn = nn->next)
if (nn->line > n->line)
! print_man_node(p, mt, nn, m);
if (savelit)
mt->fl |= MANT_LITERAL;
if (ival >= 0)
mt->lmargin[mt->lmargincur] = (size_t)ival;
--- 736,746 ----
mt->fl &= ~MANT_LITERAL;
/* Don't print same-line elements. */
for (nn = n->child; nn; nn = nn->next)
if (nn->line > n->line)
! print_man_node(p, mt, nn, meta);
if (savelit)
mt->fl |= MANT_LITERAL;
if (ival >= 0)
mt->lmargin[mt->lmargincur] = (size_t)ival;
*** 692,701 ****
--- 747,758 ----
return(0);
case (MAN_BODY):
p->offset = mt->offset + len;
p->rmargin = p->maxrmargin;
+ p->trailspace = 0;
+ p->flags &= ~TERMP_NOBREAK;
break;
default:
break;
}
*** 709,724 ****
{
switch (n->type) {
case (MAN_HEAD):
term_flushln(p);
- p->flags &= ~TERMP_NOBREAK;
- p->flags &= ~TERMP_TWOSPACE;
- p->rmargin = p->maxrmargin;
break;
case (MAN_BODY):
term_newln(p);
break;
default:
break;
}
}
--- 766,779 ----
{
switch (n->type) {
case (MAN_HEAD):
term_flushln(p);
break;
case (MAN_BODY):
term_newln(p);
+ p->offset = mt->offset;
break;
default:
break;
}
}
*** 726,735 ****
--- 781,791 ----
/* ARGSUSED */
static int
pre_SS(DECL_ARGS)
{
+ int i;
switch (n->type) {
case (MAN_BLOCK):
mt->fl &= ~MANT_LITERAL;
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
*** 738,752 ****
if (n->prev && MAN_SS == n->prev->tok)
if (NULL == n->prev->body->child)
break;
if (NULL == n->prev)
break;
term_vspace(p);
break;
case (MAN_HEAD):
term_fontrepl(p, TERMFONT_BOLD);
! p->offset = term_len(p, p->defindent/2);
break;
case (MAN_BODY):
p->offset = mt->offset;
break;
default:
--- 794,809 ----
if (n->prev && MAN_SS == n->prev->tok)
if (NULL == n->prev->body->child)
break;
if (NULL == n->prev)
break;
+ for (i = 0; i < mt->pardist; i++)
term_vspace(p);
break;
case (MAN_HEAD):
term_fontrepl(p, TERMFONT_BOLD);
! p->offset = term_len(p, 3);
break;
case (MAN_BODY):
p->offset = mt->offset;
break;
default:
*** 777,786 ****
--- 834,844 ----
/* ARGSUSED */
static int
pre_SH(DECL_ARGS)
{
+ int i;
switch (n->type) {
case (MAN_BLOCK):
mt->fl &= ~MANT_LITERAL;
mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
*** 790,799 ****
--- 848,858 ----
if (NULL == n->prev->body->child)
break;
/* If the first macro, no vspae. */
if (NULL == n->prev)
break;
+ for (i = 0; i < mt->pardist; i++)
term_vspace(p);
break;
case (MAN_HEAD):
term_fontrepl(p, TERMFONT_BOLD);
p->offset = 0;
*** 888,898 ****
--- 947,983 ----
if (--mt->lmarginsz < MAXMARGINS)
mt->lmargincur = mt->lmarginsz;
}
+ /* ARGSUSED */
+ static int
+ pre_UR(DECL_ARGS)
+ {
+
+ return (MAN_HEAD != n->type);
+ }
+
+ /* ARGSUSED */
static void
+ post_UR(DECL_ARGS)
+ {
+
+ if (MAN_BLOCK != n->type)
+ return;
+
+ term_word(p, "<");
+ p->flags |= TERMP_NOSPACE;
+
+ if (NULL != n->child->child)
+ print_man_node(p, mt, n->child->child, meta);
+
+ p->flags |= TERMP_NOSPACE;
+ term_word(p, ">");
+ }
+
+ static void
print_man_node(DECL_ARGS)
{
size_t rm, rmax;
int c;
*** 908,940 ****
return;
} else if (' ' == *n->string && MAN_LINE & n->flags)
term_newln(p);
term_word(p, n->string);
- /*
- * If we're in a literal context, make sure that words
- * togehter on the same line stay together. This is a
- * POST-printing call, so we check the NEXT word. Since
- * -man doesn't have nested macros, we don't need to be
- * more specific than this.
- */
- if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) &&
- (NULL == n->next ||
- n->next->line > n->line)) {
- rm = p->rmargin;
- rmax = p->maxrmargin;
- p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
- p->flags |= TERMP_NOSPACE;
- term_flushln(p);
- p->rmargin = rm;
- p->maxrmargin = rmax;
- }
-
- if (MAN_EOS & n->flags)
- p->flags |= TERMP_SENTENCE;
- return;
case (MAN_EQN):
term_eqn(p, n->eqn);
return;
case (MAN_TBL):
/*
--- 993,1004 ----
return;
} else if (' ' == *n->string && MAN_LINE & n->flags)
term_newln(p);
term_word(p, n->string);
+ goto out;
case (MAN_EQN):
term_eqn(p, n->eqn);
return;
case (MAN_TBL):
/*
*** 952,984 ****
if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
term_fontrepl(p, TERMFONT_NONE);
c = 1;
if (termacts[n->tok].pre)
! c = (*termacts[n->tok].pre)(p, mt, n, m);
if (c && n->child)
! print_man_nodelist(p, mt, n->child, m);
if (termacts[n->tok].post)
! (*termacts[n->tok].post)(p, mt, n, m);
if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
term_fontrepl(p, TERMFONT_NONE);
if (MAN_EOS & n->flags)
p->flags |= TERMP_SENTENCE;
}
static void
print_man_nodelist(DECL_ARGS)
{
! print_man_node(p, mt, n, m);
if ( ! n->next)
return;
! print_man_nodelist(p, mt, n->next, m);
}
static void
print_man_foot(struct termp *p, const void *arg)
--- 1016,1073 ----
if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
term_fontrepl(p, TERMFONT_NONE);
c = 1;
if (termacts[n->tok].pre)
! c = (*termacts[n->tok].pre)(p, mt, n, meta);
if (c && n->child)
! print_man_nodelist(p, mt, n->child, meta);
if (termacts[n->tok].post)
! (*termacts[n->tok].post)(p, mt, n, meta);
if ( ! (MAN_NOTEXT & termacts[n->tok].flags))
term_fontrepl(p, TERMFONT_NONE);
+ out:
+ /*
+ * If we're in a literal context, make sure that words
+ * together on the same line stay together. This is a
+ * POST-printing call, so we check the NEXT word. Since
+ * -man doesn't have nested macros, we don't need to be
+ * more specific than this.
+ */
+ if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) &&
+ (NULL == n->next || n->next->line > n->line)) {
+ rm = p->rmargin;
+ rmax = p->maxrmargin;
+ p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+ p->flags |= TERMP_NOSPACE;
+ if (NULL != n->string && '\0' != *n->string)
+ term_flushln(p);
+ else
+ term_newln(p);
+ if (rm < rmax && n->parent->tok == MAN_HP) {
+ p->offset = rm;
+ p->rmargin = rmax;
+ } else
+ p->rmargin = rm;
+ p->maxrmargin = rmax;
+ }
if (MAN_EOS & n->flags)
p->flags |= TERMP_SENTENCE;
}
static void
print_man_nodelist(DECL_ARGS)
{
! print_man_node(p, mt, n, meta);
if ( ! n->next)
return;
! print_man_nodelist(p, mt, n->next, meta);
}
static void
print_man_foot(struct termp *p, const void *arg)
*** 1014,1023 ****
--- 1103,1113 ----
datelen = term_strlen(p, meta->date);
/* Bottom left corner: manual source. */
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
+ p->trailspace = 1;
p->offset = 0;
p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2;
if (meta->source)
term_word(p, meta->source);
*** 1036,1045 ****
--- 1126,1136 ----
/* Bottom right corner: manual title and section. */
p->flags &= ~TERMP_NOBREAK;
p->flags |= TERMP_NOSPACE;
+ p->trailspace = 0;
p->offset = p->rmargin;
p->rmargin = p->maxrmargin;
term_word(p, title);
term_flushln(p);
*** 1049,1076 ****
static void
print_man_head(struct termp *p, const void *arg)
{
char buf[BUFSIZ], title[BUFSIZ];
size_t buflen, titlen;
! const struct man_meta *m;
! m = (const struct man_meta *)arg;
! assert(m->title);
! assert(m->msec);
! if (m->vol)
! strlcpy(buf, m->vol, BUFSIZ);
else
buf[0] = '\0';
buflen = term_strlen(p, buf);
/* Top left corner: manual title and section. */
! snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
titlen = term_strlen(p, title);
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
p->offset = 0;
p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
(p->maxrmargin -
term_strlen(p, buf) + term_len(p, 1)) / 2 :
p->maxrmargin - buflen;
--- 1140,1168 ----
static void
print_man_head(struct termp *p, const void *arg)
{
char buf[BUFSIZ], title[BUFSIZ];
size_t buflen, titlen;
! const struct man_meta *meta;
! meta = (const struct man_meta *)arg;
! assert(meta->title);
! assert(meta->msec);
! if (meta->vol)
! strlcpy(buf, meta->vol, BUFSIZ);
else
buf[0] = '\0';
buflen = term_strlen(p, buf);
/* Top left corner: manual title and section. */
! snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
titlen = term_strlen(p, title);
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
+ p->trailspace = 1;
p->offset = 0;
p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
(p->maxrmargin -
term_strlen(p, buf) + term_len(p, 1)) / 2 :
p->maxrmargin - buflen;
*** 1089,1098 ****
--- 1181,1191 ----
term_flushln(p);
/* Top right corner: title and section, again. */
p->flags &= ~TERMP_NOBREAK;
+ p->trailspace = 0;
if (p->rmargin + titlen <= p->maxrmargin) {
p->flags |= TERMP_NOSPACE;
p->offset = p->rmargin;
p->rmargin = p->maxrmargin;
term_word(p, title);