commonmarker 0.14.14 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6d4aa63cc2e20379e7fc57e8fafd87fc0d3d004
-  data.tar.gz: 7bb2af43330702e69f2aede9b9f6442d88e61e85
+  metadata.gz: 828326c7f9a66b8e7caa67ea4bd8eae887f349c2
+  data.tar.gz: b6036c31b529bc7fe63d80217aa6931ce51b126d
 SHA512:
-  metadata.gz: 47615b3ee50b0213f9113a8d305e1697d1d7551551e43796077099146952156e3fdb837da704b69e1a8ed0aee6ba7a16933ad68556a7659b2e06f1a064513632
-  data.tar.gz: f7b3761ee08eecbe5d365bf07340a560b8117b398028d2fa7a414bace3792f86bb6c13c44a757a2973ac5e08b12a28ffb4ccada7c5c75b38a0857d4c0a0196db
+  metadata.gz: 230cdde9843b531264c4346ea420b1aaa766713bd26b43a73531d2e263345d088779866d5bd1d6b1ae5190fbc642ed74bda1506198762b5ea3d7da20742dbb18
+  data.tar.gz: cd36ec10001cc1df2219e371b5bd02d27965558ce68cdfa17199c9cbc093cccc988a1b4845772434aa9439978b2b09ec454e2e6b8ec94b9569f0c990a468da12

data/README.md

@@ -35,7 +35,7 @@ The second argument is optional--[see below](#options) for more information.
 
 ### Generating a document
 
-You can also parse a string to receive a `Document` node. You can than print that node to HTML, iterate over the children, and other fun node stuff. For example:
+You can also parse a string to receive a `Document` node. You can then print that node to HTML, iterate over the children, and other fun node stuff. For example:
 
 ``` ruby
 require 'commonmarker'

data/commonmarker.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
   s.executables = ['commonmarker']
   s.require_paths = %w(lib ext)
 
+  s.rdoc_options += ['-x', 'ext/commonmarker/cmark/.*']
+
   s.add_dependency 'ruby-enum', '~> 0.5'
 
   s.add_development_dependency 'minitest', '~> 5.6'

data/ext/commonmarker/cmark/Makefile

@@ -15,18 +15,18 @@ BENCHSAMPLES=$(wildcard $(BENCHDIR)/samples/*.md)
 BENCHFILE=$(BENCHDIR)/benchinput.md
 ALLTESTS=alltests.md
 NUMRUNS?=20
-CMARK=$(BUILDDIR)/src/cmark
+CMARK=$(BUILDDIR)/src/cmark-gfm
 PROG?=$(CMARK)
 VERSION?=$(SPECVERSION)
 RELEASE?=CommonMark-$(VERSION)
 INSTALL_PREFIX?=/usr/local
 CLANG_CHECK?=clang-check
-CLANG_FORMAT=clang-format -style llvm -sort-includes=0 -i
+CLANG_FORMAT=clang-format-3.5 -style llvm -sort-includes=0 -i
 AFL_PATH?=/usr/local/bin
 
-.PHONY: all cmake_build leakcheck clean fuzztest test debug ubsan asan mingw archive newbench bench format update-spec afl clang-check
+.PHONY: all cmake_build leakcheck clean fuzztest test debug ubsan asan mingw archive newbench bench format update-spec afl clang-check docker
 
-all: cmake_build man/man3/cmark.3
+all: cmake_build man/man3/cmark-gfm.3
 
 $(CMARK): cmake_build
 
@@ -80,6 +80,7 @@ afl:
 	    -i test/afl_test_cases \
 	    -o test/afl_results \
 	    -x test/afl_dictionary \
+	    $(AFL_OPTIONS) \
 	    -t 100 \
 	    $(CMARK) -e table -e strikethrough -e autolink -e tagfilter $(CMARK_OPTS)
 
@@ -92,7 +93,7 @@ mingw:
 	cmake .. -DCMAKE_TOOLCHAIN_FILE=../toolchain-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$(MINGW_INSTALLDIR) ;\
 	$(MAKE) && $(MAKE) install
 
-man/man3/cmark.3: src/cmark.h | $(CMARK)
+man/man3/cmark-gfm.3: src/cmark.h | $(CMARK)
 	python man/make_man_page.py $< > $@ \
 
 archive:
@@ -131,7 +132,7 @@ $(EXTDIR)/ext_scanners.c: $(EXTDIR)/ext_scanners.re
 	esac
 	re2c --case-insensitive -b -i --no-generation-date -8 \
 		--encoding-policy substitute -o $@ $<
-	clang-format -style llvm -i $@
+	clang-format-3.5 -style llvm -i $@
 
 # We include entities.inc in the repository, so normally this
 # doesn't need to be regenerated:
@@ -156,7 +157,7 @@ $(ALLTESTS): $(SPEC) $(EXTENSIONS_SPEC)
 leakcheck: $(ALLTESTS)
 	for format in html man xml latex commonmark; do \
 	  for opts in "" "--smart" "--normalize"; do \
-	     echo "cmark -t $$format -e table -e strikethrough -e autolink -e tagfilter $$opts" ; \
+	     echo "cmark-gfm -t $$format -e table -e strikethrough -e autolink -e tagfilter $$opts" ; \
 	     valgrind -q --leak-check=full --dsymutil=yes --suppressions=suppressions --error-exitcode=1 $(PROG) -t $$format -e table -e strikethrough -e autolink -e tagfilter $$opts $(ALLTESTS) >/dev/null || exit 1;\
 	  done; \
 	done;
@@ -202,7 +203,7 @@ format:
 	$(CLANG_FORMAT) src/*.c src/*.h api_test/*.c api_test/*.h
 
 format-extensions:
-	clang-format -style llvm -i extensions/*.c extensions/*.h
+	clang-format-3.5 -style llvm -i extensions/*.c extensions/*.h
 
 operf: $(CMARK)
 	operf $< < $(BENCHFILE) > /dev/null
@@ -211,3 +212,7 @@ distclean: clean
 	-rm -rf *.dSYM
 	-rm -f README.html
 	-rm -rf $(BENCHFILE) $(ALLTESTS) progit
+
+docker:
+	docker build -t cmark $(CURDIR)/tools
+	docker run --privileged -t -i -v $(CURDIR):/src/cmark -w /src/cmark cmark /bin/bash

data/ext/commonmarker/cmark/README.md

@@ -1,13 +1,19 @@
-cmark
-=====
+cmark-gfm
+=========
 
-[![Build Status]](https://travis-ci.org/jgm/cmark)
-[![Windows Build Status]](https://ci.appveyor.com/project/jgm/cmark)
+[![Build Status]](https://travis-ci.org/github/cmark)
+[![Windows Build Status]](https://ci.appveyor.com/project/github/cmark)
 
-`cmark` is the C reference implementation of [CommonMark], a
-rationalized version of Markdown syntax with a [spec][the spec].
-(For the JavaScript reference implementation, see
-[commonmark.js].)
+`cmark-gfm` is an extended version of the C reference implementation of
+[CommonMark], a rationalized version of Markdown syntax with a spec.  This
+repository adds GitHub Flavored Markdown extensions to
+[the upstream implementation], as defined in [the spec].
+
+The rest of the README is preserved as-is from the upstream source.  Note that
+the library and binaries produced by this fork are suffixed with `-gfm` in
+order to distinguish them from the upstream.
+
+---
 
 It provides a shared library (`libcmark`) with functions for parsing
 CommonMark documents to an abstract syntax tree (AST), manipulating
@@ -178,11 +184,12 @@ Nick Wellnhofer contributed many improvements, including
 most of the C library's API and its test harness.
 
 [benchmarks]: benchmarks.md
-[the spec]: http://spec.commonmark.org
+[the spec]: https://github.github.com/gfm/
+[the upstream implementation]: https://github.com/jgm/cmark
 [CommonMark]: http://commonmark.org
 [cmake]: http://www.cmake.org/download/
 [re2c]: http://re2c.org
 [commonmark.js]: https://github.com/jgm/commonmark.js
-[Build Status]: https://img.shields.io/travis/jgm/cmark/master.svg?style=flat
-[Windows Build Status]: https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true
+[Build Status]: https://img.shields.io/travis/github/cmark/master.svg?style=flat
+[Windows Build Status]: https://ci.appveyor.com/api/projects/status/wv7ifhqhv5itm3d5?svg=true
 [american fuzzy lop]: http://lcamtuf.coredump.cx/afl/

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

@@ -8,7 +8,7 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/src
   ${PROJECT_BINARY_DIR}/src
 )
-target_link_libraries(api_test libcmark ${CMAKE_DL_LIBS})
+target_link_libraries(api_test libcmark-gfm ${CMAKE_DL_LIBS})
 
 # Compiler flags
 if(MSVC)

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

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
-set(LIBRARY "libcmarkextensions")
-set(STATICLIBRARY "libcmarkextensions_static")
+set(LIBRARY "libcmark-gfmextensions")
+set(STATICLIBRARY "libcmark-gfmextensions_static")
 set(LIBRARY_SOURCES
     core-extensions.c
     table.c
@@ -38,7 +38,7 @@ if (CMARK_SHARED)
   add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
 
   set_target_properties(${LIBRARY} PROPERTIES
-  OUTPUT_NAME "cmarkextensions"
+  OUTPUT_NAME "cmark-gfmextensions"
   SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
   VERSION ${PROJECT_VERSION})
 
@@ -46,10 +46,10 @@ if (CMARK_SHARED)
     APPEND PROPERTY MACOSX_RPATH true)
 
   # Avoid name clash between PROGRAM and LIBRARY pdb files.
-  set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmarkextensions_dll)
+  set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark-gfmextensions_dll)
 
   list(APPEND CMARK_INSTALL ${LIBRARY})
-  target_link_libraries(${LIBRARY} libcmark)
+  target_link_libraries(${LIBRARY} libcmark-gfm)
 
   generate_export_header(${LIBRARY} BASE_NAME cmarkextensions)
 endif()
@@ -63,11 +63,11 @@ if (CMARK_STATIC)
 
   if (MSVC)
     set_target_properties(${STATICLIBRARY} PROPERTIES
-      OUTPUT_NAME "cmarkextensions_static"
+      OUTPUT_NAME "cmark-gfmextensions_static"
       VERSION ${PROJECT_VERSION})
   else()
     set_target_properties(${STATICLIBRARY} PROPERTIES
-      OUTPUT_NAME "cmarkextensions"
+      OUTPUT_NAME "cmark-gfmextensions"
       VERSION ${PROJECT_VERSION})
   endif(MSVC)
 endif()