rdiscount 1.6.8 → 2.0.7

data/BUILDING

@@ -16,8 +16,12 @@ Gathering changes from an upstream Orc/discount.git clone requires first
 grabbing the discount submodule into the root of the project and then running
 the rake gather task to copy discount source files into the ext/ directory:
 
-    $ git submodule init
+    $ git submodule update --init
     Submodule 'discount' (git://github.com/rtomayko/discount.git) registered for path 'discount'
+    Cloning into discount...
+    $ cd discount
+    $ ./configure.sh  # to generate mkdio.h from mkdio.h.in
+    $ cd ..
     $ rake gather
     $ rake build
 

data/README.markdown

@@ -8,22 +8,22 @@ passes the [Markdown 1.0 test suite][2].
 CODE: `git clone git://github.com/rtomayko/rdiscount.git`  
 HOME: <http://github.com/rtomayko/rdiscount>  
 DOCS: <http://rdoc.info/projects/rtomayko/rdiscount>  
-BUGS: <http://github.com/rtomayko/rdiscount/issues>
+BUGS: <http://github.com/rtomayko/rdiscount/issues>  
 
 Discount was developed by [David Loren Parsons][3]. The Ruby extension
-is maintained by [Ryan Tomayko][4].
+is maintained by [David Foster][4].
 
 [1]: http://daringfireball.net/projects/markdown/syntax
 [2]: http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip
 [3]: http://www.pell.portland.or.us/~orc
-[4]: http://tomayko.com/about
+[4]: https://github.com/davidfstr
 
 INSTALL, HACKING
 ----------------
 
-New releases of RDiscount are published to [gemcutter][]:
+New releases of RDiscount are published to [RubyGems][]:
 
-    $ [sudo] gem install rdiscount -s http://gemcutter.org
+    $ [sudo] gem install rdiscount
 
 The RDiscount sources are available via Git:
 
@@ -33,8 +33,8 @@ The RDiscount sources are available via Git:
 
 See the file [BUILDING][] for hacking instructions.
 
-[gemcutter]: http://gemcutter.org/gems/rdiscount
-[BUILDING]: BUILDING
+[RubyGems]: https://rubygems.org/gems/rdiscount
+[BUILDING]: https://github.com/rtomayko/rdiscount/blob/master/BUILDING
 
 USAGE
 -----

data/Rakefile

@@ -9,7 +9,7 @@ task :default => :test
 # ==========================================================
 
 DLEXT = Config::MAKEFILE_CONFIG['DLEXT']
-RUBYDIGEST = Digest::MD5.hexdigest(`#{RUBY} --version`)
+RUBYDIGEST = Digest::MD5.hexdigest(`ruby --version`)
 
 file "ext/ruby-#{RUBYDIGEST}" do |f|
   rm_f FileList["ext/ruby-*"]
@@ -61,8 +61,9 @@ desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
 task 'test:conformance' => [:build] do |t|
   script = "#{pwd}/bin/rdiscount"
   test_version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
+  lib_dir = "#{pwd}/lib"
   chdir("test/MarkdownTest_#{test_version}") do
-    sh "./MarkdownTest.pl --script='#{script}' --tidy"
+    sh "RUBYLIB=#{lib_dir} ./MarkdownTest.pl --script='#{script}' --tidy"
   end
 end
 

data/ext/config.h

@@ -1,10 +1,13 @@
+/*
+ * rdiscount extension discount configuration
+ */
+#ifndef __MARKDOWN_D
+#define __MARKDOWN_D 1
 
-/* rdiscount extension configuration */
-
-#undef USE_AMALLOC
-
+/* tabs are four spaces */
 #define TABSTOP 4
 
+/* these are setup by extconf.rb */
 #if HAVE_RANDOM
 #define COINTOSS() (random()&1)
 #elif HAVE_RAND
@@ -17,5 +20,4 @@
 #define INITRNG(x) srand((unsigned int)x)
 #endif
 
-#define RELAXED_EMPHASIS 1
-#define SUPERSCRIPT 1
+#endif/* __MARKDOWN_D */

data/ext/css.c

@@ -28,9 +28,10 @@ stylesheets(Paragraph *p, Cstring *f)
 
     for ( ; p ; p = p->next ) {
 	if ( p->typ == STYLE ) {
-	    for ( q = p->text; q ; q = q->next )
+	    for ( q = p->text; q ; q = q->next ) {
 		Cswrite(f, T(q->text), S(q->text));
 		Csputc('\n', f);
+	    }
 	}
 	if ( p->down )
 	    stylesheets(p->down, f);
@@ -44,17 +45,25 @@ int
 mkd_css(Document *d, char **res)
 {
     Cstring f;
+    int size;
 
-    if ( res && *res && d && d->compiled ) {
+    if ( res && d && d->compiled ) {
+	*res = 0;
 	CREATE(f);
 	RESERVE(f, 100);
 	stylesheets(d->code, &f);
 			
+	if ( (size = S(f)) > 0 ) {
+	    EXPAND(f) = 0;
 			/* HACK ALERT! HACK ALERT! HACK ALERT! */
-	*res = T(f);	/* we know that a T(Cstring) is a character pointer */
+	    *res = T(f);/* we know that a T(Cstring) is a character pointer */
 			/* so we can simply pick it up and carry it away, */
-	return S(f);	/* leaving the husk of the Ctring on the stack */
+			/* leaving the husk of the Ctring on the stack */
 			/* END HACK ALERT */
+	}
+	else
+	    DELETE(f);
+	return size;
     }
     return EOF;
 }
@@ -69,7 +78,7 @@ mkd_generatecss(Document *d, FILE *f)
     int written = EOF, size = mkd_css(d, &res);
 
     if ( size > 0 )
-	written = fwrite(res, size, 1, f);
+	written = fwrite(res, 1, size, f);
     if ( res )
 	free(res);
     return (written == size) ? size : EOF;

data/ext/cstring.h

@@ -18,7 +18,7 @@
  */
 #define STRING(type)	struct { type *text; int size, alloc; }
 
-#define CREATE(x)	T(x) = (void*)(S(x) = (x).alloc = 0)
+#define CREATE(x)	( (T(x) = (void*)0), (S(x) = (x).alloc = 0) )
 #define EXPAND(x)	(S(x)++)[(S(x) < (x).alloc) \
 			    ? (T(x)) \
 			    : (T(x) = T(x) ? realloc(T(x), sizeof T(x)[0] * ((x).alloc += 100)) \

data/ext/docheader.c

@@ -14,13 +14,19 @@
 #include "markdown.h"
 #include "amalloc.h"
 
-#define afterdle(t)	(T((t)->text) + (t)->dle)
+static char *
+onlyifset(Line *l)
+{
+    char *ret = T(l->text) + l->dle;
+
+    return ret[0] ? ret : 0;
+}
 
 char *
 mkd_doc_title(Document *doc)
 {
-    if ( doc && doc->headers )
-	return afterdle(doc->headers);
+    if ( doc && doc->title )
+	return onlyifset(doc->title);
     return 0;
 }
 
@@ -28,8 +34,8 @@ mkd_doc_title(Document *doc)
 char *
 mkd_doc_author(Document *doc)
 {
-    if ( doc && doc->headers && doc->headers->next )
-	return afterdle(doc->headers->next);
+    if ( doc && doc->author )
+	return onlyifset(doc->author);
     return 0;
 }
 
@@ -37,7 +43,7 @@ mkd_doc_author(Document *doc)
 char *
 mkd_doc_date(Document *doc)
 {
-    if ( doc && doc->headers && doc->headers->next && doc->headers->next->next )
-	return afterdle(doc->headers->next->next);
+    if ( doc && doc->date )
+	return onlyifset(doc->date);
     return 0;
 }

data/ext/dumptree.c

@@ -111,7 +111,7 @@ dumptree(Paragraph *pp, Stack *sp, FILE *f)
 	d = fprintf(f, "[%s", Pptype(pp->typ));
 	if ( pp->ident )
 	    d += fprintf(f, " %s", pp->ident);
-	if ( pp->align )
+	if ( pp->align > 1 )
 	    d += fprintf(f, ", <%s>", Begin[pp->align]);
 
 	for (count=0, p=pp->text; p; ++count, (p = p->next) )

data/ext/emmatch.c

@@ -163,7 +163,7 @@ emblock(MMIOT *f, int first, int last)
 } /* emblock */
 
 
-/* ___mkd_emblock() -- emblock a string of blocks, then concatinate the
+/* ___mkd_emblock() -- emblock a string of blocks, then concatenate the
  *                     resulting text onto f->out.
  */
 void

data/ext/extconf.rb

@@ -7,4 +7,17 @@ HAVE_SRANDOM = have_func('srandom')
 HAVE_RAND = have_func('rand')
 HAVE_SRAND = have_func('srand')
 
+def sized_int(size, types)
+  types.find { |type| check_sizeof(type) == 4 } ||
+    abort("no int with size #{size}")
+end
+
+DWORD = sized_int(4, ["unsigned long", "unsigned int"])
+WORD =  sized_int(2, ["unsigned int", "unsigned short"])
+BYTE = "unsigned char"
+
+$defs.push("-DDWORD='#{DWORD}'")
+$defs.push("-DWORD='#{WORD}'")
+$defs.push("-DBYTE='#{BYTE}'")
+
 create_makefile('rdiscount')

data/ext/generate.c

@@ -191,6 +191,7 @@ ___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
     
     sub.flags = f->flags | flags;
     sub.cb = f->cb;
+    sub.ref_prefix = f->ref_prefix;
 
     push(bfr, size, &sub);
     EXPAND(sub.in) = 0;
@@ -351,6 +352,53 @@ linkysize(MMIOT *f, Footnote *ref)
 }
 
 
+/* extract a <...>-encased url from the input stream.
+ * (markdown 1.0.2b8 compatibility; older versions
+ * of markdown treated the < and > as syntactic
+ * sugar that didn't have to be there.  1.0.2b8 
+ * requires a closing >, and then falls into the
+ * title or closing )
+ */
+static int
+linkybroket(MMIOT *f, int image, Footnote *p)
+{
+    int c;
+    int good = 0;
+
+    T(p->link) = cursor(f);
+    for ( S(p->link)=0; (c = pull(f)) != '>'; ++S(p->link) ) {
+	/* pull in all input until a '>' is found, or die trying.
+	 */
+	if ( c == EOF )
+	    return 0;
+	else if ( (c == '\\') && ispunct(peek(f,2)) ) {
+	    ++S(p->link);
+	    pull(f);
+	}
+    }
+
+    c = eatspace(f);
+
+    /* next nonspace needs to be a title, a size, or )
+     */
+    if ( ( c == '\'' || c == '"' ) && linkytitle(f,c,p) )
+	good=1;
+    else if ( image && (c == '=') && linkysize(f,p) )
+	good=1;
+    else 
+	good=( c == ')' );
+
+    if ( good ) {
+	if ( peek(f, 1) == ')' )
+	    pull(f);
+	    
+	___mkd_tidy(&p->link);
+    }
+
+    return good;
+} /* linkybroket */
+
+
 /* extract a (-prefixed url from the input stream.
  * the label is either of the format `<link>`, where I
  * extract until I find a >, or it is of the format
@@ -368,6 +416,8 @@ linkyurl(MMIOT *f, int image, Footnote *p)
 
     if ( c == '<' ) {
 	pull(f);
+	if ( !(f->flags & MKD_1_COMPAT) )
+	    return linkybroket(f,image,p);
 	mayneedtotrim=1;
     }
 
@@ -405,10 +455,10 @@ static struct _protocol {
     int   nlen;
 } protocol[] = { 
 #define _aprotocol(x)	{ x, (sizeof x)-1 }
-    _aprotocol( "https://" ), 
-    _aprotocol( "http://" ), 
-    _aprotocol( "news://" ),
-    _aprotocol( "ftp://" ), 
+    _aprotocol( "https:" ), 
+    _aprotocol( "http:" ), 
+    _aprotocol( "news:" ),
+    _aprotocol( "ftp:" ), 
 #undef _aprotocol
 };
 #define NRPROTOCOLS	(sizeof protocol / sizeof protocol[0])
@@ -445,9 +495,9 @@ typedef struct linkytype {
 } linkytype;
 
 static linkytype imaget = { 0, 0, "<img src=\"", "\"",
-			     1, " alt=\"", "\" />", DENY_IMG|INSIDE_TAG, IS_URL };
+			     1, " alt=\"", "\" />", MKD_NOIMAGE|MKD_TAGTEXT, IS_URL };
 static linkytype linkt  = { 0, 0, "<a href=\"", "\"",
-                             0, ">", "</a>", DENY_A, IS_URL };
+                             0, ">", "</a>", MKD_NOLINKS, IS_URL };
 
 /*
  * pseudo-protocols for [][];
@@ -457,8 +507,8 @@ static linkytype linkt  = { 0, 0, "<a href=\"", "\"",
  * raw: just dump the link without any processing
  */
 static linkytype specials[] = {
-    { "id:", 3, "<a id=\"", "\"", 0, ">", "</a>", 0, IS_URL },
-    { "raw:", 4, 0, 0, 0, 0, 0, DENY_HTML, 0 },
+    { "id:", 3, "<span id=\"", "\"", 0, ">", "</span>", 0, 0 },
+    { "raw:", 4, 0, 0, 0, 0, 0, MKD_NOHTML, 0 },
     { "lang:", 5, "<span lang=\"", "\"", 0, ">", "</span>", 0, 0 },
     { "abbr:", 5, "<abbr title=\"", "\"", 0, ">", "</abbr>", 0, 0 },
     { "class:", 6, "<span class=\"", "\"", 0, ">", "</span>", 0, 0 },
@@ -489,10 +539,13 @@ printlinkyref(MMIOT *f, linkytype *tag, char *link, int size)
 {
     char *edit;
     
+    if ( f->flags & IS_LABEL )
+	return;
+    
     Qstring(tag->link_pfx, f);
 	
     if ( tag->kind & IS_URL ) {
-	if ( f->cb->e_url && (edit = (*f->cb->e_url)(link, size, f->cb->e_data)) ) {
+	if ( f->cb && f->cb->e_url && (edit = (*f->cb->e_url)(link, size, f->cb->e_data)) ) {
 	    puturl(edit, strlen(edit), f, 0);
 	    if ( f->cb->e_free ) (*f->cb->e_free)(edit, f->cb->e_data);
 	}
@@ -500,11 +553,11 @@ printlinkyref(MMIOT *f, linkytype *tag, char *link, int size)
 	    puturl(link + tag->szpat, size - tag->szpat, f, 0);
     }
     else
-	___mkd_reparse(link + tag->szpat, size - tag->szpat, INSIDE_TAG, f);
+	___mkd_reparse(link + tag->szpat, size - tag->szpat, MKD_TAGTEXT, f);
 
     Qstring(tag->link_sfx, f);
 
-    if ( f->cb->e_flags && (edit = (*f->cb->e_flags)(link, size, f->cb->e_data)) ) {
+    if ( f->cb && f->cb->e_flags && (edit = (*f->cb->e_flags)(link, size, f->cb->e_data)) ) {
 	Qchar(' ', f);
 	Qstring(edit, f);
 	if ( f->cb->e_free ) (*f->cb->e_free)(edit, f->cb->e_data);
@@ -512,6 +565,38 @@ printlinkyref(MMIOT *f, linkytype *tag, char *link, int size)
 } /* printlinkyref */
 
 
+/* helper function for php markdown extra footnotes; allow the user to
+ * define a prefix tag instead of just `fn`
+ */
+static char *
+p_or_nothing(p)
+MMIOT *p;
+{
+    return p->ref_prefix ? p->ref_prefix : "fn";
+}
+
+
+/* php markdown extra/daring fireball style print footnotes
+ */
+static int
+extra_linky(MMIOT *f, Cstring text, Footnote *ref)
+{
+    if ( ref->flags & REFERENCED )
+	return 0;
+	
+    if ( f->flags & IS_LABEL )
+    	___mkd_reparse(T(text), S(text), linkt.flags, f);
+    else {
+	ref->flags |= REFERENCED;
+	ref->refnumber = ++ f->reference;
+	Qprintf(f, "<sup id=\"%sref:%d\"><a href=\"#%s:%d\" rel=\"footnote\">%d</a></sup>",
+		p_or_nothing(f), ref->refnumber,
+		p_or_nothing(f), ref->refnumber, ref->refnumber);
+    }
+    return 1;
+} /* extra_linky */
+
+
 /* print out a linky (or fail if it's Not Allowed)
  */
 static int
@@ -519,16 +604,16 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
 {
     linkytype *tag;
 
-    if ( image )
+    if ( image || (ref == 0) )
 	tag = &imaget;
     else if ( tag = pseudo(ref->link) ) {
-	if ( f->flags & (NO_PSEUDO_PROTO|SAFELINK) )
+	if ( f->flags & (MKD_NO_EXT|MKD_SAFELINK) )
 	    return 0;
     }
-    else if ( (f->flags & SAFELINK) && T(ref->link)
-				    && (T(ref->link)[0] != '/')
-				    && !isautoprefix(T(ref->link), S(ref->link)) )
-	/* if SAFELINK, only accept links that are local or
+    else if ( (f->flags & MKD_SAFELINK) && T(ref->link)
+				        && (T(ref->link)[0] != '/')
+				        && !isautoprefix(T(ref->link), S(ref->link)) )
+	/* if MKD_SAFELINK, only accept links that are local or
 	 * a well-known protocol
 	 */
 	return 0;
@@ -538,7 +623,9 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
     if ( f->flags & tag->flags )
 	return 0;
 
-    if ( tag->link_pfx ) {
+    if ( f->flags & IS_LABEL )
+	___mkd_reparse(T(text), S(text), tag->flags, f);
+    else if ( tag->link_pfx ) {
 	printlinkyref(f, tag, T(ref->link), S(ref->link));
 
 	if ( tag->WxH ) {
@@ -548,7 +635,7 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
 
 	if ( S(ref->title) ) {
 	    Qstring(" title=\"", f);
-	    ___mkd_reparse(T(ref->title), S(ref->title), INSIDE_TAG, f);
+	    ___mkd_reparse(T(ref->title), S(ref->title), MKD_TAGTEXT, f);
 	    Qchar('"', f);
 	}
 
@@ -574,6 +661,7 @@ linkylinky(int image, MMIOT *f)
     Footnote key, *ref;
 		
     int status = 0;
+    int extra_footnote = 0;
 
     CREATE(name);
     memset(&key, 0, sizeof key);
@@ -587,7 +675,10 @@ linkylinky(int image, MMIOT *f)
 	else {
 	    int goodlink, implicit_mark = mmiottell(f);
 
-	    if ( eatspace(f) == '[' ) {
+	    if ( isspace(peek(f,1)) )
+		pull(f);
+	    
+	    if ( peek(f,1) == '[' ) {
 		pull(f);	/* consume leading '[' */
 		goodlink = linkylabel(f, &key.tag);
 	    }
@@ -597,6 +688,9 @@ linkylinky(int image, MMIOT *f)
 		 */
 		mmiotseek(f, implicit_mark);
 		goodlink = !(f->flags & MKD_1_COMPAT);
+
+		if ( (f->flags & MKD_EXTRA_FOOTNOTE) && (!image) && S(name) && T(name)[0] == '^' )
+		    extra_footnote = 1;
 	    }
 	    
 	    if ( goodlink ) {
@@ -607,8 +701,14 @@ linkylinky(int image, MMIOT *f)
 		}
 
 		if ( ref = bsearch(&key, T(*f->footnotes), S(*f->footnotes),
-					  sizeof key, (stfu)__mkd_footsort) )
-		    status = linkyformat(f, name, image, ref);
+					  sizeof key, (stfu)__mkd_footsort) ) {
+		    if ( extra_footnote )
+			status = extra_linky(f,name,ref);
+		    else
+			status = linkyformat(f, name, image, ref);
+		}
+		else if ( f->flags & IS_LABEL )
+		    status = linkyformat(f, name, image, 0);
 	    }
 	}
     }
@@ -744,19 +844,19 @@ codespan(MMIOT *f, int size)
 
 
 /* before letting a tag through, validate against
- * DENY_A and DENY_IMG
+ * MKD_NOLINKS and MKD_NOIMAGE
  */
 static int
 forbidden_tag(MMIOT *f)
 {
     int c = toupper(peek(f, 1));
 
-    if ( f->flags & DENY_HTML )
+    if ( f->flags & MKD_NOHTML )
 	return 1;
 
-    if ( c == 'A' && (f->flags & DENY_A) && !isthisalnum(f,2) )
+    if ( c == 'A' && (f->flags & MKD_NOLINKS) && !isthisalnum(f,2) )
 	return 1;
-    if ( c == 'I' && (f->flags & DENY_IMG)
+    if ( c == 'I' && (f->flags & MKD_NOIMAGE)
 		  && strncasecmp(cursor(f)+1, "MG", 2) == 0
 		  && !isthisalnum(f,4) )
 	return 1;
@@ -803,7 +903,7 @@ process_possible_link(MMIOT *f, int size)
     int mailto = 0;
     char *text = cursor(f);
     
-    if ( f->flags & DENY_A ) return 0;
+    if ( f->flags & MKD_NOLINKS ) return 0;
 
     if ( (size > 7) && strncasecmp(text, "mailto:", 7) == 0 ) {
 	/* if it says it's a mailto, it's a mailto -- who am
@@ -850,7 +950,7 @@ maybe_tag_or_link(MMIOT *f)
     int c, size;
     int maybetag = 1;
 
-    if ( f->flags & INSIDE_TAG )
+    if ( f->flags & MKD_TAGTEXT )
 	return 0;
 
     for ( size=0; (c = peek(f, size+1)) != '>'; size++) {
@@ -1013,7 +1113,7 @@ smartypants(int c, int *flags, MMIOT *f)
 {
     int i;
 
-    if ( f->flags & (DENY_SMARTY|INSIDE_TAG) )
+    if ( f->flags & (MKD_NOPANTS|MKD_TAGTEXT|IS_LABEL) )
 	return 0;
 
     for ( i=0; i < NRSMART; i++)
@@ -1081,7 +1181,7 @@ tickhandler(MMIOT *f, int tickchar, int minticks, spanhandler spanner)
     return 0;
 }
 
-#define tag_text(f)	(f->flags & INSIDE_TAG)
+#define tag_text(f)	(f->flags & MKD_TAGTEXT)
 
 
 static void
@@ -1092,7 +1192,7 @@ text(MMIOT *f)
     int smartyflags = 0;
 
     while (1) {
-        if ( (f->flags & AUTOLINK) && isalpha(peek(f,1)) && !tag_text(f) )
+        if ( (f->flags & MKD_AUTOLINK) && isalpha(peek(f,1)) && !tag_text(f) )
 	    maybe_autolink(f);
 
         c = pull(f);
@@ -1131,32 +1231,48 @@ text(MMIOT *f)
 	case '[':   if ( tag_text(f) || !linkylinky(0, f) )
 			Qchar(c, f);
 		    break;
-#if SUPERSCRIPT
 	/* A^B -> A<sup>B</sup> */
-	case '^':   if ( (f->flags & (STRICT|INSIDE_TAG)) || isthisspace(f,-1) || isthisspace(f,1) )
+	case '^':   if ( (f->flags & (MKD_NOSUPERSCRIPT|MKD_STRICT|MKD_TAGTEXT))
+				|| (isthisnonword(f,-1) && peek(f,-1) != ')')
+				|| isthisspace(f,1) )
 			Qchar(c,f);
 		    else {
 			char *sup = cursor(f);
 			int len = 0;
-			Qstring("<sup>",f);
-			while ( !isthisspace(f,1+len) ) {
-			    ++len;
+
+			if ( peek(f,1) == '(' ) {
+			    int here = mmiottell(f);
+			    pull(f);
+
+			    if ( (len = parenthetical('(',')',f)) <= 0 ) {
+				mmiotseek(f,here);
+				Qchar(c, f);
+				break;
+			    }
+			    sup++;
 			}
-			shift(f,len);
+			else {
+			    while ( isthisalnum(f,1+len) )
+				++len;
+			    if ( !len ) {
+				Qchar(c,f);
+				break;
+			    }
+			    shift(f,len);
+			}
+			Qstring("<sup>",f);
 			___mkd_reparse(sup, len, 0, f);
 			Qstring("</sup>", f);
 		    }
 		    break;
-#endif
 	case '_':
-#if RELAXED_EMPHASIS
 	/* Underscores don't count if they're in the middle of a word */
-		    if ( !(f->flags & STRICT) && isthisalnum(f,-1)
-					      && isthisalnum(f,1) ) {
+		    if ( !(f->flags & (MKD_NORELAXED|MKD_STRICT))
+					&& isthisalnum(f,-1)
+					 && isthisalnum(f,1) ) {
 			Qchar(c, f);
 			break;
 		    }
-#endif
 	case '*':
 	/* Underscores & stars don't count if they're out in the middle
 	 * of whitespace */
@@ -1174,7 +1290,7 @@ text(MMIOT *f)
 		    }
 		    break;
 	
-	case '~':   if ( (f->flags & (NOSTRIKETHROUGH|INSIDE_TAG|STRICT)) || !tickhandler(f,c,2,delspan) )
+	case '~':   if ( (f->flags & (MKD_NOSTRIKETHROUGH|MKD_TAGTEXT|MKD_STRICT)) || !tickhandler(f,c,2,delspan) )
 			Qchar(c, f);
 		    break;
 
@@ -1187,6 +1303,14 @@ text(MMIOT *f)
 				break;
 		    case '<':   Qstring("&lt;", f);
 				break;
+		    case '^':   if ( f->flags & (MKD_STRICT|MKD_NOSUPERSCRIPT) ) {
+				    Qchar('\\', f);
+				    shift(f,-1);
+				    break;
+				}
+				Qchar(c, f);
+				break;
+				
 		    case '>': case '#': case '.': case '-':
 		    case '+': case '{': case '}': case ']':
 		    case '!': case '[': case '*': case '_':
@@ -1229,13 +1353,14 @@ text(MMIOT *f)
 static void
 printheader(Paragraph *pp, MMIOT *f)
 {
-    Qprintf(f, "<h%d", pp->hnumber);
-    if ( f->flags & TOC ) {
-	Qprintf(f, " id=\"", pp->hnumber);
-	mkd_string_to_anchor(T(pp->text->text), S(pp->text->text), Qchar, f);
-	Qchar('"', f);
+    if ( f->flags & MKD_TOC ) {
+	Qstring("<a name=\"", f);
+	mkd_string_to_anchor(T(pp->text->text),
+			     S(pp->text->text),
+			     (mkd_sta_function_t)Qchar, f, 1);
+	Qstring("\"></a>\n", f);
     }
-    Qchar('>', f);
+    Qprintf(f, "<h%d>", pp->hnumber);
     push(T(pp->text->text), S(pp->text->text), f);
     text(f);
     Qprintf(f, "</h%d>", pp->hnumber);
@@ -1432,7 +1557,6 @@ htmlify(Paragraph *p, char *block, char *arguments, MMIOT *f)
 }
 
 
-#if DL_TAG_EXTENSION
 static void
 definitionlist(Paragraph *p, MMIOT *f)
 {
@@ -1455,7 +1579,6 @@ definitionlist(Paragraph *p, MMIOT *f)
 	Qstring("</dl>", f);
     }
 }
-#endif
 
 
 static void
@@ -1464,7 +1587,7 @@ listdisplay(int typ, Paragraph *p, MMIOT* f)
     if ( p ) {
 	Qprintf(f, "<%cl", (typ==UL)?'u':'o');
 	if ( typ == AL )
-	    Qprintf(f, " type=a");
+	    Qprintf(f, " type=\"a\"");
 	Qprintf(f, ">\n");
 
 	for ( ; p ; p = p->next ) {
@@ -1507,11 +1630,9 @@ display(Paragraph *p, MMIOT *f)
 	listdisplay(p->typ, p->down, f);
 	break;
 
-#if DL_TAG_EXTENSION
     case DL:
 	definitionlist(p->down, f);
 	break;
-#endif
 
     case HR:
 	Qstring("<hr />", f);
@@ -1537,20 +1658,59 @@ display(Paragraph *p, MMIOT *f)
 }
 
 
+/* dump out a list of footnotes
+ */
+static void
+mkd_extra_footnotes(MMIOT *m)
+{
+    int j, i;
+    Footnote *t;
+
+    if ( m->reference == 0 )
+	return;
+
+    Csprintf(&m->out, "\n<div class=\"footnotes\">\n<hr/>\n<ol>\n");
+    
+    for ( i=1; i <= m->reference; i++ ) {
+	for ( j=0; j < S(*m->footnotes); j++ ) {
+	    t = &T(*m->footnotes)[j];
+	    if ( (t->refnumber == i) && (t->flags & REFERENCED) ) {
+		Csprintf(&m->out, "<li id=\"%s:%d\">\n<p>",
+			    p_or_nothing(m), t->refnumber);
+		Csreparse(&m->out, T(t->title), S(t->title), 0);
+		Csprintf(&m->out, "<a href=\"#%sref:%d\" rev=\"footnote\">&#8617;</a>",
+			    p_or_nothing(m), t->refnumber);
+		Csprintf(&m->out, "</p></li>\n");
+	    }
+	}
+    }
+    Csprintf(&m->out, "</ol>\n</div>\n");
+}
+
+
 /* return a pointer to the compiled markdown
  * document.
  */
 int
 mkd_document(Document *p, char **res)
 {
+    int size;
+    
     if ( p && p->compiled ) {
 	if ( ! p->html ) {
 	    htmlify(p->code, 0, 0, p->ctx);
+	    if ( p->ctx->flags & MKD_EXTRA_FOOTNOTE )
+		mkd_extra_footnotes(p->ctx);
 	    p->html = 1;
 	}
 
+	size = S(p->ctx->out);
+	
+	if ( (size == 0) || T(p->ctx->out)[size-1] )
+	    EXPAND(p->ctx->out) = 0;
+	
 	*res = T(p->ctx->out);
-	return S(p->ctx->out);
+	return size;
     }
     return EOF;
 }