From 774ac507fc7e86c6fe0d7b16a3c1abaed4849fab Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 19 Dec 2015 20:50:37 -0800 Subject: Rename RAW_BLOCK -> CUSTOM_BLOCK, RAW_INLINE -> CUSTOM_INLINE. --- src/cmark.h | 12 ++++++------ src/commonmark.c | 4 ++-- src/html.c | 4 ++-- src/latex.c | 4 ++-- src/man.c | 4 ++-- src/node.c | 4 ++-- src/xml.c | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/cmark.h b/src/cmark.h index 612440f..be5eaad 100644 --- a/src/cmark.h +++ b/src/cmark.h @@ -40,7 +40,7 @@ typedef enum { CMARK_NODE_ITEM, CMARK_NODE_CODE_BLOCK, CMARK_NODE_HTML, - CMARK_NODE_RAW_BLOCK, + CMARK_NODE_CUSTOM_BLOCK, CMARK_NODE_PARAGRAPH, CMARK_NODE_HEADER, CMARK_NODE_HRULE, @@ -54,7 +54,7 @@ typedef enum { CMARK_NODE_LINEBREAK, CMARK_NODE_CODE, CMARK_NODE_INLINE_HTML, - CMARK_NODE_RAW_INLINE, + CMARK_NODE_CUSTOM_INLINE, CMARK_NODE_EMPH, CMARK_NODE_STRONG, CMARK_NODE_LINK, @@ -160,7 +160,7 @@ CMARK_EXPORT cmark_node *cmark_node_last_child(cmark_node *node); * of type: * * * CMARK_NODE_HTML - * * CMARK_NODE_RAW_BLOCK + * * CMARK_NODE_CUSTOM_BLOCK * * CMARK_NODE_HRULE * * CMARK_NODE_CODE_BLOCK * * CMARK_NODE_TEXT @@ -168,7 +168,7 @@ CMARK_EXPORT cmark_node *cmark_node_last_child(cmark_node *node); * * CMARK_NODE_LINEBREAK * * CMARK_NODE_CODE * * CMARK_NODE_INLINE_HTML - * * CMARK_NODE_RAW_INLINE + * * CMARK_NODE_CUSTOM_INLINE * * Nodes must only be modified after an `EXIT` event, or an `ENTER` event for * leaf nodes. @@ -518,7 +518,7 @@ const char *cmark_version_string(); #define NODE_ITEM CMARK_NODE_ITEM #define NODE_CODE_BLOCK CMARK_NODE_CODE_BLOCK #define NODE_HTML CMARK_NODE_HTML -#define NODE_RAW_BLOCK CMARK_NODE_RAW_BLOCK +#define NODE_CUSTOM_BLOCK CMARK_NODE_CUSTOM_BLOCK #define NODE_PARAGRAPH CMARK_NODE_PARAGRAPH #define NODE_HEADER CMARK_NODE_HEADER #define NODE_HRULE CMARK_NODE_HRULE @@ -527,7 +527,7 @@ const char *cmark_version_string(); #define NODE_LINEBREAK CMARK_NODE_LINEBREAK #define NODE_CODE CMARK_NODE_CODE #define NODE_INLINE_HTML CMARK_NODE_INLINE_HTML -#define NODE_RAW_INLINE CMARK_NODE_RAW_INLINE +#define NODE_CUSTOM_INLINE CMARK_NODE_CUSTOM_INLINE #define NODE_EMPH CMARK_NODE_EMPH #define NODE_STRONG CMARK_NODE_STRONG #define NODE_LINK CMARK_NODE_LINK diff --git a/src/commonmark.c b/src/commonmark.c index 32b09a1..4fbe9fd 100644 --- a/src/commonmark.c +++ b/src/commonmark.c @@ -280,7 +280,7 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node, break; case CMARK_NODE_HTML: - case CMARK_NODE_RAW_BLOCK: + case CMARK_NODE_CUSTOM_BLOCK: BLANKLINE(); OUT(cmark_node_get_literal(node), false, LITERAL); BLANKLINE(); @@ -337,7 +337,7 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node, break; case CMARK_NODE_INLINE_HTML: - case CMARK_NODE_RAW_INLINE: + case CMARK_NODE_CUSTOM_INLINE: OUT(cmark_node_get_literal(node), false, LITERAL); break; diff --git a/src/html.c b/src/html.c index 4fa4437..0e4f69f 100644 --- a/src/html.c +++ b/src/html.c @@ -176,7 +176,7 @@ static int S_render_node(cmark_node *node, cmark_event_type ev_type, cr(html); break; - case CMARK_NODE_RAW_BLOCK: + case CMARK_NODE_CUSTOM_BLOCK: cr(html); cmark_strbuf_put(html, node->as.literal.data, node->as.literal.len); cr(html); @@ -239,7 +239,7 @@ static int S_render_node(cmark_node *node, cmark_event_type ev_type, } break; - case CMARK_NODE_RAW_INLINE: + case CMARK_NODE_CUSTOM_INLINE: cmark_strbuf_put(html, node->as.literal.data, node->as.literal.len); break; diff --git a/src/latex.c b/src/latex.c index e7cb9f7..b6197ec 100644 --- a/src/latex.c +++ b/src/latex.c @@ -303,7 +303,7 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node, case CMARK_NODE_HTML: break; - case CMARK_NODE_RAW_BLOCK: + case CMARK_NODE_CUSTOM_BLOCK: CR(); OUT(cmark_node_get_literal(node), false, LITERAL); CR(); @@ -347,7 +347,7 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node, case CMARK_NODE_INLINE_HTML: break; - case CMARK_NODE_RAW_INLINE: + case CMARK_NODE_CUSTOM_INLINE: OUT(cmark_node_get_literal(node), false, LITERAL); break; diff --git a/src/man.c b/src/man.c index a1ea6e4..d8dc0bf 100644 --- a/src/man.c +++ b/src/man.c @@ -142,7 +142,7 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node, case CMARK_NODE_HTML: break; - case CMARK_NODE_RAW_BLOCK: + case CMARK_NODE_CUSTOM_BLOCK: CR(); OUT(cmark_node_get_literal(node), false, LITERAL); CR(); @@ -196,7 +196,7 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node, case CMARK_NODE_INLINE_HTML: break; - case CMARK_NODE_RAW_INLINE: + case CMARK_NODE_CUSTOM_INLINE: OUT(cmark_node_get_literal(node), false, LITERAL); break; diff --git a/src/node.c b/src/node.c index 4c5f474..10cd99d 100644 --- a/src/node.c +++ b/src/node.c @@ -161,7 +161,7 @@ const char *cmark_node_get_type_string(cmark_node *node) { return "code_block"; case CMARK_NODE_HTML: return "html"; - case CMARK_NODE_RAW_BLOCK: + case CMARK_NODE_CUSTOM_BLOCK: return "raw_block"; case CMARK_NODE_PARAGRAPH: return "paragraph"; @@ -179,7 +179,7 @@ const char *cmark_node_get_type_string(cmark_node *node) { return "code"; case CMARK_NODE_INLINE_HTML: return "inline_html"; - case CMARK_NODE_RAW_INLINE: + case CMARK_NODE_CUSTOM_INLINE: return "raw_inline"; case CMARK_NODE_EMPH: return "emph"; diff --git a/src/xml.c b/src/xml.c index 2b7e645..093e6ca 100644 --- a/src/xml.c +++ b/src/xml.c @@ -53,9 +53,9 @@ static int S_render_node(cmark_node *node, cmark_event_type ev_type, case CMARK_NODE_TEXT: case CMARK_NODE_CODE: case CMARK_NODE_HTML: - case CMARK_NODE_RAW_BLOCK: + case CMARK_NODE_CUSTOM_BLOCK: case CMARK_NODE_INLINE_HTML: - case CMARK_NODE_RAW_INLINE: + case CMARK_NODE_CUSTOM_INLINE: cmark_strbuf_puts(xml, ">"); escape_xml(xml, node->as.literal.data, node->as.literal.len); cmark_strbuf_puts(xml, "