Noted that -man text decoration is re-set when exiting a macro invocation.

3 files changed, 19 insertions, 5 deletions

diff --git a/man.7 b/man.7
index 92d0fc59..1a7aa4ce 100644
--- a/man.7
+++ b/man.7
@@ -1,4 +1,4 @@
-.\"	$Id: man.7,v 1.48 2009/11/09 05:11:46 kristaps Exp $
+.\"	$Id: man.7,v 1.49 2009/11/10 12:03:29 kristaps Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 9 2009 $
+.Dd $Mdocdate: November 10 2009 $
 .Dt MAN 7
 .Os
 .
@@ -137,6 +137,13 @@ for arbitrary-digit numerals:
 .D1 \es[+10]much bigger\es[-10]
 .D1 \es+(10much bigger\es-(10
 .D1 \es+'100'much much bigger\es-'100'
+.Pp
+Both
+.Sq \es
+and
+.Sq \ef
+attributes are forgotten when exiting a subsequent (or current) macro
+invocation.
 .
 .
 .Ss Whitespace
diff --git a/man_html.c b/man_html.c
index 82b01d95..81b78ee4 100644
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.17 2009/10/30 18:53:08 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.18 2009/11/10 12:03:30 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -211,6 +211,9 @@ print_man_node(MAN_ARGS)
 	default:
 		if (mans[n->tok].post)
 			(*mans[n->tok].post)(m, n, h);
+
+		/* Reset metafont upon exit from macro. */
+		h->metafont = 0;
 		break;
 	}
 }
diff --git a/man_term.c b/man_term.c
index c7537ab7..20080694 100644
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.50 2009/11/10 11:45:57 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.51 2009/11/10 12:03:30 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -876,9 +876,13 @@ print_man_node(DECL_ARGS)
 	if (c && n->child)
 		print_man_body(p, mt, n->child, m);
 
-	if (MAN_TEXT != n->type)
+	if (MAN_TEXT != n->type) {
 		if (termacts[n->tok].post)
 			(*termacts[n->tok].post)(p, mt, n, m);
+
+		/* Reset metafont upon exit from macro. */
+		p->metafont = 0;
+	}
 }