redcarpet 3.5.1 → 3.6.0

data/ext/redcarpet/html_blocks.h

@@ -1,6 +1,5 @@
-/* C code produced by gperf version 3.0.3 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: gperf -N find_block_tag -H hash_block_tag -C -c -E --ignore-case html_block_names.txt  */
-/* See https://git.io/vPLqa for the list of recognized elements */
 /* Computed positions: -k'1-2' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -27,7 +26,7 @@
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
 /* maximum key range = 72, duplicates = 0 */
@@ -60,10 +59,7 @@ static unsigned char gperf_downcase[256] =
 #ifndef GPERF_CASE_STRNCMP
 #define GPERF_CASE_STRNCMP 1
 static int
-gperf_case_strncmp (s1, s2, n)
-     register const char *s1;
-     register const char *s2;
-     register unsigned int n;
+gperf_case_strncmp (register const char *s1, register const char *s2, register size_t n)
 {
   for (; n > 0;)
     {
@@ -88,9 +84,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash_block_tag (str, len)
-     register const char *str;
-     register unsigned int len;
+hash_block_tag (register const char *str, register size_t len)
 {
   static const unsigned char asso_values[] =
     {
@@ -99,13 +93,13 @@ hash_block_tag (str, len)
       73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
       73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
       73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
-      26, 60, 55, 45, 40, 35, 73, 73, 73, 73,
-      73, 73, 73, 73, 73, 20, 15, 15,  0, 35,
-       0, 25, 10, 10,  5, 73, 73,  0, 15, 15,
+      16, 55, 50, 45, 40,  5, 73, 73, 73, 73,
+      73, 73, 73, 73, 73, 20, 15, 25,  0, 45,
+       0, 30, 10,  0,  5, 73, 73,  0, 15, 35,
        0, 73, 73, 15, 20, 10, 10, 73, 73, 73,
-      73, 73, 73, 73, 73, 73, 73, 20, 15, 15,
-       0, 35,  0, 25, 10, 10,  5, 73, 73,  0,
-      15, 15,  0, 73, 73, 15, 20, 10, 10, 73,
+      73, 73, 73, 73, 73, 73, 73, 20, 15, 25,
+       0, 45,  0, 30, 10,  0,  5, 73, 73,  0,
+      15, 35,  0, 73, 73, 15, 20, 10, 10, 73,
       73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
       73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
       73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
@@ -136,13 +130,11 @@ hash_block_tag (str, len)
 }
 
 const char *
-find_block_tag (str, len)
-     register const char *str;
-     register unsigned int len;
+find_block_tag (register const char *str, register size_t len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 43,
+      TOTAL_KEYWORDS = 44,
       MIN_WORD_LENGTH = 1,
       MAX_WORD_LENGTH = 10,
       MIN_HASH_VALUE = 1,
@@ -167,7 +159,7 @@ find_block_tag (str, len)
       "",
       "figcaption",
       "header",
-      "ol",
+      "h6",
       "pre",
       "math",
       "video",
@@ -178,42 +170,45 @@ find_block_tag (str, len)
       "blockquote",
       "hgroup",
       "hr",
-      "ins",
+      "h1",
       "",
       "style",
-      "output",
+      "center",
       "summary",
       "nav",
       "",
       "audio",
-      "canvas",
-      "dd",
-      "h1",
-      "abbr",
-      "table",
       "iframe",
+      "ol",
+      "ins",
+      "",
+      "table",
+      "",
       "article",
       "", "",
       "aside",
+      "canvas",
+      "dd",
       "",
-      "h6",
+      "abbr",
+      "",
+      "output",
+      "h5",
       "", "",
       "tfoot",
       "",
-      "h5",
-      "", "", "", "",
       "h4",
       "", "", "", "",
-      "address",
-      "", "", "", "",
       "h3",
       "", "", "", "",
-      "h2"
+      "h2",
+      "", "", "", "",
+      "address"
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      unsigned int key = hash_block_tag (str, len);
+      register unsigned int key = hash_block_tag (str, len);
 
       if (key <= MAX_HASH_VALUE)
         {

data/ext/redcarpet/markdown.c

@@ -1353,13 +1353,13 @@ is_hrule(uint8_t *data, size_t size)
 	return n >= 3;
 }
 
-/* check if a line begins with a code fence; return the
- * width of the code fence */
+/* check if a line begins with a code fence matching optional opendelim;
+   return the width of the code fence and store the delimiter string  */
 static size_t
-prefix_codefence(uint8_t *data, size_t size)
+prefix_codefence(uint8_t *data, size_t size, struct buf *delim, struct buf *opendelim)
 {
-	size_t i = 0, n = 0;
-	uint8_t c;
+	size_t i = 0, n = 0, min_n = 3;
+	uint8_t c, *delim_start;
 
 	/* skipping initial spaces */
 	if (size < 3) return 0;
@@ -1367,31 +1367,46 @@ prefix_codefence(uint8_t *data, size_t size)
 	if (data[1] == ' ') { i++;
 	if (data[2] == ' ') { i++; } } }
 
+	delim_start = data + i;
+
 	/* looking at the hrule uint8_t */
 	if (i + 2 >= size || !(data[i] == '~' || data[i] == '`'))
 		return 0;
 
-	c = data[i];
+	if (opendelim && opendelim->size) {
+		c = opendelim->data[0];
+		min_n = opendelim->size;
+	} else {
+		c = data[i];
+	}
 
 	/* the whole line must be the uint8_t or whitespace */
 	while (i < size && data[i] == c) {
 		n++; i++;
 	}
 
-	if (n < 3)
+	if (n < min_n)
 		return 0;
 
+	if (delim) {
+		delim->data = delim_start;
+		delim->size = n;
+	}
+
 	return i;
 }
 
 /* check if a line is a code fence; return its size if it is */
+/* checking is done in fence-pair matching mode if curdelim is provided */
 static size_t
-is_codefence(uint8_t *data, size_t size, struct buf *syntax)
+is_codefence(uint8_t *data, size_t size, struct buf *curdelim, struct buf *syntax)
 {
 	size_t i = 0, syn_len = 0;
 	uint8_t *syn_start;
+	struct buf delim = { 0, 0, 0, 0 };
+
+	i = prefix_codefence(data, size, &delim, curdelim);
 
-	i = prefix_codefence(data, size);
 	if (i == 0)
 		return 0;
 
@@ -1426,10 +1441,9 @@ is_codefence(uint8_t *data, size_t size, struct buf *syntax)
 		}
 	}
 
-	if (syntax) {
-		syntax->data = syn_start;
-		syntax->size = syn_len;
-	}
+	/* info string must not be present at the closing fence */
+	if (curdelim && curdelim->size && syn_len)
+		return 0;
 
 	while (i < size && data[i] != '\n') {
 		if (!_isspace(data[i]))
@@ -1438,6 +1452,21 @@ is_codefence(uint8_t *data, size_t size, struct buf *syntax)
 		i++;
 	}
 
+	if (curdelim) {
+		if (curdelim->size) {
+			curdelim->data = NULL;
+			curdelim->size = 0;
+		} else {
+			curdelim->data = delim.data;
+			curdelim->size = delim.size;
+		}
+	}
+
+	if (syntax) {
+		syntax->data = syn_start;
+		syntax->size = syn_len;
+	}
+
 	return i + 1;
 }
 
@@ -1673,7 +1702,7 @@ parse_paragraph(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 
 			/* see if a code fence starts here */
 			if ((rndr->ext_flags & MKDEXT_FENCED_CODE) != 0 &&
-				is_codefence(data + i, size - i, NULL) != 0) {
+				is_codefence(data + i, size - i, NULL, NULL) != 0) {
 				end = i;
 				break;
 			}
@@ -1739,19 +1768,19 @@ parse_fencedcode(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 {
 	size_t beg, end;
 	struct buf *work = 0;
+	struct buf delim = { 0, 0, 0, 0 };
 	struct buf lang = { 0, 0, 0, 0 };
 
-	beg = is_codefence(data, size, &lang);
+	beg = is_codefence(data, size, &delim, &lang);
 	if (beg == 0) return 0;
 
 	work = rndr_newbuf(rndr, BUFFER_BLOCK);
 
 	while (beg < size) {
 		size_t fence_end;
-		struct buf fence_trail = { 0, 0, 0, 0 };
 
-		fence_end = is_codefence(data + beg, size - beg, &fence_trail);
-		if (fence_end != 0 && fence_trail.size == 0) {
+		fence_end = is_codefence(data + beg, size - beg, &delim, NULL);
+		if (fence_end != 0) {
 			beg += fence_end;
 			break;
 		}
@@ -1827,6 +1856,7 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 	struct buf *work = 0, *inter = 0;
 	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, i;
 	int in_empty = 0, has_inside_empty = 0, in_fence = 0;
+	struct buf fence_delim = { 0, 0, 0, 0 };
 
 	/* keeping track of the first indentation prefix */
 	while (orgpre < 3 && orgpre < size && data[orgpre] == ' ')
@@ -1876,7 +1906,7 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 		pre = i;
 
 		if (rndr->ext_flags & MKDEXT_FENCED_CODE) {
-			if (is_codefence(data + beg + i, end - beg - i, NULL) != 0)
+			if (is_codefence(data + beg + i, end - beg - i, &fence_delim, NULL) != 0)
 				in_fence = !in_fence;
 		}
 
@@ -2804,6 +2834,7 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 	struct buf *text;
 	size_t beg, end;
 	int in_fence = 0;
+	struct buf fence_delim = { 0, 0, 0, 0 };
 
 	text = bufnew(64);
 	if (!text)
@@ -2833,7 +2864,7 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 		beg += 3;
 
 	while (beg < doc_size) { /* iterating over lines */
-		if (codefences_enabled && (is_codefence(document + beg, doc_size - beg, NULL) != 0))
+		if (codefences_enabled && (is_codefence(document + beg, doc_size - beg, &fence_delim, NULL) != 0))
 			in_fence = !in_fence;
 
 		if (!in_fence && footnotes_enabled && is_footnote(document, beg, doc_size, &end, &md->footnotes_found))

data/ext/redcarpet/rc_markdown.c

@@ -176,6 +176,7 @@ void Init_redcarpet()
 	rb_mRedcarpet = rb_define_module("Redcarpet");
 
 	rb_cMarkdown = rb_define_class_under(rb_mRedcarpet, "Markdown", rb_cObject);
+	rb_undef_alloc_func(rb_cMarkdown);
 	rb_define_singleton_method(rb_cMarkdown, "new", rb_redcarpet_md__new, -1);
 	rb_define_method(rb_cMarkdown, "render", rb_redcarpet_md_render, 1);
 

data/ext/redcarpet/rc_render.c

@@ -113,9 +113,10 @@ rndr_tablerow(struct buf *ob, const struct buf *text, void *opaque)
 static void
 rndr_tablecell(struct buf *ob, const struct buf *text, int align, void *opaque)
 {
-	VALUE rb_align;
+	VALUE rb_align, rb_header;
+	VALUE rb_callback, rb_callback_arity;
 
-	switch (align) {
+	switch (align & MKD_TABLE_ALIGNMASK) {
 	case MKD_TABLE_ALIGN_L:
 		rb_align = CSTR2SYM("left");
 		break;
@@ -133,7 +134,25 @@ rndr_tablecell(struct buf *ob, const struct buf *text, int align, void *opaque)
 		break;
 	}
 
-	BLOCK_CALLBACK("table_cell", 2, buf2str(text), rb_align);
+	if (align & MKD_TABLE_HEADER) {
+		rb_header = Qtrue;
+	} else {
+		rb_header = Qfalse;
+	}
+
+	struct redcarpet_renderopt *opt = opaque;
+
+	rb_callback = rb_funcall(opt->self, rb_intern("method"), 1, CSTR2SYM("table_cell"));
+
+	rb_callback_arity = rb_funcall(rb_callback, rb_intern("arity"), 0);
+
+	/* For backward compatibility, let's ensure that the erasure with
+	   only two parameters is still supported. */
+	if (FIX2INT(rb_callback_arity) == 3) {
+		BLOCK_CALLBACK("table_cell", 3, buf2str(text), rb_align, rb_header);
+	} else {
+		BLOCK_CALLBACK("table_cell", 2, buf2str(text), rb_align);
+	}
 }
 
 static void

data/lib/redcarpet.rb

@@ -2,7 +2,7 @@ require 'redcarpet.so'
 require 'redcarpet/compat'
 
 module Redcarpet
-  VERSION = '3.5.1'
+  VERSION = '3.6.0'
 
   class Markdown
     attr_reader :renderer

data/redcarpet.gemspec

@@ -1,17 +1,19 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '3.5.1'
+  s.version = '3.6.0'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
-  s.date = '2020-12-15'
+  s.date = '2023-01-29'
   s.email = 'vicent@github.com'
-  s.homepage = 'http://github.com/vmg/redcarpet'
+  s.homepage = 'https://github.com/vmg/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]
   s.license = 'MIT'
   s.required_ruby_version = '>= 1.9.2'
   # = MANIFEST =
   s.files = %w[
+    CHANGELOG.md
+    CONTRIBUTING.md
     COPYING
     Gemfile
     README.markdown
@@ -27,6 +29,7 @@ Gem::Specification.new do |s|
     ext/redcarpet/houdini_html_e.c
     ext/redcarpet/html.c
     ext/redcarpet/html.h
+    ext/redcarpet/html_block_names.txt
     ext/redcarpet/html_blocks.h
     ext/redcarpet/html_smartypants.c
     ext/redcarpet/markdown.c
@@ -42,21 +45,6 @@ Gem::Specification.new do |s|
     lib/redcarpet/render_man.rb
     lib/redcarpet/render_strip.rb
     redcarpet.gemspec
-    test/benchmark.rb
-    test/custom_render_test.rb
-    test/fixtures/benchmark.md
-    test/html5_test.rb
-    test/html_render_test.rb
-    test/html_toc_render_test.rb
-    test/markdown_test.rb
-    test/pathological_inputs_test.rb
-    test/redcarpet_bin_test.rb
-    test/redcarpet_compat_test.rb
-    test/safe_render_test.rb
-    test/smarty_html_test.rb
-    test/smarty_pants_test.rb
-    test/stripdown_render_test.rb
-    test/test_helper.rb
   ]
   # = MANIFEST =
   s.test_files = s.files.grep(%r{^test/})
@@ -65,7 +53,7 @@ Gem::Specification.new do |s|
   s.executables = ["redcarpet"]
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rake", "~> 12.2.1"
-  s.add_development_dependency "rake-compiler", "~> 1.0.3"
-  s.add_development_dependency "test-unit", "~> 3.2.3"
+  s.add_development_dependency "rake", "~> 13"
+  s.add_development_dependency "rake-compiler", "~> 1.1"
+  s.add_development_dependency "test-unit", "~> 3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcarpet
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Natacha Porté
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.5'
 description: A fast, safe and extensible Markdown to (X)HTML parser
 email: vicent@github.com
 executables:
@@ -62,6 +62,8 @@ extensions:
 extra_rdoc_files:
 - COPYING
 files:
+- CHANGELOG.md
+- CONTRIBUTING.md
 - COPYING
 - Gemfile
 - README.markdown
@@ -77,6 +79,7 @@ files:
 - ext/redcarpet/houdini_html_e.c
 - ext/redcarpet/html.c
 - ext/redcarpet/html.h
+- ext/redcarpet/html_block_names.txt
 - ext/redcarpet/html_blocks.h
 - ext/redcarpet/html_smartypants.c
 - ext/redcarpet/markdown.c
@@ -92,22 +95,7 @@ files:
 - lib/redcarpet/render_man.rb
 - lib/redcarpet/render_strip.rb
 - redcarpet.gemspec
-- test/benchmark.rb
-- test/custom_render_test.rb
-- test/fixtures/benchmark.md
-- test/html5_test.rb
-- test/html_render_test.rb
-- test/html_toc_render_test.rb
-- test/markdown_test.rb
-- test/pathological_inputs_test.rb
-- test/redcarpet_bin_test.rb
-- test/redcarpet_compat_test.rb
-- test/safe_render_test.rb
-- test/smarty_html_test.rb
-- test/smarty_pants_test.rb
-- test/stripdown_render_test.rb
-- test/test_helper.rb
-homepage: http://github.com/vmg/redcarpet
+homepage: https://github.com/vmg/redcarpet
 licenses:
 - MIT
 metadata: {}
@@ -126,23 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Markdown that smells nice
-test_files:
-- test/benchmark.rb
-- test/custom_render_test.rb
-- test/fixtures/benchmark.md
-- test/html5_test.rb
-- test/html_render_test.rb
-- test/html_toc_render_test.rb
-- test/markdown_test.rb
-- test/pathological_inputs_test.rb
-- test/redcarpet_bin_test.rb
-- test/redcarpet_compat_test.rb
-- test/safe_render_test.rb
-- test/smarty_html_test.rb
-- test/smarty_pants_test.rb
-- test/stripdown_render_test.rb
-- test/test_helper.rb
+test_files: []

data/test/benchmark.rb

@@ -1,24 +0,0 @@
-# coding: UTF-8
-# Thanks Kramdown for the inspiration!
-require 'benchmark/ips'
-
-require 'redcarpet'
-require 'bluecloth'
-require 'kramdown'
-
-markdown = File.read(File.join(File.dirname(__FILE__), "fixtures/benchmark.md"))
-
-# Let's bench!
-Benchmark.ips do |bench|
-  bench.report("Redcarpet") do
-    Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(markdown)
-  end
-
-  bench.report("BlueCloth") do
-    BlueCloth.new(markdown).to_html
-  end
-
-  bench.report("Kramdown") do
-    Kramdown::Document.new(markdown).to_html
-  end
-end

data/test/custom_render_test.rb

@@ -1,67 +0,0 @@
-# coding: UTF-8
-require 'test_helper'
-
-class CustomRenderTest < Redcarpet::TestCase
-  class SimpleRender < Redcarpet::Render::HTML
-    def emphasis(text)
-      if @options[:no_intra_emphasis]
-        return %(<em class="no_intra_emphasis">#{text}</em>)
-      end
-
-      %(<em class="cool">#{text}</em>)
-    end
-
-    def header(text, level)
-      "My little poney" if @options[:with_toc_data]
-    end
-  end
-
-  def test_simple_overload
-    md = Redcarpet::Markdown.new(SimpleRender)
-    assert_equal "<p>This is <em class=\"cool\">just</em> a test</p>\n",
-      md.render("This is *just* a test")
-  end
-
-  def test_renderer_options
-    parser = Redcarpet::Markdown.new(SimpleRender.new(with_toc_data: true))
-    output = parser.render("# A title")
-
-    assert_match "My little poney", output
-  end
-
-  def test_markdown_options
-    parser = Redcarpet::Markdown.new(SimpleRender, no_intra_emphasis: true)
-    output = parser.render("*foo*")
-
-    assert_match "no_intra_emphasis", output
-  end
-
-  def test_original_options_hash_is_not_mutated
-    options = { with_toc_data: true }
-    render  = SimpleRender.new(options)
-    parser  = Redcarpet::Markdown.new(render, tables: true)
-
-    computed_options = render.instance_variable_get(:"@options")
-
-    refute_equal computed_options.object_id, options.object_id
-  end
-
-  class NilPreprocessRenderer < Redcarpet::Render::HTML
-    def preprocess(fulldoc)
-      nil
-    end
-  end
-
-  def test_preprocess_returning_nil
-    md = Redcarpet::Markdown.new(NilPreprocessRenderer)
-    assert_equal(nil,md.render("Anything"))
-  end
-
-  def test_base_render_without_quote_callback
-    # Regression test for https://github.com/vmg/redcarpet/issues/569
-    render = Class.new(Redcarpet::Render::Base)
-    parser = Redcarpet::Markdown.new render.new, quote: true
-
-    assert_equal "", parser.render(%(a "quote"))
-  end
-end