commonmarker 0.14.14 → 0.15.0

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/CMakeLists.txt

@@ -55,22 +55,22 @@ IF (PYTHONINTERP_FOUND)
   endif()
 
   add_test(spectest_executable
-    ${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"
+    ${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-gfm"
     )
 
   add_test(smartpuncttest_executable
-    ${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"
+    ${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-gfm --smart"
     )
 
   add_test(extensions_executable
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/extensions.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark" "--extensions" "table strikethrough autolink tagfilter"
+    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/extensions.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark-gfm" "--extensions" "table strikethrough autolink tagfilter"
     )
 
   add_test(roundtrip_extensions_executable
     ${PYTHON_EXECUTABLE}
     "${CMAKE_CURRENT_SOURCE_DIR}/roundtrip_tests.py"
     "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/extensions.txt"
-    "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
+    "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark-gfm"
     "--extensions" "table strikethrough autolink tagfilter"
     )
 
@@ -78,7 +78,7 @@ IF (PYTHONINTERP_FOUND)
     ${PYTHON_EXECUTABLE}
     "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
     "${CMAKE_CURRENT_SOURCE_DIR}/regression.txt" "--program"
-    "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
+    "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark-gfm"
     )
 
 

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

@@ -94,13 +94,13 @@ class CMark:
             if not library_dir:
                 library_dir = os.path.join("build", "src")
             for prefix, suffix in libnames:
-                candidate = os.path.join(library_dir, prefix + "cmark" + suffix)
+                candidate = os.path.join(library_dir, prefix + "cmark-gfm" + suffix)
                 if os.path.isfile(candidate):
                     libpath = candidate
                     break
             cmark = CDLL(libpath)
             extlib = CDLL(os.path.join(
-                library_dir, "..", "extensions", prefix + "cmarkextensions" + suffix))
+                library_dir, "..", "extensions", prefix + "cmark-gfmextensions" + suffix))
             self.to_html = lambda x, exts=[]: to_html(cmark, extlib, x, exts + self.extensions)
             self.to_commonmark = lambda x, exts=[]: to_commonmark(cmark, extlib, x, exts + self.extensions)
 

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

@@ -0,0 +1,36 @@
+FROM debian:jessie
+
+RUN apt-get update && apt-get install -y \
+  build-essential autoconf libtool \
+  git \
+  pkg-config \
+  && apt-get clean
+
+RUN apt-get install -y \
+  cmake \
+  gdb \
+  valgrind \
+  python3
+
+RUN apt-get install -y \
+  wget \
+  clang
+
+RUN wget http://lcamtuf.coredump.cx/afl/releases/afl-latest.tgz && \
+	tar xf afl-latest.tgz && \
+	cd afl-* && \
+	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

data/ext/commonmarker/extconf.rb

@@ -28,8 +28,8 @@ Dir.chdir(CMARK_BUILD_DIR) do
   else
   system 'cmake .. -DCMAKE_C_FLAGS=-fPIC'
   end
-  system "make libcmark_static" or abort "make libcmark_static failed"
-  system "make libcmarkextensions_static" or abort "make libcmarkextensions_static failed"
+  system "make libcmark-gfm_static" or abort "make libcmark-gfm_static failed"
+  system "make libcmark-gfmextensions_static" or abort "make libcmark-gfmextensions_static failed"
   # rake-compiler seems to complain about this line, not sure why it's messing with it
   FileUtils.rm_rf(File.join(CMARK_BUILD_DIR, 'Testing', 'Temporary'))
 end
@@ -41,11 +41,11 @@ dir_config('cmark', HEADER_DIRS, LIB_DIRS)
 
 # don't even bother to do this check if using OS X's messed up system Ruby: http://git.io/vsxkn
 unless sitearch =~ /^universal-darwin/
-  abort 'libcmark is missing.' unless find_library('cmark', 'cmark_parse_document')
-  abort 'cmarkextensions is missing.' unless find_library('cmarkextensions', 'core_extensions_registration')
+  abort 'libcmark-gfm is missing.' unless find_library('cmark-gfm', 'cmark_parse_document')
+  abort 'libcmark-gfmextensions is missing.' unless find_library('cmark-gfmextensions', 'core_extensions_registration')
 end
 
-$LDFLAGS << " -L#{CMARK_BUILD_DIR}/src -L#{CMARK_BUILD_DIR}/extensions -lcmark -lcmarkextensions"
+$LDFLAGS << " -L#{CMARK_BUILD_DIR}/src -L#{CMARK_BUILD_DIR}/extensions -lcmark-gfm -lcmark-gfmextensions"
 $CFLAGS << " -O2 -I#{CMARK_DIR}/src -I#{CMARK_DIR}/extensions -I#{CMARK_BUILD_DIR}/src -I#{CMARK_BUILD_DIR}/extensions"
 $CFLAGS << " -DCMARK_STATIC_DEFINE -DCMARKEXTENSIONS_STATIC_DEFINE"
 

data/lib/commonmarker/node/inspect.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'pp'
+
+module CommonMarker
+  class Node
+    module Inspect
+      PP_INDENT_SIZE = 2
+
+      def inspect
+        PP.pp(self, String.new, Float::INFINITY)
+      end
+
+      # @param [PrettyPrint] pp
+      def pretty_print(pp)
+        pp.group(PP_INDENT_SIZE, "#<#{self.class}(#{type}):", '>') do
+          pp.breakable
+
+          attrs = %i[
+            sourcepos
+            string_content
+            url
+            title
+            header_level
+            list_type
+            list_start
+            list_tight
+            fence_info
+          ].map do |name|
+            begin
+              [name, __send__(name)]
+            rescue NodeError
+              nil
+            end
+          end.compact
+
+          pp.seplist(attrs) do |name, value|
+            pp.text "#{name}="
+            pp.pp value
+          end
+
+          if first_child
+            pp.breakable
+            pp.group(PP_INDENT_SIZE) do
+              children = []
+              node = first_child
+              while node
+                children << node
+                node = node.next
+              end
+              pp.text 'children='
+              pp.pp children
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/commonmarker/node.rb

@@ -1,6 +1,9 @@
+require 'commonmarker/node/inspect'
+
 module CommonMarker
   class Node
     include Enumerable
+    include Inspect
 
     # Public: An iterator that "walks the tree," descending into children recursively.
     #

data/lib/commonmarker/version.rb

@@ -1,3 +1,3 @@
 module CommonMarker
-  VERSION = '0.14.14'.freeze
+  VERSION = '0.15.0'.freeze
 end

data/test/test_node.rb

@@ -78,4 +78,12 @@ class TestNode < Minitest::Test
     end
     assert_equal "<p>Hi there, I am mostly text!</p>\n", @doc.to_html
   end
+
+  def test_inspect
+    assert_match /#<CommonMarker::Node\(document\):/, @doc.inspect
+  end
+
+  def test_pretty_print
+    assert_match /#<CommonMarker::Node\(document\):/, PP.pp(@doc, '')
+  end
 end

data/test/test_spec.rb

@@ -5,7 +5,7 @@ class TestSpec < Minitest::Test
   spec = open_spec_file('spec.txt')
 
   spec.each do |testcase|
-    # next unless testcase['example'] == 420
+    next if testcase[:extensions].include?(:disabled)
     doc = CommonMarker.render_doc(testcase[:markdown], :DEFAULT, testcase[:extensions])
 
     define_method("test_to_html_example_#{testcase[:example]}") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.14.14
+  version: 0.15.0
 platform: ruby
 authors:
 - Garen Torikian
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum
@@ -182,8 +182,8 @@ files:
 - ext/commonmarker/cmark/extensions/tagfilter.h
 - ext/commonmarker/cmark/man/CMakeLists.txt
 - ext/commonmarker/cmark/man/make_man_page.py
-- ext/commonmarker/cmark/man/man1/cmark.1
-- ext/commonmarker/cmark/man/man3/cmark.3
+- ext/commonmarker/cmark/man/man1/cmark-gfm.1
+- ext/commonmarker/cmark/man/man3/cmark-gfm.3
 - ext/commonmarker/cmark/nmake.bat
 - ext/commonmarker/cmark/src/CMakeLists.txt
 - ext/commonmarker/cmark/src/arena.c
@@ -212,7 +212,7 @@ files:
 - ext/commonmarker/cmark/src/iterator.c
 - ext/commonmarker/cmark/src/iterator.h
 - ext/commonmarker/cmark/src/latex.c
-- ext/commonmarker/cmark/src/libcmark.pc.in
+- ext/commonmarker/cmark/src/libcmark-gfm.pc.in
 - ext/commonmarker/cmark/src/linked_list.c
 - ext/commonmarker/cmark/src/main.c
 - ext/commonmarker/cmark/src/man.c
@@ -298,6 +298,7 @@ files:
 - ext/commonmarker/cmark/test/spec.txt
 - ext/commonmarker/cmark/test/spec_tests.py
 - ext/commonmarker/cmark/toolchain-mingw32.cmake
+- ext/commonmarker/cmark/tools/Dockerfile
 - ext/commonmarker/cmark/tools/appveyor-build.bat
 - ext/commonmarker/cmark/tools/make_entities_inc.py
 - ext/commonmarker/cmark/tools/mkcasefold.pl
@@ -311,6 +312,7 @@ files:
 - lib/commonmarker.rb
 - lib/commonmarker/config.rb
 - lib/commonmarker/node.rb
+- lib/commonmarker/node/inspect.rb
 - lib/commonmarker/renderer.rb
 - lib/commonmarker/renderer/html_renderer.rb
 - lib/commonmarker/version.rb
@@ -337,7 +339,9 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- "-x"
+- ext/commonmarker/cmark/.*
 require_paths:
 - lib
 - ext

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

@@ -1,10 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_PREFIX@/lib
-includedir=@CMAKE_INSTALL_PREFIX@/include
-
-Name: libcmark
-Description: CommonMark parsing, rendering, and manipulation
-Version: @PROJECT_VERSION@
-Libs: -L${libdir} -lcmark
-Cflags: -I${includedir}