commonmarker 0.17.11 → 0.17.12

data/ext/commonmarker/syntax_extension.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "cmark.h"
+#include "cmark-gfm.h"
 #include "syntax_extension.h"
 #include "buffer.h"
 

data/ext/commonmarker/syntax_extension.h

@@ -1,8 +1,8 @@
 #ifndef CMARK_SYNTAX_EXTENSION_H
 #define CMARK_SYNTAX_EXTENSION_H
 
-#include "cmark.h"
-#include "cmark_extension_api.h"
+#include "cmark-gfm.h"
+#include "cmark-gfm-extension_api.h"
 #include "config.h"
 
 struct cmark_syntax_extension {

data/ext/commonmarker/table.c

@@ -1,4 +1,4 @@
-#include <cmark_extension_api.h>
+#include <cmark-gfm-extension_api.h>
 #include <html.h>
 #include <inlines.h>
 #include <parser.h>
@@ -578,10 +578,15 @@ static void html_render(cmark_syntax_extension *extension,
       cmark_strbuf_putc(html, '>');
       table_state->need_closing_table_body = false;
     } else {
-      if (table_state->need_closing_table_body)
+      if (table_state->need_closing_table_body) {
+        cmark_html_render_cr(html);
         cmark_strbuf_puts(html, "</tbody>");
+        cmark_html_render_cr(html);
+      }
       table_state->need_closing_table_body = false;
-      cmark_strbuf_puts(html, "</table>\n");
+      cmark_html_render_cr(html);
+      cmark_strbuf_puts(html, "</table>");
+      cmark_html_render_cr(html);
     }
   } else if (node->type == CMARK_NODE_TABLE_ROW) {
     if (entering) {
@@ -680,14 +685,14 @@ cmark_syntax_extension *create_table_extension(void) {
   return self;
 }
 
-uint16_t cmarkextensions_get_table_columns(cmark_node *node) {
+uint16_t cmark_gfm_extensions_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) {
+uint8_t *cmark_gfm_extensions_get_table_alignments(cmark_node *node) {
   if (node->type != CMARK_NODE_TABLE)
     return 0;
 

data/ext/commonmarker/table.h

@@ -1,7 +1,7 @@
-#ifndef TABLE_H
-#define TABLE_H
+#ifndef CMARK_GFM_TABLE_H
+#define CMARK_GFM_TABLE_H
 
-#include "core-extensions.h"
+#include "cmark-gfm-core-extensions.h"
 
 
 extern cmark_node_type CMARK_NODE_TABLE, CMARK_NODE_TABLE_ROW,

data/ext/commonmarker/tagfilter.h

@@ -1,7 +1,7 @@
-#ifndef TAGFILTER_H
-#define TAGFILTER_H
+#ifndef CMARK_GFM_TAGFILTER_H
+#define CMARK_GFM_TAGFILTER_H
 
-#include "core-extensions.h"
+#include "cmark-gfm-core-extensions.h"
 
 cmark_syntax_extension *create_tagfilter_extension(void);
 

data/ext/commonmarker/utf8.h

@@ -8,24 +8,24 @@
 extern "C" {
 #endif
 
-CMARK_EXPORT
+CMARK_GFM_EXPORT
 void cmark_utf8proc_case_fold(cmark_strbuf *dest, const uint8_t *str,
                               bufsize_t len);
 
-CMARK_EXPORT
+CMARK_GFM_EXPORT
 void cmark_utf8proc_encode_char(int32_t uc, cmark_strbuf *buf);
 
-CMARK_EXPORT
+CMARK_GFM_EXPORT
 int cmark_utf8proc_iterate(const uint8_t *str, bufsize_t str_len, int32_t *dst);
 
-CMARK_EXPORT
+CMARK_GFM_EXPORT
 void cmark_utf8proc_check(cmark_strbuf *dest, const uint8_t *line,
                           bufsize_t size);
 
-CMARK_EXPORT
+CMARK_GFM_EXPORT
 int cmark_utf8proc_is_space(int32_t uc);
 
-CMARK_EXPORT
+CMARK_GFM_EXPORT
 int cmark_utf8proc_is_punctuation(int32_t uc);
 
 #ifdef __cplusplus

data/ext/commonmarker/xml.c

@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "config.h"
-#include "cmark.h"
+#include "cmark-gfm.h"
 #include "node.h"
 #include "buffer.h"
 #include "houdini.h"

data/lib/commonmarker/renderer/html_renderer.rb

@@ -174,7 +174,7 @@ module CommonMarker
       @alignments = node.table_alignments
       @needs_close_tbody = false
       out("<table#{sourcepos(node)}>\n", :children)
-      out("</tbody>") if @needs_close_tbody
+      out("</tbody>\n") if @needs_close_tbody
       out("</table>\n")
     end
 
@@ -182,7 +182,7 @@ module CommonMarker
       @column_index = 0
 
       @in_header = true
-      out("<thead>\n<tr#{sourcepos(node)}>", :children, "\n</tr>\n</thead>")
+      out("<thead>\n<tr#{sourcepos(node)}>\n", :children, "</tr>\n</thead>\n")
       @in_header = false
     end
 
@@ -190,9 +190,9 @@ module CommonMarker
       @column_index = 0
       if !@in_header && !@needs_close_tbody
         @needs_close_tbody = true
-        out("\n<tbody>")
+        out("<tbody>\n")
       end
-      out("\n<tr#{sourcepos(node)}>", :children, "\n</tr>")
+      out("<tr#{sourcepos(node)}>\n", :children, "</tr>\n")
     end
 
     def table_cell(node)
@@ -202,7 +202,7 @@ module CommonMarker
               when :center; ' align="center"'
               else; ''
               end
-      out(@in_header ? "\n<th#{align}#{sourcepos(node)}>" : "\n<td#{align}#{sourcepos(node)}>", :children, @in_header ? "</th>" : "</td>")
+      out(@in_header ? "<th#{align}#{sourcepos(node)}>" : "<td#{align}#{sourcepos(node)}>", :children, @in_header ? "</th>\n" : "</td>\n")
       @column_index += 1
     end
 

data/lib/commonmarker/version.rb

@@ -1,4 +1,3 @@
 module CommonMarker
-  VERSION = '0.17.11'.freeze
+  VERSION = '0.17.12'.freeze
 end
-

data/test/test_extensions.rb

@@ -95,7 +95,9 @@ Another extension:
 <td style="text-align: center">hhh</td>
 <td>iii</td>
 <td style="text-align: right">jjj</td>
-</tr></tbody></table>
+</tr>
+</tbody>
+</table>
       HTML
 aaa | bbb | ccc | ddd | eee
 :-- | --- | :-: | --- | --:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.17.11
+  version: 0.17.12
 platform: ruby
 authors:
 - Garen Torikian
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum
@@ -131,20 +131,20 @@ files:
 - ext/commonmarker/buffer.h
 - ext/commonmarker/case_fold_switch.inc
 - ext/commonmarker/chunk.h
+- ext/commonmarker/cmark-gfm-core-extensions.h
+- ext/commonmarker/cmark-gfm-extension_api.h
+- ext/commonmarker/cmark-gfm-extensions_export.h
+- ext/commonmarker/cmark-gfm.h
+- ext/commonmarker/cmark-gfm_export.h
+- ext/commonmarker/cmark-gfm_version.h
 - ext/commonmarker/cmark.c
-- ext/commonmarker/cmark.h
 - ext/commonmarker/cmark_ctype.c
 - ext/commonmarker/cmark_ctype.h
-- ext/commonmarker/cmark_export.h
-- ext/commonmarker/cmark_extension_api.h
-- ext/commonmarker/cmark_version.h
-- ext/commonmarker/cmarkextensions_export.h
 - ext/commonmarker/commonmark.c
 - ext/commonmarker/commonmarker.c
 - ext/commonmarker/commonmarker.h
 - ext/commonmarker/config.h
 - ext/commonmarker/core-extensions.c
-- ext/commonmarker/core-extensions.h
 - ext/commonmarker/entities.inc
 - ext/commonmarker/ext_scanners.c
 - ext/commonmarker/ext_scanners.h

data/ext/commonmarker/cmark_export.h

@@ -1,42 +0,0 @@
-
-#ifndef CMARK_EXPORT_H
-#define CMARK_EXPORT_H
-
-#ifdef CMARK_STATIC_DEFINE
-#  define CMARK_EXPORT
-#  define CMARK_NO_EXPORT
-#else
-#  ifndef CMARK_EXPORT
-#    ifdef libcmark_gfm_EXPORTS
-        /* We are building this library */
-#      define CMARK_EXPORT __attribute__((visibility("default")))
-#    else
-        /* We are using this library */
-#      define CMARK_EXPORT __attribute__((visibility("default")))
-#    endif
-#  endif
-
-#  ifndef CMARK_NO_EXPORT
-#    define CMARK_NO_EXPORT __attribute__((visibility("hidden")))
-#  endif
-#endif
-
-#ifndef CMARK_DEPRECATED
-#  define CMARK_DEPRECATED __attribute__ ((__deprecated__))
-#endif
-
-#ifndef CMARK_DEPRECATED_EXPORT
-#  define CMARK_DEPRECATED_EXPORT CMARK_EXPORT CMARK_DEPRECATED
-#endif
-
-#ifndef CMARK_DEPRECATED_NO_EXPORT
-#  define CMARK_DEPRECATED_NO_EXPORT CMARK_NO_EXPORT CMARK_DEPRECATED
-#endif
-
-#if 0 /* DEFINE_NO_DEPRECATED */
-#  ifndef CMARK_NO_DEPRECATED
-#    define CMARK_NO_DEPRECATED
-#  endif
-#endif
-
-#endif

data/ext/commonmarker/cmark_version.h

@@ -1,8 +0,0 @@
-#ifndef CMARK_VERSION_H
-#define CMARK_VERSION_H
-
-#define CMARK_VERSION ((0 << 24) | (28 << 16) | (3 << 8) | 14)
-#define CMARK_VERSION_STRING "0.28.3.gfm.14"
-#define CMARK_GFM_VERSION 14
-
-#endif

data/ext/commonmarker/cmarkextensions_export.h

@@ -1,42 +0,0 @@
-
-#ifndef CMARKEXTENSIONS_EXPORT_H
-#define CMARKEXTENSIONS_EXPORT_H
-
-#ifdef CMARKEXTENSIONS_STATIC_DEFINE
-#  define CMARKEXTENSIONS_EXPORT
-#  define CMARKEXTENSIONS_NO_EXPORT
-#else
-#  ifndef CMARKEXTENSIONS_EXPORT
-#    ifdef libcmark_gfmextensions_EXPORTS
-        /* We are building this library */
-#      define CMARKEXTENSIONS_EXPORT __attribute__((visibility("default")))
-#    else
-        /* We are using this library */
-#      define CMARKEXTENSIONS_EXPORT __attribute__((visibility("default")))
-#    endif
-#  endif
-
-#  ifndef CMARKEXTENSIONS_NO_EXPORT
-#    define CMARKEXTENSIONS_NO_EXPORT __attribute__((visibility("hidden")))
-#  endif
-#endif
-
-#ifndef CMARKEXTENSIONS_DEPRECATED
-#  define CMARKEXTENSIONS_DEPRECATED __attribute__ ((__deprecated__))
-#endif
-
-#ifndef CMARKEXTENSIONS_DEPRECATED_EXPORT
-#  define CMARKEXTENSIONS_DEPRECATED_EXPORT CMARKEXTENSIONS_EXPORT CMARKEXTENSIONS_DEPRECATED
-#endif
-
-#ifndef CMARKEXTENSIONS_DEPRECATED_NO_EXPORT
-#  define CMARKEXTENSIONS_DEPRECATED_NO_EXPORT CMARKEXTENSIONS_NO_EXPORT CMARKEXTENSIONS_DEPRECATED
-#endif
-
-#if 0 /* DEFINE_NO_DEPRECATED */
-#  ifndef CMARKEXTENSIONS_NO_DEPRECATED
-#    define CMARKEXTENSIONS_NO_DEPRECATED
-#  endif
-#endif
-
-#endif

data/ext/commonmarker/core-extensions.h

@@ -1,25 +0,0 @@
-#ifndef CORE_EXTENSIONS_H
-#define CORE_EXTENSIONS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "cmark_extension_api.h"
-#include "cmarkextensions_export.h"
-#include <stdint.h>
-
-CMARKEXTENSIONS_EXPORT
-void core_extensions_ensure_registered(void);
-
-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
-
-#endif