redcarpet 3.3.4 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 22bddd1461e328aa2fbe6efb52ed876bb3ce23e5
-  data.tar.gz: 88c87895f31eedbd763c33798725d1707319c85c
+SHA256:
+  metadata.gz: 3e6ea78031a1e40620168cd57fcbfae06bec5bafabc8f6e600adc552a4fe5b40
+  data.tar.gz: 658dd33e836daa11effa88e0491d09387963ea349751efd278e9fbdac7026066
 SHA512:
-  metadata.gz: 98be06e055fe5f742ca0113d7e88379238919893586378ff0ce765ed64cd44c676be362b8bb1626c01e2f3fc71bb3ff33cf267919163d82d80d50665b96a73aa
-  data.tar.gz: fe463bbfb1e0d416c817faf851c1fcbcf91654906b844c0ad34a58cd612cdce5b3c4392016b34302e6672ad67a93a6a99556f35b7f3d193271fce547caf69857
+  metadata.gz: b17b0208c25d4e8566fb4a154d0f66e778b702abcf58d1d1227fa2510be421c7496e20fd6402066adba3485778e935b46aff73fd412802eedb89e44470a7ad94
+  data.tar.gz: 1e1c8dd559979b8bd5f4de2d20e1127b2a964c03a267133c3d9a3703f71bce44a2f4dc2efdb0dc0cc331e0ab779bfad23e9b62af0ffc4ee9078896376bd86865

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org/"
 gemspec
 
 group :benchmark do
-  gem "benchmark-ips", "~> 2.3.0"
+  gem "benchmark-ips", "~> 2.7.2"
   gem "bluecloth", "~> 2.2.0"
-  gem "kramdown", "~> 1.8.0"
+  gem "kramdown", "~> 1.13.2"
 end

data/README.markdown

@@ -3,6 +3,7 @@ Redcarpet is written with sugar, spice and everything nice
 
 [![Build Status](https://travis-ci.org/vmg/redcarpet.svg?branch=master)](https://travis-ci.org/vmg/redcarpet)
 [![Dependency Status](https://www.versioneye.com/ruby/redcarpet/badge.svg)](https://www.versioneye.com/ruby/redcarpet)
+[![Help Contribute to Open Source](https://www.codetriage.com/vmg/redcarpet/badges/users.svg)](https://www.codetriage.com/vmg/redcarpet)
 
 Redcarpet is a Ruby library for Markdown processing that smells like
 butterflies and popcorn.
@@ -25,7 +26,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
 
@@ -45,10 +46,10 @@ output.
 The `Redcarpet::Markdown` object is encouraged to be instantiated once with the
 required settings, and reused between parses.
 
-~~~~~ ruby
+~~~~ ruby
 # Initializes a Markdown parser
 markdown = Redcarpet::Markdown.new(renderer, extensions = {})
-~~~~~
+~~~~
 
 Here, the `renderer` variable refers to a renderer object, inheriting
 from `Redcarpet::Render::Base`. If the given object has not been
@@ -59,10 +60,10 @@ Unlike in the RedCloth API, the text to render is passed as an argument
 and not stored inside the `Markdown` instance, to encourage reusability.
 Example:
 
-~~~~~ ruby
+~~~~ ruby
 markdown.render("This is *bongos*, indeed.")
 # => "<p>This is <em>bongos</em>, indeed.</p>"
-~~~~~
+~~~~
 
 You can also specify a hash containing the Markdown extensions which the
 parser will identify. The following extensions are accepted:
@@ -119,9 +120,9 @@ within the document (e.g. `[^1]: This is a footnote.`).
 
 Example:
 
-~~~ruby
+~~~~ ruby
 markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true)
- ~~~~~
+~~~~
 
 Darling, I packed you a couple renderers for lunch
 --------------------------------------------------
@@ -136,9 +137,9 @@ All the rendering flags that previously applied only to HTML output have
 now been moved to the `Redcarpet::Render::HTML` class, and may be enabled when
 instantiating the renderer:
 
-~~~~~ ruby
+~~~~ ruby
 Redcarpet::Render::HTML.new(render_options = {})
-~~~~~
+~~~~
 
 Initializes an HTML renderer. The following flags are available:
 
@@ -172,9 +173,9 @@ Markdown document had newlines (by default, Markdown ignores these newlines).
 
 Example:
 
-~~~~~ ruby
+~~~~ ruby
 renderer = Redcarpet::Render::HTML.new(no_links: true, hard_wrap: true)
-~~~~~
+~~~~
 
 
 The `HTML` renderer has an alternate version, `Redcarpet::Render::HTML_TOC`,
@@ -182,12 +183,21 @@ which will output a table of contents in HTML based on the headers of the
 Markdown document.
 
 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.
+option which takes an integer or a range and allows you to make it render only
+headers at certain levels.
 
-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
@@ -196,25 +206,26 @@ And you can even cook your own
 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)
+~~~~ ruby
+# 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)
-~~~~~
+markdown = Redcarpet::Markdown.new(CustomRender, 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
+~~~~ ruby
 class ManPage < Redcarpet::Render::Base
   # you get the drill -- keep going from here
 end
-~~~~~
+~~~~
 
 The following instance methods may be implemented by the renderer:
 
@@ -302,7 +313,7 @@ or after the rendering process begins:
 * postprocess(full_document)
 
 You can look at
-["How to extend the Redcarpet 2 Markdown library?"](http://dev.af83.com/2012/02/27/howto-extend-the-redcarpet2-markdown-lib.html)
+["How to extend the Redcarpet 2 Markdown library?"](https://web.archive.org/web/20170505231254/http://dev.af83.com/2012/02/27/howto-extend-the-redcarpet2-markdown-lib.html)
 for some more explanations.
 
 Also, now our Pants are much smarter
@@ -327,7 +338,7 @@ end
 
 # Standalone
 Redcarpet::Render::SmartyPants.render("<p>Oh SmartyPants, you're so crazy...</p>")
-~~~~~
+~~~~
 
 SmartyPants works on top of already-rendered HTML, and will ignore replacements
 inside the content of HTML tags and inside specific HTML blocks such as
@@ -352,16 +363,16 @@ renderer-independent, the results will be completely unreliable!
 Still, if major forces (let's say, tornadoes or other natural disasters) force you
 to keep a Markdown-compatibility layer, Redcarpet also supports this:
 
-~~~~~ ruby
+~~~~ ruby
 require 'redcarpet/compat'
-~~~~~
+~~~~
 
 Requiring the compatibility library will declare a `Markdown` class with the
 classical RedCloth API, e.g.
 
-~~~~~ ruby
+~~~~ ruby
 Markdown.new('this is my text').to_html
-~~~~~
+~~~~
 
 This class renders 100% standards compliant Markdown with 0 extensions. Nada.
 Don't even try to enable extensions with a compatibility layer, because
@@ -373,7 +384,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,9 +294,15 @@ 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;
 
 	return link_end;
 }
-

data/ext/redcarpet/buffer.h

@@ -86,4 +86,3 @@ void bufprintf(struct buf *, const char *, ...) __attribute__ ((format (printf,
 #endif
 
 #endif
-

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/houdini_html_e.c

@@ -102,4 +102,3 @@ houdini_escape_html(struct buf *ob, const uint8_t *src, size_t size)
 {
 	houdini_escape_html0(ob, src, size, 1);
 }
-

data/ext/redcarpet/html.c

@@ -255,8 +255,15 @@ rndr_quote(struct buf *ob, const struct buf *text, void *opaque)
 	if (!text || !text->size)
 		return 0;
 
+	struct html_renderopt *options = opaque;
+
 	BUFPUTSL(ob, "<q>");
-	bufput(ob, text->data, text->size);
+
+	if (options->flags & HTML_ESCAPE)
+		escape_html(ob, text->data, text->size);
+	else
+		bufput(ob, text->data, text->size);
+
 	BUFPUTSL(ob, "</q>");
 
 	return 1;
@@ -281,13 +288,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 +311,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
@@ -309,7 +333,8 @@ rndr_header(struct buf *ob, const struct buf *text, int level, void *opaque)
 	if (ob->size)
 		bufputc(ob, '\n');
 
-	if ((options->flags & HTML_TOC) && (level <= options->toc_data.nesting_level)) {
+	if ((options->flags & HTML_TOC) && level >= options->toc_data.nesting_bounds[0] &&
+	     level <= options->toc_data.nesting_bounds[1]) {
 		bufprintf(ob, "<h%d id=\"", level);
 		rndr_header_anchor(ob, text);
 		BUFPUTSL(ob, "\">");
@@ -638,7 +663,7 @@ rndr_footnote_def(struct buf *ob, const struct buf *text, unsigned int num, void
 	bufprintf(ob, "\n<li id=\"fn%d\">\n", num);
 	if (pfound) {
 		bufput(ob, text->data, i);
-		bufprintf(ob, "&nbsp;<a href=\"#fnref%d\" rev=\"footnote\">&#8617;</a>", num);
+		bufprintf(ob, "&nbsp;<a href=\"#fnref%d\">&#8617;</a>", num);
 		bufput(ob, text->data + i, text->size - i);
 	} else if (text) {
 		bufput(ob, text->data, text->size);
@@ -649,7 +674,7 @@ rndr_footnote_def(struct buf *ob, const struct buf *text, unsigned int num, void
 static int
 rndr_footnote_ref(struct buf *ob, unsigned int num, void *opaque)
 {
-	bufprintf(ob, "<sup id=\"fnref%d\"><a href=\"#fn%d\" rel=\"footnote\">%d</a></sup>", num, num, num);
+	bufprintf(ob, "<sup id=\"fnref%d\"><a href=\"#fn%d\">%d</a></sup>", num, num, num);
 	return 1;
 }
 
@@ -658,7 +683,8 @@ toc_header(struct buf *ob, const struct buf *text, int level, void *opaque)
 {
 	struct html_renderopt *options = opaque;
 
-	if (level <= options->toc_data.nesting_level) {
+	if (level >= options->toc_data.nesting_bounds[0] &&
+	    level <= options->toc_data.nesting_bounds[1]) {
 		/* set the level offset if this is the first header
 		 * we're parsing for the document */
 		if (options->toc_data.current_level == 0)
@@ -807,7 +833,8 @@ sdhtml_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options,
 	/* Prepare the options pointer */
 	memset(options, 0x0, sizeof(struct html_renderopt));
 	options->flags = render_flags;
-	options->toc_data.nesting_level = 99;
+	options->toc_data.nesting_bounds[0] = 1;
+	options->toc_data.nesting_bounds[1] = 6;
 
 	/* Prepare the callbacks */
 	memcpy(callbacks, &cb_default, sizeof(struct sd_callbacks));

data/ext/redcarpet/html.h

@@ -35,7 +35,7 @@ struct html_renderopt {
 	struct {
 		int current_level;
 		int level_offset;
-		int nesting_level;
+		int nesting_bounds[2];
 	} toc_data;
 
 	unsigned int flags;
@@ -81,4 +81,3 @@ sdhtml_smartypants(struct buf *ob, const uint8_t *text, size_t size);
 #endif
 
 #endif
-

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;
 }
@@ -341,6 +341,7 @@ smartypants_cb__ltag(struct buf *ob, struct smartypants_data *smrt, uint8_t prev
 	};
 	static const size_t skip_tags_count = 8;
 
+	size_t next_to_closing_a = 0;
 	size_t tag, i = 0;
 
 	while (i < size && text[i] != '>')
@@ -369,7 +370,23 @@ smartypants_cb__ltag(struct buf *ob, struct smartypants_data *smrt, uint8_t prev
 			i++;
 	}
 
+	if (sdhtml_is_tag(text, size, "a") == HTML_TAG_CLOSE) {
+		while (i < size && text[i] != '>')
+			i++;
+
+		next_to_closing_a = 1;
+	}
+
 	bufput(ob, text, i + 1);
+
+	// Pretty tricky: since people may refer to something or someone
+	// with a link but use the possessive form right after it, we need
+	// to check whether a single quote is next to a closing "</a"> tag.
+	if (next_to_closing_a && strncmp("&#39;", text+(i+1), 5) == 0) {
+		bufput(ob, "&rsquo;", 7);
+		i += 5;
+	}
+
 	return i;
 }
 
@@ -453,5 +470,3 @@ sdhtml_smartypants(struct buf *ob, const uint8_t *text, size_t size)
 		}
 	}
 }
-
-