===================================================================
RCS file: /cvs/mandoc/tag.c,v
retrieving revision 1.33
retrieving revision 1.35
diff -u -p -r1.33 -r1.35
--- mandoc/tag.c	2020/04/07 22:56:02	1.33
+++ mandoc/tag.c	2020/04/18 20:40:10	1.35
@@ -1,4 +1,4 @@
-/* $Id: tag.c,v 1.33 2020/04/07 22:56:02 schwarze Exp $ */
+/* $Id: tag.c,v 1.35 2020/04/18 20:40:10 schwarze Exp $ */
 /*
  * Copyright (c) 2015,2016,2018,2019,2020 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -32,6 +32,7 @@
 #include "mandoc_ohash.h"
 #include "roff.h"
 #include "mdoc.h"
+#include "roff_int.h"
 #include "tag.h"
 
 struct tag_entry {
@@ -83,6 +84,7 @@ void
 tag_put(const char *s, int prio, struct roff_node *n)
 {
 	struct tag_entry	*entry;
+	struct roff_node	*nold;
 	const char		*se;
 	size_t			 len;
 	unsigned int		 slot;
@@ -155,9 +157,12 @@ tag_put(const char *s, int prio, struct roff_node *n)
 	 */
 
 	else if (entry->prio > prio || prio == TAG_FALLBACK) {
-		while (entry->nnodes > 0)
-			entry->nodes[--entry->nnodes]->flags &= ~NODE_ID;
-
+		while (entry->nnodes > 0) {
+			nold = entry->nodes[--entry->nnodes];
+			nold->flags &= ~NODE_ID;
+			free(nold->tag);
+			nold->tag = NULL;
+		}
 		if (prio == TAG_FALLBACK) {
 			entry->prio = TAG_DELETE;
 			return;
@@ -175,8 +180,8 @@ tag_put(const char *s, int prio, struct roff_node *n)
 	entry->prio = prio;
 	n->flags |= NODE_ID;
 	if (n->child == NULL || n->child->string != s || *se != '\0') {
-		assert(n->string == NULL);
-		n->string = mandoc_strndup(s, len);
+		assert(n->tag == NULL);
+		n->tag = mandoc_strndup(s, len);
 	}
 }
 
@@ -222,9 +227,9 @@ tag_move_id(struct roff_node *n)
 			}
 			/* FALLTHROUGH */
 		case MDOC_Pp:	/* Target the ROFFT_ELEM = <p>. */
-			if (np->string == NULL) {
-				np->string = mandoc_strdup(n->string == NULL ?
-				    n->child->string : n->string);
+			if (np->tag == NULL) {
+				np->tag = mandoc_strdup(n->tag == NULL ?
+				    n->child->string : n->tag);
 				np->flags |= NODE_ID;
 				n->flags &= ~NODE_ID;
 			}
@@ -254,13 +259,37 @@ tag_move_id(struct roff_node *n)
  * to the beginning of the respective paragraphs.
  */
 void
-tag_postprocess(struct roff_node *n)
+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;
+			break;
 		case MDOC_Bd:
 		case MDOC_Bl:
-		case MDOC_Pp:
 			/* XXX No permalink for now. */
 			break;
 		default:
@@ -268,11 +297,14 @@ tag_postprocess(struct roff_node *n)
 				tag_move_id(n);
 			if (n->tok != MDOC_Tg)
 				n->flags |= NODE_HREF;
-			else if ((n->flags & NODE_ID) == 0)
+			else if ((n->flags & NODE_ID) == 0) {
 				n->flags |= NODE_NOPRT;
+				free(n->tag);
+				n->tag = NULL;
+			}
 			break;
 		}
 	}
 	for (n = n->child; n != NULL; n = n->next)
-		tag_postprocess(n);
+		tag_postprocess(man, n);
 }