===================================================================
RCS file: /cvs/mandoc/mdoc_markdown.c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -p -r1.5 -r1.7
--- mandoc/mdoc_markdown.c	2017/03/07 13:09:27	1.5
+++ mandoc/mdoc_markdown.c	2017/03/07 14:04:08	1.7
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_markdown.c,v 1.5 2017/03/07 13:09:27 schwarze Exp $ */
+/*	$Id: mdoc_markdown.c,v 1.7 2017/03/07 14:04:08 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -90,6 +90,7 @@ static	void	 md_post_En(struct roff_node *);
 static	void	 md_post_Eo(struct roff_node *);
 static	void	 md_post_Fa(struct roff_node *);
 static	void	 md_post_Fd(struct roff_node *);
+static	void	 md_post_Fl(struct roff_node *);
 static	void	 md_post_Fn(struct roff_node *);
 static	void	 md_post_Fo(struct roff_node *);
 static	void	 md_post_In(struct roff_node *);
@@ -126,7 +127,7 @@ static	const struct md_act md_acts[MDOC_MAX + 1] = {
 	{ NULL, NULL, NULL, NULL, NULL }, /* Ex */
 	{ NULL, md_pre_Fa, md_post_Fa, NULL, NULL }, /* Fa */
 	{ NULL, md_pre_Fd, md_post_Fd, "**", "**" }, /* Fd */
-	{ NULL, md_pre_raw, md_post_raw, "**-", "**" }, /* Fl */
+	{ NULL, md_pre_raw, md_post_Fl, "**-", "**" }, /* Fl */
 	{ NULL, md_pre_Fn, md_post_Fn, NULL, NULL }, /* Fn */
 	{ NULL, md_pre_Fd, md_post_raw, "*", "*" }, /* Ft */
 	{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Ic */
@@ -956,21 +957,17 @@ md_pre_Eo(struct roff_node *n)
 static void
 md_post_Eo(struct roff_node *n)
 {
-	int	 body, tail;
-
 	if (n->end != ENDBODY_NOT) {
 		outflags |= MD_spc;
 		return;
 	}
 
-	body = n->child != NULL || n->parent->head->child != NULL;
-	tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+	if (n->child == NULL && n->parent->head->child == NULL)
+		return;
 
-	if (body && tail)
+	if (n->parent->tail != NULL && n->parent->tail->child != NULL)
 		outflags &= ~MD_spc;
-        else if ( ! (body || tail))
-		md_preword();
-        else if ( ! tail)
+        else
 		outflags |= MD_spc;
 }
 
@@ -1016,6 +1013,15 @@ md_post_Fd(struct roff_node *n)
 {
 	md_post_raw(n);
 	outflags |= MD_br;
+}
+
+static void
+md_post_Fl(struct roff_node *n)
+{
+	md_post_raw(n);
+	if (n->child == NULL && n->next != NULL &&
+	    n->next->type != ROFFT_TEXT && !(n->next->flags & NODE_LINE))
+		outflags &= ~MD_spc;
 }
 
 static int