summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--example.style.css1
-rw-r--r--html.c6
-rw-r--r--man.73
-rw-r--r--man_html.c29
4 files changed, 25 insertions, 14 deletions
diff --git a/example.style.css b/example.style.css
index f7fea190..469b1feb 100644
--- a/example.style.css
+++ b/example.style.css
@@ -47,6 +47,7 @@ span.ref-corp { } /* Reference corporate/foreign author (%Q). */
span.ref-rep { } /* Reference report (%R). */
span.ref-title { } /* Reference title (%T). */
span.ref-vol { } /* Reference volume (%V). */
+span.roman { font-style: normal; font-weight: normal; } /* Generic font. */
span.small { font-size: smaller; } /* Generically small (SB, SM). */
span.symb { font-weight: bold; font-style: normal; } /* Symbols. */
span.type { font-style: italic; font-weight: normal; } /* Variable types (Vt). */
diff --git a/html.c b/html.c
index 741be084..e6409ffa 100644
--- a/html.c
+++ b/html.c
@@ -247,7 +247,7 @@ print_metaf(struct html *h, enum roffdeco deco)
assert(h->metaf == h->tags.head);
print_tagq(h, h->metaf);
}
-
+
PAIR_CLASS_INIT(&tag, class);
h->metaf = print_otag(h, TAG_SPAN, 1, &tag);
}
@@ -432,6 +432,8 @@ print_tagq(struct html *h, const struct tag *until)
struct tag *tag;
while ((tag = h->tags.head) != NULL) {
+ if (tag == h->metaf)
+ h->metaf = NULL;
print_ctag(h, tag->tag);
h->tags.head = tag->next;
free(tag);
@@ -449,6 +451,8 @@ print_stagq(struct html *h, const struct tag *suntil)
while ((tag = h->tags.head) != NULL) {
if (suntil && tag == suntil)
return;
+ if (tag == h->metaf)
+ h->metaf = NULL;
print_ctag(h, tag->tag);
h->tags.head = tag->next;
free(tag);
diff --git a/man.7 b/man.7
index 13ce8be0..6ceb6988 100644
--- a/man.7
+++ b/man.7
@@ -136,8 +136,7 @@ Both
.Sq \es
and
.Sq \ef
-attributes are forgotten when exiting a subsequent (or current) macro
-invocation.
+attributes are forgotten when entering or exiting a macro block.
.
.
.Ss Whitespace
diff --git a/man_html.c b/man_html.c
index 2bf7184b..74a453bb 100644
--- a/man_html.c
+++ b/man_html.c
@@ -190,9 +190,15 @@ print_man_node(MAN_ARGS)
print_text(h, n->string);
return;
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)
@@ -200,6 +206,9 @@ print_man_node(MAN_ARGS)
break;
}
+ if (child && n->child)
+ print_man_nodelist(m, n->child, h);
+
print_stagq(h, t);
bufinit(h);
@@ -386,10 +395,11 @@ man_alt_pre(MAN_ARGS)
const struct man_node *nn;
struct tag *t;
int i;
- struct htmlpair tagi, tagb, *tagp;
+ struct htmlpair tagi, tagb, tagr, *tagp;
PAIR_CLASS_INIT(&tagi, "italic");
PAIR_CLASS_INIT(&tagb, "bold");
+ PAIR_CLASS_INIT(&tagr, "roman");
for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
switch (n->tok) {
@@ -400,16 +410,16 @@ man_alt_pre(MAN_ARGS)
tagp = i % 2 ? &tagb : &tagi;
break;
case (MAN_RI):
- tagp = i % 2 ? &tagi : NULL;
+ tagp = i % 2 ? &tagi : &tagr;
break;
case (MAN_IR):
- tagp = i % 2 ? NULL : &tagi;
+ tagp = i % 2 ? &tagr : &tagi;
break;
case (MAN_BR):
- tagp = i % 2 ? NULL : &tagb;
+ tagp = i % 2 ? &tagr : &tagb;
break;
case (MAN_RB):
- tagp = i % 2 ? &tagb : NULL;
+ tagp = i % 2 ? &tagb : &tagr;
break;
default:
abort();
@@ -419,12 +429,9 @@ man_alt_pre(MAN_ARGS)
if (i)
h->flags |= HTML_NOSPACE;
- if (tagp) {
- t = print_otag(h, TAG_SPAN, 1, tagp);
- print_man_node(m, nn, h);
- print_tagq(h, t);
- } else
- print_man_node(m, nn, h);
+ t = print_otag(h, TAG_SPAN, 1, tagp);
+ print_man_node(m, nn, h);
+ print_tagq(h, t);
}
return(0);