===================================================================
RCS file: /cvs/mandoc/mdoc_state.c,v
retrieving revision 1.13
retrieving revision 1.19
diff -u -p -r1.13 -r1.19
--- mandoc/mdoc_state.c	2018/12/31 04:55:47	1.13
+++ mandoc/mdoc_state.c	2022/08/19 12:59:26	1.19
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_state.c,v 1.13 2018/12/31 04:55:47 schwarze Exp $ */
+/* $Id: mdoc_state.c,v 1.19 2022/08/19 12:59:26 schwarze Exp $ */
 /*
- * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014,2015,2017,2018,2022 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -21,6 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if DEBUG_MEMORY
+#include "mandoc_dbg.h"
+#endif
 #include "mandoc.h"
 #include "roff.h"
 #include "mdoc.h"
@@ -32,9 +37,8 @@
 
 typedef	void	(*state_handler)(STATE_ARGS);
 
-static	void	 state_bd(STATE_ARGS);
+static	void	 setsec(struct roff_node *, enum roff_sec);
 static	void	 state_bl(STATE_ARGS);
-static	void	 state_dl(STATE_ARGS);
 static	void	 state_sh(STATE_ARGS);
 static	void	 state_sm(STATE_ARGS);
 
@@ -46,8 +50,8 @@ static	const state_handler state_handlers[MDOC_MAX - M
 	NULL,		/* Ss */
 	NULL,		/* Pp */
 	NULL,		/* D1 */
-	state_dl,	/* Dl */
-	state_bd,	/* Bd */
+	NULL,		/* Dl */
+	NULL,		/* Bd */
 	NULL,		/* Ed */
 	state_bl,	/* Bl */
 	NULL,		/* El */
@@ -159,6 +163,7 @@ static	const state_handler state_handlers[MDOC_MAX - M
 	NULL,		/* %Q */
 	NULL,		/* %U */
 	NULL,		/* Ta */
+	NULL,		/* Tg */
 };
 
 
@@ -180,25 +185,6 @@ mdoc_state(struct roff_man *mdoc, struct roff_node *n)
 }
 
 static void
-state_bd(STATE_ARGS)
-{
-	enum mdocargt arg;
-
-	if (n->type != ROFFT_HEAD &&
-	    (n->type != ROFFT_BODY || n->end != ENDBODY_NOT))
-		return;
-
-	if (n->parent->args == NULL)
-		return;
-
-	arg = n->parent->args->argv[0].arg;
-	if (arg != MDOC_Literal && arg != MDOC_Unfilled)
-		return;
-
-	state_dl(mdoc, n);
-}
-
-static void
 state_bl(STATE_ARGS)
 {
 	struct mdoc_arg	*args;
@@ -223,51 +209,36 @@ state_bl(STATE_ARGS)
 }
 
 static void
-state_dl(STATE_ARGS)
+setsec(struct roff_node *n, enum roff_sec sec)
 {
+	struct roff_node *nch;
 
-	switch (n->type) {
-	case ROFFT_HEAD:
-		mdoc->flags |= MDOC_LITERAL;
-		break;
-	case ROFFT_BODY:
-		mdoc->flags &= ~MDOC_LITERAL;
-		break;
-	default:
-		break;
-	}
+	n->sec = sec;
+	for (nch = n->child; nch != NULL; nch = nch->next)
+		setsec(nch, sec);
 }
 
+/*
+ * Set the section attribute for the BLOCK, HEAD, and HEAD children.
+ * For other nodes, including the .Sh BODY, this is done when allocating
+ * the node data structures, but for .Sh BLOCK and HEAD, the section is
+ * still unknown at that time.
+ */
 static void
 state_sh(STATE_ARGS)
 {
-	struct roff_node *nch;
-	char		 *secname;
+	enum roff_sec sec;
 
 	if (n->type != ROFFT_HEAD)
 		return;
 
-	if ( ! (n->flags & NODE_VALID)) {
-		secname = NULL;
-		deroff(&secname, n);
-
-		/*
-		 * Set the section attribute for the BLOCK, HEAD,
-		 * and HEAD children; the latter can only be TEXT
-		 * nodes, so no recursion is needed.  For other
-		 * nodes, including the .Sh BODY, this is done
-		 * when allocating the node data structures, but
-		 * for .Sh BLOCK and HEAD, the section is still
-		 * unknown at that time.
-		 */
-
-		n->sec = n->parent->sec = secname == NULL ?
-		    SEC_CUSTOM : mdoc_a2sec(secname);
-		for (nch = n->child; nch != NULL; nch = nch->next)
-			nch->sec = n->sec;
-		free(secname);
+	if ((n->flags & NODE_VALID) == 0) {
+		sec = n->child != NULL && n->child->type == ROFFT_TEXT &&
+		    n->child->next == NULL ? mdoc_a2sec(n->child->string) :
+		    SEC_CUSTOM;
+		n->parent->sec = sec;
+		setsec(n, sec);
 	}
-
 	if ((mdoc->lastsec = n->sec) == SEC_SYNOPSIS) {
 		roff_setreg(mdoc->roff, "nS", 1, '=');
 		mdoc->flags |= MDOC_SYNOPSIS;