mandoc/man_term.c - diff

Return to man_term.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/man_term.c between version 1.156 and 1.183

version 1.156, 2014/11/21 01:52:53

version 1.183, 2015/04/19 19:44:21

Line 1

/* $Id$ */

* 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.

* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

Line 21

#include <assert.h>

#include <ctype.h>

#include <limits.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include "mandoc.h"

#include "mandoc_aux.h"

#include "out.h"

#include "mandoc.h"

#include "roff.h"

#include "man.h"

#include "out.h"

#include "term.h"

#include "main.h"

Line 37

Line 39

struct mtermp {

int fl;

#define MANT_LITERAL (1 << 0)

size_t lmargin[MAXMARGINS]; /* margins (incl. visible page) */

int lmargin[MAXMARGINS]; /* margins (incl. vis. page) */

int lmargincur; /* index of current margin */

int lmarginsz; /* actual number of nested margins */

size_t offset; /* default offset to visible page */

Line 46 struct mtermp {

Line 48 struct mtermp {

#define DECL_ARGS struct termp *p, \

struct mtermp *mt, \

const struct man_node *n, \

struct roff_node *n, \

const struct man_meta *meta

const struct roff_meta *meta

struct termact {

int (*pre)(DECL_ARGS);

Line 56 struct termact {

Line 58 struct termact {

#define MAN_NOTEXT (1 << 0) /* Never has text children. */

};

static int a2width(const struct termp *, const char *);

static size_t a2height(const struct termp *, const char *);

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_head(struct termp *,

static void print_man_foot(struct termp *, const void *);

const struct roff_meta *);

static void print_man_foot(struct termp *,

const struct roff_meta *);

static void print_bvspace(struct termp *,

const struct man_node *, int);

const struct roff_node *, int);

static int pre_B(DECL_ARGS);

static int pre_HP(DECL_ARGS);

Line 116 static const struct termact termacts[MAN_MAX] = {

Line 117 static const struct termact termacts[MAN_MAX] = {

{ pre_I, NULL, 0 }, /* I */

{ pre_alternate, NULL, 0 }, /* IR */

{ pre_alternate, NULL, 0 }, /* RI */

{ pre_ign, NULL, MAN_NOTEXT }, /* na */

{ pre_sp, NULL, MAN_NOTEXT }, /* sp */

{ pre_literal, NULL, 0 }, /* nf */

{ 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, MAN_NOTEXT }, /* UC */

{ pre_PD, NULL, MAN_NOTEXT }, /* PD */

{ pre_ign, NULL, 0 }, /* AT */

{ pre_in, NULL, MAN_NOTEXT }, /* in */

Line 138 static const struct termact termacts[MAN_MAX] = {

void

terminal_man(void *arg, const struct man *man)

terminal_man(void *arg, const struct roff_man *man)

{

struct termp *p;

const struct man_meta *meta;

struct roff_node *n;

struct man_node *n;

struct mtermp mt;

p = (struct termp *)arg;

p->overstep = 0;

p->rmargin = p->maxrmargin = p->defrmargin;

p->tabwidth = term_len(p, 5);

n = man_node(man)->child;

meta = man_meta(man);

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;

n = man->first->child;

if (p->synopsisonly) {

while (n != NULL) {

if (n->tok == MAN_SH &&

n->child->child->type == MAN_TEXT &&

n->child->child->type == ROFFT_TEXT &&

!strcmp(n->child->child->string, "SYNOPSIS")) {

if (n->child->next->child != NULL)

print_man_nodelist(p, &mt,

n->child->next->child, meta);

n->child->next->child,

&man->meta);

term_newln(p);

break;

}

Line 176 terminal_man(void *arg, const struct man *man)

Line 172 terminal_man(void *arg, const struct man *man)

} else {

if (p->defindent == 0)

p->defindent = 7;

term_begin(p, print_man_head, print_man_foot, meta);

term_begin(p, print_man_head, print_man_foot, &man->meta);

p->flags |= TERMP_NOSPACE;

if (n != NULL)

print_man_nodelist(p, &mt, n, meta);

print_man_nodelist(p, &mt, n, &man->meta);

term_end(p);

}

static size_t

a2height(const struct termp *p, const char *cp)

{

struct roffsu su;

if ( ! a2roffsu(cp, &su, SCALE_VS))

SCALE_VS_INIT(&su, atoi(cp));

return(term_vspan(p, &su));

}

static int

a2width(const struct termp *p, const char *cp)

{

struct roffsu su;

if ( ! a2roffsu(cp, &su, SCALE_BU))

return(-1);

return((int)term_hspan(p, &su));

}

* Printing leading vertical space before a block.

* This is used for the paragraph macros.

Line 216 a2width(const struct termp *p, const char *cp)

Line 189 a2width(const struct termp *p, const char *cp)

* first, print it.

static void

print_bvspace(struct termp *p, const struct man_node *n, int pardist)

print_bvspace(struct termp *p, const struct roff_node *n, int pardist)

{

int i;

term_newln(p);

if (n->body && n->body->child)

if (MAN_TBL == n->body->child->type)

if (n->body->child->type == ROFFT_TBL)

return;

if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok)

if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)

if (NULL == n->prev)

return;

Line 288 pre_literal(DECL_ARGS)

Line 261 pre_literal(DECL_ARGS)

static int

pre_PD(DECL_ARGS)

{

struct roffsu su;

n = n->child;

if (0 == n) {

if (n == NULL) {

mt->pardist = 1;

return(0);

}

assert(MAN_TEXT == n->type);

assert(n->type == ROFFT_TEXT);

mt->pardist = atoi(n->string);

if (a2roffsu(n->string, &su, SCALE_VS))

mt->pardist = term_vspan(p, &su);

return(0);

}

Line 303 static int

Line 278 static int

pre_alternate(DECL_ARGS)

{

enum termfont font[2];

const struct man_node *nn;

struct roff_node *nn;

int savelit, i;

switch (n->tok) {

Line 342 pre_alternate(DECL_ARGS)

Line 317 pre_alternate(DECL_ARGS)

term_fontrepl(p, font[i]);

if (savelit && NULL == nn->next)

mt->fl |= MANT_LITERAL;

print_man_node(p, mt, nn, meta);

assert(nn->type == ROFFT_TEXT);

term_word(p, nn->string);

if (nn->flags & MAN_EOS)

p->flags |= TERMP_SENTENCE;

if (nn->next)

p->flags |= TERMP_NOSPACE;

}

Line 423 pre_ft(DECL_ARGS)

Line 401 pre_ft(DECL_ARGS)

static int

pre_in(DECL_ARGS)

{

int len, less;

struct roffsu su;

size_t v;

const char *cp;

size_t v;

int less;

term_newln(p);

Line 444 pre_in(DECL_ARGS)

Line 423 pre_in(DECL_ARGS)

else

cp--;

if ((len = a2width(p, ++cp)) < 0)

if ( ! a2roffsu(++cp, &su, SCALE_EN))

return(0);

v = (size_t)len;

v = (term_hspan(p, &su) + 11) / 24;

if (less < 0)

p->offset -= p->offset > v ? v : p->offset;

Line 455 pre_in(DECL_ARGS)

Line 434 pre_in(DECL_ARGS)

p->offset += v;

else

p->offset = v;

if (p->offset > SHRT_MAX)

p->offset = term_len(p, p->defindent);

return(0);

}

Line 462 pre_in(DECL_ARGS)

Line 443 pre_in(DECL_ARGS)

static int

pre_sp(DECL_ARGS)

{

char *s;

struct roffsu su;

size_t i, len;

int i, len;

int neg;

if ((NULL == n->prev && n->parent)) {

switch (n->parent->tok) {

Line 484 pre_sp(DECL_ARGS)

Line 464 pre_sp(DECL_ARGS)

}

neg = 0;

if (n->tok == MAN_br)

switch (n->tok) {

case MAN_br:

len = 0;

break;

else if (n->child == NULL)

default:

len = 1;

if (NULL == n->child) {

else {

len = 1;

if ( ! a2roffsu(n->child->string, &su, SCALE_VS))

break;

su.scale = 1.0;

}

len = term_vspan(p, &su);

s = n->child->string;

if ('-' == *s) {

neg = 1;

s++;

}

len = a2height(p, s);

break;

}

if (0 == len)

if (len == 0)

term_newln(p);

else if (neg)

else if (len < 0)

p->skipvsp += len;

p->skipvsp -= len;

else

for (i = 0; i < len; i++)

term_vspace(p);

* Handle an explicit break request in the same way

* as an overflowing line.

if (p->flags & TERMP_BRIND) {

p->offset = p->rmargin;

p->rmargin = p->maxrmargin;

p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);

}

return(0);

}

static int

pre_HP(DECL_ARGS)

{

size_t len, one;

struct roffsu su;

int ival;

const struct roff_node *nn;

const struct man_node *nn;

int len;

switch (n->type) {

case MAN_BLOCK:

case ROFFT_BLOCK:

print_bvspace(p, n, mt->pardist);

return(1);

case MAN_BODY:

case ROFFT_BODY:

break;

default:

return(0);

Line 536 pre_HP(DECL_ARGS)

Line 518 pre_HP(DECL_ARGS)

p->trailspace = 2;

}

len = mt->lmargin[mt->lmargincur];

ival = -1;

/* Calculate offset. */

if (NULL != (nn = n->parent->head->child))

if ((nn = n->parent->head->child) != NULL &&

if ((ival = a2width(p, nn->string)) >= 0)

a2roffsu(nn->string, &su, SCALE_EN)) {

len = (size_t)ival;

len = term_hspan(p, &su) / 24;

if (len < 0 && (size_t)(-len) > mt->offset)

len = -mt->offset;

else if (len > SHRT_MAX)

len = term_len(p, p->defindent);

mt->lmargin[mt->lmargincur] = len;

} else

len = mt->lmargin[mt->lmargincur];

one = term_len(p, 1);

if (len < one)

len = one;

p->offset = mt->offset;

p->rmargin = mt->offset + len;

if (ival >= 0)

mt->lmargin[mt->lmargincur] = (size_t)ival;

return(1);

}

Line 563 post_HP(DECL_ARGS)

Line 541 post_HP(DECL_ARGS)

{

switch (n->type) {

case MAN_BODY:

case ROFFT_BODY:

term_newln(p);

* Compatibility with a groff bug.

* The .HP macro uses the undocumented .tag request

* which causes a line break and cancels no-space

* mode even if there isn't any output.

if (n->child == NULL)

term_vspace(p);

p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);

p->trailspace = 0;

p->offset = mt->offset;

Line 580 pre_PP(DECL_ARGS)

Line 569 pre_PP(DECL_ARGS)

{

switch (n->type) {

case MAN_BLOCK:

case ROFFT_BLOCK:

mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);

print_bvspace(p, n, mt->pardist);

break;

Line 589 pre_PP(DECL_ARGS)

Line 578 pre_PP(DECL_ARGS)

break;

}

return(MAN_HEAD != n->type);

return(n->type != ROFFT_HEAD);

}

static int

pre_IP(DECL_ARGS)

{

const struct man_node *nn;

struct roffsu su;

size_t len;

const struct roff_node *nn;

int savelit, ival;

int len, savelit;

switch (n->type) {

case MAN_BODY:

case ROFFT_BODY:

p->flags |= TERMP_NOSPACE;

break;

case MAN_HEAD:

case ROFFT_HEAD:

p->flags |= TERMP_NOBREAK;

p->trailspace = 1;

break;

case MAN_BLOCK:

case ROFFT_BLOCK:

print_bvspace(p, n, mt->pardist);

/* FALLTHROUGH */

default:

return(1);

}

len = mt->lmargin[mt->lmargincur];

ival = -1;

/* Calculate the offset from the optional second argument. */

if (NULL != (nn = n->parent->head->child))

if ((nn = n->parent->head->child) != NULL &&

if (NULL != (nn = nn->next))

(nn = nn->next) != NULL &&

if ((ival = a2width(p, nn->string)) >= 0)

a2roffsu(nn->string, &su, SCALE_EN)) {

len = (size_t)ival;

len = term_hspan(p, &su) / 24;

if (len < 0 && (size_t)(-len) > mt->offset)

len = -mt->offset;

else if (len > SHRT_MAX)

len = term_len(p, p->defindent);

mt->lmargin[mt->lmargincur] = len;

} else

len = mt->lmargin[mt->lmargincur];

switch (n->type) {

case MAN_HEAD:

case ROFFT_HEAD:

/* Handle zero-width lengths. */

if (0 == len)

len = term_len(p, 1);

p->offset = mt->offset;

p->rmargin = mt->offset + len;

if (ival < 0)

break;

/* Set the saved left-margin. */

mt->lmargin[mt->lmargincur] = (size_t)ival;

savelit = MANT_LITERAL & mt->fl;

mt->fl &= ~MANT_LITERAL;

Line 647 pre_IP(DECL_ARGS)

Line 631 pre_IP(DECL_ARGS)

mt->fl |= MANT_LITERAL;

return(0);

case MAN_BODY:

case ROFFT_BODY:

p->offset = mt->offset + len;

p->rmargin = p->maxrmargin;

break;

Line 663 post_IP(DECL_ARGS)

Line 647 post_IP(DECL_ARGS)

{

switch (n->type) {

case MAN_HEAD:

case ROFFT_HEAD:

term_flushln(p);

p->flags &= ~TERMP_NOBREAK;

p->trailspace = 0;

p->rmargin = p->maxrmargin;

break;

case MAN_BODY:

case ROFFT_BODY:

term_newln(p);

p->offset = mt->offset;

break;

Line 681 post_IP(DECL_ARGS)

Line 665 post_IP(DECL_ARGS)

static int

pre_TP(DECL_ARGS)

{

const struct man_node *nn;

struct roffsu su;

size_t len;

struct roff_node *nn;

int savelit, ival;

int len, savelit;

switch (n->type) {

case MAN_HEAD:

case ROFFT_HEAD:

p->flags |= TERMP_NOBREAK;

p->trailspace = 1;

break;

case MAN_BODY:

case ROFFT_BODY:

p->flags |= TERMP_NOSPACE;

break;

case MAN_BLOCK:

case ROFFT_BLOCK:

print_bvspace(p, n, mt->pardist);

/* FALLTHROUGH */

default:

return(1);

}

len = (size_t)mt->lmargin[mt->lmargincur];

ival = -1;

/* Calculate offset. */

if (NULL != (nn = n->parent->head->child))

if ((nn = n->parent->head->child) != NULL &&

if (nn->string && 0 == (MAN_LINE & nn->flags))

nn->string != NULL && ! (MAN_LINE & nn->flags) &&

if ((ival = a2width(p, nn->string)) >= 0)

a2roffsu(nn->string, &su, SCALE_EN)) {

len = (size_t)ival;

len = term_hspan(p, &su) / 24;

if (len < 0 && (size_t)(-len) > mt->offset)

len = -mt->offset;

else if (len > SHRT_MAX)

len = term_len(p, p->defindent);

mt->lmargin[mt->lmargincur] = len;

} else

len = mt->lmargin[mt->lmargincur];

switch (n->type) {

case MAN_HEAD:

case ROFFT_HEAD:

/* Handle zero-length properly. */

if (0 == len)

len = term_len(p, 1);

p->offset = mt->offset;

p->rmargin = mt->offset + len;

Line 734 pre_TP(DECL_ARGS)

Line 718 pre_TP(DECL_ARGS)

if (savelit)

mt->fl |= MANT_LITERAL;

if (ival >= 0)

mt->lmargin[mt->lmargincur] = (size_t)ival;

return(0);

case MAN_BODY:

case ROFFT_BODY:

p->offset = mt->offset + len;

p->rmargin = p->maxrmargin;

p->trailspace = 0;

Line 756 post_TP(DECL_ARGS)

Line 737 post_TP(DECL_ARGS)

{

switch (n->type) {

case MAN_HEAD:

case ROFFT_HEAD:

term_flushln(p);

break;

case MAN_BODY:

case ROFFT_BODY:

term_newln(p);

p->offset = mt->offset;

break;

Line 774 pre_SS(DECL_ARGS)

Line 755 pre_SS(DECL_ARGS)

int i;

switch (n->type) {

case MAN_BLOCK:

case ROFFT_BLOCK:

mt->fl &= ~MANT_LITERAL;

mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);

mt->offset = term_len(p, p->defindent);

/* If following a prior empty `SS', no vspace. */

if (n->prev && MAN_SS == n->prev->tok)

if (NULL == n->prev->body->child)

* No vertical space before the first subsection

break;

* and after an empty subsection.

if (NULL == n->prev)

do {

n = n->prev;

} while (n != NULL && n->tok != TOKEN_NONE &&

termacts[n->tok].flags & MAN_NOTEXT);

if (n == NULL || (n->tok == MAN_SS && n->body->child == NULL))

break;

for (i = 0; i < mt->pardist; i++)

term_vspace(p);

break;

case MAN_HEAD:

case ROFFT_HEAD:

term_fontrepl(p, TERMFONT_BOLD);

p->offset = term_len(p, 3);

p->rmargin = mt->offset;

p->trailspace = mt->offset;

p->flags |= TERMP_NOBREAK | TERMP_BRIND;

break;

case MAN_BODY:

case ROFFT_BODY:

p->offset = mt->offset;

p->rmargin = p->maxrmargin;

p->trailspace = 0;

p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);

break;

default:

break;

Line 806 post_SS(DECL_ARGS)

Line 800 post_SS(DECL_ARGS)

{

switch (n->type) {

case MAN_HEAD:

case ROFFT_HEAD:

term_newln(p);

break;

case MAN_BODY:

case ROFFT_BODY:

term_newln(p);

break;

default:

Line 823 pre_SH(DECL_ARGS)

Line 817 pre_SH(DECL_ARGS)

int i;

switch (n->type) {

case MAN_BLOCK:

case ROFFT_BLOCK:

mt->fl &= ~MANT_LITERAL;

mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);

mt->offset = term_len(p, p->defindent);

/* If following a prior empty `SH', no vspace. */

if (n->prev && MAN_SH == n->prev->tok)

if (NULL == n->prev->body->child)

* No vertical space before the first section

break;

* and after an empty section.

/* If the first macro, no vspae. */

if (NULL == n->prev)

do {

n = n->prev;

} while (n != NULL && termacts[n->tok].flags & MAN_NOTEXT);

if (n == NULL || (n->tok == MAN_SH && n->body->child == NULL))

break;

for (i = 0; i < mt->pardist; i++)

term_vspace(p);

break;

case MAN_HEAD:

case ROFFT_HEAD:

term_fontrepl(p, TERMFONT_BOLD);

p->offset = 0;

p->rmargin = mt->offset;

p->trailspace = mt->offset;

p->flags |= TERMP_NOBREAK | TERMP_BRIND;

break;

case MAN_BODY:

case ROFFT_BODY:

p->offset = mt->offset;

p->rmargin = p->maxrmargin;

p->trailspace = 0;

p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);

break;

default:

break;

Line 856 post_SH(DECL_ARGS)

Line 861 post_SH(DECL_ARGS)

{

switch (n->type) {

case MAN_HEAD:

case ROFFT_HEAD:

term_newln(p);

break;

case MAN_BODY:

case ROFFT_BODY:

term_newln(p);

break;

default:

Line 870 post_SH(DECL_ARGS)

Line 875 post_SH(DECL_ARGS)

static int

pre_RS(DECL_ARGS)

{

int ival;

struct roffsu su;

size_t sz;

switch (n->type) {

case MAN_BLOCK:

case ROFFT_BLOCK:

term_newln(p);

return(1);

case MAN_HEAD:

case ROFFT_HEAD:

return(0);

default:

break;

}

sz = term_len(p, p->defindent);

n = n->parent->head;

n->aux = SHRT_MAX + 1;

if (n->child == NULL)

n->aux = mt->lmargin[mt->lmargincur];

else if (a2roffsu(n->child->string, &su, SCALE_EN))

n->aux = term_hspan(p, &su) / 24;

if (n->aux < 0 && (size_t)(-n->aux) > mt->offset)

n->aux = -mt->offset;

else if (n->aux > SHRT_MAX)

n->aux = term_len(p, p->defindent);

if (NULL != (n = n->parent->head->child))

mt->offset += n->aux;

if ((ival = a2width(p, n->string)) >= 0)

sz = (size_t)ival;

mt->offset += sz;

p->offset = mt->offset;

p->rmargin = p->maxrmargin;

if (++mt->lmarginsz < MAXMARGINS)

mt->lmargincur = mt->lmarginsz;

mt->lmargin[mt->lmargincur] = mt->lmargin[mt->lmargincur - 1];

mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);

return(1);

}

static void

post_RS(DECL_ARGS)

{

int ival;

size_t sz;

switch (n->type) {

case MAN_BLOCK:

case ROFFT_BLOCK:

return;

case MAN_HEAD:

case ROFFT_HEAD:

return;

default:

term_newln(p);

break;

}

sz = term_len(p, p->defindent);

mt->offset -= n->parent->head->aux;

if (NULL != (n = n->parent->head->child))

if ((ival = a2width(p, n->string)) >= 0)

sz = (size_t)ival;

mt->offset = mt->offset < sz ? 0 : mt->offset - sz;

p->offset = mt->offset;

if (--mt->lmarginsz < MAXMARGINS)

Line 933 static int

Line 934 static int

pre_UR(DECL_ARGS)

{

return (MAN_HEAD != n->type);

return (n->type != ROFFT_HEAD);

}

static void

post_UR(DECL_ARGS)

{

if (MAN_BLOCK != n->type)

if (n->type != ROFFT_BLOCK)

return;

term_word(p, "<");

Line 960 print_man_node(DECL_ARGS)

Line 961 print_man_node(DECL_ARGS)

int c;

switch (n->type) {

case MAN_TEXT:

case ROFFT_TEXT:

* If we have a blank line, output a vertical space.

* If we have a space as the first character, break

Line 975 print_man_node(DECL_ARGS)

Line 976 print_man_node(DECL_ARGS)

term_word(p, n->string);

goto out;

case MAN_EQN:

case ROFFT_EQN:

if ( ! (n->flags & MAN_LINE))

p->flags |= TERMP_NOSPACE;

term_eqn(p, n->eqn);

if (n->next != NULL && ! (n->next->flags & MAN_LINE))

p->flags |= TERMP_NOSPACE;

return;

case MAN_TBL:

case ROFFT_TBL:

if (p->tbl.cols == NULL)

* Tables are preceded by a newline. Then process a

term_vspace(p);

* table line, which will cause line termination,

if (TBL_SPAN_FIRST & n->span->flags)

term_newln(p);

term_tbl(p, n->span);

return;

default:

Line 1018 out:

Line 1015 out:

* -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) &&

if (mt->fl & MANT_LITERAL &&

(NULL == n->next || MAN_LINE & n->next->flags)) {

! (p->flags & (TERMP_NOBREAK | TERMP_NONEWLINE)) &&

(n->next == NULL || n->next->flags & MAN_LINE)) {

rm = p->rmargin;

rmax = p->maxrmargin;

p->rmargin = p->maxrmargin = TERM_MAXMARGIN;

p->flags |= TERMP_NOSPACE;

if (NULL != n->string && '\0' != *n->string)

if (n->string != NULL && *n->string != '\0')

term_flushln(p);

else

term_newln(p);

Line 1044 static void

Line 1042 static void

print_man_nodelist(DECL_ARGS)

{

print_man_node(p, mt, n, meta);

while (n != NULL) {

if ( ! n->next)

print_man_node(p, mt, n, meta);

return;

n = n->next;

print_man_nodelist(p, mt, n->next, meta);

}

static void

print_man_foot(struct termp *p, const void *arg)

print_man_foot(struct termp *p, const struct roff_meta *meta)

{

const struct man_meta *meta;

char *title;

size_t datelen, titlen;

meta = (const struct man_meta *)arg;

assert(meta->title);

assert(meta->msec);

assert(meta->date);

Line 1069 print_man_foot(struct termp *p, const void *arg)

Line 1065 print_man_foot(struct termp *p, const void *arg)

* Temporary, undocumented option to imitate mdoc(7) output.

* In the bottom right corner, use the source instead of

* In the bottom right corner, use the operating system

* the title.

* instead of the title.

if ( ! p->mdocstyle) {

Line 1080 print_man_foot(struct termp *p, const void *arg)

Line 1076 print_man_foot(struct termp *p, const void *arg)

}

mandoc_asprintf(&title, "%s(%s)",

meta->title, meta->msec);

} else if (meta->source) {

} else if (meta->os) {

title = mandoc_strdup(meta->source);

title = mandoc_strdup(meta->os);

} else {

title = mandoc_strdup("");

}

datelen = term_strlen(p, meta->date);

/* Bottom left corner: manual source. */

/* Bottom left corner: operating system. */

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

p->trailspace = 1;

Line 1095 print_man_foot(struct termp *p, const void *arg)

Line 1091 print_man_foot(struct termp *p, const void *arg)

p->rmargin = p->maxrmargin > datelen ?

(p->maxrmargin + term_len(p, 1) - datelen) / 2 : 0;

if (meta->source)

if (meta->os)

term_word(p, meta->source);

term_word(p, meta->os);

term_flushln(p);

/* At the bottom in the middle: manual date. */

Line 1123 print_man_foot(struct termp *p, const void *arg)

Line 1119 print_man_foot(struct termp *p, const void *arg)

}

static void

print_man_head(struct termp *p, const void *arg)

print_man_head(struct termp *p, const struct roff_meta *meta)

{

const struct man_meta *meta;

const char *volume;

char *title;

size_t vollen, titlen;

meta = (const struct man_meta *)arg;

assert(meta->title);

assert(meta->msec);

CVSweb