Merge pull request #2450 from vibe-d/markdown_fix

Fix HTML escaping rules within Markdown emphasis.
vibe-d · Jun 9, 2020 · 7eaaf70 · 7eaaf70
2 parents 1bc9bfe + 2e4da15
commit 7eaaf70
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/textfilter/vibe/textfilter/markdown.d b/textfilter/vibe/textfilter/markdown.d
@@ -788,7 +788,7 @@ private void writeMarkdownEscaped(R)(ref R dst, string ln, in LinkRef[string] li
 				string text;
 				if (auto em = parseEmphasis(ln, text)) {
 					dst.put(em == 1 ? "<em>" : em == 2 ? "<strong>" : "<strong><em>");
-					filterHTMLEscape(dst, text, HTMLEscapeFlags.escapeMinimal);
+					dst.put(text);
 					dst.put(em == 1 ? "</em>" : em == 2 ? "</strong>": "</em></strong>");
 				} else {
 					dst.put(ln[0]);
@@ -1685,3 +1685,9 @@ private struct Link {
 	assert (filterMarkdown("- foo\n- %%%", MarkdownFlags.figures) == "<ul>\n<li>foo\n</li>\n</ul>\n<figure></figure>\n");
 	assert (filterMarkdown("- foo\n\n- %%%", MarkdownFlags.figures) == "<ul>\n<li>foo\n</li>\n</ul>\n<figure></figure>\n");
 }
+
+@safe unittest { // HTML entities
+	assert(filterMarkdown("&nbsp;") == "<p>&nbsp;\n</p>\n");
+	assert(filterMarkdown("*&nbsp;*") == "<p><em>&nbsp;</em>\n</p>\n");
+	assert(filterMarkdown("`&nbsp;`") == "<p><code class=\"prettyprint\">&amp;nbsp;</code>\n</p>\n");
+}