commonmarker 0.3.0 → 0.4.0

data/ext/commonmarker/cmark/src/utf8.h

@@ -8,12 +8,12 @@
 extern "C" {
 #endif
 
-void utf8proc_case_fold(cmark_strbuf *dest, const uint8_t *str, bufsize_t len);
-void utf8proc_encode_char(int32_t uc, cmark_strbuf *buf);
-int utf8proc_iterate(const uint8_t *str, bufsize_t str_len, int32_t *dst);
-void utf8proc_check(cmark_strbuf *dest, const uint8_t *line, bufsize_t size);
-int utf8proc_is_space(int32_t uc);
-int utf8proc_is_punctuation(int32_t uc);
+void cmark_utf8proc_case_fold(cmark_strbuf *dest, const uint8_t *str, bufsize_t len);
+void cmark_utf8proc_encode_char(int32_t uc, cmark_strbuf *buf);
+int cmark_utf8proc_iterate(const uint8_t *str, bufsize_t str_len, int32_t *dst);
+void cmark_utf8proc_check(cmark_strbuf *dest, const uint8_t *line, bufsize_t size);
+int cmark_utf8proc_is_space(int32_t uc);
+int cmark_utf8proc_is_punctuation(int32_t uc);
 
 #ifdef __cplusplus
 }

data/ext/commonmarker/cmark/src/xml.c

@@ -11,157 +11,142 @@
 
 // Functions to convert cmark_nodes to XML strings.
 
-static void escape_xml(cmark_strbuf *dest, const unsigned char *source, bufsize_t length)
-{
-	houdini_escape_html0(dest, source, length, 0);
+static void escape_xml(cmark_strbuf *dest, const unsigned char *source,
+                       bufsize_t length) {
+  houdini_escape_html0(dest, source, length, 0);
 }
 
 struct render_state {
-	cmark_strbuf* xml;
-	int indent;
+  cmark_strbuf *xml;
+  int indent;
 };
 
-static inline void indent(struct render_state *state)
-{
-	int i;
-	for (i = 0; i < state->indent; i++) {
-		cmark_strbuf_putc(state->xml, ' ');
-	}
+static inline void indent(struct render_state *state) {
+  int i;
+  for (i = 0; i < state->indent; i++) {
+    cmark_strbuf_putc(state->xml, ' ');
+  }
 }
 
-static int
-S_render_node(cmark_node *node, cmark_event_type ev_type,
-              struct render_state *state, int options)
-{
-	cmark_strbuf *xml = state->xml;
-	bool literal = false;
-	cmark_delim_type delim;
-	bool entering = (ev_type == CMARK_EVENT_ENTER);
-
-	if (entering) {
-		indent(state);
-		cmark_strbuf_printf(xml, "<%s",
-		                    cmark_node_get_type_string(node));
-
-		if (options & CMARK_OPT_SOURCEPOS && node->start_line != 0) {
-			cmark_strbuf_printf(xml, " sourcepos=\"%d:%d-%d:%d\"",
-			                    node->start_line,
-			                    node->start_column,
-			                    node->end_line,
-			                    node->end_column);
-		}
-
-		literal = false;
-
-		switch (node->type) {
-		case CMARK_NODE_TEXT:
-		case CMARK_NODE_CODE:
-		case CMARK_NODE_HTML:
-		case CMARK_NODE_INLINE_HTML:
-			cmark_strbuf_puts(xml, ">");
-			escape_xml(xml, node->as.literal.data,
-			           node->as.literal.len);
-			cmark_strbuf_puts(xml, "</");
-			cmark_strbuf_puts(xml,
-			                  cmark_node_get_type_string(node));
-			literal = true;
-			break;
-		case CMARK_NODE_LIST:
-			switch (cmark_node_get_list_type(node)) {
-			case CMARK_ORDERED_LIST:
-				cmark_strbuf_puts(xml, " type=\"ordered\"");
-				cmark_strbuf_printf(xml, " start=\"%d\"",
-				                    cmark_node_get_list_start(node));
-				delim = cmark_node_get_list_delim(node);
-				if (delim == CMARK_PAREN_DELIM) {
-					cmark_strbuf_puts(xml,
-					                  " delim=\"paren\"");
-				} else if (delim == CMARK_PERIOD_DELIM) {
-					cmark_strbuf_puts(xml,
-					                  " delim=\"period\"");
-				}
-				break;
-			case CMARK_BULLET_LIST:
-				cmark_strbuf_puts(xml, " type=\"bullet\"");
-				break;
-			default:
-				break;
-			}
-			cmark_strbuf_printf(xml, " tight=\"%s\"",
-			                    (cmark_node_get_list_tight(node) ?
-			                     "true" : "false"));
-			break;
-		case CMARK_NODE_HEADER:
-			cmark_strbuf_printf(xml, " level=\"%d\"",
-			                    node->as.header.level);
-			break;
-		case CMARK_NODE_CODE_BLOCK:
-			if (node->as.code.info.len > 0) {
-				cmark_strbuf_puts(xml, " info=\"");
-				escape_xml(xml, node->as.code.info.data,
-				           node->as.code.info.len);
-				cmark_strbuf_putc(xml, '"');
-			}
-			cmark_strbuf_puts(xml, ">");
-			escape_xml(xml, node->as.code.literal.data,
-			           node->as.code.literal.len);
-			cmark_strbuf_puts(xml, "</");
-			cmark_strbuf_puts(xml,
-			                  cmark_node_get_type_string(node));
-			literal = true;
-			break;
-		case CMARK_NODE_LINK:
-		case CMARK_NODE_IMAGE:
-			cmark_strbuf_puts(xml, " destination=\"");
-			escape_xml(xml, node->as.link.url.data,
-			           node->as.link.url.len);
-			cmark_strbuf_putc(xml, '"');
-			cmark_strbuf_puts(xml, " title=\"");
-			escape_xml(xml, node->as.link.title.data,
-			           node->as.link.title.len);
-			cmark_strbuf_putc(xml, '"');
-			break;
-		default:
-			break;
-		}
-		if (node->first_child) {
-			state->indent += 2;
-		} else if (!literal) {
-			cmark_strbuf_puts(xml, " /");
-		}
-		cmark_strbuf_puts(xml, ">\n");
-
-
-	} else if (node->first_child) {
-		state->indent -= 2;
-		indent(state);
-		cmark_strbuf_printf(xml, "</%s>\n",
-		                    cmark_node_get_type_string(node));
-	}
-
-	return 1;
+static int S_render_node(cmark_node *node, cmark_event_type ev_type,
+                         struct render_state *state, int options) {
+  cmark_strbuf *xml = state->xml;
+  bool literal = false;
+  cmark_delim_type delim;
+  bool entering = (ev_type == CMARK_EVENT_ENTER);
+  char buffer[100];
+
+  if (entering) {
+    indent(state);
+    cmark_strbuf_putc(xml, '<');
+    cmark_strbuf_puts(xml, cmark_node_get_type_string(node));
+
+    if (options & CMARK_OPT_SOURCEPOS && node->start_line != 0) {
+      sprintf(buffer, " sourcepos=\"%d:%d-%d:%d\"", node->start_line,
+              node->start_column, node->end_line, node->end_column);
+      cmark_strbuf_puts(xml, buffer);
+    }
+
+    literal = false;
+
+    switch (node->type) {
+    case CMARK_NODE_TEXT:
+    case CMARK_NODE_CODE:
+    case CMARK_NODE_HTML:
+    case CMARK_NODE_INLINE_HTML:
+      cmark_strbuf_puts(xml, ">");
+      escape_xml(xml, node->as.literal.data, node->as.literal.len);
+      cmark_strbuf_puts(xml, "</");
+      cmark_strbuf_puts(xml, cmark_node_get_type_string(node));
+      literal = true;
+      break;
+    case CMARK_NODE_LIST:
+      switch (cmark_node_get_list_type(node)) {
+      case CMARK_ORDERED_LIST:
+        cmark_strbuf_puts(xml, " type=\"ordered\"");
+        sprintf(buffer, " start=\"%d\"", cmark_node_get_list_start(node));
+        cmark_strbuf_puts(xml, buffer);
+        delim = cmark_node_get_list_delim(node);
+        if (delim == CMARK_PAREN_DELIM) {
+          cmark_strbuf_puts(xml, " delim=\"paren\"");
+        } else if (delim == CMARK_PERIOD_DELIM) {
+          cmark_strbuf_puts(xml, " delim=\"period\"");
+        }
+        break;
+      case CMARK_BULLET_LIST:
+        cmark_strbuf_puts(xml, " type=\"bullet\"");
+        break;
+      default:
+        break;
+      }
+      sprintf(buffer, " tight=\"%s\"",
+              (cmark_node_get_list_tight(node) ? "true" : "false"));
+      cmark_strbuf_puts(xml, buffer);
+      break;
+    case CMARK_NODE_HEADER:
+      sprintf(buffer, " level=\"%d\"", node->as.header.level);
+      cmark_strbuf_puts(xml, buffer);
+      break;
+    case CMARK_NODE_CODE_BLOCK:
+      if (node->as.code.info.len > 0) {
+        cmark_strbuf_puts(xml, " info=\"");
+        escape_xml(xml, node->as.code.info.data, node->as.code.info.len);
+        cmark_strbuf_putc(xml, '"');
+      }
+      cmark_strbuf_puts(xml, ">");
+      escape_xml(xml, node->as.code.literal.data, node->as.code.literal.len);
+      cmark_strbuf_puts(xml, "</");
+      cmark_strbuf_puts(xml, cmark_node_get_type_string(node));
+      literal = true;
+      break;
+    case CMARK_NODE_LINK:
+    case CMARK_NODE_IMAGE:
+      cmark_strbuf_puts(xml, " destination=\"");
+      escape_xml(xml, node->as.link.url.data, node->as.link.url.len);
+      cmark_strbuf_putc(xml, '"');
+      cmark_strbuf_puts(xml, " title=\"");
+      escape_xml(xml, node->as.link.title.data, node->as.link.title.len);
+      cmark_strbuf_putc(xml, '"');
+      break;
+    default:
+      break;
+    }
+    if (node->first_child) {
+      state->indent += 2;
+    } else if (!literal) {
+      cmark_strbuf_puts(xml, " /");
+    }
+    cmark_strbuf_puts(xml, ">\n");
+
+  } else if (node->first_child) {
+    state->indent -= 2;
+    indent(state);
+    cmark_strbuf_puts(xml, "</");
+    cmark_strbuf_puts(xml, cmark_node_get_type_string(node));
+    cmark_strbuf_puts(xml, ">\n");
+  }
+
+  return 1;
 }
 
-char *cmark_render_xml(cmark_node *root, int options)
-{
-	char *result;
-	cmark_strbuf xml = GH_BUF_INIT;
-	cmark_event_type ev_type;
-	cmark_node *cur;
-	struct render_state state = { &xml, 0 };
-
-	cmark_iter *iter = cmark_iter_new(root);
-
-	cmark_strbuf_puts(state.xml,
-	                  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-	cmark_strbuf_puts(state.xml,
-	                  "<!DOCTYPE CommonMark SYSTEM \"CommonMark.dtd\">\n");
-	while ((ev_type = cmark_iter_next(iter)) != CMARK_EVENT_DONE) {
-		cur = cmark_iter_get_node(iter);
-		S_render_node(cur, ev_type, &state, options);
-	}
-	result = (char *)cmark_strbuf_detach(&xml);
-
-	cmark_iter_free(iter);
-	return result;
+char *cmark_render_xml(cmark_node *root, int options) {
+  char *result;
+  cmark_strbuf xml = GH_BUF_INIT;
+  cmark_event_type ev_type;
+  cmark_node *cur;
+  struct render_state state = {&xml, 0};
+
+  cmark_iter *iter = cmark_iter_new(root);
+
+  cmark_strbuf_puts(state.xml, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+  cmark_strbuf_puts(state.xml,
+                    "<!DOCTYPE CommonMark SYSTEM \"CommonMark.dtd\">\n");
+  while ((ev_type = cmark_iter_next(iter)) != CMARK_EVENT_DONE) {
+    cur = cmark_iter_get_node(iter);
+    S_render_node(cur, ev_type, &state, options);
+  }
+  result = (char *)cmark_strbuf_detach(&xml);
+
+  cmark_iter_free(iter);
+  return result;
 }

data/ext/commonmarker/cmark/test/CMakeLists.txt

@@ -27,20 +27,20 @@ IF (PYTHONINTERP_FOUND)
 
   add_test(spectest_library
     ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
-    "${CMAKE_SOURCE_DIR}/test/spec.txt" "--library-dir" "${CMAKE_BINARY_DIR}/src"
+    "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
     )
 
   add_test(pathological_tests_library
     ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/pathological_tests.py"
-    "--library-dir" "${CMAKE_BINARY_DIR}/src"
+    "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
     )
 
   add_test(spectest_executable
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_SOURCE_DIR}/test/spec.txt" "--program" "${CMAKE_BINARY_DIR}/src/cmark"
+    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
     )
 
   add_test(smartpuncttest_executable
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_SOURCE_DIR}/test/smart_punct.txt" "--program" "${CMAKE_BINARY_DIR}/src/cmark --smart"
+    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/smart_punct.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark --smart"
     )
 
 ELSE(PYTHONINTERP_FOUND)

data/ext/commonmarker/cmark/test/smart_punct.txt

@@ -58,6 +58,14 @@ by the single quote before `jolly`:
 <p>’tis the season to be ‘jolly’</p>
 .
 
+Multiple apostrophes should not be marked as open/closing quotes.
+
+.
+'We'll use Jane's boat and John's truck,' Jenna said.
+.
+<p>‘We’ll use Jane’s boat and John’s truck,’ Jenna said.</p>
+.
+
 An unmatched double quote will be interpreted as a
 left double quote, to facilitate this style: