src/usr.bin/mandoc/man_html.c - diff

Return to man_html.c CVS log

Up to [local] / src / usr.bin / mandoc

Diff for /src/usr.bin/mandoc/man_html.c between version 1.26 and 1.27

version 1.26, 2010/12/22 22:35:05

version 1.27, 2010/12/25 13:23:03

Line 207

* scope. Assert that the metafont is on the top of the

* stack (it's never nested).

if (h->metaf) {

if (HTMLFONT_NONE != h->metac) {

assert(h->metaf == t);

h->metal = h->metac;

print_tagq(h, h->metaf);

h->metac = HTMLFONT_NONE;

assert(NULL == h->metaf);

t = h->tags.head;

}

if (mans[n->tok].pre)

child = (*mans[n->tok].pre)(m, n, mh, h);

Line 407

Line 405

man_alt_pre(MAN_ARGS)

{

const struct man_node *nn;

struct tag *t;

int i;

enum htmltag fp;

enum htmlfont fp;

struct tag *t;

for (i = 0, nn = n->child; nn; nn = nn->next, i++) {

t = NULL;

switch (n->tok) {

case (MAN_BI):

fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_BOLD;

fp = i % 2 ? TAG_I : TAG_B;

break;

case (MAN_IB):

fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_ITALIC;

fp = i % 2 ? TAG_B : TAG_I;

break;

case (MAN_RI):

fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_NONE;

fp = i % 2 ? TAG_I : TAG_MAX;

break;

case (MAN_IR):

fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_ITALIC;

fp = i % 2 ? TAG_MAX : TAG_I;

break;

case (MAN_BR):

fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_BOLD;

fp = i % 2 ? TAG_MAX : TAG_B;

break;

case (MAN_RB):

fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_NONE;

fp = i % 2 ? TAG_B : TAG_MAX;

break;

default:

abort();

Line 439

Line 438

if (i)

h->flags |= HTML_NOSPACE;

if (TAG_MAX != fp)

* Open and close the scope with each argument, so that

t = print_otag(h, fp, 0, NULL);

* internal \f escapes, which are common, are also

* closed out with the scope.

t = print_ofont(h, fp);

print_man_node(m, nn, mh, h);

print_tagq(h, t);

if (t)

print_tagq(h, t);

}

return(0);

Line 457

Line 455

static int

man_SM_pre(MAN_ARGS)

{

struct htmlpair tag;

/* FIXME: print_ofont(). */

print_otag(h, TAG_SMALL, 0, NULL);

PAIR_CLASS_INIT(&tag, "small");

print_otag(h, TAG_SPAN, 1, &tag);

if (MAN_SB == n->tok)

print_ofont(h, HTMLFONT_BOLD);

print_otag(h, TAG_B, 0, NULL);

return(1);

}

Line 628

Line 623

man_B_pre(MAN_ARGS)

{

print_ofont(h, HTMLFONT_BOLD);

print_otag(h, TAG_B, 0, NULL);

return(1);

}

Line 638

Line 633

man_I_pre(MAN_ARGS)

{

print_ofont(h, HTMLFONT_ITALIC);

print_otag(h, TAG_I, 0, NULL);

return(1);

}