===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.334
retrieving revision 1.336
diff -u -p -r1.334 -r1.336
--- mandoc/mdoc_validate.c	2017/06/10 16:54:16	1.334
+++ mandoc/mdoc_validate.c	2017/06/11 17:16:51	1.336
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.334 2017/06/10 16:54:16 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.336 2017/06/11 17:16:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -53,10 +53,10 @@ typedef	void	(*v_post)(POST_ARGS);
 
 static	int	 build_list(struct roff_man *, int);
 static	void	 check_text(struct roff_man *, int, int, char *);
-static	void	 check_bsd(struct roff_man *, int, int, char *);
 static	void	 check_argv(struct roff_man *,
 			struct roff_node *, struct mdoc_argv *);
 static	void	 check_args(struct roff_man *, struct roff_node *);
+static	void	 check_toptext(struct roff_man *, int, int, const char *);
 static	int	 child_an(const struct roff_node *);
 static	size_t		macro2len(enum roff_tok);
 static	void	 rewrite_macro2len(struct roff_man *, char **);
@@ -184,7 +184,7 @@ static	const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] 
 	NULL,		/* Eo */
 	post_xx,	/* Fx */
 	post_delim,	/* Ms */
-	post_delim,	/* No */
+	NULL,		/* No */
 	post_ns,	/* Ns */
 	post_xx,	/* Nx */
 	post_xx,	/* Ox */
@@ -304,10 +304,11 @@ mdoc_node_validate(struct roff_man *mdoc)
 		if (n->sec != SEC_SYNOPSIS ||
 		    (n->parent->tok != MDOC_Cd && n->parent->tok != MDOC_Fd))
 			check_text(mdoc, n->line, n->pos, n->string);
-		if (n->parent->tok == MDOC_Sh ||
-		    n->parent->tok == MDOC_Ss ||
-		    n->parent->tok == MDOC_It)
-			check_bsd(mdoc, n->line, n->pos, n->string);
+		if (n->parent->tok == MDOC_It ||
+		    (n->parent->type == ROFFT_BODY &&
+		     (n->parent->tok == MDOC_Sh ||
+		      n->parent->tok == MDOC_Ss)))
+			check_toptext(mdoc, n->line, n->pos, n->string);
 		break;
 	case ROFFT_EQN:
 	case ROFFT_TBL:
@@ -390,10 +391,13 @@ check_text(struct roff_man *mdoc, int ln, int pos, cha
 }
 
 static void
-check_bsd(struct roff_man *mdoc, int ln, int pos, char *p)
+check_toptext(struct roff_man *mdoc, int ln, int pos, const char *p)
 {
-	const char	*cp;
+	const char	*cp, *cpr;
 
+	if (*p == '\0')
+		return;
+
 	if ((cp = strstr(p, "OpenBSD")) != NULL)
 		mandoc_msg(MANDOCERR_BX, mdoc->parse,
 		    ln, pos + (cp - p), "Ox");
@@ -406,6 +410,19 @@ check_bsd(struct roff_man *mdoc, int ln, int pos, char
 	if ((cp = strstr(p, "DragonFly")) != NULL)
 		mandoc_msg(MANDOCERR_BX, mdoc->parse,
 		    ln, pos + (cp - p), "Dx");
+
+	cp = p;
+	while ((cp = strstr(cp + 1, "()")) != NULL) {
+		for (cpr = cp - 1; cpr >= p; cpr--)
+			if (*cpr != '_' && !isalnum((unsigned char)*cpr))
+				break;
+		if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) {
+			cpr++;
+			mandoc_vmsg(MANDOCERR_FUNC, mdoc->parse,
+			    ln, pos + (cpr - p),
+			    "%.*s()", (int)(cp - cpr), cpr);
+		}
+	}
 }
 
 static void
@@ -481,8 +498,8 @@ post_delim(POST_ARGS)
 
 	/* At least three alphabetic words with a sentence ending. */
 	if (strchr("!.:?", *lc) != NULL && (tok == MDOC_Em ||
-	    tok == MDOC_Li || tok == MDOC_No || tok == MDOC_Po ||
-	    tok == MDOC_Pq || tok == MDOC_Sy)) {
+	    tok == MDOC_Li || tok == MDOC_Po || tok == MDOC_Pq ||
+	    tok == MDOC_Sy)) {
 		nw = 0;
 		for (cp = lc - 1; cp >= nch->string; cp--) {
 			if (*cp == ' ') {