redcarpet 1.17.2 → 2.0.0b

data/README.markdown

@@ -1,61 +1,256 @@
-Ruby + Upskirt = Markdown that doesn't suck
-===========================================
+Redcarpet 2 is written with sugar, spice and everything nice
+============================================================
 
-Redcarpet is a Ruby wrapper for Upskirt. It is mostly based on Ryan
-Tomayko's RDiscount wrapper, and inspired by Rick Astley wearing a kilt.
+Redcarpet is Ruby library for Markdown processing that smells like
+butterflies and popcorn.
 
-Redcarpet is powered by the Upskirt library, which can be found at
+Redcarpet used to be a drop-in replacement for Redcloth. This is no longer the
+case since version 2 -- it now has its own API, but retains the old name. Yes,
+that does mean that Redcarpet 2 is not backwards-compatible with the 1.X
+versions.
 
-	https://www.github.com/tanoku/upskirt
+Redcarpet is powered by the Sundown library, which can be found at
 
-You might want to find out more about Upskirt to see what makes these Ruby
-bindings so awesome.
+    https://www.github.com/tanoku/sundown
 
-Credits
--------
+You might want to find out more about Sundown to see what makes this Ruby
+library so awesome.
 
-* Natacha Porté, lady of Markdown
-* Vicent Martí, wannabe
-* With special thanks to Ryan Tomayko
+This library is written by people
+-------------------------------------------------------
 
-Install
--------
+Redcarpet 2 has been rewritten from scratch by Vicent Marti (@tanoku). Why
+are you not following me on Twitter?
 
-Redcarpet is readily available as a Ruby gem:
+Redcarpet would not be possible without the Sundown library and its authors
+(Natacha Porté, Vicent Martí, and its many awesome contributors).
+
+You can totally install it as a Gem
+-----------------------------------
+
+Redcarpet is readily available as a Ruby gem. It will build some native
+extensions, but the parser is standalone and requires no installed libraries.
 
     $ [sudo] gem install redcarpet
 
-The Redcarpet source (including Upskirt as a submodule) is available at GitHub:
+The Redcarpet source (including Sundown as a submodule) is available at GitHub:
 
     $ git clone git://github.com/tanoku/redcarpet.git
 
-Usage
------
+And it's like *really* simple to use
+------------------------------------
+
+The core of the Redcarpet library is the `Redcarpet::Markdown` class. Each
+instance of the class is attached to a `Renderer` object; the Markdown class
+performs parsing of a document and uses the attached renderer to generate
+output.
+
+The `Markdown` object is encouraged to be instantiated once with the required
+settings, and reused between parses.
+
+    Markdown.new(renderer, extensions={})
+
+    Initializes a Markdown parser
+
+    renderer -  a renderer object, inheriting from Redcarpet::Render::Base.
+                If the given object has not been instantiated, the library
+                will do it with default arguments.
+
+    extensions - a hash containing the Markdown extesions which the parser
+                will identify. The following extensions are accepted:
+
+                :no_intra_emphasis - do not parse emphasis inside of words.
+                    Strings such as `foo_bar_baz` will not generate `<em>`
+                    tags.
+
+                :tables - parse tables, PHP-Markdown style
+
+                :fenced_code_blocks - parse fenced code blocks, PHP-Markdown
+                    style .Blocks delimited with 3 or more `~` or backticks
+                    will be considered as code, without the need to be
+                    indented. An optional language name may be added at the
+                    end of the opening fence for the code block
+
+                :autolink - parse links even when they are not enclosed in
+                    `<>` characters. Autolinks for the http, https and ftp
+                    protocols will be automatically detected. Email addresses
+                    are also handled, and http links without protocol, but
+                    starting with `www.`
+
+                :strikethrough - parse strikethrough, PHP-Markdown style
+                    Two `~` characters mark the start of a strikethrough,
+                    e.g. `this is ~~good~~ bad`
+
+                :lax_html_blocks - HTML blocks do not require to be surrounded
+                    by an empty line as in the Markdown standard.
+
+                :space_after_headers - A space is always required between the
+                    hash at the beggining of a header and its name, e.g.
+                    `#this is my header` would not be a valid header.
+
+                :superscript - parse superscripts after the `^` character;
+                    contiguous superscripts are nested together, and complex
+                    values can be enclosed in parenthesis,
+                    e.g. `this is the 2^(nd) time`
+
+    Example:
+
+        markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
+            :autolink => true, :space_after_headers => true)
+
+Rendering with the `Markdown` object is done through `Markdown#render`.
+Unlike in the RedCloth API, the text to render is passed as an argument
+and not stored inside the `Markdown` instance, to encourage reusability.
+
+    Markdown.render(text)
+
+    Render a Markdown document with the attached renderer
+
+    text - a Markdown document
+
+    Example:
+
+        markdown.render("This is *bongos*, indeed.")
+        #=> "<p>This is <em>bongos</em>, indeed</p>"
+
+
+Darling, I packed you a couple renderers for lunch 
+--------------------------------------------------
+
+Redcarpet comes with two built-in renderers, `Redcarpet::Render::HTML` and
+`Redcarpet::Render::XHTML`, which output HTML and XHTML, respectively. These
+renderers are actually implemented in C, and hence offer a brilliant
+performance, several degrees of magnitude faster than other Ruby Markdown
+solutions.
+
+The `HTML` renderer has an alternate version, `Redcarpet::Render::HTML_toc`,
+which will output a table of contents in HTML based on the headers of the
+Markdown document.
+
+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.
+
+
+And you can even cook your own
+------------------------------
+
+Custom renderers are created by inheriting from an existing renderer. The
+builtin renderers, `HTML` and `XHTML` may be extended as such:
+
+~~~~~ ruby
+# create a custom renderer that allows highlighting of code blocks
+class HTMLwithAlbino < Redcarpet::Render::HTML
+  def block_code(code, language)
+    Albino.safe_colorize(code, language)
+  end
+end
+
+markdown = Redcarpet::Markdown.new(HTMLwithAlbino, :fenced_code_blocks => true)
+~~~~~
+
+But new renderers can also be created from scratch (see `lib/render_man.rb` for
+an example implementation of a Manpage renderer)
+
+~~~~~~ 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:
+
+    # Block-level calls
+    # If the return value of the method is `nil`, the block
+    # will be skipped.
+    # If the method for a document element is not implemented,
+    # the block will be skipped.
+    # 
+    # Example:
+    #
+    #   class RenderWithoutCode < Redcarpet::Render::HTML
+    #     def block_code(code, language)
+    #       nil
+    #     end
+    #   end
+    #
+    block_code(code, language)
+    block_quote(quote)
+    block_html(raw_html)
+    header(text, header_level)
+    hrule()
+    list(contents, list_type)
+    list_item(text)
+    paragraph(text)
+    table(header, body)
+    table_row(content)
+    table_cell(content, alignment)
+
+    # Span-level calls
+    # A return value of `nil` will not output any data
+    # If the method for a document element is not implemented,
+    # the contents of the span will be copied verbatim
+    autolink(link, link_type)
+    codespan(code)
+    double_emphasis(text)
+    emphasis(text)
+    image(link, title, alt_text)
+    linebreak()
+    link(link, title, content)
+    raw_html(raw_html)
+    triple_emphasis(text)
+    strikethrough(text)
+    superscript(text)
+
+    # Low level rendering
+    entity(text)
+    normal_text(text)
+
+    # Header of the document
+    # Rendered before any another elements
+    doc_header()
+
+    # Footer of the document
+    # Rendered after all the other elements
+    doc_footer()
+
+    # Pre/post-process
+    # Special callback: preprocess or postprocess the whole
+    # document before or after the rendering process begins
+    preprocess(full_document)
+    postprocess(full_document)
+    
+
+Also, now our Pants are much smarter
+------------------------------------
 
-Redcarpet implements the basic protocol popularized by RedCloth:
+Redcarpet 2 comes with a standalone [SmartyPants](
+http://daringfireball.net/projects/smartypants/) implementation. It is fully
+compilant with the original implementation. It is the fastest SmartyPants
+parser there is, with a difference of several orders of magnitude.
 
-~~~~~~ {ruby}
-require 'redcarpet'
-markdown = Redcarpet.new("Hello World!")
-puts markdown.to_html
-~~~~~~
+The SmartyPants parser can be found in `Redcarpet::Render::SmartyPants`. It has
+been implemented as a module, so it can be used standalone or as a mixin.
 
-[Additional processing options](http://rdoc.info/github/tanoku/redcarpet/master/Redcarpet#autolink-instance_method) can be turned on when creating the
-Redcarpet object:
+When mixed with a Renderer class, it will override the `postprocess` method
+to perform SmartyPants replacements once the rendering is complete
 
-~~~~~~ {ruby}
-markdown = Redcarpet.new("Hello World!", :smart, :filter_html)
-~~~~~~
+~~~~ ruby
+# Mixin
+class HTMLWithPants < Redcarpet::Render::HTML
+  include Redcarpet::Render::SmartyPants
+end
 
-Note that by default, Redcarpet parses standard Markdown (with no extensions)
-and offers a sane subset of parse options which allow you to modify the rendering
-output and to enable MD extensions on a per-case basis.
+# Standalone
+Redcarpet::Render::SmartyPants.render("<p>Oh SmartyPants, you're so crazy...</p>")
+~~~~~
 
-Redcarpet also offers a wrapper class, `RedcarpetCompat` with the same flags
-and behavior as the RDiscount library, which acts as a drop-in replacement.
+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 
+`<code>` or `<pre>`.
 
-License
--------
+Boring legal stuff
+------------------
 
 Copyright (c) 2011, Vicent Martí
 

data/Rakefile

@@ -70,9 +70,6 @@ task :install => package('.gem') do
   sh "gem install #{package('.gem')}"
 end
 
-desc 'Update the gemspec'
-task :update_gem => file('redcarpet.gemspec')
-
 directory 'pkg/'
 
 file package('.gem') => %w[pkg/ redcarpet.gemspec] + $spec.files do |f|
@@ -91,9 +88,10 @@ def source_version
   line.match(/.*VERSION = '(.*)'/)[1]
 end
 
-file 'redcarpet.gemspec' => FileList['Rakefile','lib/redcarpet.rb'] do |f|
+task :update_gem do
   # read spec file and split out manifest section
-  spec = File.read(f.name)
+  GEMFILE = 'redcarpet.gemspec'
+  spec = File.read(GEMFILE)
   head, manifest, tail = spec.split("  # = MANIFEST =\n")
   head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
   head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
@@ -107,26 +105,26 @@ file 'redcarpet.gemspec' => FileList['Rakefile','lib/redcarpet.rb'] do |f|
   # piece file back together and write...
   manifest = "  s.files = %w[\n#{files}\n  ]\n"
   spec = [head,manifest,tail].join("  # = MANIFEST =\n")
-  File.open(f.name, 'w') { |io| io.write(spec) }
-  puts "updated #{f.name}"
+  File.open(GEMFILE, 'w') { |io| io.write(spec) }
+  puts "updated #{GEMFILE}"
 end
 
-desc 'Gather required Upskirt sources into extension directory'
-task :gather => 'upskirt/src/markdown.h' do |t|
+desc 'Gather required Sundown sources into extension directory'
+task :gather => 'sundown/src/markdown.h' do |t|
   files =
     FileList[
-      'upskirt/src/{markdown,buffer,array,autolink}.h',
-      'upskirt/src/{markdown,buffer,array,autolink}.c',
-      'upskirt/html/{html,html_smartypants}.c',
-      'upskirt/html/html.h',
+      'sundown/src/{markdown,buffer,array,autolink}.h',
+      'sundown/src/{markdown,buffer,array,autolink}.c',
+      'sundown/html/{html,html_smartypants}.c',
+      'sundown/html/html.h',
     ]
   cp files, 'ext/redcarpet/',
     :preserve => true,
     :verbose => true
 end
 
-file 'upskirt/src/markdown.h' do |t|
-  abort "The Upskirt submodule is required."
+file 'sundown/src/markdown.h' do |t|
+  abort "The Sundown submodule is required."
 end
 
 

data/bin/redcarpet

@@ -10,4 +10,4 @@ if ARGV.include?('--help')
 end
 
 require 'redcarpet'
-STDOUT.write(Redcarpet.new(ARGF.read).to_html)
+STDOUT.write(Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(ARGF.read))

data/ext/redcarpet/autolink.c

@@ -22,7 +22,7 @@
 #include <ctype.h>
 
 int
-is_safe_link(const char *link, size_t link_len)
+sd_autolink_issafe(const char *link, size_t link_len)
 {
 	static const size_t valid_uris_count = 4;
 	static const char *valid_uris[] = {
@@ -147,7 +147,7 @@ check_domain(char *data, size_t size)
 }
 
 size_t
-ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
+sd_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
 {
 	size_t link_end;
 
@@ -177,7 +177,7 @@ ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset,
 }
 
 size_t
-ups_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
+sd_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
 {
 	size_t link_end, rewind;
 	int nb = 0, np = 0;
@@ -226,7 +226,7 @@ ups_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offse
 }
 
 size_t
-ups_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
+sd_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
 {
 	size_t link_end, rewind = 0, domain_len;
 
@@ -236,7 +236,7 @@ ups_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset,
 	while (rewind < offset && isalpha(data[-rewind - 1]))
 		rewind++;
 
-	if (!is_safe_link(data - rewind, size + rewind))
+	if (!sd_autolink_issafe(data - rewind, size + rewind))
 		return 0;
 	link_end = STRLEN("://");
 

data/ext/redcarpet/autolink.h

@@ -15,18 +15,21 @@
  */
 
 #ifndef UPSKIRT_AUTOLINK_H
-#define UPSKIRT_AUTOLINK_H_H
+#define UPSKIRT_AUTOLINK_H
 
 #include "buffer.h"
 
+extern int
+sd_autolink_issafe(const char *link, size_t link_len);
+
 extern size_t
-ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
+sd_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
 
 extern size_t
-ups_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
+sd_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
 
 extern size_t
-ups_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
+sd_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
 
 #endif
 

data/ext/redcarpet/html.c

@@ -23,14 +23,17 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#define USE_XHTML(opt) (opt->flags & HTML_USE_XHTML)
+
 struct html_renderopt {
+	void *extra;
+
 	struct {
 		int header_count;
 		int current_level;
 	} toc_data;
 
 	unsigned int flags;
-	const char *close_tag;
 };
 
 static inline void
@@ -45,9 +48,9 @@ put_scaped_char(struct buf *ob, char c)
 	}
 }
 
-/* upshtml_escape • copy the buffer entity-escaping '<', '>', '&' and '"' */
+/* sdhtml_escape • copy the buffer entity-escaping '<', '>', '&' and '"' */
 void
-upshtml_escape(struct buf *ob, const char *src, size_t size)
+sdhtml_escape(struct buf *ob, const char *src, size_t size)
 {
 	size_t  i = 0, org;
 	while (i < size) {
@@ -66,37 +69,37 @@ upshtml_escape(struct buf *ob, const char *src, size_t size)
 	}
 }
 
-static int
-is_html_tag(struct buf *tag, const char *tagname)
+int
+sdhtml_tag(const char *tag_data, size_t tag_size, const char *tagname)
 {
-	size_t i = 0;
-
-	if (i < tag->size && tag->data[0] != '<')
-		return 0;
+	size_t i;
+	int closed = 0;
 
-	i++;
+	if (tag_size < 3 || tag_data[0] != '<')
+		return HTML_TAG_NONE;
 
-	while (i < tag->size && isspace(tag->data[i]))
-		i++;
+	i = 1;
 
-	if (i < tag->size && tag->data[i] == '/')
-		i++;
-
-	while (i < tag->size && isspace(tag->data[i]))
+	if (tag_data[i] == '/') {
+		closed = 1;
 		i++;
+	}
 
-	for (; i < tag->size; ++i, ++tagname) {
+	for (; i < tag_size; ++i, ++tagname) {
 		if (*tagname == 0)
 			break;
 
-		if (tag->data[i] != *tagname)
-			return 0;
+		if (tag_data[i] != *tagname)
+			return HTML_TAG_NONE;
 	}
 
-	if (i == tag->size)
-		return 0;
+	if (i == tag_size)
+		return HTML_TAG_NONE;
+
+	if (isspace(tag_data[i]) || tag_data[i] == '>')
+		return closed ? HTML_TAG_CLOSE : HTML_TAG_OPEN;
 
-	return (isspace(tag->data[i]) || tag->data[i] == '>');
+	return HTML_TAG_NONE;
 }
 
 /********************
@@ -111,7 +114,7 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 		return 0;
 
 	if ((options->flags & HTML_SAFELINK) != 0 &&
-		!is_safe_link(link->data, link->size) &&
+		!sd_autolink_issafe(link->data, link->size) &&
 		type != MKDA_EMAIL)
 		return 0;
 
@@ -127,9 +130,9 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 	 * want to print the `mailto:` prefix
 	 */
 	if (bufprefix(link, "mailto:") == 0) {
-		upshtml_escape(ob, link->data + 7, link->size - 7);
+		sdhtml_escape(ob, link->data + 7, link->size - 7);
 	} else {
-		upshtml_escape(ob, link->data, link->size);
+		sdhtml_escape(ob, link->data, link->size);
 	}
 
 	BUFPUTSL(ob, "</a>");
@@ -159,7 +162,7 @@ rndr_blockcode(struct buf *ob, struct buf *text, struct buf *lang, void *opaque)
 					org++;
 
 				if (cls) bufputc(ob, ' ');
-				upshtml_escape(ob, lang->data + org, i - org);
+				sdhtml_escape(ob, lang->data + org, i - org);
 			}
 		}
 
@@ -168,7 +171,7 @@ rndr_blockcode(struct buf *ob, struct buf *text, struct buf *lang, void *opaque)
 		BUFPUTSL(ob, "<pre><code>");
 
 	if (text)
-		upshtml_escape(ob, text->data, text->size);
+		sdhtml_escape(ob, text->data, text->size);
 
 	BUFPUTSL(ob, "</code></pre>\n");
 }
@@ -204,16 +207,16 @@ rndr_blockcode_github(struct buf *ob, struct buf *text, struct buf *lang, void *
 			i++;
 
 		if (lang->data[0] == '.')
-			upshtml_escape(ob, lang->data + 1, i - 1);
+			sdhtml_escape(ob, lang->data + 1, i - 1);
 		else
-			upshtml_escape(ob, lang->data, i);
+			sdhtml_escape(ob, lang->data, i);
 
 		BUFPUTSL(ob, "\"><code>");
 	} else
 		BUFPUTSL(ob, "<pre><code>");
 
 	if (text)
-		upshtml_escape(ob, text->data, text->size);
+		sdhtml_escape(ob, text->data, text->size);
 
 	BUFPUTSL(ob, "</code></pre>\n");
 }
@@ -221,16 +224,17 @@ rndr_blockcode_github(struct buf *ob, struct buf *text, struct buf *lang, void *
 static void
 rndr_blockquote(struct buf *ob, struct buf *text, void *opaque)
 {
+	if (ob->size) bufputc(ob, '\n');
 	BUFPUTSL(ob, "<blockquote>\n");
 	if (text) bufput(ob, text->data, text->size);
-	BUFPUTSL(ob, "</blockquote>");
+	BUFPUTSL(ob, "</blockquote>\n");
 }
 
 static int
 rndr_codespan(struct buf *ob, struct buf *text, void *opaque)
 {
 	BUFPUTSL(ob, "<code>");
-	if (text) upshtml_escape(ob, text->data, text->size);
+	if (text) sdhtml_escape(ob, text->data, text->size);
 	BUFPUTSL(ob, "</code>");
 	return 1;
 }
@@ -270,6 +274,14 @@ rndr_emphasis(struct buf *ob, struct buf *text, void *opaque)
 	return 1;
 }
 
+static int
+rndr_linebreak(struct buf *ob, void *opaque)
+{
+	struct html_renderopt *options = opaque;	
+	bufputs(ob, USE_XHTML(options) ? "<br/>\n" : "<br>\n");
+	return 1;
+}
+
 static void
 rndr_header(struct buf *ob, struct buf *text, int level, void *opaque)
 {
@@ -292,14 +304,14 @@ rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *conte
 {
 	struct html_renderopt *options = opaque;
 	
-	if ((options->flags & HTML_SAFELINK) != 0 && !is_safe_link(link->data, link->size))
+	if ((options->flags & HTML_SAFELINK) != 0 && !sd_autolink_issafe(link->data, link->size))
 		return 0;
 
 	BUFPUTSL(ob, "<a href=\"");
 	if (link && link->size) bufput(ob, link->data, link->size);
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		upshtml_escape(ob, title->data, title->size); }
+		sdhtml_escape(ob, title->data, title->size); }
 	BUFPUTSL(ob, "\">");
 	if (content && content->size) bufput(ob, content->data, content->size);
 	BUFPUTSL(ob, "</a>");
@@ -353,11 +365,14 @@ rndr_paragraph(struct buf *ob, struct buf *text, void *opaque)
 			if (i > org)
 				bufput(ob, text->data + org, i - org);
 
-			if (i >= text->size)
+			/*
+			 * do not insert a line break if this newline
+			 * is the last character on the paragraph
+			 */
+			if (i >= text->size - 1)
 				break;
-
-			BUFPUTSL(ob, "<br");
-			bufputs(ob, options->close_tag);
+			
+			rndr_linebreak(ob, opaque);
 			i++;
 		}
 	} else {
@@ -396,8 +411,7 @@ rndr_hrule(struct buf *ob, void *opaque)
 {
 	struct html_renderopt *options = opaque;	
 	if (ob->size) bufputc(ob, '\n');
-	BUFPUTSL(ob, "<hr");
-	bufputs(ob, options->close_tag);
+	bufputs(ob, USE_XHTML(options) ? "<hr/>\n" : "<hr>\n");
 }
 
 static int
@@ -406,25 +420,15 @@ rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt,
 	struct html_renderopt *options = opaque;	
 	if (!link || !link->size) return 0;
 	BUFPUTSL(ob, "<img src=\"");
-	upshtml_escape(ob, link->data, link->size);
+	sdhtml_escape(ob, link->data, link->size);
 	BUFPUTSL(ob, "\" alt=\"");
 	if (alt && alt->size)
-		upshtml_escape(ob, alt->data, alt->size);
+		sdhtml_escape(ob, alt->data, alt->size);
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		upshtml_escape(ob, title->data, title->size); }
-
-	bufputc(ob, '"');
-	bufputs(ob, options->close_tag);
-	return 1;
-}
+		sdhtml_escape(ob, title->data, title->size); }
 
-static int
-rndr_linebreak(struct buf *ob, void *opaque)
-{
-	struct html_renderopt *options = opaque;	
-	BUFPUTSL(ob, "<br");
-	bufputs(ob, options->close_tag);
+	bufputs(ob, USE_XHTML(options) ? "\"/>" : "\">");
 	return 1;
 }
 
@@ -436,13 +440,13 @@ rndr_raw_html(struct buf *ob, struct buf *text, void *opaque)
 	if ((options->flags & HTML_SKIP_HTML) != 0)
 		return 1;
 
-	if ((options->flags & HTML_SKIP_STYLE) != 0 && is_html_tag(text, "style"))
+	if ((options->flags & HTML_SKIP_STYLE) != 0 && sdhtml_tag(text->data, text->size, "style"))
 		return 1;
 
-	if ((options->flags & HTML_SKIP_LINKS) != 0 && is_html_tag(text, "a"))
+	if ((options->flags & HTML_SKIP_LINKS) != 0 && sdhtml_tag(text->data, text->size, "a"))
 		return 1;
 
-	if ((options->flags & HTML_SKIP_IMAGES) != 0 && is_html_tag(text, "img"))
+	if ((options->flags & HTML_SKIP_IMAGES) != 0 && sdhtml_tag(text->data, text->size, "img"))
 		return 1;
 
 	bufput(ob, text->data, text->size);
@@ -456,26 +460,24 @@ rndr_table(struct buf *ob, struct buf *header, struct buf *body, void *opaque)
 	BUFPUTSL(ob, "<table><thead>\n");
 	if (header)
 		bufput(ob, header->data, header->size);
-	BUFPUTSL(ob, "\n</thead><tbody>\n");
+	BUFPUTSL(ob, "</thead><tbody>\n");
 	if (body)
 		bufput(ob, body->data, body->size);
-	BUFPUTSL(ob, "\n</tbody></table>");
+	BUFPUTSL(ob, "</tbody></table>\n");
 }
 
 static void
 rndr_tablerow(struct buf *ob, struct buf *text, void *opaque)
 {
-	if (ob->size) bufputc(ob, '\n');
 	BUFPUTSL(ob, "<tr>\n");
 	if (text)
 		bufput(ob, text->data, text->size);
-	BUFPUTSL(ob, "\n</tr>");
+	BUFPUTSL(ob, "</tr>\n");
 }
 
 static void
 rndr_tablecell(struct buf *ob, struct buf *text, int align, void *opaque)
 {
-	if (ob->size) bufputc(ob, '\n');
 	switch (align) {
 	case MKD_TABLE_ALIGN_L:
 		BUFPUTSL(ob, "<td align=\"left\">");
@@ -496,14 +498,24 @@ rndr_tablecell(struct buf *ob, struct buf *text, int align, void *opaque)
 
 	if (text)
 		bufput(ob, text->data, text->size);
-	BUFPUTSL(ob, "</td>");
+	BUFPUTSL(ob, "</td>\n");
+}
+
+static int
+rndr_superscript(struct buf *ob, struct buf *text, void *opaque)
+{
+	if (!text || !text->size) return 0;
+	BUFPUTSL(ob, "<sup>");
+	bufput(ob, text->data, text->size);
+	BUFPUTSL(ob, "</sup>");
+	return 1;
 }
 
 static void
 rndr_normal_text(struct buf *ob, struct buf *text, void *opaque)
 {
 	if (text)
-		upshtml_escape(ob, text->data, text->size);
+		sdhtml_escape(ob, text->data, text->size);
 }
 
 static void
@@ -546,7 +558,7 @@ toc_finalize(struct buf *ob, void *opaque)
 }
 
 void
-upshtml_toc_renderer(struct mkd_renderer *renderer)
+sdhtml_toc_renderer(struct mkd_renderer *renderer, void *extra)
 {
 	static const struct mkd_renderer toc_render = {
 		NULL,
@@ -571,6 +583,7 @@ upshtml_toc_renderer(struct mkd_renderer *renderer)
 		NULL,
 		rndr_triple_emphasis,
 		rndr_strikethrough,
+		rndr_superscript,
 
 		NULL,
 		NULL,
@@ -584,17 +597,15 @@ upshtml_toc_renderer(struct mkd_renderer *renderer)
 	struct html_renderopt *options;	
 	options = calloc(1, sizeof(struct html_renderopt));
 	options->flags = HTML_TOC;
+	options->extra = extra;
 
 	memcpy(renderer, &toc_render, sizeof(struct mkd_renderer));
 	renderer->opaque = options;
 }
 
 void
-upshtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
+sdhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags, void *extra)
 {
-	static const char *xhtml_close = "/>\n";
-	static const char *html_close = ">\n";
-
 	static const struct mkd_renderer renderer_default = {
 		rndr_blockcode,
 		rndr_blockquote,
@@ -618,6 +629,7 @@ upshtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
 		rndr_raw_html,
 		rndr_triple_emphasis,
 		rndr_strikethrough,
+		rndr_superscript,
 
 		NULL,
 		rndr_normal_text,
@@ -631,7 +643,7 @@ upshtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
 	struct html_renderopt *options;	
 	options = calloc(1, sizeof(struct html_renderopt));
 	options->flags = render_flags;
-	options->close_tag = (render_flags & HTML_USE_XHTML) ? xhtml_close : html_close;
+	options->extra = extra;
 
 	memcpy(renderer, &renderer_default, sizeof(struct mkd_renderer));
 	renderer->opaque = options;
@@ -652,7 +664,7 @@ upshtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
 }
 
 void
-upshtml_free_renderer(struct mkd_renderer *renderer)
+sdhtml_free_renderer(struct mkd_renderer *renderer)
 {
 	free(renderer->opaque);
 }