===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.79
retrieving revision 1.82
diff -u -p -r1.79 -r1.82
--- mandoc/mdoc_term.c	2009/09/24 09:20:02	1.79
+++ mandoc/mdoc_term.c	2009/09/24 11:55:28	1.82
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.79 2009/09/24 09:20:02 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.82 2009/09/24 11:55:28 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -218,7 +218,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_under_pre, NULL }, /* Em */ 
 	{ NULL, NULL }, /* Eo */
 	{ termp_xx_pre, NULL }, /* Fx */
-	{ termp_bold_pre, NULL }, /* Ms */
+	{ termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */
 	{ NULL, NULL }, /* No */
 	{ termp_ns_pre, NULL }, /* Ns */
 	{ termp_xx_pre, NULL }, /* Nx */
@@ -261,8 +261,8 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_brq_pre, termp_brq_post }, /* Bro */ 
 	{ NULL, NULL }, /* Brc */ 
 	{ NULL, NULL }, /* %C */ 
-	{ NULL, NULL }, /* Es */ 
-	{ NULL, NULL }, /* En */ 
+	{ NULL, NULL }, /* Es */ /* TODO */
+	{ NULL, NULL }, /* En */ /* TODO */
 	{ termp_xx_pre, NULL }, /* Dx */ 
 	{ NULL, NULL }, /* %Q */ 
 	{ termp_sp_pre, NULL }, /* br */
@@ -1164,6 +1164,8 @@ static int
 termp_rs_pre(DECL_ARGS)
 {
 
+	if (SEC_SEE_ALSO != node->sec)
+		return(1);
 	if (MDOC_BLOCK == node->type && node->prev)
 		term_vspace(p);
 	return(1);
@@ -1415,7 +1417,7 @@ termp_bt_pre(DECL_ARGS)
 {
 
 	term_word(p, "is currently in beta test.");
-	return(1);
+	return(0);
 }
 
 
@@ -1424,7 +1426,8 @@ static void
 termp_lb_post(DECL_ARGS)
 {
 
-	term_newln(p);
+	if (SEC_LIBRARY == node->sec)
+		term_newln(p);
 }
 
 
@@ -1515,10 +1518,6 @@ static int
 termp_fn_pre(DECL_ARGS)
 {
 	const struct mdoc_node *n;
-
-	assert(node->child && MDOC_TEXT == node->child->type);
-
-	/* FIXME: can be "type funcname" "type varname"... */
 
 	p->bold++;
 	term_word(p, node->child->string);