commonmarker 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e855f9f6f32138265b19ab35063080b3b61c2f
-  data.tar.gz: 4702b402037a3cba2062343b130cedb4703fec00
+  metadata.gz: f47e1115fc03d5a3d93db2ece1626fb2c38ba6b3
+  data.tar.gz: 8fe93860696f9344e3ef097bc7cd00e971bdb391
 SHA512:
-  metadata.gz: 552b76cad8bab6d9fd4c7afd0aeca88dd13c657ed7770993604e2acce2d144072e47d3dbbe6d8c29d4baaa0427bc2be9e956636b11118ede868f4cd9138171de
-  data.tar.gz: 88cf6715b32ca88e98d038d6782666cbd85bbbc3ff3c9722507940eb699dbcf0f1e80c3dd97147369413fab87003256ebf0c7a3f3bf214eb3eee1ad55044afca
+  metadata.gz: 6ba87287a25a9758033ac659d6c39ac30e7bf551f9ce0890593fa5d0287973bb77996896945850aaaf73a152eb110c623d42301f00ba39d951b2280d32d18b4f
+  data.tar.gz: fd802cf0b355314b87674b3cea0b78caefb6bdb7bcc59c5e7dbbfbdee633fff4e6f6e227fcd8df57f29d09472f43e4a0f268a34aed1a9f1c5b62c8488355ab10

data/ext/commonmarker/cmark/CMakeLists.txt

@@ -19,12 +19,12 @@ set(PROJECT_NAME "cmark")
 set(PROJECT_VERSION_MAJOR 0)
 set(PROJECT_VERSION_MINOR 27)
 set(PROJECT_VERSION_PATCH 1)
-set(PROJECT_VERSION_GFM 0)
+set(PROJECT_VERSION_GFM 1)
 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM} )
 
 option(CMARK_TESTS "Build cmark tests and enable testing" ON)
-option(CMARK_STATIC "Build static libcmark library" ON)
-option(CMARK_SHARED "Build shared libcmark library" ON)
+option(CMARK_STATIC "Build static libcmark-gfm library" ON)
+option(CMARK_SHARED "Build shared libcmark-gfm library" ON)
 
 add_subdirectory(src)
 add_subdirectory(extensions)

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-gfm ${CMAKE_DL_LIBS})
+target_link_libraries(api_test libcmark-gfm)
 
 # Compiler flags
 if(MSVC)

data/ext/commonmarker/cmark/changelog.txt

@@ -1,3 +1,10 @@
+[0.27.1.gfm.1]
+
+  * Add plaintext renderer.
+  * Remove normalize option; we now always normalize the AST.
+  * Add getters for table alignment.
+  * `make install` also installs the extensions static/shared library.
+
 [0.27.1.gfm.0]
 
   * Add extensions: tagfilter, strikethrough, table, autolink.

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

@@ -19,15 +19,6 @@ include_directories(
 
 include (GenerateExportHeader)
 
-# We make LIB_INSTALL_DIR configurable rather than
-# hard-coding lib, because on some OSes different locations
-# are used for different architectures (e.g. /usr/lib64 on
-# 64-bit Fedora).
-if(NOT LIB_INSTALL_DIR)
-  set(LIB_INSTALL_DIR "lib" CACHE STRING
-  "Set the installation directory for libraries." FORCE)
-endif(NOT LIB_INSTALL_DIR)
-
 include_directories(. ${CMAKE_CURRENT_BINARY_DIR})
 
 set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE} -pg")
@@ -38,9 +29,9 @@ if (CMARK_SHARED)
   add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
 
   set_target_properties(${LIBRARY} PROPERTIES
-  OUTPUT_NAME "cmark-gfmextensions"
-  SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
-  VERSION ${PROJECT_VERSION})
+    OUTPUT_NAME "cmark-gfmextensions"
+    SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
+    VERSION ${PROJECT_VERSION})
 
   set_property(TARGET ${LIBRARY}
     APPEND PROPERTY MACOSX_RPATH true)
@@ -48,10 +39,12 @@ if (CMARK_SHARED)
   # Avoid name clash between PROGRAM and LIBRARY pdb files.
   set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark-gfmextensions_dll)
 
+  generate_export_header(${LIBRARY}
+    BASE_NAME cmarkextensions)
+
   list(APPEND CMARK_INSTALL ${LIBRARY})
   target_link_libraries(${LIBRARY} libcmark-gfm)
 
-  generate_export_header(${LIBRARY} BASE_NAME cmarkextensions)
 endif()
 
 if (CMARK_STATIC)
@@ -70,6 +63,28 @@ if (CMARK_STATIC)
       OUTPUT_NAME "cmark-gfmextensions"
       VERSION ${PROJECT_VERSION})
   endif(MSVC)
+
+  list(APPEND CMARK_INSTALL ${STATICLIBRARY})
+endif()
+
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+
+include (InstallRequiredSystemLibraries)
+install(TARGETS ${CMARK_INSTALL}
+  EXPORT cmark-gfmextensions
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib${LIB_SUFFIX}
+  ARCHIVE DESTINATION lib${LIB_SUFFIX}
+  )
+
+if (CMARK_SHARED OR CMARK_STATIC)
+  install(FILES
+  core-extensions.h
+  ${CMAKE_CURRENT_BINARY_DIR}/cmarkextensions_export.h
+  DESTINATION include
+  )
+
+  install(EXPORT cmark-gfmextensions DESTINATION lib${LIB_SUFFIX}/cmake-gfmextensions)
 endif()
 
 # Feature tests

data/ext/commonmarker/cmark/extensions/autolink.c

@@ -152,7 +152,7 @@ static cmark_node *www_match(cmark_parser *parser, cmark_node *parent,
 
   size_t link_end;
 
-  if (max_rewind > 0 && strchr("*_~([", data[-1]) == NULL &&
+  if (max_rewind > 0 && strchr("*_~(", data[-1]) == NULL &&
       !cmark_isspace(data[-1]))
     return 0;
 

data/ext/commonmarker/cmark/extensions/core-extensions.h

@@ -11,6 +11,12 @@ extern "C" {
 CMARKEXTENSIONS_EXPORT
 int core_extensions_registration(cmark_plugin *plugin);
 
+CMARKEXTENSIONS_EXPORT
+uint16_t cmarkextensions_get_table_columns(cmark_node *node);
+
+CMARKEXTENSIONS_EXPORT
+uint8_t *cmarkextensions_get_table_alignments(cmark_node *node);
+
 #ifdef __cplusplus
 }
 #endif

data/ext/commonmarker/cmark/extensions/table.c

@@ -9,7 +9,7 @@
 #include "strikethrough.h"
 #include "table.h"
 
-static cmark_node_type CMARK_NODE_TABLE, CMARK_NODE_TABLE_ROW,
+cmark_node_type CMARK_NODE_TABLE, CMARK_NODE_TABLE_ROW,
     CMARK_NODE_TABLE_CELL;
 
 typedef struct {
@@ -644,3 +644,17 @@ cmark_syntax_extension *create_table_extension(void) {
 
   return self;
 }
+
+uint16_t cmarkextensions_get_table_columns(cmark_node *node) {
+  if (node->type != CMARK_NODE_TABLE)
+    return 0;
+
+  return ((node_table *)node->as.opaque)->n_columns;
+}
+
+uint8_t *cmarkextensions_get_table_alignments(cmark_node *node) {
+  if (node->type != CMARK_NODE_TABLE)
+    return 0;
+
+  return ((node_table *)node->as.opaque)->alignments;
+}

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

@@ -71,10 +71,7 @@ include (GenerateExportHeader)
 add_executable(${PROGRAM} ${PROGRAM_SOURCES})
 add_compiler_export_flags()
 
-target_link_libraries(${PROGRAM} libcmark-gfm_static)
-
-add_dependencies(${PROGRAM} libcmark-gfmextensions_static)
-target_link_libraries(${PROGRAM} libcmark-gfmextensions_static)
+target_link_libraries(${PROGRAM} libcmark-gfmextensions_static libcmark-gfm_static)
 
 # Disable the PUBLIC declarations when compiling the executable:
 set_target_properties(${PROGRAM} PROPERTIES
@@ -100,9 +97,9 @@ if (CMARK_SHARED)
   add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
   # Include minor version and patch level in soname for now.
   set_target_properties(${LIBRARY} PROPERTIES
-  OUTPUT_NAME "cmark-gfm"
-  SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
-  VERSION ${PROJECT_VERSION})
+    OUTPUT_NAME "cmark-gfm"
+    SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.gfm.${PROJECT_VERSION_GFM}
+    VERSION ${PROJECT_VERSION})
 
   set_property(TARGET ${LIBRARY}
     APPEND PROPERTY MACOSX_RPATH true)
@@ -119,31 +116,21 @@ endif()
 if (CMARK_STATIC)
   add_library(${STATICLIBRARY} STATIC ${LIBRARY_SOURCES})
   set_target_properties(${STATICLIBRARY} PROPERTIES
-  COMPILE_FLAGS -DCMARK_STATIC_DEFINE
-  POSITION_INDEPENDENT_CODE ON)
+    COMPILE_FLAGS -DCMARK_STATIC_DEFINE
+    POSITION_INDEPENDENT_CODE ON)
 
   if (MSVC)
-  set_target_properties(${STATICLIBRARY} PROPERTIES
-    OUTPUT_NAME "cmark-gfm_static"
-    VERSION ${PROJECT_VERSION})
+    set_target_properties(${STATICLIBRARY} PROPERTIES
+      OUTPUT_NAME "cmark-gfm_static"
+      VERSION ${PROJECT_VERSION})
   else()
-  set_target_properties(${STATICLIBRARY} PROPERTIES
-    OUTPUT_NAME "cmark-gfm"
-    VERSION ${PROJECT_VERSION})
-endif(MSVC)
-
-target_link_libraries(cmark-gfm ${CMAKE_DL_LIBS})
+    set_target_properties(${STATICLIBRARY} PROPERTIES
+      OUTPUT_NAME "cmark-gfm"
+      VERSION ${PROJECT_VERSION})
+  endif(MSVC)
 
   list(APPEND CMARK_INSTALL ${STATICLIBRARY})
 endif()
-set_property(TARGET ${LIBRARY}
-  APPEND PROPERTY MACOSX_RPATH true)
-
-# Avoid name clash between PROGRAM and LIBRARY pdb files.
-set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark-gfm_dll)
-
-generate_export_header(${LIBRARY}
-    BASE_NAME ${PROJECT_NAME})
 
 if (MSVC)
   set_property(TARGET ${PROGRAM}
@@ -154,7 +141,7 @@ set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
 
 include (InstallRequiredSystemLibraries)
 install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
-  EXPORT cmark
+  EXPORT cmark-gfm
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib${LIB_SUFFIX}
   ARCHIVE DESTINATION lib${LIB_SUFFIX}
@@ -167,14 +154,14 @@ if(CMARK_SHARED OR CMARK_STATIC)
     DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
   install(FILES
-  cmark.h
-  cmark_extension_api.h
-  ${CMAKE_CURRENT_BINARY_DIR}/cmark_export.h
-  ${CMAKE_CURRENT_BINARY_DIR}/cmark_version.h
-  DESTINATION include
-  )
-
-  install(EXPORT cmark DESTINATION lib${LIB_SUFFIX}/cmake)
+    cmark.h
+    cmark_extension_api.h
+    ${CMAKE_CURRENT_BINARY_DIR}/cmark_export.h
+    ${CMAKE_CURRENT_BINARY_DIR}/cmark_version.h
+    DESTINATION include
+    )
+
+  install(EXPORT cmark-gfm DESTINATION lib${LIB_SUFFIX}/cmake-gfm)
 endif()
 
 # Feature tests

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

@@ -366,6 +366,11 @@ void cmark_syntax_extension_set_private(cmark_syntax_extension *extension,
                                         void *priv,
                                         cmark_free_func free_func);
 
+/** See the documentation for 'cmark_syntax_extension'
+ */
+CMARK_EXPORT
+void *cmark_syntax_extension_get_private(cmark_syntax_extension *extension);
+
 /** See the documentation for 'cmark_syntax_extension'
  */
 CMARK_EXPORT

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

@@ -3,5 +3,6 @@
 
 #define CMARK_VERSION ((@PROJECT_VERSION_MAJOR@ << 24) | (@PROJECT_VERSION_MINOR@ << 16) | (@PROJECT_VERSION_PATCH@ << 8) | @PROJECT_VERSION_GFM@)
 #define CMARK_VERSION_STRING "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.gfm.@PROJECT_VERSION_GFM@"
+#define CMARK_GFM_VERSION @PROJECT_VERSION_GFM@
 
 #endif

data/ext/commonmarker/cmark/src/scanners.re

@@ -128,7 +128,7 @@ bufsize_t _scan_liberal_html_tag(const unsigned char *p)
   const unsigned char *marker = NULL;
   const unsigned char *start = p;
 /*!re2c
-  .+ [>] { return (bufsize_t)(p - start); }
+  [^\x00]+ [>] { return (bufsize_t)(p - start); }
   * { return 0; }
 */
 }
@@ -167,7 +167,7 @@ bufsize_t _scan_html_block_end_1(const unsigned char *p)
   const unsigned char *marker = NULL;
   const unsigned char *start = p;
 /*!re2c
-  .* [<] [/] ('script'|'pre'|'style') [>] { return (bufsize_t)(p - start); }
+  [^\x00]* [<] [/] ('script'|'pre'|'style') [>] { return (bufsize_t)(p - start); }
   * { return 0; }
 */
 }
@@ -178,7 +178,7 @@ bufsize_t _scan_html_block_end_2(const unsigned char *p)
   const unsigned char *marker = NULL;
   const unsigned char *start = p;
 /*!re2c
-  .* '-->' { return (bufsize_t)(p - start); }
+  [^\x00]* '-->' { return (bufsize_t)(p - start); }
   * { return 0; }
 */
 }
@@ -189,7 +189,7 @@ bufsize_t _scan_html_block_end_3(const unsigned char *p)
   const unsigned char *marker = NULL;
   const unsigned char *start = p;
 /*!re2c
-  .* '?>' { return (bufsize_t)(p - start); }
+  [^\x00]* '?>' { return (bufsize_t)(p - start); }
   * { return 0; }
 */
 }
@@ -200,7 +200,7 @@ bufsize_t _scan_html_block_end_4(const unsigned char *p)
   const unsigned char *marker = NULL;
   const unsigned char *start = p;
 /*!re2c
-  .* '>' { return (bufsize_t)(p - start); }
+  [^\x00]* '>' { return (bufsize_t)(p - start); }
   * { return 0; }
 */
 }
@@ -211,7 +211,7 @@ bufsize_t _scan_html_block_end_5(const unsigned char *p)
   const unsigned char *marker = NULL;
   const unsigned char *start = p;
 /*!re2c
-  .* ']]>' { return (bufsize_t)(p - start); }
+  [^\x00]* ']]>' { return (bufsize_t)(p - start); }
   * { return 0; }
 */
 }

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

@@ -118,6 +118,10 @@ void cmark_syntax_extension_set_private(cmark_syntax_extension *extension,
   extension->free_function = free_func;
 }
 
+void *cmark_syntax_extension_get_private(cmark_syntax_extension *extension) {
+    return extension->priv;
+}
+
 void cmark_syntax_extension_set_opaque_free_func(cmark_syntax_extension *extension,
                                                  cmark_opaque_free_func func) {
   extension->opaque_free_func = func;

data/lib/commonmarker/version.rb

@@ -1,3 +1,3 @@
 module CommonMarker
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.16.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Garen Torikian
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum