redcarpet 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22bddd1461e328aa2fbe6efb52ed876bb3ce23e5
-  data.tar.gz: 88c87895f31eedbd763c33798725d1707319c85c
+  metadata.gz: 54a531e17acc94f275045e633bab8458df9c0075
+  data.tar.gz: 407c3e570ffbaff80b809ab344fb4a7d27b1b97f
 SHA512:
-  metadata.gz: 98be06e055fe5f742ca0113d7e88379238919893586378ff0ce765ed64cd44c676be362b8bb1626c01e2f3fc71bb3ff33cf267919163d82d80d50665b96a73aa
-  data.tar.gz: fe463bbfb1e0d416c817faf851c1fcbcf91654906b844c0ad34a58cd612cdce5b3c4392016b34302e6672ad67a93a6a99556f35b7f3d193271fce547caf69857
+  metadata.gz: 7d7189a86a6ed3451e823f2b75acfc2c7086f73e02e22ece1490b25fba5df75d149c8d1ce61cef47c7604aa0a941e090bbff93f5623d501d78e3cf2ef5836d89
+  data.tar.gz: 34e6b6980076319b5094c1766687c31b21ace1d2e5d96f7b291f36f60350d727b40f87f14a870f16601732532ca4ad469a79430312ac5b72eda18ef9f4e1e364

data/README.markdown

@@ -25,7 +25,7 @@ Starting with Redcarpet 3.0, the minimum required Ruby version is 1.9.2 (or Rubi
 
     $ [sudo] gem install redcarpet
 
-If you need to use it with Ruby 1.8.7, you will need to stick with 2.3.0:
+If you need to use it with Ruby 1.8.7, you will have to stick with 2.3.0:
 
     $ [sudo] gem install redcarpet -v 2.3.0
 
@@ -185,9 +185,18 @@ When instantiating this render object, you can optionally pass a `nesting_level`
 option which takes an integer and allows you to make it render only headers
 until a specific level.
 
-Furthermore, the abstract base class `Redcarpet::Render::Base` can be used
-to write a custom renderer purely in Ruby, or extending an existing renderer.
-See the following section for more information.
+Redcarpet also includes a plaintext renderer, `Redcarpet::Render::StripDown`, that
+strips out all the formatting:
+
+~~~~ ruby
+require 'redcarpet'
+require 'redcarpet/render_strip'
+
+markdown = Redcarpet::Markdown.new(Redcarpet::Render::StripDown)
+
+markdown.render("**This** _is_ an [example](http://example.org/).")
+# => "This is an example (http://example.org/)."
+~~~~
 
 
 And you can even cook your own
@@ -197,18 +206,19 @@ Custom renderers are created by inheriting from an existing renderer. The
 built-in renderers, `HTML` and `XHTML` may be extended as such:
 
 ~~~~~ ruby
-# create a custom renderer that allows highlighting of code blocks
-class HTMLwithPygments < Redcarpet::Render::HTML
-  def block_code(code, language)
-    Pygments.highlight(code, lexer: language)
+# Create a custom renderer that sets a custom class for block-quotes.
+class CustomRender < Redcarpet::Render::HTML
+  def block_quote(quote)
+    %(<blockquote class="my-custom-class">#{quote}</blockquote>)
   end
 end
 
 markdown = Redcarpet::Markdown.new(HTMLwithPygments, fenced_code_blocks: true)
 ~~~~~
 
-But new renderers can also be created from scratch (see `lib/redcarpet/render_man.rb` for
-an example implementation of a Manpage renderer)
+But new renderers can also be created from scratch by extending the abstract
+base class `Redcarpet::Render::Base` (see `lib/redcarpet/render_man.rb` for
+an example implementation of a Manpage renderer):
 
 ~~~~~~ ruby
 class ManPage < Redcarpet::Render::Base
@@ -373,7 +383,7 @@ monkeypatches the Markdown class, you're a terrible human being. Just saying.
 Boring legal stuff
 ------------------
 
-Copyright (c) 2011-2015, Vicent Martí
+Copyright (c) 2011-2016, Vicent Martí
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/ext/redcarpet/autolink.c

@@ -294,6 +294,13 @@ sd_autolink__url(
 	if (link_end == 0)
 		return 0;
 
+	/**
+	 * In certain cases, we may refer to a link at the end of a
+	 * sentence so the period should not be part of the URL.
+	 */
+	if (data[link_end - 1] == '.')
+		link_end--;
+
 	bufput(link, data - rewind, link_end + rewind);
 	*rewind_p = rewind;
 

data/ext/redcarpet/houdini_href_e.c

@@ -44,10 +44,10 @@
  * have its native function (i.e. as an URL 
  * component/separator) and hence needs no escaping.
  *
- * There are two exceptions: the chacters & (amp)
- * and ' (single quote) do not appear in the table.
- * They are meant to appear in the URL as components,
- * yet they require special HTML-entity escaping
+ * There is one exception: the ' (single quote) 
+ * character does not appear in the table.
+ * It is meant to appear in the URL as components,
+ * however it require special HTML-entity escaping
  * to generate valid HTML markup.
  *
  * All other characters will be escaped to %XX.
@@ -56,7 +56,7 @@
 static const char HREF_SAFE[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 
+	0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 
@@ -95,12 +95,6 @@ houdini_escape_href(struct buf *ob, const uint8_t *src, size_t size)
 			break;
 
 		switch (src[i]) {
-		/* amp appears all the time in URLs, but needs
-		 * HTML-entity escaping to be inside an href */
-		case '&': 
-			BUFPUTSL(ob, "&");
-			break;
-
 		/* the single quote is a valid URL character
 		 * according to the standard; it needs HTML
 		 * entity escaping too */

data/ext/redcarpet/html.c

@@ -281,13 +281,20 @@ rndr_header_anchor(struct buf *out, const struct buf *anchor)
 	int stripped = 0, inserted = 0;
 
 	for (; i < size; ++i) {
+		// skip html tags
 		if (a[i] == '<') {
 			while (i < size && a[i] != '>')
 				i++;
+		// skip html entities
+		} else if (a[i] == '&') {
+			while (i < size && a[i] != ';')
+				i++;
 		}
+		// replace non-ascii or invalid characters with dashes
 		else if (!isascii(a[i]) || strchr(STRIPPED, a[i])) {
 			if (inserted && !stripped)
 				bufputc(out, '-');
+			// and do it only once
 			stripped = 1;
 		}
 		else {
@@ -297,8 +304,18 @@ rndr_header_anchor(struct buf *out, const struct buf *anchor)
 		}
 	}
 
-	if (stripped)
+	// replace the last dash if there was anything added
+	if (stripped && inserted)
 		out->size--;
+
+	// if anchor found empty, use djb2 hash for it
+	if (!inserted && anchor->size) {
+	        unsigned long hash = 5381;
+		for (i = 0; i < size; ++i) {
+			hash = ((hash << 5) + hash) + a[i]; /* h * 33 + c */
+		}
+		bufprintf(out, "part-%lx", hash);
+	}
 }
 
 static void

data/ext/redcarpet/html_blocks.h

@@ -1,6 +1,6 @@
-/* C code produced by gperf version 3.0.4 */
+/* C code produced by gperf version 3.0.3 */
 /* Command-line: gperf -N find_block_tag -H hash_block_tag -C -c -E --ignore-case html_block_names.txt  */
-/* See http://git.io/RN0ncw for the list of recognized elements */
+/* See https://git.io/vPLqa for the list of recognized elements */
 /* Computed positions: -k'1-2' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -30,7 +30,7 @@
 error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-/* maximum key range = 67, duplicates = 0 */
+/* maximum key range = 72, duplicates = 0 */
 
 #ifndef GPERF_DOWNCASE
 #define GPERF_DOWNCASE 1
@@ -94,34 +94,34 @@ hash_block_tag (str, len)
 {
   static const unsigned char asso_values[] =
     {
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      55, 50, 45, 40, 35, 30, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 15, 10, 15, 15, 15,
-       0, 20, 10, 10,  5, 68, 68,  0, 20, 25,
-       0, 68, 68,  0, 25,  0, 15, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 15, 10, 15,
-      15, 15,  0, 20, 10, 10,  5, 68, 68,  0,
-      20, 25,  0, 68, 68,  0, 25,  0, 15, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-      68, 68, 68, 68, 68, 68, 68
+      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, 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,
+       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, 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, 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, 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,
+      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, 73, 73, 73, 73, 73, 73
     };
-  register int hval = len;
+  register unsigned int hval = len;
 
   switch (hval)
     {
@@ -135,12 +135,6 @@ hash_block_tag (str, len)
   return hval;
 }
 
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
 const char *
 find_block_tag (str, len)
      register const char *str;
@@ -148,76 +142,80 @@ find_block_tag (str, len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 41,
+      TOTAL_KEYWORDS = 43,
       MIN_WORD_LENGTH = 1,
       MAX_WORD_LENGTH = 10,
       MIN_HASH_VALUE = 1,
-      MAX_HASH_VALUE = 67
+      MAX_HASH_VALUE = 72
     };
 
   static const char * const wordlist[] =
     {
       "",
       "p",
-      "ul",
-      "pre",
+      "dl",
+      "del",
       "form",
-      "style",
+      "",
       "footer",
-      "section",
-      "", "", "",
+      "details",
+      "div",
+      "", "",
       "figure",
-      "hr",
+      "ul",
       "fieldset",
-      "math",
+      "",
       "figcaption",
       "header",
-      "dl",
-      "del",
-      "",
-      "blockquote",
+      "ol",
+      "pre",
+      "math",
+      "video",
       "script",
-      "article",
-      "div",
+      "section",
+      "noscript",
       "",
-      "video",
+      "blockquote",
       "hgroup",
-      "ol",
-      "noscript",
-      "", "",
+      "hr",
+      "ins",
+      "",
+      "style",
+      "output",
+      "summary",
+      "nav",
+      "",
+      "audio",
       "canvas",
       "dd",
-      "nav",
+      "h1",
       "abbr",
-      "audio",
-      "iframe",
-      "address",
-      "ins",
-      "",
       "table",
-      "",
-      "h6",
+      "iframe",
+      "article",
       "", "",
       "aside",
-      "output",
-      "h5",
+      "",
+      "h6",
       "", "",
       "tfoot",
       "",
+      "h5",
+      "", "", "", "",
       "h4",
       "", "", "", "",
-      "h3",
+      "address",
       "", "", "", "",
-      "h2",
+      "h3",
       "", "", "", "",
-      "h1"
+      "h2"
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = hash_block_tag (str, len);
+      unsigned int key = hash_block_tag (str, len);
 
-      if (key <= MAX_HASH_VALUE && key >= 0)
+      if (key <= MAX_HASH_VALUE)
         {
           register const char *s = wordlist[key];
 

data/ext/redcarpet/html_smartypants.c

@@ -151,6 +151,9 @@ smartypants_squote(struct buf *ob, struct smartypants_data *smrt, uint8_t previo
 				return next_squote_len;
 		}
 
+		if (smartypants_quotes(ob, previous_char, size > 0 ? text[1] : 0, 's', &smrt->in_squote))
+			return 0;
+
 		// trailing single quotes: students', tryin'
 		if (word_boundary(t1)) {
 			BUFPUTSL(ob, "’");
@@ -178,9 +181,6 @@ smartypants_squote(struct buf *ob, struct smartypants_data *smrt, uint8_t previo
 		}
 	}
 
-	if (smartypants_quotes(ob, previous_char, size > 0 ? text[1] : 0, 's', &smrt->in_squote))
-		return 0;
-
 	bufput(ob, squote_text, squote_size);
 	return 0;
 }

data/ext/redcarpet/markdown.c

@@ -92,7 +92,6 @@ typedef size_t
 
 static size_t char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_underline(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
-static size_t char_highlight(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_quote(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_linebreak(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_codespan(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
@@ -613,7 +612,7 @@ parse_emph1(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 		if (data[i] == c && !_isspace(data[i - 1])) {
 
 			if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS) {
-				if (i + i < size && _isalnum(data[i + 1]))
+				if (i + 1 < size && _isalnum(data[i + 1]))
 					continue;
 			}
 
@@ -845,7 +844,6 @@ char_quote(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offse
 	return end;
 }
 
-
 /* char_escape • '\\' backslash escape */
 static size_t
 char_escape(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size)
@@ -2339,7 +2337,7 @@ parse_table_header(
 		if (i < under_end && data[i] != '|' && data[i] != '+')
 			break;
 
-		if (dashes < 3)
+		if (dashes < 1)
 			break;
 
 		i++;
@@ -2757,10 +2755,13 @@ sd_markdown_new(
 	if (md->cb.emphasis || md->cb.double_emphasis || md->cb.triple_emphasis) {
 		md->active_char['*'] = MD_CHAR_EMPHASIS;
 		md->active_char['_'] = MD_CHAR_EMPHASIS;
+
 		if (extensions & MKDEXT_STRIKETHROUGH)
 			md->active_char['~'] = MD_CHAR_EMPHASIS;
 		if (extensions & MKDEXT_HIGHLIGHT)
 			md->active_char['='] = MD_CHAR_EMPHASIS;
+		if (extensions & MKDEXT_QUOTE)
+			md->active_char['"'] = MD_CHAR_QUOTE;
 	}
 
 	if (md->cb.codespan)
@@ -2785,9 +2786,6 @@ sd_markdown_new(
 	if (extensions & MKDEXT_SUPERSCRIPT)
 		md->active_char['^'] = MD_CHAR_SUPERSCRIPT;
 
-	if (extensions & MKDEXT_QUOTE)
-		md->active_char['"'] = MD_CHAR_QUOTE;
-
 	/* Extension data */
 	md->ext_flags = extensions;
 	md->opaque = opaque;