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.62 and 1.75

version 1.62, 2010/05/10 08:31:41

version 1.75, 2010/06/10 23:24:37

Line 26

#include <stdlib.h>

#include <string.h>

#include "mandoc.h"

#include "out.h"

#include "man.h"

#include "term.h"

Line 72 struct termact {

Line 73 struct termact {

static int a2width(const struct man_node *);

static int a2height(const struct man_node *);

static void print_man_head(struct termp *,

const struct man_meta *);

static void print_man_nodelist(DECL_ARGS);

static void print_man_node(DECL_ARGS);

static void print_man_foot(struct termp *,

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

const struct man_meta *);

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

static void print_bvspace(struct termp *,

const struct man_node *);

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

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

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

{ pre_nf, NULL, 0 }, /* Vb */

{ pre_fi, NULL, 0 }, /* Ve */

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

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

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

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

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

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

{ NULL, NULL, 0 }, /* . */

};

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

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

p = (struct termp *)arg;

p->overstep = 0;

p->maxrmargin = 65;

p->maxrmargin = p->defrmargin;

p->tabwidth = 5;

if (NULL == p->symtab)

switch (p->enc) {

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

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

n = man_node(man);

m = man_meta(man);

print_man_head(p, m);

term_begin(p, print_man_head, print_man_foot, m);

p->flags |= TERMP_NOSPACE;

mt.fl = 0;

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

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

if (n->child)

print_man_nodelist(p, &mt, n->child, m);

print_man_foot(p, m);

term_end(p);

}

Line 484 pre_IP(DECL_ARGS)

Line 480 pre_IP(DECL_ARGS)

break;

case (MAN_HEAD):

p->flags |= TERMP_NOBREAK;

p->flags |= TERMP_TWOSPACE;

break;

case (MAN_BLOCK):

print_bvspace(p, n);

Line 545 post_IP(DECL_ARGS)

Line 540 post_IP(DECL_ARGS)

case (MAN_HEAD):

term_flushln(p);

p->flags &= ~TERMP_NOBREAK;

p->flags &= ~TERMP_TWOSPACE;

p->rmargin = p->maxrmargin;

break;

case (MAN_BODY):

Line 803 post_RS(DECL_ARGS)

Line 797 post_RS(DECL_ARGS)

static void

print_man_node(DECL_ARGS)

{

size_t rm, rmax;

int c;

c = 1;

Line 819 print_man_node(DECL_ARGS)

Line 814 print_man_node(DECL_ARGS)

/* FIXME: this means that macro lines are munged! */

if (MANT_LITERAL & mt->fl) {

rm = p->rmargin;

rmax = p->maxrmargin;

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

p->flags |= TERMP_NOSPACE;

term_flushln(p);

p->rmargin = p->maxrmargin = 65;

p->rmargin = rm;

p->maxrmargin = rmax;

}

break;

default:

Line 842 print_man_node(DECL_ARGS)

Line 840 print_man_node(DECL_ARGS)

if ( ! (MAN_NOTEXT & termacts[n->tok].flags))

term_fontrepl(p, TERMFONT_NONE);

}

if (MAN_EOS & n->flags)

p->flags |= TERMP_SENTENCE;

}

Line 857 print_man_nodelist(DECL_ARGS)

Line 858 print_man_nodelist(DECL_ARGS)

static void

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

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

{

char buf[DATESIZ];

const struct man_meta *meta;

meta = (const struct man_meta *)arg;

term_fontrepl(p, TERMFONT_NONE);

time2a(meta->date, buf, DATESIZ);

if (meta->rawdate)

strlcpy(buf, meta->rawdate, DATESIZ);

else

time2a(meta->date, buf, DATESIZ);

term_vspace(p);

p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;

p->rmargin = p->maxrmargin - strlen(buf);

Line 888 print_man_foot(struct termp *p, const struct man_meta

Line 897 print_man_foot(struct termp *p, const struct man_meta

static void

print_man_head(struct termp *p, const struct man_meta *m)

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;

* Note that old groff would spit out some spaces before the

* header. We discontinue this strange behaviour, but at one

Line 908 print_man_head(struct termp *p, const struct man_meta

Line 920 print_man_head(struct termp *p, const struct man_meta

strlcpy(buf, m->vol, BUFSIZ);

buflen = strlen(buf);

snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);

snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);

titlen = strlen(title);

p->offset = 0;

CVSweb