===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.152
retrieving revision 1.158
diff -u -p -r1.152 -r1.158
--- mandoc/man_validate.c	2020/04/04 20:33:33	1.152
+++ mandoc/man_validate.c	2023/04/28 20:23:19	1.158
@@ -1,4 +1,4 @@
-/* $Id: man_validate.c,v 1.152 2020/04/04 20:33:33 schwarze Exp $ */
+/* $Id: man_validate.c,v 1.158 2023/04/28 20:23:19 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2012-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -34,17 +34,16 @@
 #include "mandoc_aux.h"
 #include "mandoc.h"
 #include "roff.h"
-#include "tag.h"
 #include "man.h"
 #include "libmandoc.h"
 #include "roff_int.h"
 #include "libman.h"
+#include "tag.h"
 
 #define	CHKARGS	  struct roff_man *man, struct roff_node *n
 
 typedef	void	(*v_check)(CHKARGS);
 
-static	void	  check_abort(CHKARGS) __attribute__((__noreturn__));
 static	void	  check_par(CHKARGS);
 static	void	  check_part(CHKARGS);
 static	void	  check_root(CHKARGS);
@@ -69,9 +68,9 @@ static	const v_check man_valids[MAN_MAX - MAN_TH] = {
 	post_SH,    /* SS */
 	post_TP,    /* TP */
 	post_TP,    /* TQ */
-	check_abort,/* LP */
+	check_par,  /* LP */
 	check_par,  /* PP */
-	check_abort,/* P */
+	check_par,  /* P */
 	post_IP,    /* IP */
 	NULL,       /* HP */
 	NULL,       /* SM */
@@ -112,25 +111,11 @@ man_validate(struct roff_man *man)
 	const v_check	 *cp;
 
 	/*
-	 * Translate obsolete macros such that later code
-	 * does not need to look for them.
-	 */
-
-	n = man->last;
-	switch (n->tok) {
-	case MAN_LP:
-	case MAN_P:
-		n->tok = MAN_PP;
-		break;
-	default:
-		break;
-	}
-
-	/*
 	 * Iterate over all children, recursing into each one
 	 * in turn, depth-first.
 	 */
 
+	n = man->last;
 	man->last = man->last->child;
 	while (man->last != NULL) {
 		man_validate(man);
@@ -200,12 +185,6 @@ check_root(CHKARGS)
 		    "(OpenBSD)" : "(NetBSD)");
 }
 
-static void
-check_abort(CHKARGS)
-{
-	abort();
-}
-
 /*
  * Skip leading whitespace, dashes, backslashes, and font escapes,
  * then create a tag if the first following byte is a letter.
@@ -239,7 +218,9 @@ check_tag(struct roff_node *n, struct roff_node *nt)
 			case ESCAPE_FONTITALIC:
 			case ESCAPE_FONTBI:
 			case ESCAPE_FONTROMAN:
-			case ESCAPE_FONTCW:
+			case ESCAPE_FONTCR:
+			case ESCAPE_FONTCB:
+			case ESCAPE_FONTCI:
 			case ESCAPE_FONTPREV:
 			case ESCAPE_IGNORE:
 				break;
@@ -324,7 +305,7 @@ post_SH(CHKARGS)
 					*cp = '_';
 			if (nc != NULL && nc->type == ROFFT_TEXT &&
 			    strcmp(nc->string, tag) == 0)
-				tag_put(NULL, TAG_WEAK, n);
+				tag_put(NULL, TAG_STRONG, n);
 			else
 				tag_put(tag, TAG_FALLBACK, n);
 			free(tag);
@@ -338,7 +319,8 @@ post_SH(CHKARGS)
 		return;
 	}
 
-	if (nc->tok == MAN_PP && nc->body->child != NULL) {
+	if ((nc->tok == MAN_LP || nc->tok == MAN_PP || nc->tok == MAN_P) &&
+	    nc->body->child != NULL) {
 		while (nc->body->last != NULL) {
 			man->next = ROFF_NEXT_CHILD;
 			roff_node_relink(man, nc->body->last);
@@ -346,7 +328,8 @@ post_SH(CHKARGS)
 		}
 	}
 
-	if (nc->tok == MAN_PP || nc->tok == ROFF_sp || nc->tok == ROFF_br) {
+	if (nc->tok == MAN_LP || nc->tok == MAN_PP || nc->tok == MAN_P ||
+	    nc->tok == ROFF_sp || nc->tok == ROFF_br) {
 		mandoc_msg(MANDOCERR_PAR_SKIP, nc->line, nc->pos,
 		    "%s after %s", roff_name[nc->tok], roff_name[n->tok]);
 		roff_node_delete(man, nc);
@@ -371,13 +354,11 @@ post_UR(CHKARGS)
 	if (n->type == ROFFT_HEAD && n->child == NULL)
 		mandoc_msg(MANDOCERR_UR_NOHEAD, n->line, n->pos,
 		    "%s", roff_name[n->tok]);
-	check_part(man, n);
 }
 
 static void
 check_part(CHKARGS)
 {
-
 	if (n->type == ROFFT_BODY && n->child == NULL)
 		mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos,
 		    "%s", roff_name[n->tok]);
@@ -510,9 +491,14 @@ post_TH(CHKARGS)
 
 	if (n != NULL)
 		n = n->next;
-	if (n != NULL && n->string != NULL)
+	if (n != NULL && n->string != NULL) {
 		man->meta.msec = mandoc_strdup(n->string);
-	else {
+		if (man->filesec != '\0' &&
+		    man->filesec != *n->string &&
+		    *n->string >= '1' && *n->string <= '9')
+			mandoc_msg(MANDOCERR_MSEC_FILE, n->line, n->pos,
+			    "*.%c vs TH ... %c", man->filesec, *n->string);
+	} else {
 		man->meta.msec = mandoc_strdup("");
 		mandoc_msg(MANDOCERR_MSEC_MISSING,
 		    nb->line, nb->pos, "TH %s", man->meta.title);