commonmarker 0.17.7.1 → 0.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62db9ada9b0ec7e95b771d2ddf75f6062b5f4434
-  data.tar.gz: 4b2fc6430b0cfdbdff042429511d5cb82415c3dc
+  metadata.gz: 69c41f8d0a015334fbd220a9e2145505a4be9c65
+  data.tar.gz: 488ba4741fb7a2d2d35d7e6e809258117b3be7e9
 SHA512:
-  metadata.gz: d817521a55244e3f9f1632e827b998fe72adcaa2975b8d79615cc03347ac4c1105f81eee423d5ae36fcbf64ef5f54d4fc36d18d77e70c5da820f11568e559e4d
-  data.tar.gz: 5c4afeae4736e9122721a0052a77e494c3925c974d3f32689b6fdf40aa94e2bf3aaa4d01f23f36cd7935cf0c18dc1780d0792b25ac5448c947745f880b48d7bb
+  metadata.gz: 862e194be41831558ef5df2863f5ff4ff041472c2036d6fdd15f85667657de6cf33431da1571acb5ded8c4ce697b4c897bafabcea8d3cc80e66a9d61e76b7a05
+  data.tar.gz: fe5f480b49c4f93ab1becf7c22ec074afb8bfd6b478de569de1e6f076d49a2f88e3898999c16c1ad4b49f98f25a6c6d78fb1f23b34e1039f956aa2e47bbe74df

data/README.md

@@ -147,6 +147,7 @@ CommonMarker accepts the same options that CMark does, as symbols. Note that the
 | `:NOBREAKS`        | Translate `\n` in the source to a single whitespace.
 | `:SAFE`            | Suppress raw HTML and unsafe links.
 | `:GITHUB_PRE_LANG` | Use GitHub-style `<pre lang>` for fenced code blocks.
+| `:TABLE_PREFER_STYLE_ATTRIBUTES` | Use `style` insted of `align` for table cells
 
 ### Passing options
 
@@ -175,7 +176,6 @@ The available extensions are:
 * `:strikethrough` - This provides support for strikethroughs.
 * `:autolink` - This provides support for automatically converting URLs to anchor tags.
 * `:tagfilter` - This strips out [several "unsafe" HTML tags](https://github.github.com/gfm/#disallowed-raw-html-extension-) from being used.
-* `:tasklist` - This enables support for task list rendering.
 
 ## Developing locally
 

data/commonmarker.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version = CommonMarker::VERSION
   s.summary = 'CommonMark parser and renderer. Written in C, wrapped in Ruby.'
   s.description = 'A fast, safe, extensible parser for CommonMark. This wraps the official libcmark library.'
-  s.authors       = ['Garen Torikian', 'Yuki Izumi']
+  s.authors       = ['Garen Torikian', 'Ashe Connor']
   s.homepage = 'http://github.com/gjtorikian/commonmarker'
   s.license = 'MIT'
   s.required_ruby_version = '>= 2.0.0'

data/ext/commonmarker/cmark.h

@@ -724,6 +724,15 @@ char *cmark_render_latex_with_mem(cmark_node *root, int options, int width, cmar
  */
 #define CMARK_OPT_FOOTNOTES (1 << 13)
 
+/** Only parse strikethroughs if surrounded by exactly 2 tildes.
+ * Gives some compatibility with redcarpet.
+ */
+#define CMARK_OPT_STRIKETHROUGH_DOUBLE_TILDE (1 << 14)
+
+/** Use style attributes to align table cells instead of align attributes.
+ */
+#define CMARK_OPT_TABLE_PREFER_STYLE_ATTRIBUTES (1 << 15)
+
 /**
  * ## Version information
  */

data/ext/commonmarker/cmark_version.h

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

data/ext/commonmarker/commonmarker.c

@@ -524,7 +524,7 @@ static VALUE rb_node_insert_before(VALUE self, VALUE sibling) {
  *
  * Returns a {String}.
  */
-static VALUE rb_render_html(VALUE n, VALUE rb_options, VALUE rb_extensions) {
+static VALUE rb_render_html(VALUE self, VALUE rb_options, VALUE rb_extensions) {
   int options, extensions_len;
   VALUE rb_ext_name;
   int i;
@@ -537,7 +537,7 @@ static VALUE rb_render_html(VALUE n, VALUE rb_options, VALUE rb_extensions) {
   options = FIX2INT(rb_options);
   extensions_len = RARRAY_LEN(rb_extensions);
 
-  Data_Get_Struct(n, cmark_node, node);
+  Data_Get_Struct(self, cmark_node, node);
 
   for (i = 0; i < extensions_len; ++i) {
     rb_ext_name = RARRAY_PTR(rb_extensions)[i];
@@ -571,15 +571,24 @@ static VALUE rb_render_html(VALUE n, VALUE rb_options, VALUE rb_extensions) {
  *
  * Returns a {String}.
  */
-static VALUE rb_render_commonmark(VALUE n, VALUE rb_options) {
+static VALUE rb_render_commonmark(int argc, VALUE *argv, VALUE self) {
+  VALUE rb_options, rb_width;
+  rb_scan_args(argc, argv, "11", &rb_options, &rb_width);
+
+  int width = 120;
+  if (!NIL_P(rb_width)) {
+    Check_Type(rb_width, T_FIXNUM);
+    width = FIX2INT(rb_width);
+  }
+
   int options;
   cmark_node *node;
   Check_Type(rb_options, T_FIXNUM);
 
   options = FIX2INT(rb_options);
-  Data_Get_Struct(n, cmark_node, node);
+  Data_Get_Struct(self, cmark_node, node);
 
-  char *cmark = cmark_render_commonmark(node, options, 120);
+  char *cmark = cmark_render_commonmark(node, options, width);
   VALUE ruby_cmark = rb_str_new2(cmark);
   free(cmark);
 
@@ -590,15 +599,24 @@ static VALUE rb_render_commonmark(VALUE n, VALUE rb_options) {
  *
  * Returns a {String}.
  */
-static VALUE rb_render_plaintext(VALUE n, VALUE rb_options) {
+static VALUE rb_render_plaintext(int argc, VALUE *argv, VALUE self) {
+  VALUE rb_options, rb_width;
+  rb_scan_args(argc, argv, "11", &rb_options, &rb_width);
+
+  int width = 120;
+  if (!NIL_P(rb_width)) {
+    Check_Type(rb_width, T_FIXNUM);
+    width = FIX2INT(rb_width);
+  }
+
   int options;
   cmark_node *node;
   Check_Type(rb_options, T_FIXNUM);
 
   options = FIX2INT(rb_options);
-  Data_Get_Struct(n, cmark_node, node);
+  Data_Get_Struct(self, cmark_node, node);
 
-  char *text = cmark_render_plaintext(node, options, 120);
+  char *text = cmark_render_plaintext(node, options, width);
   VALUE ruby_text = rb_str_new2(text);
   free(text);
 
@@ -1148,8 +1166,8 @@ __attribute__((visibility("default"))) void Init_commonmarker() {
   rb_define_method(rb_mNode, "next", rb_node_next, 0);
   rb_define_method(rb_mNode, "insert_before", rb_node_insert_before, 1);
   rb_define_method(rb_mNode, "_render_html", rb_render_html, 2);
-  rb_define_method(rb_mNode, "_render_commonmark", rb_render_commonmark, 1);
-  rb_define_method(rb_mNode, "_render_plaintext", rb_render_plaintext, 1);
+  rb_define_method(rb_mNode, "_render_commonmark", rb_render_commonmark, -1);
+  rb_define_method(rb_mNode, "_render_plaintext", rb_render_plaintext, -1);
   rb_define_method(rb_mNode, "insert_after", rb_node_insert_after, 1);
   rb_define_method(rb_mNode, "prepend_child", rb_node_prepend_child, 1);
   rb_define_method(rb_mNode, "append_child", rb_node_append_child, 1);

data/ext/commonmarker/strikethrough.c

@@ -27,7 +27,8 @@ static cmark_node *match(cmark_syntax_extension *self, cmark_parser *parser,
   res->start_line = res->end_line = cmark_inline_parser_get_line(inline_parser);
   res->start_column = cmark_inline_parser_get_column(inline_parser) - delims;
 
-  if (left_flanking || right_flanking) {
+  if ((left_flanking || right_flanking) &&
+      (!(parser->options & CMARK_OPT_STRIKETHROUGH_DOUBLE_TILDE) || delims == 2)) {
     cmark_inline_parser_push_delimiter(inline_parser, character, left_flanking,
                                        right_flanking, res);
   }

data/ext/commonmarker/table.c

@@ -542,6 +542,18 @@ static void man_render(cmark_syntax_extension *extension,
   }
 }
 
+static void html_table_add_align(cmark_strbuf* html, const char* align, int options) {
+  if (options & CMARK_OPT_TABLE_PREFER_STYLE_ATTRIBUTES) {
+    cmark_strbuf_puts(html, " style=\"text-align: ");
+    cmark_strbuf_puts(html, align);
+    cmark_strbuf_puts(html, "\"");
+  } else {
+    cmark_strbuf_puts(html, " align=\"");
+    cmark_strbuf_puts(html, align);
+    cmark_strbuf_puts(html, "\"");
+  }
+}
+
 struct html_table_state {
   unsigned need_closing_table_body : 1;
   unsigned in_table_header : 1;
@@ -611,9 +623,9 @@ static void html_render(cmark_syntax_extension *extension,
           break;
 
       switch (alignments[i]) {
-      case 'l': cmark_strbuf_puts(html, " align=\"left\""); break;
-      case 'c': cmark_strbuf_puts(html, " align=\"center\""); break;
-      case 'r': cmark_strbuf_puts(html, " align=\"right\""); break;
+      case 'l': html_table_add_align(html, "left", options); break;
+      case 'c': html_table_add_align(html, "center", options); break;
+      case 'r': html_table_add_align(html, "right", options); break;
       }
 
       cmark_html_render_sourcepos(node, html, options);

data/lib/commonmarker/config.rb

@@ -10,6 +10,7 @@ module CommonMarker
       define :SMART, (1 << 10)
       define :LIBERAL_HTML_TAG, (1 << 12)
       define :FOOTNOTES, (1 << 13)
+      define :STRIKETHROUGH_DOUBLE_TILDE, (1 << 14)
     end
 
     class Render
@@ -21,6 +22,7 @@ module CommonMarker
       define :SAFE, (1 << 3)
       define :NOBREAKS, (1 << 4)
       define :GITHUB_PRE_LANG, (1 << 11)
+      define :TABLE_PREFER_STYLE_ATTRIBUTES, (1 << 15)
     end
 
     def self.process_options(option, type)

data/lib/commonmarker/node.rb

@@ -31,21 +31,23 @@ module CommonMarker
     # Public: Convert the node to a CommonMark string.
     #
     # options - A {Symbol} or {Array of Symbol}s indicating the render options
+    # width - Column to wrap the output at
     #
     # Returns a {String}.
-    def to_commonmark(options = :DEFAULT)
+    def to_commonmark(options = :DEFAULT, width = 120)
       opts = Config.process_options(options, :render)
-      _render_commonmark(opts).force_encoding('utf-8')
+      _render_commonmark(opts, width).force_encoding('utf-8')
     end
 
     # Public: Convert the node to a plain text string.
     #
     # options - A {Symbol} or {Array of Symbol}s indicating the render options
+    # width - Column to wrap the output at
     #
     # Returns a {String}.
-    def to_plaintext(options = :DEFAULT)
+    def to_plaintext(options = :DEFAULT, width = 120)
       opts = Config.process_options(options, :render)
-      _render_plaintext(opts).force_encoding('utf-8')
+      _render_plaintext(opts, width).force_encoding('utf-8')
     end
 
     # Public: Iterate over the children (if any) of the current pointer.

data/lib/commonmarker/version.rb

@@ -1,3 +1,3 @@
 module CommonMarker
-  VERSION = '0.17.7.1'.freeze
+  VERSION = '0.17.8'.freeze
 end

data/test/test_extensions.rb

@@ -35,6 +35,9 @@ Another extension:
       assert out.include?("<del>hi</del>")
     end
 
+    doc = CommonMarker.render_doc("~a~ ~~b~~ ~~~c~~~", :STRIKETHROUGH_DOUBLE_TILDE, [:strikethrough])
+    assert_equal doc.to_html, "<p>~a~ <del>b</del> ~~~c~~~</p>\n"
+
     CommonMarker.render_html(@markdown, :DEFAULT, %i[table strikethrough]).tap do |out|
       refute out.include?("| a")
       refute out.include?("| <strong>x</strong>")
@@ -57,6 +60,9 @@ Another extension:
       %w(<table> <tr> <th> a </th> <td> c </td> <strong>x</strong>).each {|html| assert out.include?(html) }
       assert out.include?("~~hi~~")
     end
+
+    doc = CommonMarker.render_doc("~a~ ~~b~~ ~~~c~~~", :STRIKETHROUGH_DOUBLE_TILDE, [:strikethrough])
+    assert_equal HtmlRenderer.new.render(doc), "<p>~a~ <del>b</del> ~~~c~~~</p>\n"
   end
 
   def test_bad_extension_specifications
@@ -69,4 +75,31 @@ Another extension:
     assert_equal "<!--hello--> <blah> &lt;xmp>\n",
       CommonMarker.render_html("<!--hello--> <blah> <xmp>\n", :DEFAULT, %i[tagfilter])
   end
+
+  def test_table_prefer_style_attributes
+      assert_equal(<<-HTML, CommonMarker.render_html(<<-MD, :TABLE_PREFER_STYLE_ATTRIBUTES, %i[table]))
+<table>
+<thead>
+<tr>
+<th style="text-align: left">aaa</th>
+<th>bbb</th>
+<th style="text-align: center">ccc</th>
+<th>ddd</th>
+<th style="text-align: right">eee</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td style="text-align: left">fff</td>
+<td>ggg</td>
+<td style="text-align: center">hhh</td>
+<td>iii</td>
+<td style="text-align: right">jjj</td>
+</tr></tbody></table>
+      HTML
+aaa | bbb | ccc | ddd | eee
+:-- | --- | :-: | --- | --:
+fff | ggg | hhh | iii | jjj
+      MD
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.17.7.1
+  version: 0.17.8
 platform: ruby
 authors:
 - Garen Torikian
-- Yuki Izumi
+- Ashe Connor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum