mandoc/mdoc_man.c - diff

Return to mdoc_man.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_man.c between version 1.22 and 1.29

version 1.22, 2012/07/08 16:52:20

version 1.29, 2012/07/09 23:53:36

Line 41 struct manact {

static int cond_body(DECL_ARGS);

static int cond_head(DECL_ARGS);

static void font_push(char);

static void font_pop(void);

static void post_bd(DECL_ARGS);

static void post_bf(DECL_ARGS);

static void post_bk(DECL_ARGS);

static void post_dl(DECL_ARGS);

static void post_enc(DECL_ARGS);

static void post_eo(DECL_ARGS);

static void post_fa(DECL_ARGS);

static void post_fd(DECL_ARGS);

static void post_fl(DECL_ARGS);

static void post_fn(DECL_ARGS);

static void post_fo(DECL_ARGS);

static void post_font(DECL_ARGS);

static void post_in(DECL_ARGS);

static void post_lb(DECL_ARGS);

static void post_nm(DECL_ARGS);

Line 59 static void post_vt(DECL_ARGS);

Line 66 static void post_vt(DECL_ARGS);

static int pre_an(DECL_ARGS);

static int pre_ap(DECL_ARGS);

static int pre_bd(DECL_ARGS);

static int pre_bf(DECL_ARGS);

static int pre_bk(DECL_ARGS);

static int pre_br(DECL_ARGS);

static int pre_bx(DECL_ARGS);

static int pre_dl(DECL_ARGS);

static int pre_enc(DECL_ARGS);

static int pre_em(DECL_ARGS);

static int pre_fa(DECL_ARGS);

static int pre_fd(DECL_ARGS);

static int pre_fl(DECL_ARGS);

static int pre_fn(DECL_ARGS);

static int pre_fo(DECL_ARGS);

static int pre_ft(DECL_ARGS);

static int pre_in(DECL_ARGS);

static int pre_it(DECL_ARGS);

static int pre_lk(DECL_ARGS);

static int pre_li(DECL_ARGS);

static int pre_nm(DECL_ARGS);

static int pre_no(DECL_ARGS);

static int pre_ns(DECL_ARGS);

static int pre_pp(DECL_ARGS);

static int pre_sm(DECL_ARGS);

static int pre_sp(DECL_ARGS);

static int pre_sect(DECL_ARGS);

static int pre_sy(DECL_ARGS);

static void pre_syn(const struct mdoc_node *);

static int pre_vt(DECL_ARGS);

static int pre_ux(DECL_ARGS);

static int pre_xr(DECL_ARGS);

Line 97 static const struct manact manacts[MDOC_MAX + 1] = {

Line 114 static const struct manact manacts[MDOC_MAX + 1] = {

{ NULL, NULL, NULL, NULL, NULL }, /* Bl */

{ NULL, NULL, NULL, NULL, NULL }, /* El */

{ NULL, pre_it, NULL, NULL, NULL }, /* _It */

{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Ad */

{ NULL, pre_em, post_font, NULL, NULL }, /* Ad */

{ NULL, pre_an, NULL, NULL, NULL }, /* An */

{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Ar */

{ NULL, pre_em, post_font, NULL, NULL }, /* Ar */

{ NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Cd */

{ NULL, pre_sy, post_font, NULL, NULL }, /* Cd */

{ NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Cm */

{ NULL, pre_sy, post_font, NULL, NULL }, /* Cm */

{ NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Dv */

{ NULL, pre_li, post_font, NULL, NULL }, /* Dv */

{ NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Er */

{ NULL, pre_li, post_font, NULL, NULL }, /* Er */

{ NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Ev */

{ NULL, pre_li, post_font, NULL, NULL }, /* Ev */

{ NULL, pre_enc, post_enc, "The \\fB",

"\\fP\nutility exits 0 on success, and >0 if an error occurs."

}, /* Ex */

{ NULL, pre_fa, post_fa, NULL, NULL }, /* Fa */

{ NULL, NULL, NULL, NULL, NULL }, /* _Fd */

{ NULL, pre_fd, post_fd, NULL, NULL }, /* Fd */

{ NULL, pre_enc, post_enc, "\\fB-", "\\fP" }, /* Fl */

{ NULL, pre_fl, post_fl, NULL, NULL }, /* Fl */

{ NULL, pre_fn, post_fn, NULL, NULL }, /* Fn */

{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Ft */

{ NULL, pre_ft, post_font, NULL, NULL }, /* Ft */

{ NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Ic */

{ NULL, pre_sy, post_font, NULL, NULL }, /* Ic */

{ NULL, pre_in, post_in, NULL, NULL }, /* In */

{ NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Li */

{ NULL, pre_li, post_font, NULL, NULL }, /* Li */

{ cond_head, pre_enc, NULL, "\\- ", NULL }, /* Nd */

{ NULL, pre_nm, post_nm, NULL, NULL }, /* Nm */

{ cond_body, pre_enc, post_enc, "[", "]" }, /* Op */

{ NULL, NULL, NULL, NULL, NULL }, /* Ot */

{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Pa */

{ NULL, pre_em, post_font, NULL, NULL }, /* Pa */

{ NULL, pre_enc, post_enc, "The \\fB",

"\\fP\nfunction returns the value 0 if successful;\n"

"otherwise the value -1 is returned and the global\n"

"variable \\fIerrno\\fP is set to indicate the error."

}, /* Rv */

{ NULL, NULL, NULL, NULL, NULL }, /* St */

{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Va */

{ NULL, pre_em, post_font, NULL, NULL }, /* Va */

{ NULL, pre_vt, post_vt, NULL, NULL }, /* Vt */

{ NULL, pre_xr, NULL, NULL, NULL }, /* Xr */

{ NULL, NULL, post_percent, NULL, NULL }, /* _%A */

Line 146 static const struct manact manacts[MDOC_MAX + 1] = {

Line 163 static const struct manact manacts[MDOC_MAX + 1] = {

{ cond_body, pre_enc, post_enc, "<", ">" }, /* Aq */

{ NULL, NULL, NULL, NULL, NULL }, /* At */

{ NULL, NULL, NULL, NULL, NULL }, /* Bc */

{ NULL, NULL, NULL, NULL, NULL }, /* _Bf */

{ NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */

{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bo */

{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */

{ NULL, pre_ux, NULL, "BSD/OS", NULL }, /* Bsx */

Line 155 static const struct manact manacts[MDOC_MAX + 1] = {

Line 172 static const struct manact manacts[MDOC_MAX + 1] = {

{ NULL, NULL, NULL, NULL, NULL }, /* Dc */

{ cond_body, pre_enc, post_enc, "``", "''" }, /* Do */

{ cond_body, pre_enc, post_enc, "``", "''" }, /* Dq */

{ NULL, NULL, NULL, NULL, NULL }, /* _Ec */

{ NULL, NULL, NULL, NULL, NULL }, /* Ec */

{ NULL, NULL, NULL, NULL, NULL }, /* _Ef */

{ NULL, NULL, NULL, NULL, NULL }, /* Ef */

{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Em */

{ NULL, pre_em, post_font, NULL, NULL }, /* Em */

{ NULL, NULL, NULL, NULL, NULL }, /* _Eo */

{ NULL, NULL, post_eo, NULL, NULL }, /* Eo */

{ NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */

{ NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Ms */

{ NULL, pre_sy, post_font, NULL, NULL }, /* Ms */

{ NULL, NULL, NULL, NULL, NULL }, /* No */

{ NULL, pre_no, NULL, NULL, NULL }, /* No */

{ NULL, pre_ns, NULL, NULL, NULL }, /* Ns */

{ NULL, pre_ux, NULL, "NetBSD", NULL }, /* Nx */

{ NULL, pre_ux, NULL, "OpenBSD", NULL }, /* Ox */

Line 179 static const struct manact manacts[MDOC_MAX + 1] = {

Line 196 static const struct manact manacts[MDOC_MAX + 1] = {

{ cond_body, pre_enc, post_enc, "`", "'" }, /* So */

{ cond_body, pre_enc, post_enc, "`", "'" }, /* Sq */

{ NULL, pre_sm, NULL, NULL, NULL }, /* Sm */

{ NULL, pre_enc, post_enc, "\\fI", "\\fP" }, /* Sx */

{ NULL, pre_em, post_font, NULL, NULL }, /* Sx */

{ NULL, pre_enc, post_enc, "\\fB", "\\fP" }, /* Sy */

{ NULL, pre_sy, post_font, NULL, NULL }, /* Sy */

{ NULL, pre_enc, post_enc, "\\fR", "\\fP" }, /* Tn */

{ NULL, pre_li, post_font, NULL, NULL }, /* Tn */

{ NULL, pre_ux, NULL, "UNIX", NULL }, /* Ux */

{ NULL, NULL, NULL, NULL, NULL }, /* _Xc */

{ NULL, NULL, NULL, NULL, NULL }, /* _Xo */

Line 197 static const struct manact manacts[MDOC_MAX + 1] = {

Line 214 static const struct manact manacts[MDOC_MAX + 1] = {

{ NULL, pre_ux, NULL, "currently under development.", NULL }, /* Ud */

{ NULL, NULL, post_lb, NULL, NULL }, /* Lb */

{ NULL, pre_pp, NULL, NULL, NULL }, /* Lp */

{ NULL, NULL, NULL, NULL, NULL }, /* _Lk */

{ NULL, pre_lk, NULL, NULL, NULL }, /* Lk */

{ NULL, NULL, NULL, NULL, NULL }, /* _Mt */

{ NULL, pre_em, post_font, NULL, NULL }, /* Mt */

{ cond_body, pre_enc, post_enc, "{", "}" }, /* Brq */

{ cond_body, pre_enc, post_enc, "{", "}" }, /* Bro */

{ NULL, NULL, NULL, NULL, NULL }, /* Brc */

{ NULL, NULL, NULL, NULL, NULL }, /* _%C */

{ NULL, NULL, NULL, NULL, NULL }, /* _Es */

{ NULL, NULL, NULL, NULL, NULL }, /* Es */

{ NULL, NULL, NULL, NULL, NULL }, /* _En */

{ NULL, NULL, NULL, NULL, NULL }, /* En */

{ NULL, pre_ux, NULL, "DragonFly", NULL }, /* Dx */

{ NULL, NULL, NULL, NULL, NULL }, /* _%Q */

{ NULL, pre_br, NULL, NULL, NULL }, /* br */

Line 216 static const struct manact manacts[MDOC_MAX + 1] = {

Line 233 static const struct manact manacts[MDOC_MAX + 1] = {

static int outflags;

#define MMAN_spc (1 << 0)

#define MMAN_nl (1 << 1)

#define MMAN_spc_force (1 << 1)

#define MMAN_br (1 << 2)

#define MMAN_nl (1 << 2)

#define MMAN_sp (1 << 3)

#define MMAN_br (1 << 3)

#define MMAN_Sm (1 << 4)

#define MMAN_sp (1 << 4)

#define MMAN_Bk (1 << 5)

#define MMAN_Sm (1 << 5)

#define MMAN_An_split (1 << 6)

#define MMAN_Bk (1 << 6)

#define MMAN_An_nosplit (1 << 7)

#define MMAN_An_split (1 << 7)

#define MMAN_An_nosplit (1 << 8)

static struct {

char *head;

char *tail;

size_t size;

} fontqueue;

static void

font_push(char newfont)

{

if (fontqueue.head + fontqueue.size <= ++fontqueue.tail) {

fontqueue.size += 8;

fontqueue.head = mandoc_realloc(fontqueue.head,

fontqueue.size);

}

*fontqueue.tail = newfont;

print_word("\\f");

putchar(newfont);

outflags &= ~MMAN_spc;

}

static void

font_pop(void)

{

if (fontqueue.tail > fontqueue.head)

fontqueue.tail--;

outflags &= ~MMAN_spc;

print_word("\\f");

putchar(*fontqueue.tail);

}

static void

print_word(const char *s)

{

Line 241 print_word(const char *s)

Line 291 print_word(const char *s)

outflags &= ~(MMAN_sp|MMAN_br|MMAN_nl|MMAN_spc);

} else if (MMAN_spc & outflags && '\0' != s[0])

* If we need a space, only print it before

* If we need a space, only print it if

* (1) a nonzero length word;

* (1) it is forced by `No' or

* (2) a word that is non-punctuation; and

* (2) what follows is not terminating punctuation or

* (3) if punctuation, non-terminating puncutation.

* (3) what follows is longer than one character.

if (NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) {

if (MMAN_spc_force & outflags ||

NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) {

if (MMAN_Bk & outflags) {

putchar('\\');

putchar('~');

Line 263 print_word(const char *s)

Line 314 print_word(const char *s)

outflags |= MMAN_spc;

else

outflags &= ~MMAN_spc;

outflags &= ~MMAN_spc_force;

for ( ; *s; s++) {

switch (*s) {

Line 328 man_mdoc(void *arg, const struct mdoc *mdoc)

Line 380 man_mdoc(void *arg, const struct mdoc *mdoc)

m->title, m->msec, m->date, m->os, m->vol);

outflags = MMAN_nl | MMAN_Sm;

if (0 == fontqueue.size) {

fontqueue.size = 8;

fontqueue.head = fontqueue.tail = mandoc_malloc(8);

*fontqueue.tail = 'R';

}

print_node(m, n);

putchar('\n');

}

Line 344 print_node(DECL_ARGS)

Line 401 print_node(DECL_ARGS)

* This makes the page structure be more consistent.

prev = n->prev ? n->prev : n->parent;

if (prev && prev->line < n->line &&

if (MMAN_spc & outflags && prev && prev->line < n->line)

MDOC_Fo != prev->tok && MDOC_Ns != prev->tok)

outflags |= MMAN_nl;

act = NULL;

Line 404 cond_body(DECL_ARGS)

Line 460 cond_body(DECL_ARGS)

return(MDOC_BODY == n->type);

}

* Output a font encoding before a node, e.g., \fR.

* This obviously has no trailing space.

static int

pre_enc(DECL_ARGS)

{

Line 421 pre_enc(DECL_ARGS)

Line 473 pre_enc(DECL_ARGS)

return(1);

}

* Output a font encoding subsequent a node, e.g., \fP.

static void

post_enc(DECL_ARGS)

{

Line 434 post_enc(DECL_ARGS)

Line 483 post_enc(DECL_ARGS)

return;

outflags &= ~MMAN_spc;

print_word(suffix);

if (MDOC_Fl == n->tok && 0 == n->nchild)

outflags &= ~MMAN_spc;

}

static void

post_font(DECL_ARGS)

{

font_pop();

}

* Used in listings (percent = %A, e.g.).

* FIXME: this is incomplete.

Line 488 post_sect(DECL_ARGS)

Line 542 post_sect(DECL_ARGS)

outflags &= ~(MMAN_An_split | MMAN_An_nosplit);

}

/* See mdoc_term.c, synopsis_pre() for comments. */

static void

pre_syn(const struct mdoc_node *n)

{

if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))

return;

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

MDOC_Ft != n->tok &&

MDOC_Fo != n->tok &&

MDOC_Fn != n->tok) {

outflags |= MMAN_br;

return;

}

switch (n->prev->tok) {

case (MDOC_Fd):

/* FALLTHROUGH */

case (MDOC_Fn):

/* FALLTHROUGH */

case (MDOC_Fo):

/* FALLTHROUGH */

case (MDOC_In):

/* FALLTHROUGH */

case (MDOC_Vt):

outflags |= MMAN_sp;

break;

case (MDOC_Ft):

if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {

outflags |= MMAN_sp;

break;

}

/* FALLTHROUGH */

default:

outflags |= MMAN_br;

break;

}

static int

pre_an(DECL_ARGS)

{

Line 554 post_bd(DECL_ARGS)

Line 648 post_bd(DECL_ARGS)

}

static int

pre_bf(DECL_ARGS)

{

switch (n->type) {

case (MDOC_BLOCK):

return(1);

case (MDOC_BODY):

break;

default:

return(0);

}

switch (n->norm->Bf.font) {

case (FONT_Em):

font_push('I');

break;

case (FONT_Sy):

font_push('B');

break;

default:

font_push('R');

break;

}

return(1);

}

static void

post_bf(DECL_ARGS)

{

if (MDOC_BODY == n->type)

font_pop();

}

static int

pre_bk(DECL_ARGS)

{

Line 624 post_dl(DECL_ARGS)

Line 752 post_dl(DECL_ARGS)

}

static int

pre_em(DECL_ARGS)

{

font_push('I');

return(1);

}

static void

post_eo(DECL_ARGS)

{

if (MDOC_HEAD == n->type || MDOC_BODY == n->type)

outflags &= ~MMAN_spc;

}

static int

pre_fa(DECL_ARGS)

{

Line 631 pre_fa(DECL_ARGS)

Line 775 pre_fa(DECL_ARGS)

n = n->child;

while (NULL != n) {

print_word("\\fI");

font_push('I');

outflags &= ~MMAN_spc;

print_node(m, n);

outflags &= ~MMAN_spc;

font_pop();

print_word("\\fP");

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

print_word(",");

}

Line 651 post_fa(DECL_ARGS)

Line 793 post_fa(DECL_ARGS)

}

static int

pre_fd(DECL_ARGS)

{

pre_syn(n);

font_push('B');

return(1);

}

static void

post_fd(DECL_ARGS)

{

font_pop();

outflags |= MMAN_br;

}

static int

pre_fl(DECL_ARGS)

{

font_push('B');

print_word("-");

outflags &= ~MMAN_spc;

return(1);

}

static void

post_fl(DECL_ARGS)

{

font_pop();

if (0 == n->nchild && NULL != n->next &&

n->next->line == n->line)

outflags &= ~MMAN_spc;

}

static int

pre_fn(DECL_ARGS)

{

pre_syn(n);

n = n->child;

if (NULL == n)

return(0);

if (MDOC_SYNPRETTY & n->flags)

font_push('B');

outflags |= MMAN_br;

print_word("\\fB");

outflags &= ~MMAN_spc;

print_node(m, n);

font_pop();

outflags &= ~MMAN_spc;

print_word("\\fP(");

print_word("(");

outflags &= ~MMAN_spc;

return(pre_fa(m, n->next));

}

Line 685 pre_fo(DECL_ARGS)

Line 864 pre_fo(DECL_ARGS)

{

switch (n->type) {

case (MDOC_BLOCK):

pre_syn(n);

break;

case (MDOC_HEAD):

if (MDOC_SYNPRETTY & n->flags)

font_push('B');

outflags |= MMAN_br;

print_word("\\fB");

outflags &= ~MMAN_spc;

break;

case (MDOC_BODY):

outflags &= ~MMAN_spc;

Line 708 post_fo(DECL_ARGS)

Line 887 post_fo(DECL_ARGS)

switch (n->type) {

case (MDOC_HEAD):

outflags &= ~MMAN_spc;

font_pop();

print_word("\\fP");

break;

case (MDOC_BODY):

post_fn(m, n);

Line 720 post_fo(DECL_ARGS)

Line 898 post_fo(DECL_ARGS)

}

static int

pre_ft(DECL_ARGS)

{

pre_syn(n);

font_push('I');

return(1);

}

static int

pre_in(DECL_ARGS)

{

if (MDOC_SYNPRETTY & n->flags) {

outflags |= MMAN_br;

pre_syn(n);

print_word("\\fB#include <");

font_push('B');

} else

print_word("#include <");

print_word("<\\fI");

outflags &= ~MMAN_spc;

} else {

print_word("<");

outflags &= ~MMAN_spc;

font_push('I');

}

return(1);

}

Line 736 static void

Line 927 static void

post_in(DECL_ARGS)

{

outflags &= ~MMAN_spc;

if (MDOC_SYNPRETTY & n->flags) {

print_word(">\\fP");

outflags &= ~MMAN_spc;

print_word(">");

font_pop();

outflags |= MMAN_br;

} else

} else {

print_word("\\fP>");

font_pop();

outflags &= ~MMAN_spc;

print_word(">");

}

static int

Line 778 post_lb(DECL_ARGS)

Line 973 post_lb(DECL_ARGS)

}

static int

pre_lk(DECL_ARGS)

{

const struct mdoc_node *link, *descr;

if (NULL == (link = n->child))

return(0);

if (NULL != (descr = link->next)) {

font_push('I');

while (NULL != descr) {

print_word(descr->string);

descr = descr->next;

}

print_word(":");

font_pop();

}

font_push('B');

print_word(link->string);

font_pop();

return(0);

}

static int

pre_li(DECL_ARGS)

{

font_push('R');

return(1);

}

static int

pre_nm(DECL_ARGS)

{

if (MDOC_BLOCK == n->type)

pre_syn(n);

if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)

return(1);

if (MDOC_SYNPRETTY & n->flags)

if (NULL == n->child && NULL == m->name)

outflags |= MMAN_br;

return(0);

print_word("\\fB");

font_push('B');

outflags &= ~MMAN_spc;

if (NULL == n->child)

print_word(m->name);

return(1);

Line 798 post_nm(DECL_ARGS)

Line 1026 post_nm(DECL_ARGS)

if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)

return;

outflags &= ~MMAN_spc;

font_pop();

print_word("\\fP");

}

static int

pre_no(DECL_ARGS)

{

outflags |= MMAN_spc_force;

return(1);

}

static int

pre_ns(DECL_ARGS)

{

Line 836 pre_sm(DECL_ARGS)

Line 1071 pre_sm(DECL_ARGS)

assert(n->child && MDOC_TEXT == n->child->type);

if (0 == strcmp("on", n->child->string))

outflags |= MMAN_Sm;

outflags |= MMAN_Sm | MMAN_spc;

else

outflags &= ~MMAN_Sm;

return(0);

Line 859 post_sp(DECL_ARGS)

Line 1094 post_sp(DECL_ARGS)

}

static int

pre_sy(DECL_ARGS)

{

font_push('B');

return(1);

}

static int

pre_vt(DECL_ARGS)

{

if (MDOC_SYNPRETTY & n->flags) {

switch (n->type) {

case (MDOC_BLOCK):

pre_syn(n);

return(1);

case (MDOC_BODY):

break;

default:

return(0);

}

outflags |= MMAN_br;

}

print_word("\\fI");

font_push('I');

outflags &= ~MMAN_spc;

return(1);

}

Line 884 post_vt(DECL_ARGS)

Line 1126 post_vt(DECL_ARGS)

if (MDOC_SYNPRETTY & n->flags && MDOC_BODY != n->type)

return;

font_pop();

outflags &= ~MMAN_spc;

print_word("\\fP");

if (MDOC_SYNPRETTY & n->flags)

outflags |= MMAN_br;

}

static int

CVSweb