diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/blocks.c | 12 | ||||
| -rw-r--r-- | src/cmark.h | 4 | ||||
| -rw-r--r-- | src/html.c | 2 | ||||
| -rw-r--r-- | src/man.c | 4 | ||||
| -rw-r--r-- | src/node.c | 8 | ||||
| -rw-r--r-- | src/print.c | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/blocks.c b/src/blocks.c index 4dcd3f4..d52cd99 100644 --- a/src/blocks.c +++ b/src/blocks.c @@ -104,8 +104,8 @@ static inline bool can_contain(cmark_node_type parent_type, cmark_node_type chil { return ( parent_type == NODE_DOCUMENT || parent_type == NODE_BLOCK_QUOTE || - parent_type == NODE_LIST_ITEM || - (parent_type == NODE_LIST && child_type == NODE_LIST_ITEM) ); + parent_type == NODE_ITEM || + (parent_type == NODE_LIST && child_type == NODE_ITEM) ); } static inline bool accepts_lines(cmark_node_type block_type) @@ -149,7 +149,7 @@ static bool ends_with_blank_line(cmark_node* cmark_node) if (cmark_node->last_line_blank) { return true; } - if ((cmark_node->type == NODE_LIST || cmark_node->type == NODE_LIST_ITEM) && cmark_node->last_child) { + if ((cmark_node->type == NODE_LIST || cmark_node->type == NODE_ITEM) && cmark_node->last_child) { return ends_with_blank_line(cmark_node->last_child); } else { return false; @@ -558,7 +558,7 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes) all_matched = false; } - } else if (container->type == NODE_LIST_ITEM) { + } else if (container->type == NODE_ITEM) { if (indent >= container->as.list.marker_offset + container->as.list.padding) { @@ -741,7 +741,7 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes) } // add the list item - container = add_child(parser, container, NODE_LIST_ITEM, parser->line_number, + container = add_child(parser, container, NODE_ITEM, parser->line_number, first_nonspace + 1); /* TODO: static */ memcpy(&container->as.list, data, sizeof(*data)); @@ -775,7 +775,7 @@ S_process_line(cmark_parser *parser, const unsigned char *buffer, size_t bytes) container->type != NODE_HEADER && !(container->type == NODE_CODE_BLOCK && container->as.code.fenced) && - !(container->type == NODE_LIST_ITEM && + !(container->type == NODE_ITEM && container->first_child == NULL && container->start_line == parser->line_number)); diff --git a/src/cmark.h b/src/cmark.h index 732b244..a9d7bb6 100644 --- a/src/cmark.h +++ b/src/cmark.h @@ -40,7 +40,7 @@ typedef enum { CMARK_NODE_DOCUMENT, CMARK_NODE_BLOCK_QUOTE, CMARK_NODE_LIST, - CMARK_NODE_LIST_ITEM, + CMARK_NODE_ITEM, CMARK_NODE_CODE_BLOCK, CMARK_NODE_HTML, CMARK_NODE_PARAGRAPH, @@ -426,7 +426,7 @@ char *cmark_render_man(cmark_node *root); #define NODE_DOCUMENT CMARK_NODE_DOCUMENT #define NODE_BLOCK_QUOTE CMARK_NODE_BLOCK_QUOTE #define NODE_LIST CMARK_NODE_LIST - #define NODE_LIST_ITEM CMARK_NODE_LIST_ITEM + #define NODE_ITEM CMARK_NODE_ITEM #define NODE_CODE_BLOCK CMARK_NODE_CODE_BLOCK #define NODE_HTML CMARK_NODE_HTML #define NODE_PARAGRAPH CMARK_NODE_PARAGRAPH @@ -113,7 +113,7 @@ S_render_node(cmark_node *node, cmark_event_type ev_type, void *vstate) break; } - case CMARK_NODE_LIST_ITEM: + case CMARK_NODE_ITEM: if (entering) { cr(html); cmark_strbuf_puts(html, "<li>"); @@ -93,7 +93,7 @@ S_render_node(cmark_node *node, cmark_event_type ev_type, void *vstate) case CMARK_NODE_LIST: break; - case CMARK_NODE_LIST_ITEM: + case CMARK_NODE_ITEM: if (entering) { cr(man); cmark_strbuf_puts(man, ".IP "); @@ -150,7 +150,7 @@ S_render_node(cmark_node *node, cmark_event_type ev_type, void *vstate) if (entering) { // no blank line if first paragraph in list: if (node->parent && - node->parent->type == CMARK_NODE_LIST_ITEM && + node->parent->type == CMARK_NODE_ITEM && node->prev == NULL) { // no blank line or .PP } else { @@ -98,7 +98,7 @@ cmark_node_get_type_string(cmark_node *node) case CMARK_NODE_DOCUMENT: return "document"; case CMARK_NODE_BLOCK_QUOTE: return "block_quote"; case CMARK_NODE_LIST: return "list"; - case CMARK_NODE_LIST_ITEM: return "list_item"; + case CMARK_NODE_ITEM: return "item"; case CMARK_NODE_CODE_BLOCK: return "code_block"; case CMARK_NODE_HTML: return "html"; case CMARK_NODE_PARAGRAPH: return "paragraph"; @@ -518,12 +518,12 @@ S_can_contain(cmark_node *node, cmark_node *child) switch (node->type) { case CMARK_NODE_DOCUMENT: case CMARK_NODE_BLOCK_QUOTE: - case CMARK_NODE_LIST_ITEM: + case CMARK_NODE_ITEM: return S_is_block(child) - && child->type != CMARK_NODE_LIST_ITEM; + && child->type != CMARK_NODE_ITEM; case CMARK_NODE_LIST: - return child->type == CMARK_NODE_LIST_ITEM; + return child->type == CMARK_NODE_ITEM; case CMARK_NODE_PARAGRAPH: case CMARK_NODE_HEADER: diff --git a/src/print.c b/src/print.c index c38271f..98e5fd2 100644 --- a/src/print.c +++ b/src/print.c @@ -51,7 +51,7 @@ static void render_nodes(cmark_strbuf* buffer, cmark_node* node, int indent) case NODE_BLOCK_QUOTE: cmark_strbuf_printf(buffer, "block_quote\n"); break; - case NODE_LIST_ITEM: + case NODE_ITEM: cmark_strbuf_printf(buffer, "list_item\n"); break; case NODE_LIST: |