Don't append a newline character when rendering inline nodes.

commonmark · Aug 19, 2024 · 9b5d8d1 · 9b5d8d1
1 parent 2734f21
commit 9b5d8d1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/api_test/main.c b/api_test/main.c
@@ -713,7 +713,7 @@ static void render_commonmark(test_batch_runner *runner) {
   cmark_node *text = cmark_node_new(CMARK_NODE_TEXT);
   cmark_node_set_literal(text, "Hi");
   commonmark = cmark_render_commonmark(text, CMARK_OPT_DEFAULT, 0);
-  STR_EQ(runner, commonmark, "Hi\n", "render single inline node");
+  STR_EQ(runner, commonmark, "Hi", "render single inline node");
   free(commonmark);
 
   cmark_node_free(text);

diff --git a/src/node.h b/src/node.h
@@ -86,6 +86,22 @@ struct cmark_node {
 
 CMARK_EXPORT int cmark_node_check(cmark_node *node, FILE *out);
 
+static inline bool CMARK_NODE_TYPE_BLOCK_P(cmark_node_type node_type) {
+	return node_type < CMARK_NODE_TEXT;
+}
+
+static inline bool CMARK_NODE_BLOCK_P(cmark_node *node) {
+	return node != NULL && CMARK_NODE_TYPE_BLOCK_P((cmark_node_type) node->type);
+}
+
+static inline bool CMARK_NODE_TYPE_INLINE_P(cmark_node_type node_type) {
+	return node_type >= CMARK_NODE_TEXT;
+}
+
+static inline bool CMARK_NODE_INLINE_P(cmark_node *node) {
+	return node != NULL && CMARK_NODE_TYPE_INLINE_P((cmark_node_type) node->type);
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/render.c b/src/render.c
@@ -178,9 +178,11 @@ char *cmark_render(cmark_node *root, int options, int width,
     }
   }
 
-  // ensure final newline
-  if (renderer.buffer->size == 0 || renderer.buffer->ptr[renderer.buffer->size - 1] != '\n') {
-    cmark_strbuf_putc(renderer.buffer, '\n');
+  // If the root node is a block type (i.e. not inline), ensure there's a final newline:
+  if (CMARK_NODE_TYPE_BLOCK_P(root->type)) {
+    if (renderer.buffer->size == 0 || renderer.buffer->ptr[renderer.buffer->size - 1] != '\n') {
+      cmark_strbuf_putc(renderer.buffer, '\n');
+    }
   }
 
   result = (char *)cmark_strbuf_detach(renderer.buffer);