Various improvements related to .Ex and .Rv:

* let .Nm fall back to the empty string, not to UNKNOWN
* never let .Rv copy an argument from .Nm
* avoid spurious \fR after empty .Nm in -Tman
* correct handling of .Ex and .Rv in -Tman
* correct the wording of the output for .Rv without arguments
* use non-breaking spaces in .Ex and .Rv output where required
* split MANDOCERR_NONAME into a warning for .Ex and an error for .Nm

1 files changed, 30 insertions, 21 deletions

diff --git a/mdoc_term.c b/mdoc_term.c
index e05b9f96..63829263 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1167,33 +1167,42 @@ termp_rv_pre(DECL_ARGS)
 	int		 nchild;
 
 	term_newln(p);
-	term_word(p, "The");
 
 	nchild = n->nchild;
-	for (n = n->child; n; n = n->next) {
-		term_fontpush(p, TERMFONT_BOLD);
-		term_word(p, n->string);
-		term_fontpop(p);
+	if (nchild > 0) {
+		term_word(p, "The");
 
-		p->flags |= TERMP_NOSPACE;
-		term_word(p, "()");
+		for (n = n->child; n; n = n->next) {
+			term_fontpush(p, TERMFONT_BOLD);
+			term_word(p, n->string);
+			term_fontpop(p);
 
-		if (nchild > 2 && n->next) {
 			p->flags |= TERMP_NOSPACE;
-			term_word(p, ",");
+			term_word(p, "()");
+
+			if (n->next == NULL)
+				continue;
+
+			if (nchild > 2) {
+				p->flags |= TERMP_NOSPACE;
+				term_word(p, ",");
+			}
+			if (n->next->next == NULL)
+				term_word(p, "and");
 		}
 
-		if (n->next && NULL == n->next->next)
-			term_word(p, "and");
-	}
+		if (nchild > 1)
+			term_word(p, "functions return");
+		else
+			term_word(p, "function returns");
 
-	if (nchild > 1)
-		term_word(p, "functions return");
-	else
-		term_word(p, "function returns");
+		term_word(p, "the value\\~0 if successful;");
+	} else
+		term_word(p, "Upon successful completion,"
+		    " the value\\~0 is returned;");
 
-	term_word(p, "the value 0 if successful; otherwise the "
-	    "value -1 is returned and the global variable");
+	term_word(p, "otherwise the value\\~\\-1 is returned"
+	    " and the global variable");
 
 	term_fontpush(p, TERMFONT_UNDER);
 	term_word(p, "errno");
@@ -1229,11 +1238,11 @@ termp_ex_pre(DECL_ARGS)
 	}
 
 	if (nchild > 1)
-		term_word(p, "utilities exit");
+		term_word(p, "utilities exit\\~0");
 	else
-		term_word(p, "utility exits");
+		term_word(p, "utility exits\\~0");
 
-	term_word(p, "0 on success, and >0 if an error occurs.");
+	term_word(p, "on success, and\\~>0 if an error occurs.");
 
 	p->flags |= TERMP_SENTENCE;
 	return(0);