commonmarker 0.20.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 237799ebff0e881aabc44799deac5c31a201307b
-  data.tar.gz: c2ebbe9b5bf5cc3ff8cb218c92a280eeb6aca70f
+SHA256:
+  metadata.gz: f5356237deaf85df9914e0c7fa3f121fa0301579653b83b006df4dd8404c65f2
+  data.tar.gz: 9d4a09830e1c107dec28e47a3c0ab96f2cc6bcd9786982e38607752022ec12f1
 SHA512:
-  metadata.gz: 2d5122a6869dc1b0e112a7ca8afcadfc53fda72c75f5bc0486e7046e59094f67f72f80955af1cc5fd6604ecea76361ee511c124b47f1c66f3f01496cf5a6b6ad
-  data.tar.gz: 39f7183d9f048c72729a916cefca93fecdc55e95054ff019fdeddc2ad94be5dbeb61c2c4ef7175373a0c2d520a72ad3743e415700bcbade0eb5dcdc37443ed16
+  metadata.gz: 7e43f365eb266fa8c0627572999a2102df7dd65e0404917c5fa6054b532c526a35ad5d0ef9423cf68033edc52fb0c20da79ca73d7345b04d4493f33bff35ed73
+  data.tar.gz: 0e5da729c2247288a1bf60672f572f785def6e2a1726afeaf87aa1332d083e4834d52c403479a36437f9c0a9e99548569f7d5bc092a405304ccef81ac71096b1

data/README.md

@@ -1,6 +1,6 @@
 # CommonMarker
 
-[![Build Status](https://travis-ci.org/gjtorikian/commonmarker.svg)](https://travis-ci.org/gjtorikian/commonmarker) [![Gem Version](https://badge.fury.io/rb/commonmarker.svg)](http://badge.fury.io/rb/commonmarker)
+![Build Status](https://github.com/gjtorikian/commonmarker/workflows/CI/badge.svg) [![Gem Version](https://badge.fury.io/rb/commonmarker.svg)](http://badge.fury.io/rb/commonmarker)
 
 Ruby wrapper for [libcmark-gfm](https://github.com/github/cmark),
 GitHub's fork of the reference parser for CommonMark. It passes all of the C tests, and is therefore spec-complete. It also includes extensions to the CommonMark spec as documented in the [GitHub Flavored Markdown spec](http://github.github.com/gfm/), such as support for tables, strikethroughs, and autolinking.
@@ -112,10 +112,8 @@ class MyHtmlRenderer < CommonMarker::HtmlRenderer
   end
 end
 
-# this renderer prints directly to STDOUT, instead
-# of returning a string
 myrenderer = MyHtmlRenderer.new
-print(myrenderer.render(doc))
+puts myrenderer.render(doc)
 
 # Print any warnings to STDERR
 renderer.warnings.each do |w|
@@ -141,16 +139,17 @@ CommonMarker accepts the same options that CMark does, as symbols. Note that the
 
 ### Render options
 
-| Name                             | Description                                                    |
-| ------------------               | -----------                                                    |
-| `:DEFAULT`                       | The default rendering system.                                  |
-| `:UNSAFE`                        | Allow raw/custom HTML and unsafe links.                        |
-| `:GITHUB_PRE_LANG`               | Use GitHub-style `<pre lang>` for fenced code blocks.          |
-| `:HARDBREAKS`                    | Treat `\n` as hardbreaks (by adding `<br/>`).                  |
-| `:NOBREAKS`                      | Translate `\n` in the source to a single whitespace.           |
-| `:SOURCEPOS`                     | Include source position in rendered HTML.                      |
-| `:TABLE_PREFER_STYLE_ATTRIBUTES` | Use `style` insted of `align` for table cells                  |
-| `:FULL_INFO_STRING`              | Include full info strings of code blocks in separate attribute |
+| Name                             | Description                                                     |
+| ------------------               | -----------                                                     |
+| `:DEFAULT`                       | The default rendering system.                                   |
+| `:UNSAFE`                        | Allow raw/custom HTML and unsafe links.                         |
+| `:GITHUB_PRE_LANG`               | Use GitHub-style `<pre lang>` for fenced code blocks.           |
+| `:HARDBREAKS`                    | Treat `\n` as hardbreaks (by adding `<br/>`).                   |
+| `:NOBREAKS`                      | Translate `\n` in the source to a single whitespace.            |
+| `:SOURCEPOS`                     | Include source position in rendered HTML.                       |
+| `:TABLE_PREFER_STYLE_ATTRIBUTES` | Use `style` insted of `align` for table cells.                  |
+| `:FULL_INFO_STRING`              | Include full info strings of code blocks in separate attribute. |
+| `:FOOTNOTES`                     | Render footnotes.                                               |
 
 ### Passing options
 
@@ -176,6 +175,7 @@ Both `render_html` and `render_doc` take an optional third argument defining the
 The available extensions are:
 
 * `:table` - This provides support for tables.
+* `:tasklist` - This provides support for task list items.
 * `:strikethrough` - This provides support for strikethroughs.
 * `:autolink` - This provides support for automatically converting URLs to anchor tags.
 * `:tagfilter` - This escapes [several "unsafe" HTML tags](https://github.github.com/gfm/#disallowed-raw-html-extension-), causing them to not have any effect.

data/Rakefile

@@ -5,7 +5,6 @@ require 'rake/clean'
 require 'rake/extensiontask'
 require 'digest/md5'
 
-
 host_os = RbConfig::CONFIG['host_os']
 require 'devkit' if host_os == 'mingw32'
 
@@ -36,7 +35,7 @@ end
 task 'test:unit' => :compile
 
 desc 'Run unit and conformance tests'
-task test: %w(test:unit)
+task test: %w[test:unit]
 
 require 'rubocop/rake_task'
 
@@ -47,7 +46,7 @@ task :benchmark do
   if ENV['FETCH_PROGIT']
     `rm -rf test/progit`
     `git clone https://github.com/progit/progit.git test/progit`
-    langs = %w(ar az be ca cs de en eo es es-ni fa fi fr hi hu id it ja ko mk nl no-nb pl pt-br ro ru sr th tr uk vi zh zh-tw)
+    langs = %w[ar az be ca cs de en eo es es-ni fa fi fr hi hu id it ja ko mk nl no-nb pl pt-br ro ru sr th tr uk vi zh zh-tw]
     langs.each do |lang|
       `cat test/progit/#{lang}/*/*.markdown >> test/benchinput.md`
     end
@@ -77,13 +76,26 @@ RDoc::Task.new do |rd|
   rd.options << '--fileboxes'
 end
 
+desc 'Generate the documentation and run a web server'
+task serve: [:rdoc] do
+  require 'webrick'
+
+  puts 'Navigate to http://localhost:3000 to see the docs'
+
+  server = WEBrick::HTTPServer.new Port: 3000
+  server.mount '/', WEBrick::HTTPServlet::FileHandler, 'docs'
+  trap('INT') { server.stop }
+  server.start
+end
+
 desc 'Generate and publish docs to gh-pages'
 task publish: [:rdoc] do
+  require 'tmpdir'
   require 'shellwords'
 
   Dir.mktmpdir do |tmp|
     system "mv docs/* #{tmp}"
-    system 'git checkout gh-pages'
+    system 'git checkout origin/gh-pages'
     system 'rm -rf *'
     system "mv #{tmp}/* ."
     message = Shellwords.escape("Site updated at #{Time.now.utc}")

data/bin/commonmarker

@@ -1,60 +1,98 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Usage: commonmarker [--html-renderer] [--list-extensions] [--extension=EXTENSION] [FILE..]
-# Convert one or more CommonMark files to HTML and write to standard output.
-# If no FILE argument is provided, text will be read from STDIN.
-# With --html-renderer, use the HtmlRenderer renderer rather than the native C
-# renderer.
-# With --extension=EXTENSION, EXTENSION will be used for parsing, and HTML
-# output unless --html-renderer is specified.
-if ARGV.include?('--help') or ARGV.include?('-h')
-  File.read(__FILE__).split("\n").grep(/^# /).each do |line|
-    puts line[2..-1]
-  end
-  exit 0
-end
+require 'optparse'
+require 'ostruct'
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'commonmarker'
 
-if ARGV.include?('--version') or ARGV.include?('-v')
-  puts "commonmarker #{CommonMarker::VERSION}"
-  exit 0
-end
+root = File.expand_path('..', __dir__)
+$LOAD_PATH.unshift File.expand_path('lib', root)
+
+def parse_options
+  options = OpenStruct.new
+  extensions = CommonMarker.extensions
+  parse_options = CommonMarker::Config::OPTS.fetch(:parse)
+  render_options = CommonMarker::Config::OPTS.fetch(:render)
+
+  options.active_extensions = []
+  options.active_parse_options = [:DEFAULT]
+  options.active_render_options = [:DEFAULT]
+
+  option_parser = OptionParser.new do |opts|
+    opts.banner = 'Usage: commonmarker [--html-renderer] [--extension=EXTENSION]'
+    opts.separator '                    [--parse-option=OPTION]'
+    opts.separator '                    [--render-option=OPTION]'
+    opts.separator '                    [FILE..]'
+    opts.separator ''
+    opts.separator 'Convert one or more CommonMark files to HTML and write to standard output.'
+    opts.separator 'If no FILE argument is provided, text will be read from STDIN.'
+    opts.separator ''
+
+    opts.on('--extension=EXTENSION', Array, 'Use EXTENSION for parsing and HTML output (unless --html-renderer is specified)') do |values|
+      values.each do |value|
+        if extensions.include?(value)
+          options.active_extensions << value.to_sym
+        else
+          abort("extension '#{value}' not found")
+        end
+      end
+    end
+
+    opts.on('-h', '--help', 'Prints this help') do
+      puts opts
+      puts
+      puts "Available extentions: #{extensions.join(', ')}"
+      puts "Available parse options: #{parse_options.keys.join(', ')}"
+      puts "Available render options: #{render_options.keys.join(', ')}"
+      puts
+      puts 'See the README for more information on these.'
+      exit
+    end
 
-root = File.expand_path('../../', __FILE__)
-$:.unshift File.expand_path('lib', root)
-
-extensions = CommonMarker.extensions
-active_extensions = []
-
-renderer = nil
-ARGV.delete_if do |arg|
-  if arg =~ /^--html-renderer$/
-    renderer = true
-    true
-  elsif arg =~ /^--list-extensions$/
-    puts extensions
-    exit 0
-  elsif arg =~ /^--extension=(.+)$/
-    if extensions.include?($1)
-      active_extensions << $1.intern
-    else
-      STDERR.puts "extension #$1 not found"
-      exit 1
+    opts.on('--html-renderer', 'Use the HtmlRenderer renderer rather than the native C renderer') do
+      options.renderer = true
+    end
+
+    opts.on('--parse-option=OPTION', Array, 'OPTION passed during parsing') do |values|
+      values.each do |value|
+        if parse_options.key?(value.to_sym)
+          options.active_parse_options << value.to_sym
+        else
+          abort("parse-option '#{value}' not found")
+        end
+      end
+    end
+
+    opts.on('--render-option=OPTION', Array, 'OPTION passed during rendering') do |values|
+      values.each do |value|
+        if render_options.key?(value.to_sym)
+          options.active_render_options << value.to_sym
+        else
+          abort("render-option '#{value}' not found")
+        end
+      end
+    end
+
+    opts.on('-v', '--version', 'Version information') do
+      puts "commonmarker #{CommonMarker::VERSION}"
+      exit
     end
-    true
-  else
-    false
   end
+
+  option_parser.parse!
+
+  options
 end
 
-doc = CommonMarker.render_doc(ARGF.read, :DEFAULT, active_extensions)
+options = parse_options
+
+doc = CommonMarker.render_doc(ARGF.read, options.active_parse_options, options.active_extensions)
 
-if renderer
-  renderer = CommonMarker::HtmlRenderer.new(extensions: active_extensions)
-  STDOUT.write(renderer.render(doc))
+if options.renderer
+  renderer = CommonMarker::HtmlRenderer.new(extensions: options.active_extensions)
+  $stdout.write(renderer.render(doc))
 else
-  STDOUT.write(doc.to_html(:DEFAULT, active_extensions))
+  $stdout.write(doc.to_html(options.active_render_options, options.active_extensions))
 end

data/commonmarker.gemspec

@@ -1,7 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'commonmarker/version'
 
@@ -10,32 +9,29 @@ 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', 'Ashe Connor']
+  s.authors = ['Garen Torikian', 'Ashe Connor']
   s.homepage = 'https://github.com/gjtorikian/commonmarker'
   s.license = 'MIT'
-  s.required_ruby_version = '>= 2.0.0'
 
-  s.files         = %w(LICENSE.txt README.md Rakefile commonmarker.gemspec bin/commonmarker)
+  s.files         = %w[LICENSE.txt README.md Rakefile commonmarker.gemspec bin/commonmarker]
   s.files        += Dir.glob('lib/**/*.rb')
   s.files        += Dir.glob('ext/commonmarker/*.*')
   s.test_files    = Dir.glob('test/**/*').reject { |f| f == 'test/benchinput.md' || f.start_with?('test/progit/') }
   s.extensions    = ['ext/commonmarker/extconf.rb']
 
-  s.test_files = s.files.grep(%r{^test/})
   s.executables = ['commonmarker']
-  s.require_paths = %w(lib ext)
+  s.require_paths = %w[lib ext]
+  s.required_ruby_version = ['>= 2.6', '< 4.0']
 
   s.rdoc_options += ['-x', 'ext/commonmarker/cmark/.*']
 
-  s.add_dependency 'ruby-enum', '~> 0.5'
-
+  s.add_development_dependency 'awesome_print'
+  s.add_development_dependency 'json', '~> 2.3'
   s.add_development_dependency 'minitest', '~> 5.6'
   s.add_development_dependency 'minitest-focus', '~> 1.1'
-  s.add_development_dependency 'rake-compiler', '~> 0.9'
-  s.add_development_dependency 'json', '~> 1.8.1'
-  s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rdoc', '~> 5.1'
+  s.add_development_dependency 'rake-compiler', '~> 0.9'
+  s.add_development_dependency 'rdoc', '~> 6.2'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-standard'
 end

data/ext/commonmarker/cmark-gfm-core-extensions.h

@@ -7,6 +7,7 @@ extern "C" {
 
 #include "cmark-gfm-extension_api.h"
 #include "cmark-gfm-extensions_export.h"
+#include "config.h" // for bool
 #include <stdint.h>
 
 CMARK_GFM_EXTENSIONS_EXPORT
@@ -15,14 +16,36 @@ void cmark_gfm_core_extensions_ensure_registered(void);
 CMARK_GFM_EXTENSIONS_EXPORT
 uint16_t cmark_gfm_extensions_get_table_columns(cmark_node *node);
 
+/** Sets the number of columns for the table, returning 1 on success and 0 on error.
+ */
+CMARK_GFM_EXTENSIONS_EXPORT
+int cmark_gfm_extensions_set_table_columns(cmark_node *node, uint16_t n_columns);
+
 CMARK_GFM_EXTENSIONS_EXPORT
 uint8_t *cmark_gfm_extensions_get_table_alignments(cmark_node *node);
 
+/** Sets the alignments for the table, returning 1 on success and 0 on error.
+ */
+CMARK_GFM_EXTENSIONS_EXPORT
+int cmark_gfm_extensions_set_table_alignments(cmark_node *node, uint16_t ncols, uint8_t *alignments);
+
 CMARK_GFM_EXTENSIONS_EXPORT
 int cmark_gfm_extensions_get_table_row_is_header(cmark_node *node);
 
+/** Sets whether the node is a table header row, returning 1 on success and 0 on error.
+ */
+CMARK_GFM_EXTENSIONS_EXPORT
+int cmark_gfm_extensions_set_table_row_is_header(cmark_node *node, int is_header);
+
+CMARK_GFM_EXTENSIONS_EXPORT
+bool cmark_gfm_extensions_get_tasklist_item_checked(cmark_node *node);
+/* For backwards compatibility */
+#define cmark_gfm_extensions_tasklist_is_checked cmark_gfm_extensions_get_tasklist_item_checked
+
+/** Sets whether a tasklist item is "checked" (completed), returning 1 on success and 0 on error.
+ */
 CMARK_GFM_EXTENSIONS_EXPORT
-char *cmark_gfm_extensions_get_tasklist_state(cmark_node *node);
+int cmark_gfm_extensions_set_tasklist_item_checked(cmark_node *node, bool is_checked);
 
 #ifdef __cplusplus
 }

data/ext/commonmarker/commonmarker.c

@@ -7,8 +7,8 @@
 #include "syntax_extension.h"
 #include "cmark-gfm-core-extensions.h"
 
-static VALUE rb_mNodeError;
-static VALUE rb_mNode;
+static VALUE rb_eNodeError;
+static VALUE rb_cNode;
 
 static VALUE sym_document;
 static VALUE sym_blockquote;
@@ -45,6 +45,13 @@ static VALUE encode_utf8_string(const char *c_string) {
   return string;
 }
 
+/* Encode a C string using the encoding from Ruby string +source+. */
+static VALUE encode_source_string(const char *c_string, VALUE source) {
+  VALUE string = rb_str_new2(c_string);
+  rb_enc_copy(string, source);
+  return string;
+}
+
 static void rb_mark_c_struct(void *data) {
   cmark_node *node = data;
   cmark_node *child;
@@ -94,7 +101,7 @@ static VALUE rb_node_to_value(cmark_node *node) {
 
   /* Only free tree roots. */
   free_func = cmark_node_parent(node) ? NULL : rb_free_c_struct;
-  val = Data_Wrap_Struct(rb_mNode, rb_mark_c_struct, free_func, node);
+  val = Data_Wrap_Struct(rb_cNode, rb_mark_c_struct, free_func, node);
   cmark_node_set_user_data(node, (void *)val);
 
   return val;
@@ -166,7 +173,7 @@ static VALUE rb_markdown_to_html(VALUE self, VALUE rb_text, VALUE rb_options, VA
   doc = cmark_parser_finish(parser);
   if (doc == NULL) {
     cmark_arena_reset();
-    rb_raise(rb_mNodeError, "error parsing document");
+    rb_raise(rb_eNodeError, "error parsing document");
   }
 
   cmark_mem *default_mem = cmark_get_default_mem_allocator();
@@ -250,11 +257,11 @@ static VALUE rb_node_new(VALUE self, VALUE type) {
   else if (type == sym_footnote_definition)
     node_type = CMARK_NODE_FOOTNOTE_DEFINITION;
   else
-    rb_raise(rb_mNodeError, "invalid node of type %d", node_type);
+    rb_raise(rb_eNodeError, "invalid node of type %d", node_type);
 
   node = cmark_node_new(node_type);
   if (node == NULL) {
-    rb_raise(rb_mNodeError, "could not create node of type %d", node_type);
+    rb_raise(rb_eNodeError, "could not create node of type %d", node_type);
   }
 
   return rb_node_to_value(node);
@@ -283,7 +290,7 @@ static VALUE rb_parse_document(VALUE self, VALUE rb_text, VALUE rb_len,
   cmark_parser_feed(parser, text, len);
   doc = cmark_parser_finish(parser);
   if (doc == NULL) {
-    rb_raise(rb_mNodeError, "error parsing document");
+    rb_raise(rb_eNodeError, "error parsing document");
   }
   cmark_parser_free(parser);
 
@@ -302,7 +309,7 @@ static VALUE rb_node_get_string_content(VALUE self) {
 
   text = cmark_node_get_literal(node);
   if (text == NULL) {
-    rb_raise(rb_mNodeError, "could not get string content");
+    rb_raise(rb_eNodeError, "could not get string content");
   }
 
   return encode_utf8_string(text);
@@ -324,7 +331,7 @@ static VALUE rb_node_set_string_content(VALUE self, VALUE s) {
   text = StringValueCStr(s);
 
   if (!cmark_node_set_literal(node, text)) {
-    rb_raise(rb_mNodeError, "could not set string content");
+    rb_raise(rb_eNodeError, "could not set string content");
   }
 
   return Qnil;
@@ -412,7 +419,7 @@ static VALUE rb_node_get_type(VALUE self) {
       s = node->extension->get_type_string_func(node->extension, node);
       return ID2SYM(rb_intern(s));
     }
-    rb_raise(rb_mNodeError, "invalid node type %d", node_type);
+    rb_raise(rb_eNodeError, "invalid node type %d", node_type);
   }
 
   return symbol;
@@ -512,7 +519,7 @@ static VALUE rb_node_insert_before(VALUE self, VALUE sibling) {
   Data_Get_Struct(sibling, cmark_node, node2);
 
   if (!cmark_node_insert_before(node1, node2)) {
-    rb_raise(rb_mNodeError, "could not insert before");
+    rb_raise(rb_eNodeError, "could not insert before");
   }
 
   rb_parent_added(sibling);
@@ -638,7 +645,7 @@ static VALUE rb_node_insert_after(VALUE self, VALUE sibling) {
   Data_Get_Struct(sibling, cmark_node, node2);
 
   if (!cmark_node_insert_after(node1, node2)) {
-    rb_raise(rb_mNodeError, "could not insert after");
+    rb_raise(rb_eNodeError, "could not insert after");
   }
 
   rb_parent_added(sibling);
@@ -661,7 +668,7 @@ static VALUE rb_node_prepend_child(VALUE self, VALUE child) {
   Data_Get_Struct(child, cmark_node, node2);
 
   if (!cmark_node_prepend_child(node1, node2)) {
-    rb_raise(rb_mNodeError, "could not prepend child");
+    rb_raise(rb_eNodeError, "could not prepend child");
   }
 
   rb_parent_added(child);
@@ -684,7 +691,7 @@ static VALUE rb_node_append_child(VALUE self, VALUE child) {
   Data_Get_Struct(child, cmark_node, node2);
 
   if (!cmark_node_append_child(node1, node2)) {
-    rb_raise(rb_mNodeError, "could not append child");
+    rb_raise(rb_eNodeError, "could not append child");
   }
 
   rb_parent_added(child);
@@ -744,7 +751,7 @@ static VALUE rb_node_get_url(VALUE self) {
 
   text = cmark_node_get_url(node);
   if (text == NULL) {
-    rb_raise(rb_mNodeError, "could not get url");
+    rb_raise(rb_eNodeError, "could not get url");
   }
 
   return rb_str_new2(text);
@@ -766,7 +773,7 @@ static VALUE rb_node_set_url(VALUE self, VALUE url) {
   text = StringValueCStr(url);
 
   if (!cmark_node_set_url(node, text)) {
-    rb_raise(rb_mNodeError, "could not set url");
+    rb_raise(rb_eNodeError, "could not set url");
   }
 
   return Qnil;
@@ -785,7 +792,7 @@ static VALUE rb_node_get_title(VALUE self) {
 
   text = cmark_node_get_title(node);
   if (text == NULL) {
-    rb_raise(rb_mNodeError, "could not get title");
+    rb_raise(rb_eNodeError, "could not get title");
   }
 
   return rb_str_new2(text);
@@ -807,7 +814,7 @@ static VALUE rb_node_set_title(VALUE self, VALUE title) {
   text = StringValueCStr(title);
 
   if (!cmark_node_set_title(node, text)) {
-    rb_raise(rb_mNodeError, "could not set title");
+    rb_raise(rb_eNodeError, "could not set title");
   }
 
   return Qnil;
@@ -827,7 +834,7 @@ static VALUE rb_node_get_header_level(VALUE self) {
   header_level = cmark_node_get_header_level(node);
 
   if (header_level == 0) {
-    rb_raise(rb_mNodeError, "could not get header_level");
+    rb_raise(rb_eNodeError, "could not get header_level");
   }
 
   return INT2NUM(header_level);
@@ -849,7 +856,7 @@ static VALUE rb_node_set_header_level(VALUE self, VALUE level) {
   l = FIX2INT(level);
 
   if (!cmark_node_set_header_level(node, l)) {
-    rb_raise(rb_mNodeError, "could not set header_level");
+    rb_raise(rb_eNodeError, "could not set header_level");
   }
 
   return Qnil;
@@ -874,7 +881,7 @@ static VALUE rb_node_get_list_type(VALUE self) {
   } else if (list_type == CMARK_ORDERED_LIST) {
     symbol = sym_ordered_list;
   } else {
-    rb_raise(rb_mNodeError, "could not get list_type");
+    rb_raise(rb_eNodeError, "could not get list_type");
   }
 
   return symbol;
@@ -899,11 +906,11 @@ static VALUE rb_node_set_list_type(VALUE self, VALUE list_type) {
   } else if (list_type == sym_ordered_list) {
     type = CMARK_ORDERED_LIST;
   } else {
-    rb_raise(rb_mNodeError, "invalid list_type");
+    rb_raise(rb_eNodeError, "invalid list_type");
   }
 
   if (!cmark_node_set_list_type(node, type)) {
-    rb_raise(rb_mNodeError, "could not set list_type");
+    rb_raise(rb_eNodeError, "could not set list_type");
   }
 
   return Qnil;
@@ -922,7 +929,7 @@ static VALUE rb_node_get_list_start(VALUE self) {
 
   if (cmark_node_get_type(node) != CMARK_NODE_LIST ||
       cmark_node_get_list_type(node) != CMARK_ORDERED_LIST) {
-    rb_raise(rb_mNodeError, "can't get list_start for non-ordered list %d",
+    rb_raise(rb_eNodeError, "can't get list_start for non-ordered list %d",
              cmark_node_get_list_type(node));
   }
 
@@ -946,7 +953,7 @@ static VALUE rb_node_set_list_start(VALUE self, VALUE start) {
   s = FIX2INT(start);
 
   if (!cmark_node_set_list_start(node, s)) {
-    rb_raise(rb_mNodeError, "could not set list_start");
+    rb_raise(rb_eNodeError, "could not set list_start");
   }
 
   return Qnil;
@@ -964,7 +971,7 @@ static VALUE rb_node_get_list_tight(VALUE self) {
   Data_Get_Struct(self, cmark_node, node);
 
   if (cmark_node_get_type(node) != CMARK_NODE_LIST) {
-    rb_raise(rb_mNodeError, "can't get list_tight for non-list");
+    rb_raise(rb_eNodeError, "can't get list_tight for non-list");
   }
 
   flag = cmark_node_get_list_tight(node);
@@ -986,7 +993,7 @@ static VALUE rb_node_set_list_tight(VALUE self, VALUE tight) {
   t = RTEST(tight);
 
   if (!cmark_node_set_list_tight(node, t)) {
-    rb_raise(rb_mNodeError, "could not set list_tight");
+    rb_raise(rb_eNodeError, "could not set list_tight");
   }
 
   return Qnil;
@@ -1006,7 +1013,7 @@ static VALUE rb_node_get_fence_info(VALUE self) {
   fence_info = cmark_node_get_fence_info(node);
 
   if (fence_info == NULL) {
-    rb_raise(rb_mNodeError, "could not get fence_info");
+    rb_raise(rb_eNodeError, "could not get fence_info");
   }
 
   return rb_str_new2(fence_info);
@@ -1028,24 +1035,64 @@ static VALUE rb_node_set_fence_info(VALUE self, VALUE info) {
   text = StringValueCStr(info);
 
   if (!cmark_node_set_fence_info(node, text)) {
-    rb_raise(rb_mNodeError, "could not set fence_info");
+    rb_raise(rb_eNodeError, "could not set fence_info");
   }
 
   return Qnil;
 }
 
-static VALUE rb_node_get_tasklist_state(VALUE self) {
-  const char *tasklist_state;
+static VALUE rb_node_get_tasklist_item_checked(VALUE self) {
+  int tasklist_state;
   cmark_node *node;
   Data_Get_Struct(self, cmark_node, node);
 
-  tasklist_state = cmark_gfm_extensions_get_tasklist_state(node);
+  tasklist_state = cmark_gfm_extensions_get_tasklist_item_checked(node);
 
-  if (tasklist_state == NULL) {
-    rb_raise(rb_mNodeError, "could not get tasklist_state");
+  if (tasklist_state == 1) {
+    return Qtrue;
+  } else {
+    return Qfalse;
   }
+}
+
+/*
+ * Public: Sets the checkbox state of the current node (must be a `:tasklist`).
+ *
+ * item_checked - A {Boolean} representing the new checkbox state
+ *
+ * Returns a {Boolean} representing the new checkbox state.
+ * Raises a NodeError if the checkbox state can't be set.
+ */
+static VALUE rb_node_set_tasklist_item_checked(VALUE self, VALUE item_checked) {
+  int tasklist_state;
+  cmark_node *node;
+  Data_Get_Struct(self, cmark_node, node);
+  tasklist_state = RTEST(item_checked);
 
-  return rb_str_new2(tasklist_state);
+  if (!cmark_gfm_extensions_set_tasklist_item_checked(node, tasklist_state)) {
+    rb_raise(rb_eNodeError, "could not set tasklist_item_checked");
+  };
+
+  if (tasklist_state) {
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
+}
+
+// TODO: remove this, superseded by the above method
+static VALUE rb_node_get_tasklist_state(VALUE self) {
+  int tasklist_state;
+  cmark_node *node;
+  Data_Get_Struct(self, cmark_node, node);
+
+  tasklist_state = cmark_gfm_extensions_get_tasklist_item_checked(node);
+
+  if (tasklist_state == 1) {
+    return rb_str_new2("checked");
+  } else {
+    return rb_str_new2("unchecked");
+  }
 }
 
 static VALUE rb_node_get_table_alignments(VALUE self) {
@@ -1059,7 +1106,7 @@ static VALUE rb_node_get_table_alignments(VALUE self) {
   alignments = cmark_gfm_extensions_get_table_alignments(node);
 
   if (!column_count || !alignments) {
-    rb_raise(rb_mNodeError, "could not get column_count or alignments");
+    rb_raise(rb_eNodeError, "could not get column_count or alignments");
   }
 
   ary = rb_ary_new();
@@ -1090,7 +1137,8 @@ static VALUE rb_html_escape_href(VALUE self, VALUE rb_text) {
   if (houdini_escape_href(&buf, (const uint8_t *)RSTRING_PTR(rb_text),
                           RSTRING_LEN(rb_text))) {
     result = (char *)cmark_strbuf_detach(&buf);
-    return rb_str_new2(result);
+    return encode_source_string(result, rb_text);
+
   }
 
   return rb_text;
@@ -1110,7 +1158,7 @@ static VALUE rb_html_escape_html(VALUE self, VALUE rb_text) {
   if (houdini_escape_html0(&buf, (const uint8_t *)RSTRING_PTR(rb_text),
                            RSTRING_LEN(rb_text), 0)) {
     result = (char *)cmark_strbuf_detach(&buf);
-    return rb_str_new2(result);
+    return encode_source_string(result, rb_text);
   }
 
   return rb_text;
@@ -1164,49 +1212,51 @@ __attribute__((visibility("default"))) void Init_commonmarker() {
 
   module = rb_define_module("CommonMarker");
   rb_define_singleton_method(module, "extensions", rb_extensions, 0);
-  rb_mNodeError = rb_define_class_under(module, "NodeError", rb_eStandardError);
-  rb_mNode = rb_define_class_under(module, "Node", rb_cObject);
-  rb_define_singleton_method(rb_mNode, "markdown_to_html", rb_markdown_to_html,
+  rb_eNodeError = rb_define_class_under(module, "NodeError", rb_eStandardError);
+  rb_cNode = rb_define_class_under(module, "Node", rb_cObject);
+  rb_define_singleton_method(rb_cNode, "markdown_to_html", rb_markdown_to_html,
                              3);
-  rb_define_singleton_method(rb_mNode, "new", rb_node_new, 1);
-  rb_define_singleton_method(rb_mNode, "parse_document", rb_parse_document, 4);
-  rb_define_method(rb_mNode, "string_content", rb_node_get_string_content, 0);
-  rb_define_method(rb_mNode, "string_content=", rb_node_set_string_content, 1);
-  rb_define_method(rb_mNode, "type", rb_node_get_type, 0);
-  rb_define_method(rb_mNode, "type_string", rb_node_get_type_string, 0);
-  rb_define_method(rb_mNode, "sourcepos", rb_node_get_sourcepos, 0);
-  rb_define_method(rb_mNode, "delete", rb_node_unlink, 0);
-  rb_define_method(rb_mNode, "first_child", rb_node_first_child, 0);
-  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, "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);
-  rb_define_method(rb_mNode, "last_child", rb_node_last_child, 0);
-  rb_define_method(rb_mNode, "parent", rb_node_parent, 0);
-  rb_define_method(rb_mNode, "previous", rb_node_previous, 0);
-  rb_define_method(rb_mNode, "url", rb_node_get_url, 0);
-  rb_define_method(rb_mNode, "url=", rb_node_set_url, 1);
-  rb_define_method(rb_mNode, "title", rb_node_get_title, 0);
-  rb_define_method(rb_mNode, "title=", rb_node_set_title, 1);
-  rb_define_method(rb_mNode, "header_level", rb_node_get_header_level, 0);
-  rb_define_method(rb_mNode, "header_level=", rb_node_set_header_level, 1);
-  rb_define_method(rb_mNode, "list_type", rb_node_get_list_type, 0);
-  rb_define_method(rb_mNode, "list_type=", rb_node_set_list_type, 1);
-  rb_define_method(rb_mNode, "list_start", rb_node_get_list_start, 0);
-  rb_define_method(rb_mNode, "list_start=", rb_node_set_list_start, 1);
-  rb_define_method(rb_mNode, "list_tight", rb_node_get_list_tight, 0);
-  rb_define_method(rb_mNode, "list_tight=", rb_node_set_list_tight, 1);
-  rb_define_method(rb_mNode, "fence_info", rb_node_get_fence_info, 0);
-  rb_define_method(rb_mNode, "fence_info=", rb_node_set_fence_info, 1);
-  rb_define_method(rb_mNode, "table_alignments", rb_node_get_table_alignments, 0);
-  rb_define_method(rb_mNode, "tasklist_state", rb_node_get_tasklist_state, 0);
-
-  rb_define_method(rb_mNode, "html_escape_href", rb_html_escape_href, 1);
-  rb_define_method(rb_mNode, "html_escape_html", rb_html_escape_html, 1);
+  rb_define_singleton_method(rb_cNode, "new", rb_node_new, 1);
+  rb_define_singleton_method(rb_cNode, "parse_document", rb_parse_document, 4);
+  rb_define_method(rb_cNode, "string_content", rb_node_get_string_content, 0);
+  rb_define_method(rb_cNode, "string_content=", rb_node_set_string_content, 1);
+  rb_define_method(rb_cNode, "type", rb_node_get_type, 0);
+  rb_define_method(rb_cNode, "type_string", rb_node_get_type_string, 0);
+  rb_define_method(rb_cNode, "sourcepos", rb_node_get_sourcepos, 0);
+  rb_define_method(rb_cNode, "delete", rb_node_unlink, 0);
+  rb_define_method(rb_cNode, "first_child", rb_node_first_child, 0);
+  rb_define_method(rb_cNode, "next", rb_node_next, 0);
+  rb_define_method(rb_cNode, "insert_before", rb_node_insert_before, 1);
+  rb_define_method(rb_cNode, "_render_html", rb_render_html, 2);
+  rb_define_method(rb_cNode, "_render_commonmark", rb_render_commonmark, -1);
+  rb_define_method(rb_cNode, "_render_plaintext", rb_render_plaintext, -1);
+  rb_define_method(rb_cNode, "insert_after", rb_node_insert_after, 1);
+  rb_define_method(rb_cNode, "prepend_child", rb_node_prepend_child, 1);
+  rb_define_method(rb_cNode, "append_child", rb_node_append_child, 1);
+  rb_define_method(rb_cNode, "last_child", rb_node_last_child, 0);
+  rb_define_method(rb_cNode, "parent", rb_node_parent, 0);
+  rb_define_method(rb_cNode, "previous", rb_node_previous, 0);
+  rb_define_method(rb_cNode, "url", rb_node_get_url, 0);
+  rb_define_method(rb_cNode, "url=", rb_node_set_url, 1);
+  rb_define_method(rb_cNode, "title", rb_node_get_title, 0);
+  rb_define_method(rb_cNode, "title=", rb_node_set_title, 1);
+  rb_define_method(rb_cNode, "header_level", rb_node_get_header_level, 0);
+  rb_define_method(rb_cNode, "header_level=", rb_node_set_header_level, 1);
+  rb_define_method(rb_cNode, "list_type", rb_node_get_list_type, 0);
+  rb_define_method(rb_cNode, "list_type=", rb_node_set_list_type, 1);
+  rb_define_method(rb_cNode, "list_start", rb_node_get_list_start, 0);
+  rb_define_method(rb_cNode, "list_start=", rb_node_set_list_start, 1);
+  rb_define_method(rb_cNode, "list_tight", rb_node_get_list_tight, 0);
+  rb_define_method(rb_cNode, "list_tight=", rb_node_set_list_tight, 1);
+  rb_define_method(rb_cNode, "fence_info", rb_node_get_fence_info, 0);
+  rb_define_method(rb_cNode, "fence_info=", rb_node_set_fence_info, 1);
+  rb_define_method(rb_cNode, "table_alignments", rb_node_get_table_alignments, 0);
+  rb_define_method(rb_cNode, "tasklist_state", rb_node_get_tasklist_state, 0);
+  rb_define_method(rb_cNode, "tasklist_item_checked?", rb_node_get_tasklist_item_checked, 0);
+  rb_define_method(rb_cNode, "tasklist_item_checked=", rb_node_set_tasklist_item_checked, 1);
+
+  rb_define_method(rb_cNode, "html_escape_href", rb_html_escape_href, 1);
+  rb_define_method(rb_cNode, "html_escape_html", rb_html_escape_html, 1);
 
   cmark_gfm_core_extensions_ensure_registered();
 }