commonmarker 0.14.15 → 0.15.0

data/ext/commonmarker/cmark/man/make_man_page.py

@@ -129,5 +129,5 @@ with open(sourcefile, 'r') as cmarkh:
             chunk = []
             mdlines.append('\n')
 
-sys.stdout.write('.TH ' + os.path.basename(sourcefile).replace('.h','') + ' 3 "' + date.today().strftime('%B %d, %Y') + '" "LOCAL" "Library Functions Manual"\n')
+sys.stdout.write('.TH cmark-gfm 3 "' + date.today().strftime('%B %d, %Y') + '" "LOCAL" "Library Functions Manual"\n')
 sys.stdout.write(''.join(mdlines))

data/ext/commonmarker/cmark/man/man1/{cmark.1 → cmark-gfm.1}

@@ -1,14 +1,14 @@
-.TH "cmark" "1" "March 24, 2016" "LOCAL" "General Commands Manual"
+.TH "cmark-gfm" "1" "March 24, 2016" "LOCAL" "General Commands Manual"
 .SH "NAME"
 \fBcmark\fR
-\- convert CommonMark formatted text to HTML
+\- convert CommonMark formatted text with GitHub Flavored Markdown extensions to HTML
 .SH "SYNOPSIS"
 .HP 6n
-\fBcmark\fR
+\fBcmark-gfm\fR
 [options]
 file*
 .SH "DESCRIPTION"
-\fBcmark\fR
+\fBcmark-gfm\fR
 converts Markdown formatted plain text to either HTML, groff man,
 CommonMark XML, LaTeX, or CommonMark, using the conventions
 described in the CommonMark spec.  It reads input from \fIstdin\fR
@@ -42,6 +42,12 @@ Include source position attribute.
 .B \-\-normalize
 Consolidate adjacent text nodes.
 .TP 12n
+.B \-\-extension, \-e \f[I]EXTENSION_NAME\f[]
+Specify an extension name to use.
+.TP 12n
+.B \-\-list\-extensions
+List available extensions and quit.
+.TP 12n
 .B \-\-validate-utf8
 Validate UTF-8, replacing illegal sequences with U+FFFD.
 .TP 12n

data/ext/commonmarker/cmark/man/man3/cmark-gfm.3

@@ -1,8 +1,8 @@
-.TH cmark 3 "March 28, 2017" "LOCAL" "Library Functions Manual"
+.TH cmark-gfm 3 "April 03, 2017" "LOCAL" "Library Functions Manual"
 .SH
 NAME
 .PP
-\f[B]cmark\f[] \- CommonMark parsing, manipulating, and rendering
+\f[B]cmark\-gfm\f[] \- CommonMark parsing, manipulating, and rendering
 
 .SH
 DESCRIPTION

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

@@ -42,8 +42,12 @@ void cmark_strbuf_grow(cmark_strbuf *buf, bufsize_t target_size) {
   if (target_size < buf->asize)
     return;
 
-  if (target_size > (bufsize_t)(INT32_MAX / 2))
+  if (target_size > (bufsize_t)(INT32_MAX / 2)) {
+    fprintf(stderr,
+      "[cmark] cmark_strbuf_grow requests buffer with size > %d, aborting\n",
+         (INT32_MAX / 2));
     abort();
+  }
 
   /* Oversize the buffer by 50% to guarantee amortized linear time
    * complexity on append operations. */

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

@@ -16,15 +16,19 @@ const char *cmark_version_string() { return CMARK_VERSION_STRING; }
 
 static void *xcalloc(size_t nmem, size_t size) {
   void *ptr = calloc(nmem, size);
-  if (!ptr)
+  if (!ptr) {
+    fprintf(stderr, "[cmark] calloc returned null pointer, aborting\n");
     abort();
+  }
   return ptr;
 }
 
 static void *xrealloc(void *ptr, size_t size) {
   void *new_ptr = realloc(ptr, size);
-  if (!new_ptr)
+  if (!new_ptr) {
+    fprintf(stderr, "[cmark] realloc returned null pointer, aborting\n");
     abort();
+  }
   return new_ptr;
 }
 

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

@@ -11,7 +11,7 @@ extern "C" {
 
 /** # NAME
  *
- * **cmark** - CommonMark parsing, manipulating, and rendering
+ * **cmark-gfm** - CommonMark parsing, manipulating, and rendering
  */
 
 /** # DESCRIPTION

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

@@ -115,11 +115,9 @@ typedef struct delimiter {
   struct delimiter *next;
   cmark_node *inl_text;
   bufsize_t length;
-  int position;
   unsigned char delim_char;
   int can_open;
   int can_close;
-  int active;
 } delimiter;
 
 /**

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

@@ -33,8 +33,7 @@ static CMARK_INLINE void outc(cmark_renderer *renderer, cmark_node *node,
   needs_escaping =
       c < 0x80 && escape != LITERAL &&
       ((escape == NORMAL &&
-        ((node->parent && node->parent->extension && node->parent->extension->commonmark_escape_func && node->parent->extension->commonmark_escape_func(node->extension, node->parent, c)) ||
-         c == '*' || c == '_' || c == '[' || c == ']' || c == '#' || c == '<' ||
+        (c == '*' || c == '_' || c == '[' || c == ']' || c == '#' || c == '<' ||
          c == '>' || c == '\\' || c == '`' || c == '!' ||
          (c == '&' && cmark_isalpha(nextc)) || (c == '!' && nextc == '[') ||
          (renderer->begin_content && (c == '-' || c == '+' || c == '=') &&

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

@@ -1209,7 +1209,7 @@ void cmark_parse_inlines(cmark_parser *parser,
   process_emphasis(parser, &subj, NULL);
   // free bracket and delim stack
   while (subj.last_delim) {
-    pop_bracket(&subj);
+    remove_delimiter(&subj, subj.last_delim);
   }
   while (subj.last_bracket) {
     pop_bracket(&subj);

data/ext/commonmarker/cmark/src/libcmark-gfm.pc.in

@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_PREFIX@/lib
+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
 includedir=@CMAKE_INSTALL_PREFIX@/include
 
 Name: libcmark-gfm

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

@@ -40,7 +40,7 @@ void print_usage() {
   printf("  --smart           Use smart punctuation\n");
   printf("  --github-pre-lang Use GitHub-style <pre lang> for code blocks\n");
   printf("  --normalize       Consolidate adjacent text nodes\n");
-  printf("  -e, --extension EXTENSION_NAME Specify an extension name to use\n");
+  printf("  --extension, -e EXTENSION_NAME Specify an extension name to use\n");
   printf("  --list-extensions              List available extensions and quit\n");
   printf("  --help, -h        Print usage information\n");
   printf("  --version         Print version\n");

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

@@ -5,6 +5,7 @@
 #include "utf8.h"
 #include "render.h"
 #include "node.h"
+#include "syntax_extension.h"
 
 static CMARK_INLINE void S_cr(cmark_renderer *renderer) {
   if (renderer->need_cr < 1) {
@@ -30,6 +31,16 @@ static void S_out(cmark_renderer *renderer, cmark_node *node,
   cmark_chunk remainder = cmark_chunk_literal("");
   int k = renderer->buffer->size - 1;
 
+  cmark_syntax_extension *ext = NULL;
+  cmark_node *n = node;
+  while (n && !ext) {
+    ext = n->extension;
+    if (!ext)
+      n = n->parent;
+  }
+  if (ext && !ext->commonmark_escape_func)
+    ext = NULL;
+
   wrap = wrap && !renderer->no_linebreaks;
 
   if (renderer->in_tight_list_item && renderer->need_cr > 1) {
@@ -63,6 +74,10 @@ static void S_out(cmark_renderer *renderer, cmark_node *node,
     if (len == -1) { // error condition
       return;        // return without rendering rest of string
     }
+
+    if (ext && ext->commonmark_escape_func(ext, node, c))
+      cmark_strbuf_putc(renderer->buffer, '\\');
+
     nextc = source[i + len];
     if (c == 32 && wrap) {
       if (!renderer->begin_line) {

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

@@ -254,8 +254,8 @@ Tables with embedded pipes could be tricky.
 | a | b |
 | --- | --- |
 | Escaped pipes are \|okay\|. | Like \| this. |
-| Within `|code| is okay` too. |
-| _**`c|`**_ \| complex
+| Within `\|code\| is okay` too. |
+| _**`c\|`**_ \| complex
 | don't **\_reparse\_**
 .
 <table>
@@ -344,7 +344,7 @@ This shouldn't assert.
 </tr>
 <tr>
 <td>|</td>
-<td><code>\|</code></td>
+<td><code>|</code></td>
 </tr>
 <tr>
 <td>\a</td>
@@ -427,6 +427,27 @@ Here's a link to [Freedom Planet 2][].
 </tr></tbody></table>
 ````````````````````````````````
 
+### Interaction with emphasis
+
+```````````````````````````````` example
+| a | b |
+| --- | --- |
+|***(a)***|
+.
+<table>
+<thead>
+<tr>
+<th>a</th>
+<th>b</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><em><strong>(a)</strong></em></td>
+<td></td>
+</tr></tbody></table>
+````````````````````````````````
+
 
 ## Strikethroughs
 

data/ext/commonmarker/cmark/test/roundtrip_tests.py

@@ -46,4 +46,5 @@ result_counts = {'pass': 0, 'fail': 0, 'error': 0, 'skip': 0}
 for test in tests:
     do_test(converter, test, args.normalize, result_counts)
 
+sys.stdout.buffer.write("{pass} passed, {fail} failed, {error} errored, {skip} skipped\n".format(**result_counts).encode('utf-8'))
 exit(result_counts['fail'] + result_counts['error'])

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

@@ -1,13 +1,25 @@
 ---
-title: CommonMark Spec
-author: John MacFarlane
+title: GitHub Flavored Markdown Spec
 version: 0.27
-date: '2016-11-18'
+date: '2017-2-20'
 license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
 ...
 
 # Introduction
 
+## What is GitHub Flavored Markdown?
+
+GitHub Flavored Markdown, often shortened as GFM, is the dialect of Markdown
+that is currently supported for user content on GitHub.com and GitHub
+Enterprise.
+
+This formal specification, based on the CommonMark Spec, defines the syntax and
+semantics of this dialect.
+
+GFM is a strict superset of CommonMark. All the features which are supported in
+GitHub user content and that are not specified on the original CommonMark Spec
+are hence known as **extensions**, and highlighted as such.
+
 ## What is Markdown?
 
 Markdown is a plain text format for writing structured documents,
@@ -3165,8 +3177,8 @@ aaa
 
 ## Tables (extension)
 
-If the `table` extension is enabled, an additional leaf block type is
-available
+GFM enables the `table` extension, where an additional leaf block type is
+available.
 
 A [table](@) is an arrangement of data with rows and columns, consisting of a
 single header row, a [delimiter row] separating the header from the data, and
@@ -3223,14 +3235,14 @@ bar | baz
 </tr></tbody></table>
 ````````````````````````````````
 
-Include a pipe in a cell's content by escaping it. Pipes inside other inline
-spans (such as emphasis, code, etc.) will not break a cell:
+Include a pipe in a cell's content by escaping it, including inside other
+inline spans:
 
 ```````````````````````````````` example table
 | f\|oo  |
 | ------ |
-| b `|` az |
-| b **|** im |
+| b `\|` az |
+| b **\|** im |
 .
 <table>
 <thead>
@@ -3314,8 +3326,8 @@ a table will not be recognized:
 ````````````````````````````````
 
 The remainder of the table's rows may vary in the number of cells.  If there
-are a number of cells than the header, empty cells are inserted.  If there are
-greater, the excess is ignored:
+are a number of cells fewer than the number of cells in the header row, empty
+cells are inserted.  If there are greater, the excess is ignored:
 
 ```````````````````````````````` example table
 | abc | def |
@@ -4907,6 +4919,63 @@ that in such cases, we require one space indentation from the list marker
 four-space rule in cases where the list marker plus its initial indentation
 takes four spaces (a common case), but diverge in other cases.
 
+<div class="extension">
+
+## Task list items (extension)
+
+GFM enables the `tasklist` extension, where an additional processing step is
+performed on [list items].
+
+A [task list item](@) is a [list item][list items] where the first block in it
+is a paragraph which begins with a [task list item marker] and at least one
+whitespace character before any other content.
+
+A [task list item marker](@) consists of an optional number of spaces, a left
+bracket (`[`), either a whitespace character or the letter `x` in either
+lowercase or uppercase, and then a right bracket (`]`).
+
+When rendered, the [task list item marker] is replaced with a semantic checkbox element;
+in an HTML output, this would be an `<input type="checkbox">` element.
+
+If the character between the brackets is a whitespace character, the checkbox
+is unchecked.  Otherwise, the checkbox is checked.
+
+This spec does not define how the checkbox elements are interacted with: in practice,
+implementors are free to render the checkboxes as disabled or inmutable elements,
+or they may dynamically handle dynamic interactions (i.e. checking, unchecking) in
+the final rendered document.
+
+```````````````````````````````` example disabled
+- [ ] foo
+- [x] bar
+.
+<ul>
+<li><input disabled="" type="checkbox"> foo</li>
+<li><input checked="" disabled="" type="checkbox"> bar</li>
+</ul>
+````````````````````````````````
+
+Task lists can be arbitrarily nested:
+
+```````````````````````````````` example disabled
+- [x] foo
+  - [ ] bar
+  - [x] baz
+- [ ] bim
+.
+<ul>
+<li><input checked="" disabled="" type="checkbox"> foo
+<ul>
+<li><input disabled="" type="checkbox"> bar</li>
+<li><input checked="" disabled="" type="checkbox"> baz</li>
+</ul>
+</li>
+<li><input disabled="" type="checkbox"> bim</li>
+</ul>
+````````````````````````````````
+
+</div>
+
 ## Lists
 
 A [list](@) is a sequence of one or more
@@ -7292,7 +7361,7 @@ __a<http://foo.bar/?q=__>
 
 ## Strikethrough (extension)
 
-If the `strikethrough` extension is enabled, an additional emphasis type is
+GFM enables the `strikethrough` extension, where an additional emphasis type is
 available.
 
 Strikethrough text is any text wrapped in tildes (`~`).
@@ -8750,7 +8819,7 @@ foo@bar.example.com
 
 ## Autolinks (extension)
 
-If the `autolink` extension is enabled, autolinks will be recognised in a
+GFM enables the `autolink` extension, where autolinks will be recognised in a
 greater number of conditions.
 
 [Autolink]s can also be constructed without requiring the use of `<` and to `>`
@@ -9179,9 +9248,9 @@ foo <a href="\*">
 
 <div class="extension">
 
-## Raw HTML (extension)
+## Disallowed Raw HTML (extension)
 
-If the `tagfilter` extension is enabled, the following HTML tags will be
+GFM enables the `tagfilter` extension, where the following HTML tags will be
 filtered when rendering HTML output:
 
 * `<title>`

data/ext/commonmarker/cmark/test/spec_tests.py

@@ -104,14 +104,15 @@ def get_tests(specfile):
                 state = 0
                 example_number = example_number + 1
                 end_line = line_number
-                tests.append({
-                    "markdown":''.join(markdown_lines).replace('→',"\t"),
-                    "html":''.join(html_lines).replace('→',"\t"),
-                    "example": example_number,
-                    "start_line": start_line,
-                    "end_line": end_line,
-                    "section": headertext,
-                    "extensions": extensions})
+                if 'disabled' not in extensions:
+                    tests.append({
+                        "markdown":''.join(markdown_lines).replace('→',"\t"),
+                        "html":''.join(html_lines).replace('→',"\t"),
+                        "example": example_number,
+                        "start_line": start_line,
+                        "end_line": end_line,
+                        "section": headertext,
+                        "extensions": extensions})
                 start_line = 0
                 markdown_lines = []
                 html_lines = []

data/ext/commonmarker/cmark/tools/Dockerfile

@@ -22,3 +22,15 @@ RUN wget http://lcamtuf.coredump.cx/afl/releases/afl-latest.tgz && \
 	make install && \
 	cd .. && \
 	rm -rf afl-*
+
+RUN apt-get install -y man
+
+RUN wget https://github.com/skvadrik/re2c/releases/download/0.15.3/re2c-0.15.3.tar.gz && \
+	tar xf re2c-0.15.3.tar.gz && \
+	cd re2c-* && \
+	./configure && \
+	make install && \
+	cd .. && \
+	rm -rf re2c-*
+
+RUN apt-get install -y clang-format-3.5