===================================================================
RCS file: /cvs/mandoc/mdoc_markdown.c,v
retrieving revision 1.15
retrieving revision 1.18
diff -u -p -r1.15 -r1.18
--- mandoc/mdoc_markdown.c	2017/03/11 12:35:45	1.15
+++ mandoc/mdoc_markdown.c	2017/05/04 17:48:29	1.18
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_markdown.c,v 1.15 2017/03/11 12:35:45 schwarze Exp $ */
+/*	$Id: mdoc_markdown.c,v 1.18 2017/05/04 17:48:29 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "mandoc_aux.h"
@@ -103,8 +104,7 @@ static	void	 md_post_Pf(struct roff_node *);
 static	void	 md_post_Vt(struct roff_node *);
 static	void	 md_post__T(struct roff_node *);
 
-static	const struct md_act md_acts[MDOC_MAX + 1] = {
-	{ NULL, md_pre_Ap, NULL, NULL, NULL }, /* Ap */
+static	const struct md_act __md_acts[MDOC_MAX - MDOC_Dd] = {
 	{ NULL, NULL, NULL, NULL, NULL }, /* Dd */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Dt */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Os */
@@ -120,6 +120,7 @@ static	const struct md_act md_acts[MDOC_MAX + 1] = {
 	{ NULL, md_pre_It, md_post_It, NULL, NULL }, /* It */
 	{ NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ad */
 	{ NULL, md_pre_An, NULL, NULL, NULL }, /* An */
+	{ NULL, md_pre_Ap, NULL, NULL, NULL }, /* Ap */
 	{ NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ar */
 	{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cd */
 	{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cm */
@@ -222,13 +223,12 @@ static	const struct md_act md_acts[MDOC_MAX + 1] = {
 	{ md_cond_body, md_pre_En, md_post_En, NULL, NULL }, /* En */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Dx */
 	{ NULL, NULL, md_post_pc, NULL, NULL }, /* %Q */
-	{ NULL, md_pre_br, NULL, NULL, NULL }, /* br */
 	{ NULL, md_pre_Pp, NULL, NULL, NULL }, /* sp */
 	{ NULL, md_pre_Lk, md_post_pc, NULL, NULL }, /* %U */
 	{ NULL, NULL, NULL, NULL, NULL }, /* Ta */
 	{ NULL, NULL, NULL, NULL, NULL }, /* ll */
-	{ NULL, NULL, NULL, NULL, NULL }, /* ROOT */
 };
+static	const struct md_act *const md_acts = __md_acts - MDOC_Dd;
 
 static	int	 outflags;
 #define	MD_spc		 (1 << 0)  /* Blank character before next word. */
@@ -310,8 +310,7 @@ md_node(struct roff_node *n)
 	process_children = 1;
 	n->flags &= ~NODE_ENDED;
 
-	switch (n->type) {
-	case ROFFT_TEXT:
+	if (n->type == ROFFT_TEXT) {
 		if (n->flags & NODE_DELIMC)
 			outflags &= ~(MD_spc | MD_spc_force);
 		else if (outflags & MD_Sm)
@@ -321,14 +320,21 @@ md_node(struct roff_node *n)
 			outflags &= ~(MD_spc | MD_spc_force);
 		else if (outflags & MD_Sm)
 			outflags |= MD_spc;
-		break;
-	default:
+	} else if (n->tok < ROFF_MAX) {
+		switch (n->tok) {
+		case ROFF_br:
+			md_pre_br(n);
+			break;
+		default:
+			abort();
+		}
+	} else {
+		assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
 		act = md_acts + n->tok;
 		cond = act->cond == NULL || (*act->cond)(n);
 		if (cond && act->pre != NULL &&
 		    (n->end == ENDBODY_NOT || n->child != NULL))
 			process_children = (*act->pre)(n);
-		break;
 	}
 
 	if (process_children && n->child != NULL)
@@ -1304,18 +1310,29 @@ md_pre_Lk(struct roff_node *n)
 	if ((link = n->child) == NULL)
 		return 0;
 
-	descr = link->next == NULL ? link : link->next;
+	/* Link text. */
+	descr = link->next;
+	if (descr == NULL || descr->flags & NODE_DELIMC)
+		descr = link;  /* no text */
 	md_rawword("[");
 	outflags &= ~MD_spc;
 	do {
 		md_word(descr->string);
-		descr = link->next == NULL ? NULL : descr->next;
-	} while (descr != NULL);
+		descr = descr->next;
+	} while (descr != NULL && !(descr->flags & NODE_DELIMC));
 	outflags &= ~MD_spc;
+
+	/* Link target. */
 	md_rawword("](");
 	md_uri(link->string);
 	outflags &= ~MD_spc;
 	md_rawword(")");
+
+	/* Trailing punctuation. */
+	while (descr != NULL) {
+		md_word(descr->string);
+		descr = descr->next;
+	}
 	return 0;
 }