Adjustments to how the tasklist generation occurs (commonmark#136)

* Adjustments to how the tasklist generation occurs

* hit it until it passes spec

* clean up compiler warnings

Author: gjtorikian

extensions/cmark-gfm-core-extensions.h

@@ -21,6 +21,9 @@ uint8_t *cmark_gfm_extensions_get_table_alignments(cmark_node *node);
 CMARK_GFM_EXTENSIONS_EXPORT
 int cmark_gfm_extensions_get_table_row_is_header(cmark_node *node);
 
+CMARK_GFM_EXTENSIONS_EXPORT
+char *cmark_gfm_extensions_get_tasklist_state(cmark_node *node);
+
 #ifdef __cplusplus
 }
 #endif

extensions/tasklist.c

@@ -13,6 +13,18 @@ static const char *get_type_string(cmark_syntax_extension *extension, cmark_node
   return "tasklist";
 }
 
+char *cmark_gfm_extensions_get_tasklist_state(cmark_node *node) {
+  if (!node || ((int)node->as.opaque != CMARK_TASKLIST_CHECKED && (int)node->as.opaque != CMARK_TASKLIST_NOCHECKED))
+    return 0;
+
+  if ((int)node->as.opaque != CMARK_TASKLIST_CHECKED) {
+    return "checked";
+  }
+  else {
+    return "unchecked";
+  }
+}
+
 static bool parse_node_item_prefix(cmark_parser *parser, const char *input,
                                    cmark_node *container) {
   bool res = false;
@@ -62,13 +74,11 @@ static cmark_node *open_tasklist_item(cmark_syntax_extension *self,
   cmark_node_set_syntax_extension(parent_container, self);
   cmark_parser_advance_offset(parser, (char *)input, 3, false);
 
-  long userdata;
   if (strstr((char*)input, "[x]")) {
-    userdata = CMARK_TASKLIST_CHECKED;
+    parent_container->as.opaque = (void *)CMARK_TASKLIST_CHECKED;
   } else {
-    userdata = CMARK_TASKLIST_NOCHECKED;
+    parent_container->as.opaque = (void *)CMARK_TASKLIST_NOCHECKED;
   }
-  cmark_node_set_user_data(parent_container, (void*)userdata);
 
   return NULL;
 }
@@ -79,15 +89,14 @@ static void commonmark_render(cmark_syntax_extension *extension,
   bool entering = (ev_type == CMARK_EVENT_ENTER);
   if (entering) {
     renderer->cr(renderer);
-    long userdata = (long)cmark_node_get_user_data(node);
-    if (userdata == CMARK_TASKLIST_CHECKED) {
-      renderer->out(renderer, node, "  - [x] ", false, LITERAL);
+    if ((int)node->as.opaque == CMARK_TASKLIST_CHECKED) {
+      renderer->out(renderer, node, "- [x] ", false, LITERAL);
     } else {
-      renderer->out(renderer, node, "  - [ ] ", false, LITERAL);
+      renderer->out(renderer, node, "- [ ] ", false, LITERAL);
     }
-    cmark_strbuf_puts(renderer->prefix, "    ");
+    cmark_strbuf_puts(renderer->prefix, "  ");
   } else {
-    cmark_strbuf_truncate(renderer->prefix, renderer->prefix->size - 4);
+    cmark_strbuf_truncate(renderer->prefix, renderer->prefix->size - 2);
     renderer->cr(renderer);
   }
 }
@@ -101,8 +110,7 @@ static void html_render(cmark_syntax_extension *extension,
     cmark_strbuf_puts(renderer->html, "<li");
     cmark_html_render_sourcepos(node, renderer->html, options);
     cmark_strbuf_putc(renderer->html, '>');
-    long userdata = (long)cmark_node_get_user_data(node);
-    if (userdata == CMARK_TASKLIST_CHECKED) {
+    if ((int)node->as.opaque == CMARK_TASKLIST_CHECKED) {
       cmark_strbuf_puts(renderer->html, "<input type=\"checkbox\" checked=\"\" disabled=\"\" /> ");
     } else {
       cmark_strbuf_puts(renderer->html, "<input type=\"checkbox\" disabled=\"\" /> ");