===================================================================
RCS file: /cvs/mandoc/mdoc_markdown.c,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -p -r1.7 -r1.9
--- mandoc/mdoc_markdown.c	2017/03/07 14:04:08	1.7
+++ mandoc/mdoc_markdown.c	2017/03/08 14:30:06	1.9
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_markdown.c,v 1.7 2017/03/07 14:04:08 schwarze Exp $ */
+/*	$Id: mdoc_markdown.c,v 1.9 2017/03/08 14:30:06 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -247,6 +247,7 @@ static	int	 escflags; /* Escape in generated markdown 
 #define	ESC_PAR	 (1 << 3)  /* ")" when "(" is open. */
 #define	ESC_SQU	 (1 << 4)  /* "]" when "[" is open. */
 #define	ESC_FON	 (1 << 5)  /* "*" immediately after unrelated "*". */
+#define	ESC_EOL	 (1 << 6)  /* " " at the and of a line. */
 
 static	int	 code_blocks, quote_blocks, list_blocks;
 static	int	 outcount;
@@ -374,37 +375,43 @@ md_stack(char c)
 static void
 md_preword(void)
 {
+	const char	*cp;
+
 	/*
 	 * If a list block is nested inside a code block or a blockquote,
 	 * blank lines for paragraph breaks no longer work; instead,
 	 * they terminate the list.  Work around this markdown issue
 	 * by using mere line breaks instead.
 	 */
+
 	if (list_blocks && outflags & MD_sp) {
 		outflags &= ~MD_sp;
 		outflags |= MD_br;
 	}
 
-	/* End the old line if requested. */
+	/*
+	 * End the old line if requested.
+	 * Escape whitespace at the end of the markdown line
+	 * such that it won't look like an output line break.
+	 */
 
 	if (outflags & MD_sp)
 		putchar('\n');
 	else if (outflags & MD_br) {
 		putchar(' ');
 		putchar(' ');
-#ifdef DEBUG
-		putchar(':');
-		putchar(':');
-		putchar(' ');
-		putchar(' ');
-#endif
-	}
+	} else if (outflags & MD_nl && escflags & ESC_EOL)
+		md_named("zwnj");
 
 	/* Start a new line if necessary. */
 
 	if (outflags & (MD_nl | MD_br | MD_sp)) {
 		putchar('\n');
-		fputs(md_stack('\0'), stdout);
+		for (cp = md_stack('\0'); *cp != '\0'; cp++) {
+			putchar(*cp);
+			if (*cp == '>')
+				putchar(' ');
+		}
 		outflags &= ~(MD_nl | MD_br | MD_sp);
 		escflags = ESC_BOL;
 		outcount = 0;
@@ -437,7 +444,7 @@ md_rawword(const char *s)
 {
 	md_preword();
 
-	if (*s == 0)
+	if (*s == '\0')
 		return;
 
 	if (escflags & ESC_FON) {
@@ -470,6 +477,10 @@ md_rawword(const char *s)
 		}
 		md_char(*s++);
 	}
+	if (s[-1] == ' ')
+		escflags |= ESC_EOL;
+	else
+		escflags &= ~ESC_EOL;
 }
 
 /*
@@ -490,6 +501,9 @@ md_word(const char *s)
 
 	md_preword();
 
+	if (*s == '\0')
+		return;
+
 	/* No spacing after opening delimiters. */
 	if ((s[0] == '(' || s[0] == '[') && s[1] == '\0')
 		outflags &= ~MD_spc;
@@ -630,7 +644,10 @@ md_word(const char *s)
 	if (*currfont != '\0') {
 		outflags &= ~MD_spc;
 		md_rawword(currfont);
-	}
+	} else if (s[-2] == ' ')
+		escflags |= ESC_EOL;
+	else
+		escflags &= ~ESC_EOL;
 }
 
 /*
@@ -640,7 +657,7 @@ static void
 md_named(const char *s)
 {
 	printf("&%s;", s);
-	escflags &= ~ESC_FON;
+	escflags &= ~(ESC_FON | ESC_EOL);
 	outcount++;
 }