content-parser: do not convert -- and --- to &ndash and &mdash inside code

2 files changed, 34 insertions, 1 deletions

diff --git a/src/content-parser.c b/src/content-parser.c
index 0a87fcb..782a85d 100644
--- a/src/content-parser.c
+++ b/src/content-parser.c
@@ -364,7 +364,9 @@ blogc_content_parse_inline(const char *src)
             case '-':
                 if (state != LINK_CLOSED)
                     break;
-                if (current < (src_len - 1) && src[current + 1] == '-') {
+                if ((current < (src_len - 1) && src[current + 1] == '-') &&
+                    !(open_code || open_code_double))
+                {
                     if (current < (src_len - 2) && src[current + 2] == '-') {
                         sb_string_append(rv, "&mdash;");
                         current += 2;
diff --git a/tests/check_content_parser.c b/tests/check_content_parser.c
index b20f8d0..ea3a9a2 100644
--- a/tests/check_content_parser.c
+++ b/tests/check_content_parser.c
@@ -1751,6 +1751,36 @@ test_content_parse_inline_line_break_crlf(void **state)
 }
 
 
+static void
+test_content_parse_inline_endash_emdash(void **state)
+{
+    char *html = blogc_content_parse_inline("foo -- bar");
+    assert_non_null(html);
+    assert_string_equal(html, "foo &ndash; bar");
+    free(html);
+    html = blogc_content_parse_inline("foo --- bar");
+    assert_non_null(html);
+    assert_string_equal(html, "foo &mdash; bar");
+    free(html);
+    html = blogc_content_parse_inline("`foo -- bar`");
+    assert_non_null(html);
+    assert_string_equal(html, "<code>foo -- bar</code>");
+    free(html);
+    html = blogc_content_parse_inline("`foo --- bar`");
+    assert_non_null(html);
+    assert_string_equal(html, "<code>foo --- bar</code>");
+    free(html);
+    html = blogc_content_parse_inline("``foo -- bar``");
+    assert_non_null(html);
+    assert_string_equal(html, "<code>foo -- bar</code>");
+    free(html);
+    html = blogc_content_parse_inline("``foo --- bar``");
+    assert_non_null(html);
+    assert_string_equal(html, "<code>foo --- bar</code>");
+    free(html);
+}
+
+
 int
 main(void)
 {
@@ -1793,6 +1823,7 @@ main(void)
         unit_test(test_content_parse_inline_image),
         unit_test(test_content_parse_inline_line_break),
         unit_test(test_content_parse_inline_line_break_crlf),
+        unit_test(test_content_parse_inline_endash_emdash),
     };
     return run_tests(tests);
 }