===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.32
retrieving revision 1.35
diff -u -p -r1.32 -r1.35
--- mandoc/mdoc_term.c	2009/07/12 19:28:46	1.32
+++ mandoc/mdoc_term.c	2009/07/12 20:24:24	1.35
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.32 2009/07/12 19:28:46 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.35 2009/07/12 20:24:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -127,7 +127,6 @@ static	int	  termp__t_pre(DECL_ARGS);
 static	int	  termp_ap_pre(DECL_ARGS);
 static	int	  termp_aq_pre(DECL_ARGS);
 static	int	  termp_ar_pre(DECL_ARGS);
-static	int	  termp_at_pre(DECL_ARGS);
 static	int	  termp_bd_pre(DECL_ARGS);
 static	int	  termp_bf_pre(DECL_ARGS);
 static	int	  termp_bq_pre(DECL_ARGS);
@@ -232,7 +231,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Ac */
 	{ termp_aq_pre, termp_aq_post }, /* Ao */
 	{ termp_aq_pre, termp_aq_post }, /* Aq */
-	{ termp_at_pre, NULL }, /* At */
+	{ NULL, NULL }, /* At */
 	{ NULL, NULL }, /* Bc */
 	{ termp_bf_pre, NULL }, /* Bf */ 
 	{ termp_bq_pre, termp_bq_post }, /* Bo */
@@ -1070,13 +1069,10 @@ termp_rv_pre(DECL_ARGS)
 {
 	int		 i;
 
-	/* FIXME: mandated by parser. */
+	i = arg_getattr(MDOC_Std, node);
+	assert(-1 != i);
+	assert(node->args->argv[i].sz);
 
-	if (-1 == (i = arg_getattr(MDOC_Std, node)))
-		errx(1, "expected -std argument");
-	if (1 != node->args->argv[i].sz)
-		errx(1, "expected -std argument");
-
 	term_newln(p);
 	term_word(p, "The");
 
@@ -1105,13 +1101,10 @@ termp_ex_pre(DECL_ARGS)
 {
 	int		 i;
 
-	/* FIXME: mandated by parser? */
+	i = arg_getattr(MDOC_Std, node);
+	assert(-1 != i);
+	assert(node->args->argv[i].sz);
 
-	if (-1 == (i = arg_getattr(MDOC_Std, node)))
-		errx(1, "expected -std argument");
-	if (1 != node->args->argv[i].sz)
-		errx(1, "expected -std argument");
-
 	term_word(p, "The");
 	p->flags |= ttypes[TTYPE_PROG];
 	term_word(p, *node->args->argv[i].value);
@@ -1844,24 +1837,6 @@ termp_in_post(DECL_ARGS)
 
 /* ARGSUSED */
 static int
-termp_at_pre(DECL_ARGS)
-{
-	const char	*att;
-
-	att = NULL;
-
-	if (node->child)
-		att = mdoc_a2att(node->child->string);
-	if (NULL == att)
-		att = "AT&T UNIX";
-
-	term_word(p, att);
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
 termp_brq_pre(DECL_ARGS)
 {
 
@@ -1941,13 +1916,12 @@ termp_fo_pre(DECL_ARGS)
 	const struct mdoc_node *n;
 
 	if (MDOC_BODY == node->type) {
+		p->flags |= TERMP_NOSPACE;
 		term_word(p, "(");
 		p->flags |= TERMP_NOSPACE;
 		return(1);
 	} else if (MDOC_HEAD != node->type) 
 		return(1);
-
-	/* XXX - groff shows only first parameter */
 
 	p->flags |= ttypes[TTYPE_FUNC_NAME];
 	for (n = node->child; n; n = n->next) {