===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.104
retrieving revision 1.125
diff -u -p -r1.104 -r1.125
--- mandoc/mdoc_term.c	2010/01/01 13:35:30	1.104
+++ mandoc/mdoc_term.c	2010/05/17 22:11:42	1.125
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.104 2010/01/01 13:35:30 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.125 2010/05/17 22:11:42 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,14 +14,20 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
 #include "out.h"
 #include "term.h"
 #include "mdoc.h"
@@ -33,7 +39,6 @@
 
 struct	termpair {
 	struct termpair	 *ppair;
-	int	  	  flag;	
 	int		  count;
 };
 
@@ -55,6 +60,7 @@ static	int	  arg_hasattr(int, const struct mdoc_node *
 static	int	  arg_getattrs(const int *, int *, size_t,
 			const struct mdoc_node *);
 static	int	  arg_getattr(int, const struct mdoc_node *);
+static	int	  arg_disptype(const struct mdoc_node *);
 static	int	  arg_listtype(const struct mdoc_node *);
 static	void	  print_bvspace(struct termp *,
 			const struct mdoc_node *,
@@ -64,11 +70,6 @@ static	void	  print_mdoc_head(DECL_ARGS);
 static	void	  print_mdoc_nodelist(DECL_ARGS);
 static	void	  print_foot(DECL_ARGS);
 
-#ifdef __linux__
-extern	size_t	  strlcpy(char *, const char *, size_t);
-extern	size_t	  strlcat(char *, const char *, size_t);
-#endif
-
 static	void	  termp____post(DECL_ARGS);
 static	void	  termp_an_post(DECL_ARGS);
 static	void	  termp_aq_post(DECL_ARGS);
@@ -95,12 +96,12 @@ static	void	  termp_sq_post(DECL_ARGS);
 static	void	  termp_ss_post(DECL_ARGS);
 static	void	  termp_vt_post(DECL_ARGS);
 
-static	int	  termp__t_pre(DECL_ARGS);
 static	int	  termp_an_pre(DECL_ARGS);
 static	int	  termp_ap_pre(DECL_ARGS);
 static	int	  termp_aq_pre(DECL_ARGS);
 static	int	  termp_bd_pre(DECL_ARGS);
 static	int	  termp_bf_pre(DECL_ARGS);
+static	int	  termp_bl_pre(DECL_ARGS);
 static	int	  termp_bold_pre(DECL_ARGS);
 static	int	  termp_bq_pre(DECL_ARGS);
 static	int	  termp_brq_pre(DECL_ARGS);
@@ -134,6 +135,7 @@ static	int	  termp_sq_pre(DECL_ARGS);
 static	int	  termp_ss_pre(DECL_ARGS);
 static	int	  termp_under_pre(DECL_ARGS);
 static	int	  termp_ud_pre(DECL_ARGS);
+static	int	  termp_vt_pre(DECL_ARGS);
 static	int	  termp_xr_pre(DECL_ARGS);
 static	int	  termp_xx_pre(DECL_ARGS);
 
@@ -149,7 +151,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_d1_pre, termp_d1_post }, /* Dl */
 	{ termp_bd_pre, termp_bd_post }, /* Bd */
 	{ NULL, NULL }, /* Ed */
-	{ NULL, termp_bl_post }, /* Bl */
+	{ termp_bl_pre, termp_bl_post }, /* Bl */
 	{ NULL, NULL }, /* El */
 	{ termp_it_pre, termp_it_post }, /* It */
 	{ NULL, NULL }, /* Ad */ 
@@ -177,7 +179,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_rv_pre, NULL }, /* Rv */
 	{ NULL, NULL }, /* St */ 
 	{ termp_under_pre, NULL }, /* Va */
-	{ termp_under_pre, termp_vt_post }, /* Vt */
+	{ termp_vt_pre, termp_vt_post }, /* Vt */
 	{ termp_xr_pre, NULL }, /* Xr */
 	{ NULL, termp____post }, /* %A */
 	{ termp_under_pre, termp____post }, /* %B */
@@ -188,7 +190,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ NULL, termp____post }, /* %O */
 	{ NULL, termp____post }, /* %P */
 	{ NULL, termp____post }, /* %R */
-	{ termp__t_pre, termp____post }, /* %T */
+	{ termp_under_pre, termp____post }, /* %T */
 	{ NULL, termp____post }, /* %V */
 	{ NULL, NULL }, /* Ac */
 	{ termp_aq_pre, termp_aq_post }, /* Ao */
@@ -204,7 +206,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Dc */
 	{ termp_dq_pre, termp_dq_post }, /* Do */
 	{ termp_dq_pre, termp_dq_post }, /* Dq */
-	{ NULL, NULL }, /* Ec */
+	{ NULL, NULL }, /* Ec */ /* FIXME: no space */
 	{ NULL, NULL }, /* Ef */
 	{ termp_under_pre, NULL }, /* Em */ 
 	{ NULL, NULL }, /* Eo */
@@ -271,6 +273,9 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
 	p = (struct termp *)arg;
 
+	p->overstep = 0;
+	p->maxrmargin = p->defrmargin;
+
 	if (NULL == p->symtab)
 		switch (p->enc) {
 		case (TERMENC_ASCII):
@@ -333,6 +338,9 @@ print_mdoc_node(DECL_ARGS)
 		if (termacts[n->tok].post)
 			(*termacts[n->tok].post)(p, &npair, m, n);
 
+	if (MDOC_EOS & n->flags)
+		p->flags |= TERMP_SENTENCE;
+
 	p->offset = offset;
 	p->rmargin = rmargin;
 }
@@ -418,7 +426,7 @@ print_mdoc_head(DECL_ARGS)
 		strlcat(buf, ")", BUFSIZ);
 	}
 
-	snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
+	snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
 
 	p->offset = 0;
 	p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
@@ -471,12 +479,40 @@ a2width(const struct mdoc_argv *arg, int pos)
 	if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
 		SCALE_HS_INIT(&su, strlen(arg->value[pos]));
 
-	/* XXX: pachemu? */
-	return(term_hspan(&su) + 2);
+	return(term_hspan(&su));
 }
 
 
 static int
+arg_disptype(const struct mdoc_node *n)
+{
+	int		 i, len;
+
+	assert(MDOC_BLOCK == n->type);
+
+	len = (int)(n->args ? n->args->argc : 0);
+
+	for (i = 0; i < len; i++)
+		switch (n->args->argv[i].arg) {
+		case (MDOC_Centred):
+			/* FALLTHROUGH */
+		case (MDOC_Ragged):
+			/* FALLTHROUGH */
+		case (MDOC_Filled):
+			/* FALLTHROUGH */
+		case (MDOC_Unfilled):
+			/* FALLTHROUGH */
+		case (MDOC_Literal):
+			return(n->args->argv[i].arg);
+		default:
+			break;
+		}
+
+	return(-1);
+}
+
+
+static int
 arg_listtype(const struct mdoc_node *n)
 {
 	int		 i, len;
@@ -537,6 +573,10 @@ a2offs(const struct mdoc_argv *arg)
 }
 
 
+/*
+ * Return 1 if an argument has a particular argument value or 0 if it
+ * does not.  See arg_getattr().
+ */
 static int
 arg_hasattr(int arg, const struct mdoc_node *n)
 {
@@ -545,6 +585,10 @@ arg_hasattr(int arg, const struct mdoc_node *n)
 }
 
 
+/*
+ * Get the index of an argument in a node's argument list or -1 if it
+ * does not exist.  See arg_getattrs().
+ */
 static int
 arg_getattr(int v, const struct mdoc_node *n)
 {
@@ -554,6 +598,12 @@ arg_getattr(int v, const struct mdoc_node *n)
 }
 
 
+/*
+ * Walk through the argument list for a node and fill an array "vals"
+ * with the positions of the argument structures listed in "keys".
+ * Return the number of elements that were written into "vals", which
+ * can be zero.
+ */
 static int
 arg_getattrs(const int *keys, int *vals, 
 		size_t sz, const struct mdoc_node *n)
@@ -573,6 +623,11 @@ arg_getattrs(const int *keys, int *vals, 
 }
 
 
+/*
+ * Determine how much space to print out before block elements of `It'
+ * (and thus `Bl') and `Bd'.  And then go ahead and print that space,
+ * too.
+ */
 static void
 print_bvspace(struct termp *p, 
 		const struct mdoc_node *bl, 
@@ -651,7 +706,7 @@ termp_it_pre(DECL_ARGS)
 	const struct mdoc_node *bl, *nn;
 	char		        buf[7];
 	int		        i, type, keys[3], vals[3];
-	size_t		        width, offset;
+	size_t		        width, offset, ncols, dcol;
 
 	if (MDOC_BLOCK == n->type) {
 		print_bvspace(p, n->parent->parent, n);
@@ -660,60 +715,79 @@ termp_it_pre(DECL_ARGS)
 
 	bl = n->parent->parent->parent;
 
-	/* Save parent attributes. */
+	/* Get list width, offset, and list type from argument list. */
 
-	pair->flag = p->flags;
-
-	/* Get list width and offset. */
-
 	keys[0] = MDOC_Width;
 	keys[1] = MDOC_Offset;
 	keys[2] = MDOC_Column;
 
 	vals[0] = vals[1] = vals[2] = -1;
 
-	width = offset = 0;
+	arg_getattrs(keys, vals, 3, bl);
 
-	(void)arg_getattrs(keys, vals, 3, bl);
-
 	type = arg_listtype(bl);
 	assert(-1 != type);
 
-	/* Calculate real width and offset. */
+	/* 
+	 * First calculate width and offset.  This is pretty easy unless
+	 * we're a -column list, in which case all prior columns must
+	 * be accounted for.
+	 */
 
+	width = offset = 0;
+
+	if (vals[1] >= 0) 
+		offset = a2offs(&bl->args->argv[vals[1]]);
+
 	switch (type) {
 	case (MDOC_Column):
 		if (MDOC_BODY == n->type)
 			break;
-		/* 
-		 * Work around groff's column handling.  The offset is
-		 * equal to the sum of all widths leading to the current
-		 * column (plus the -offset value).  If this column
-		 * exceeds the stated number of columns, the width is
-		 * set as 0, else it's the stated column width (later
-		 * the 0 will be adjusted to default 10 or, if in the
-		 * last column case, set to stretch to the margin).
+		/*
+		 * Imitate groff's column handling:
+		 * - For each earlier column, add its width.
+		 * - For less than 5 columns, add four more blanks per
+		 *   column.
+		 * - For exactly 5 columns, add three more blank per
+		 *   column.
+		 * - For more than 5 columns, add only one column.
 		 */
-		for (i = 0, nn = n->prev; nn && 
-				i < (int)bl->args->argv[vals[2]].sz; 
+		ncols = bl->args->argv[vals[2]].sz;
+		/* LINTED */
+		dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1;
+
+		for (i = 0, nn = n->prev; 
+				nn && i < (int)ncols; 
 				nn = nn->prev, i++)
-			offset += a2width 
+			offset += dcol + a2width
 				(&bl->args->argv[vals[2]], i);
 
-		/* Whether exceeds maximum column. */
-		if (i < (int)bl->args->argv[vals[2]].sz)
-			width = a2width(&bl->args->argv[vals[2]], i);
-		else
-			width = 0;
 
-		if (vals[1] >= 0) 
-			offset += a2offs(&bl->args->argv[vals[1]]);
+		/*
+		 * When exceeding the declared number of columns, leave
+		 * the remaining widths at 0.  This will later be
+		 * adjusted to the default width of 10, or, for the last
+		 * column, stretched to the right margin.
+		 */
+		if (i >= (int)ncols)
+			break;
+
+		/*
+		 * Use the declared column widths, extended as explained
+		 * in the preceding paragraph.
+		 */
+		width = a2width(&bl->args->argv[vals[2]], i) + dcol;
 		break;
 	default:
-		if (vals[0] >= 0) 
-			width = a2width(&bl->args->argv[vals[0]], 0);
-		if (vals[1] >= 0) 
-			offset += a2offs(&bl->args->argv[vals[1]]);
+		if (vals[0] < 0) 
+			break;
+
+		/* 
+		 * Note: buffer the width by 2, which is groff's magic
+		 * number for buffering single arguments.  See the above
+		 * handling for column for how this changes.
+		 */
+		width = a2width(&bl->args->argv[vals[0]], 0) + 2;
 		break;
 	}
 
@@ -782,11 +856,10 @@ termp_it_pre(DECL_ARGS)
 	}
 
 	/*
-	 * Pad and break control.  This is the tricker part.  Lists with
-	 * set right-margins for the head get TERMP_NOBREAK because, if
-	 * they overrun the margin, they wrap to the new margin.
-	 * Correspondingly, the body for these types don't left-pad, as
-	 * the head will pad out to to the right.
+	 * Pad and break control.  This is the tricky part.  These flags
+	 * are documented in term_flushln() in term.c.  Note that we're
+	 * going to unset all of these flags in termp_it_post() when we
+	 * exit.
 	 */
 
 	switch (type) {
@@ -898,7 +971,8 @@ termp_it_pre(DECL_ARGS)
 		 * right-most column is filled to the right margin.
 		 */
 		if (MDOC_HEAD == n->type &&
-				MDOC_BODY == n->next->type)
+				MDOC_BODY == n->next->type &&
+				p->rmargin < p->maxrmargin)
 			p->rmargin = p->maxrmargin;
 		break;
 	default:
@@ -926,7 +1000,7 @@ termp_it_pre(DECL_ARGS)
 			break;
 		case (MDOC_Enum):
 			(pair->ppair->ppair->count)++;
-			(void)snprintf(buf, sizeof(buf), "%d.", 
+			snprintf(buf, sizeof(buf), "%d.", 
 					pair->ppair->ppair->count);
 			term_word(p, buf);
 			break;
@@ -969,7 +1043,7 @@ termp_it_post(DECL_ARGS)
 {
 	int		   type;
 
-	if (MDOC_BODY != n->type && MDOC_HEAD != n->type)
+	if (MDOC_BLOCK == n->type)
 		return;
 
 	type = arg_listtype(n->parent->parent->parent);
@@ -993,7 +1067,17 @@ termp_it_post(DECL_ARGS)
 		break;
 	}
 
-	p->flags = pair->flag;
+	/* 
+	 * Now that our output is flushed, we can reset our tags.  Since
+	 * only `It' sets these flags, we're free to assume that nobody
+	 * has munged them in the meanwhile.
+	 */
+
+	p->flags &= ~TERMP_DANGLE;
+	p->flags &= ~TERMP_NOBREAK;
+	p->flags &= ~TERMP_TWOSPACE;
+	p->flags &= ~TERMP_NOLPAD;
+	p->flags &= ~TERMP_HANG;
 }
 
 
@@ -1002,13 +1086,16 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
-	if (SEC_SYNOPSIS == n->sec)
+	if (NULL == n->child && NULL == m->name)
+
+	if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
 		term_newln(p);
 
 	term_fontpush(p, TERMFONT_BOLD);
 
 	if (NULL == n->child)
 		term_word(p, m->name);
+
 	return(1);
 }
 
@@ -1021,10 +1108,10 @@ termp_fl_pre(DECL_ARGS)
 	term_fontpush(p, TERMFONT_BOLD);
 	term_word(p, "\\-");
 
-	/* A blank `Fl' should incur a subsequent space. */
-
 	if (n->child)
 		p->flags |= TERMP_NOSPACE;
+	else if (n->next && n->next->line == n->line)
+		p->flags |= TERMP_NOSPACE;
 
 	return(1);
 }
@@ -1077,7 +1164,7 @@ termp_an_post(DECL_ARGS)
 		return;
 	}
 
-	if (arg_getattr(MDOC_Split, n) > -1) {
+	if (arg_hasattr(MDOC_Split, n)) {
 		p->flags &= ~TERMP_NOSPLIT;
 		p->flags |= TERMP_SPLIT;
 	} else {
@@ -1133,7 +1220,7 @@ termp_rv_pre(DECL_ARGS)
 			term_word(p, "()");
 	}
 
-	if (n->child->next)
+	if (n->child && n->child->next)
 		term_word(p, "functions return");
 	else
 		term_word(p, "function returns");
@@ -1172,7 +1259,7 @@ termp_ex_pre(DECL_ARGS)
 			p->flags &= ~TERMP_NOSPACE;
 	}
 
-	if (n->child->next)
+	if (n->child && n->child->next)
 		term_word(p, "utilities exit");
 	else
 		term_word(p, "utility exits");
@@ -1201,6 +1288,15 @@ termp_nd_pre(DECL_ARGS)
 
 
 /* ARGSUSED */
+static int
+termp_bl_pre(DECL_ARGS)
+{
+
+	return(MDOC_HEAD != n->type);
+}
+
+
+/* ARGSUSED */
 static void
 termp_bl_post(DECL_ARGS)
 {
@@ -1228,7 +1324,10 @@ termp_xr_pre(DECL_ARGS)
 {
 	const struct mdoc_node *nn;
 
-	assert(n->child && MDOC_TEXT == n->child->type);
+	if (NULL == n->child)
+		return(0);
+
+	assert(MDOC_TEXT == n->child->type);
 	nn = n->child;
 
 	term_word(p, nn->string);
@@ -1245,12 +1344,27 @@ termp_xr_pre(DECL_ARGS)
 }
 
 
+static int
+termp_vt_pre(DECL_ARGS)
+{
+
+	if (MDOC_ELEM == n->type)
+		return(termp_under_pre(p, pair, m, n));
+	else if (MDOC_HEAD == n->type)
+		return(0);
+	else if (MDOC_BLOCK == n->type)
+		return(1);
+
+	return(termp_under_pre(p, pair, m, n));
+}
+
+
 /* ARGSUSED */
 static void
 termp_vt_post(DECL_ARGS)
 {
 
-	if (n->sec != SEC_SYNOPSIS)
+	if (MDOC_BLOCK != n->type)
 		return;
 	if (n->next && MDOC_Vt == n->next->tok)
 		term_newln(p);
@@ -1274,7 +1388,7 @@ static void
 termp_fd_post(DECL_ARGS)
 {
 
-	if (n->sec != SEC_SYNOPSIS)
+	if (n->sec != SEC_SYNOPSIS || ! (MDOC_LINE & n->flags))
 		return;
 
 	term_newln(p);
@@ -1361,7 +1475,7 @@ static void
 termp_lb_post(DECL_ARGS)
 {
 
-	if (SEC_LIBRARY == n->sec)
+	if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
 		term_newln(p);
 }
 
@@ -1430,7 +1544,7 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
-	if (SEC_SYNOPSIS == n->sec)
+	if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
 		if (n->prev && MDOC_Fo == n->prev->tok)
 			term_vspace(p);
 
@@ -1444,7 +1558,7 @@ static void
 termp_ft_post(DECL_ARGS)
 {
 
-	if (SEC_SYNOPSIS == n->sec)
+	if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags)
 		term_newln(p);
 }
 
@@ -1485,7 +1599,7 @@ static void
 termp_fn_post(DECL_ARGS)
 {
 
-	if (n->sec == SEC_SYNOPSIS && n->next)
+	if (n->sec == SEC_SYNOPSIS && n->next && MDOC_LINE & n->flags)
 		term_vspace(p);
 }
 
@@ -1522,37 +1636,23 @@ static int
 termp_bd_pre(DECL_ARGS)
 {
 	int	         	 i, type;
+	size_t			 rm, rmax;
 	const struct mdoc_node	*nn;
 
 	if (MDOC_BLOCK == n->type) {
 		print_bvspace(p, n, n);
 		return(1);
-	} else if (MDOC_BODY != n->type)
-		return(1);
+	} else if (MDOC_HEAD == n->type)
+		return(0);
 
 	nn = n->parent;
 
-	for (type = -1, i = 0; i < (int)nn->args->argc; i++) {
-		switch (nn->args->argv[i].arg) {
-		case (MDOC_Centred):
-			/* FALLTHROUGH */
-		case (MDOC_Ragged):
-			/* FALLTHROUGH */
-		case (MDOC_Filled):
-			/* FALLTHROUGH */
-		case (MDOC_Unfilled):
-			/* FALLTHROUGH */
-		case (MDOC_Literal):
-			type = nn->args->argv[i].arg;
-			break;
-		case (MDOC_Offset):
-			p->offset += a2offs(&nn->args->argv[i]);
-			break;
-		default:
-			break;
-		}
-	}
+	type = arg_disptype(nn);
+	assert(-1 != type);
 
+	if (-1 != (i = arg_getattr(MDOC_Offset, nn)))
+		p->offset += a2offs(&nn->args->argv[i]);
+
 	/*
 	 * If -ragged or -filled are specified, the block does nothing
 	 * but change the indentation.  If -unfilled or -literal are
@@ -1561,10 +1661,13 @@ termp_bd_pre(DECL_ARGS)
 	 * lines are allowed.
 	 */
 	
-	assert(type > -1);
 	if (MDOC_Literal != type && MDOC_Unfilled != type)
 		return(1);
 
+	rm = p->rmargin;
+	rmax = p->maxrmargin;
+	p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+
 	for (nn = n->child; nn; nn = nn->next) {
 		p->flags |= TERMP_NOSPACE;
 		print_mdoc_node(p, pair, m, nn);
@@ -1576,6 +1679,8 @@ termp_bd_pre(DECL_ARGS)
 			term_flushln(p);
 	}
 
+	p->rmargin = rm;
+	p->maxrmargin = rmax;
 	return(0);
 }
 
@@ -1584,11 +1689,26 @@ termp_bd_pre(DECL_ARGS)
 static void
 termp_bd_post(DECL_ARGS)
 {
+	int		 type;
+	size_t		 rm, rmax;
 
 	if (MDOC_BODY != n->type) 
 		return;
+
+	type = arg_disptype(n->parent);
+	assert(-1 != type);
+
+	rm = p->rmargin;
+	rmax = p->maxrmargin;
+
+	if (MDOC_Literal == type || MDOC_Unfilled == type)
+		p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+
 	p->flags |= TERMP_NOSPACE;
 	term_flushln(p);
+
+	p->rmargin = rm;
+	p->maxrmargin = rmax;
 }
 
 
@@ -1778,7 +1898,7 @@ termp_in_post(DECL_ARGS)
 	term_word(p, ">");
 	term_fontpop(p);
 
-	if (SEC_SYNOPSIS != n->sec)
+	if (SEC_SYNOPSIS != n->sec && ! (MDOC_LINE & n->flags))
 		return;
 
 	term_newln(p);
@@ -1974,10 +2094,9 @@ termp_sm_pre(DECL_ARGS)
 {
 
 	assert(n->child && MDOC_TEXT == n->child->type);
-	if (0 == strcmp("on", n->child->string)) {
+	if (0 == strcmp("on", n->child->string))
 		p->flags &= ~TERMP_NONOSPACE;
-		p->flags &= ~TERMP_NOSPACE;
-	} else
+	else
 		p->flags |= TERMP_NONOSPACE;
 
 	return(0);
@@ -2004,14 +2123,6 @@ termp____post(DECL_ARGS)
 	/* TODO: %U. */
 
 	p->flags |= TERMP_NOSPACE;
-	switch (n->tok) {
-	case (MDOC__T):
-		term_word(p, "\\(rq");
-		p->flags |= TERMP_NOSPACE;
-		break;
-	default:
-		break;
-	}
 	term_word(p, n->next ? "," : ".");
 }
 
@@ -2059,16 +2170,5 @@ termp_under_pre(DECL_ARGS)
 {
 
 	term_fontpush(p, TERMFONT_UNDER);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp__t_pre(DECL_ARGS)
-{
-
-	term_word(p, "\\(lq");
-	p->flags |= TERMP_NOSPACE;
 	return(1);
 }