version 1.18, 2009/11/10 12:03:30 |
version 1.21, 2009/11/15 06:45:31 |
Line 188 print_man_node(MAN_ARGS) |
|
Line 188 print_man_node(MAN_ARGS) |
|
break; |
break; |
case (MAN_TEXT): |
case (MAN_TEXT): |
print_text(h, n->string); |
print_text(h, n->string); |
break; |
return; |
default: |
default: |
|
/* |
|
* Close out scope of font prior to opening a macro |
|
* scope. Assert that the metafont is on the top of the |
|
* stack (it's never nested). |
|
*/ |
|
if (h->metaf) { |
|
assert(h->metaf == t); |
|
print_tagq(h, h->metaf); |
|
assert(NULL == h->metaf); |
|
t = h->tags.head; |
|
} |
if (mans[n->tok].pre) |
if (mans[n->tok].pre) |
child = (*mans[n->tok].pre)(m, n, h); |
child = (*mans[n->tok].pre)(m, n, h); |
break; |
break; |
Line 211 print_man_node(MAN_ARGS) |
|
Line 222 print_man_node(MAN_ARGS) |
|
default: |
default: |
if (mans[n->tok].post) |
if (mans[n->tok].post) |
(*mans[n->tok].post)(m, n, h); |
(*mans[n->tok].post)(m, n, h); |
|
|
/* Reset metafont upon exit from macro. */ |
|
h->metafont = 0; |
|
break; |
break; |
} |
} |
} |
} |
Line 387 man_alt_pre(MAN_ARGS) |
|
Line 395 man_alt_pre(MAN_ARGS) |
|
const struct man_node *nn; |
const struct man_node *nn; |
struct tag *t; |
struct tag *t; |
int i; |
int i; |
struct htmlpair tagi, tagb, *tagp; |
struct htmlpair tagi, tagb, tagr, *tagp; |
|
|
PAIR_CLASS_INIT(&tagi, "italic"); |
PAIR_CLASS_INIT(&tagi, "italic"); |
PAIR_CLASS_INIT(&tagb, "bold"); |
PAIR_CLASS_INIT(&tagb, "bold"); |
|
PAIR_CLASS_INIT(&tagr, "roman"); |
|
|
for (i = 0, nn = n->child; nn; nn = nn->next, i++) { |
for (i = 0, nn = n->child; nn; nn = nn->next, i++) { |
switch (n->tok) { |
switch (n->tok) { |
Line 401 man_alt_pre(MAN_ARGS) |
|
Line 410 man_alt_pre(MAN_ARGS) |
|
tagp = i % 2 ? &tagb : &tagi; |
tagp = i % 2 ? &tagb : &tagi; |
break; |
break; |
case (MAN_RI): |
case (MAN_RI): |
tagp = i % 2 ? &tagi : NULL; |
tagp = i % 2 ? &tagi : &tagr; |
break; |
break; |
case (MAN_IR): |
case (MAN_IR): |
tagp = i % 2 ? NULL : &tagi; |
tagp = i % 2 ? &tagr : &tagi; |
break; |
break; |
case (MAN_BR): |
case (MAN_BR): |
tagp = i % 2 ? NULL : &tagb; |
tagp = i % 2 ? &tagr : &tagb; |
break; |
break; |
case (MAN_RB): |
case (MAN_RB): |
tagp = i % 2 ? &tagb : NULL; |
tagp = i % 2 ? &tagb : &tagr; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 420 man_alt_pre(MAN_ARGS) |
|
Line 429 man_alt_pre(MAN_ARGS) |
|
if (i) |
if (i) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
|
if (tagp) { |
t = print_otag(h, TAG_SPAN, 1, tagp); |
t = print_otag(h, TAG_SPAN, 1, tagp); |
print_man_node(m, nn, h); |
print_man_node(m, nn, h); |
print_tagq(h, t); |
print_tagq(h, t); |
|
} else |
|
print_man_node(m, nn, h); |
|
} |
} |
|
|
return(0); |
return(0); |