===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.65
retrieving revision 1.67
diff -u -p -r1.65 -r1.67
--- mandoc/term.c	2009/03/21 13:09:29	1.65
+++ mandoc/term.c	2009/03/21 13:47:02	1.67
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.65 2009/03/21 13:09:29 kristaps Exp $ */
+/* $Id: term.c,v 1.67 2009/03/21 13:47:02 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -320,8 +320,8 @@ arg_width(const struct mdoc_argv *arg, int pos)
 	if (0 == strcmp(arg->value[pos], "indent-two"))
 		return(INDENT * 2);
 
-	len = (int)strlen(arg->value[pos]);
-	assert(len > 0);
+	if (0 == (len = (int)strlen(arg->value[pos])))
+		return(0);
 
 	for (i = 0; i < len - 1; i++) 
 		if ( ! isdigit((u_char)arg->value[pos][i]))
@@ -1171,9 +1171,9 @@ termp_fn_pre(DECL_ARGS)
 	term_word(p, node->child->string);
 	p->flags &= ~ttypes[TTYPE_FUNC_NAME];
 
+	p->flags |= TERMP_NOSPACE;
 	term_word(p, "(");
 
-	p->flags |= TERMP_NOSPACE;
 	for (n = node->child->next; n; n = n->next) {
 		p->flags |= ttypes[TTYPE_FUNC_ARG];
 		term_word(p, n->string);
@@ -1231,7 +1231,7 @@ termp_fa_pre(DECL_ARGS)
 			term_word(p, ",");
 	}
 
-	if (node->next && node->next->tok == MDOC_Fa)
+	if (node->child && node->next && node->next->tok == MDOC_Fa)
 		term_word(p, ",");
 
 	return(0);