===================================================================
RCS file: /cvs/mandoc/tag.c,v
retrieving revision 1.35
retrieving revision 1.37
diff -u -p -r1.35 -r1.37
--- mandoc/tag.c	2020/04/18 20:40:10	1.35
+++ mandoc/tag.c	2022/04/26 11:38:38	1.37
@@ -1,6 +1,7 @@
-/* $Id: tag.c,v 1.35 2020/04/18 20:40:10 schwarze Exp $ */
+/* $Id: tag.c,v 1.37 2022/04/26 11:38:38 schwarze Exp $ */
 /*
- * Copyright (c) 2015,2016,2018,2019,2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2015, 2016, 2018, 2019, 2020, 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
@@ -43,6 +44,8 @@ struct tag_entry {
 	char	 s[];
 };
 
+static void		 tag_move_href(struct roff_man *,
+				struct roff_node *, const char *);
 static void		 tag_move_id(struct roff_node *);
 
 static struct ohash	 tag_data;
@@ -78,7 +81,7 @@ tag_free(void)
 
 /*
  * Set a node where a term is defined,
- * unless it is already defined at a lower priority.
+ * unless the term is already defined at a lower priority.
  */
 void
 tag_put(const char *s, int prio, struct roff_node *n)
@@ -91,6 +94,18 @@ tag_put(const char *s, int prio, struct roff_node *n)
 
 	assert(prio <= TAG_FALLBACK);
 
+	/*
+	 * If the node is already tagged, the existing tag is
+	 * explicit and we are now about to add an implicit tag.
+	 * Don't do that; just skip implicit tagging if the author
+	 * specified an explicit tag.
+	 */
+
+	if (n->flags & NODE_ID)
+		return;
+
+	/* Determine the implicit tag. */
+
 	if (s == NULL) {
 		if (n->child == NULL || n->child->type != ROFFT_TEXT)
 			return;
@@ -148,7 +163,7 @@ tag_put(const char *s, int prio, struct roff_node *n)
 	 */
 
 	else if (entry->prio < prio)
-			return;
+		return;
 
 	/*
 	 * If the existing entry is worse, clear it.
@@ -254,6 +269,39 @@ tag_move_id(struct roff_node *n)
 }
 
 /*
+ * When a paragraph is tagged and starts with text,
+ * move the permalink to the first few words.
+ */
+static void
+tag_move_href(struct roff_man *man, struct roff_node *n, const char *tag)
+{
+	char	*cp;
+
+	if (n == NULL || n->type != ROFFT_TEXT ||
+	    *n->string == '\0' || *n->string == ' ')
+		return;
+
+	cp = n->string;
+	while (cp != NULL && cp - n->string < 5)
+		cp = strchr(cp + 1, ' ');
+
+	/* If the first text node is longer, split it. */
+
+	if (cp != NULL && cp[1] != '\0') {
+		man->last = n;
+		man->next = ROFF_NEXT_SIBLING;
+		roff_word_alloc(man, n->line,
+		    n->pos + (cp - n->string), cp + 1);
+		man->last->flags = n->flags & ~NODE_LINE;
+		*cp = '\0';
+	}
+
+	assert(n->tag == NULL);
+	n->tag = mandoc_strdup(tag);
+	n->flags |= NODE_HREF;
+}
+
+/*
  * When all tags have been set, decide where to put
  * the associated permalinks, and maybe move some tags
  * to the beginning of the respective paragraphs.
@@ -261,34 +309,16 @@ tag_move_id(struct roff_node *n)
 void
 tag_postprocess(struct roff_man *man, struct roff_node *n)
 {
-	struct roff_node	*nn;
-	char			*cp;
-
 	if (n->flags & NODE_ID) {
 		switch (n->tok) {
 		case MDOC_Pp:
-			nn = n->next;
-			if (nn == NULL || nn->type != ROFFT_TEXT ||
-			    *nn->string == '\0' || *nn->string == ' ')
-				break;
-			/* Use the first few letters for the permalink. */
-			cp = nn->string;
-			while (cp != NULL && cp - nn->string < 5)
-				cp = strchr(cp + 1, ' ');
-			if (cp != NULL && cp[1] != '\0') {
-				/* Split a longer text node. */
-				man->last = nn;
-				man->next = ROFF_NEXT_SIBLING;
-				roff_word_alloc(man, nn->line,
-				    nn->pos + (cp - nn->string), cp + 1);
-				man->last->flags = nn->flags;
-				*cp = '\0';
-			}
-			assert(nn->tag == NULL);
-			nn->tag = mandoc_strdup(n->tag);
-			nn->flags |= NODE_HREF;
+			tag_move_href(man, n->next, n->tag);
 			break;
 		case MDOC_Bd:
+		case MDOC_D1:
+		case MDOC_Dl:
+			tag_move_href(man, n->child, n->tag);
+			break;
 		case MDOC_Bl:
 			/* XXX No permalink for now. */
 			break;