bluecloth 2.0.7-x86-mswin32 → 2.0.11pre158-x86-mswin32

data/ext/extconf.rb

@@ -13,19 +13,17 @@ version = versionfile.read.chomp
 if CONFIG['host_os'].match( 'mswin' )
 	$CFLAGS << ' -I.' << ' -W3' << ' -Zi'
 else
-	$CFLAGS << ' -I.' << ' -Wall'
+	$CFLAGS << ' -I.'
 end
 $CPPFLAGS << %Q{ -DVERSION=\\"#{version}\\"}
 
 # Add my own debugging hooks if building for me
-if ENV['DEBUGGING_BUILD']
+if ENV['MAINTAINER_MODE']
+	$stderr.puts "Maintainer mode enabled."
+	$CFLAGS << ' -Wall'
 	$CFLAGS << ' -ggdb' << ' -DDEBUG'
 end
 
-def fail( *messages )
-	$stderr.puts( *messages )
-	exit( 1 )
-end
 
 # Stuff from configure.sh
 have_func( "srand" ) || have_func( "srandom" )
@@ -35,13 +33,13 @@ have_func( "random" ) || have_func( "rand" )
 have_func( "bzero", %w[string.h strings.h] )
 
 unless have_func( "strcasecmp" ) || have_func( "stricmp" )
-	fail( "This extension requires either strcasecmp() or stricmp()" )
+	abort "This extension requires either strcasecmp() or stricmp()"
 end
 unless have_func( "strncasecmp" ) || have_func( "strnicmp" )
-	fail( "This extensions requires either strncasecmp() or strnicmp()" )
+	abort "This extensions requires either strncasecmp() or strnicmp()"
 end
 
-have_header( 'mkdio.h' ) or fail( "missing mkdio.h" )
+have_header( 'mkdio.h' ) or abort "missing mkdio.h"
 
 # Check for 1.9.xish encoding header
 have_header( 'ruby/encoding.h' )

data/ext/generate.c

@@ -18,11 +18,9 @@
 #include "amalloc.h"
 
 typedef int (*stfu)(const void*,const void*);
-
+typedef void (*spanhandler)(MMIOT*,int);
 
 /* forward declarations */
-static int iscodeblock(MMIOT*);
-static void code(int, MMIOT*);
 static void text(MMIOT *f);
 static Paragraph *display(Paragraph*, MMIOT*);
 
@@ -182,118 +180,6 @@ Qem(MMIOT *f, char c, int count)
 }
 
 
-/* empair()
- */
-static int
-empair(MMIOT *f, int go, int level)
-{
-    
-    int i;
-    block *begin, *p;
-
-    begin = &T(f->Q)[go];
-    for (i=go+1; i < S(f->Q); i++) {
-	p = &T(f->Q)[i];
-
-	if ( (p->b_type != bTEXT) && (p->b_count <= 0) )
-	    break;
-	
-	if ( p->b_type == begin->b_type ) {
-	    if ( p->b_count == level )	/* exact match */
-		return i-go;
-
-	    if ( p->b_count > 2 )	/* fuzzy match */
-		return i-go;
-	}
-    }
-    return EOF;
-}
-
-
-
-static struct emtags {
-    char open[10];
-    char close[10];
-    int size;
-} emtags[] = {  { "<em>" , "</em>", 5 }, { "<strong>", "</strong>", 9 } };
-
-
-static void
-emclose(Cstring *s, int level)
-{
-    PREFIX(*s, emtags[level-1].close, emtags[level-1].size);
-}
-
-
-static void
-emopen(Cstring *s, int level)
-{
-    SUFFIX(*s, emtags[level-1].open, emtags[level-1].size-1);
-}
-
-
-/* emmatch()
- */
-static void
-emmatch(MMIOT *f, int go)
-{
-    block *start = &T(f->Q)[go], *end;
-    int e, e2, i, match;
-
-    while ( start->b_count ) {
-	switch (start->b_count) {
-	case 2: e = empair(f,go,match=2);
-		if ( e != EOF ) break;
-	case 1: e = empair(f,go,match=1); break;
-	default:
-	    e = empair(f,go,1);
-	    e2= empair(f,go,2);
-
-	    if ( e == EOF || ((e2 != EOF) && (e2 >= e)) ) {
-		e = e2;
-		match = 2;
-	    } 
-	    else
-		match = 1;
-	}
-	if ( e != EOF ) {
-	    end = &T(f->Q)[go+e];
-	    emclose(&end->b_post, match);
-	    emopen(&start->b_text, match);
-	    end->b_count -= match;
-	}
-	else {
-	    for (i=0; i < match; i++)
-		EXPAND(start->b_text) = start->b_char;
-	}
-	
-	start->b_count -= match;
-    }
-}
-
-
-/* ___mkd_emblock()
- */
-void
-___mkd_emblock(MMIOT *f)
-{
-    int i;
-    block *p;
-
-    for (i=0; i < S(f->Q); i++) {
-	p = &T(f->Q)[i];
-	
-	if ( p->b_type != bTEXT ) emmatch(f, i);
-
-	if ( S(p->b_post) ) { SUFFIX(f->out, T(p->b_post), S(p->b_post));
-			      DELETE(p->b_post); }
-	if ( S(p->b_text) ) { SUFFIX(f->out, T(p->b_text), S(p->b_text));
-			      DELETE(p->b_text); }
-    }
-    S(f->Q) = 0;
-}
-
-
 /* generate html from a markup fragment
  */
 void
@@ -304,7 +190,7 @@ ___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
     ___mkd_initmmiot(&sub, f->footnotes);
     
     sub.flags = f->flags | flags;
-    sub.base = f->base;
+    sub.cb = f->cb;
 
     push(bfr, size, &sub);
     EXPAND(sub.in) = 0;
@@ -345,6 +231,8 @@ puturl(char *s, int size, MMIOT *f, int display)
 	    Qstring("%22", f);
 	else if ( isalnum(c) || ispunct(c) || (display && isspace(c)) )
 	    Qchar(c, f);
+	else if ( c == 003 )	/* untokenize ^C */
+	    Qstring("  ", f);
 	else
 	    Qprintf(f, "%%%02X", c);
     }
@@ -374,12 +262,12 @@ parenthetical(int in, int out, MMIOT *f)
     for ( indent=1,size=0; indent; size++ ) {
 	if ( (c = pull(f)) == EOF )
 	    return EOF;
-	else if ( c == in )
-	    ++indent;
-	else if ( (c == '\\') && (peek(f,1) == out) ) {
+	else if ( (c == '\\') && (peek(f,1) == out || peek(f,1) == in) ) {
 	    ++size;
 	    pull(f);
 	}
+	else if ( c == in )
+	    ++indent;
 	else if ( c == out )
 	    --indent;
     }
@@ -463,6 +351,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
@@ -480,6 +415,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;
     }
 
@@ -512,27 +449,28 @@ linkyurl(MMIOT *f, int image, Footnote *p)
 
 /* prefixes for <automatic links>
  */
-static struct {
+static struct _protocol {
     char *name;
     int   nlen;
 } protocol[] = { 
 #define _aprotocol(x)	{ x, (sizeof x)-1 }
-    _aprotocol( "http://" ), 
-    _aprotocol( "https://" ), 
-    _aprotocol( "ftp://" ), 
-    _aprotocol( "news://" ),
+    _aprotocol( "https:" ), 
+    _aprotocol( "http:" ), 
+    _aprotocol( "news:" ),
+    _aprotocol( "ftp:" ), 
 #undef _aprotocol
 };
 #define NRPROTOCOLS	(sizeof protocol / sizeof protocol[0])
 
 
 static int
-isautoprefix(char *text)
+isautoprefix(char *text, int size)
 {
     int i;
+    struct _protocol *p;
 
-    for (i=0; i < NRPROTOCOLS; i++)
-	if ( strncasecmp(text, protocol[i].name, protocol[i].nlen) == 0 )
+    for (i=0, p=protocol; i < NRPROTOCOLS; i++, p++)
+	if ( (size >= p->nlen) && strncasecmp(text, p->name, p->nlen) == 0 )
 	    return 1;
     return 0;
 }
@@ -556,9 +494,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 [][];
@@ -568,10 +506,11 @@ 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 },
-    { "class:", 6, "<span class=\"", "\"", 0, ">", "</span>", 0, 0 },
-    { "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 },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
@@ -584,8 +523,7 @@ pseudo(Cstring t)
     int i;
     linkytype *r;
 
-    for ( i=0; i < NR(specials); i++ ) {
-	r = &specials[i];
+    for ( i=0, r=specials; i < NR(specials); i++,r++ ) {
 	if ( (S(t) > r->szpat) && (strncasecmp(T(t), r->pat, r->szpat) == 0) )
 	    return r;
     }
@@ -593,6 +531,39 @@ pseudo(Cstring t)
 }
 
 
+/* print out the start of an `img' or `a' tag, applying callbacks as needed.
+ */
+static void
+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 && 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);
+	}
+	else
+	    puturl(link + tag->szpat, size - tag->szpat, f, 0);
+    }
+    else
+	___mkd_reparse(link + tag->szpat, size - tag->szpat, MKD_TAGTEXT, f);
+
+    Qstring(tag->link_sfx, f);
+
+    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);
+    }
+} /* printlinkyref */
+
+
 /* print out a linky (or fail if it's Not Allowed)
  */
 static int
@@ -600,46 +571,38 @@ 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)) )
-	/* 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;
+	return 0;
     else
 	tag = &linkt;
 
     if ( f->flags & tag->flags )
 	return 0;
 
-    if ( tag->link_pfx ) {
-	Qstring(tag->link_pfx, f);
-	
-	if ( tag->kind & IS_URL ) {
-	    if ( f->base && T(ref->link) && (T(ref->link)[tag->szpat] == '/') )
-		puturl(f->base, strlen(f->base), f, 0);
-	    puturl(T(ref->link) + tag->szpat, S(ref->link) - tag->szpat, f, 0);
-	}
-	else
-	    ___mkd_reparse(T(ref->link) + tag->szpat, S(ref->link) - tag->szpat, INSIDE_TAG, f);
-	
-	Qstring(tag->link_sfx, f);
+    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) {
-	    if ( ref->height) Qprintf(f," height=\"%d\"", ref->height);
-	    if ( ref->width) Qprintf(f, " width=\"%d\"", ref->width);
+	if ( tag->WxH ) {
+	    if ( ref->height ) Qprintf(f," height=\"%d\"", ref->height);
+	    if ( ref->width ) Qprintf(f, " width=\"%d\"", ref->width);
 	}
 
 	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);
 	}
 
@@ -677,8 +640,11 @@ 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);
 	    }
@@ -700,6 +666,8 @@ 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);
+		else if ( f->flags & IS_LABEL )
+		    status = linkyformat(f, name, image, 0);
 	    }
 	}
     }
@@ -742,20 +710,112 @@ mangle(char *s, int len, MMIOT *f)
 }
 
 
+/* nrticks() -- count up a row of tick marks
+ */
+static int
+nrticks(int offset, int tickchar, MMIOT *f)
+{
+    int  tick = 0;
+
+    while ( peek(f, offset+tick) == tickchar ) tick++;
+
+    return tick;
+} /* nrticks */
+
+
+/* matchticks() -- match a certain # of ticks, and if that fails
+ *                 match the largest subset of those ticks.
+ *
+ *                 if a subset was matched, return the # of ticks
+ *		   that were matched.
+ */
+static int
+matchticks(MMIOT *f, int tickchar, int ticks, int *endticks)
+{
+    int size, count, c;
+    int subsize=0, subtick=0;
+    
+    *endticks = ticks;
+    for (size = 0; (c=peek(f,size+ticks)) != EOF; size ++) {
+	if ( (c == tickchar) && ( count = nrticks(size+ticks,tickchar,f)) ) {
+	    if ( count == ticks )
+		return size;
+	    else if ( count ) {
+		if ( (count > subtick) && (count < ticks) ) {
+		    subsize = size;
+		    subtick = count;
+		}
+		size += count;
+	    }
+	}
+    }
+    if ( subsize ) {
+	*endticks = subtick;
+	return subsize;
+    }
+    return 0;
+} /* matchticks */
+
+
+/* code() -- write a string out as code. The only characters that have
+ *           special meaning in a code block are * `<' and `&' , which
+ *           are /always/ expanded to &lt; and &amp;
+ */
+static void
+code(MMIOT *f, char *s, int length)
+{
+    int i,c;
+
+    for ( i=0; i < length; i++ )
+	if ( (c = s[i]) == 003)  /* ^C: expand back to 2 spaces */
+	    Qstring("  ", f);
+	else
+	    cputc(c, f);
+} /* code */
+
+
+/*  delspan() -- write out a chunk of text, blocking with <del>...</del>
+ */
+static void
+delspan(MMIOT *f, int size)
+{
+    Qstring("<del>", f);
+    ___mkd_reparse(cursor(f)-1, size, 0, f);
+    Qstring("</del>", f);
+}
+
+
+/*  codespan() -- write out a chunk of text as code, trimming one
+ *                space off the front and/or back as appropriate.
+ */
+static void
+codespan(MMIOT *f, int size)
+{
+    int i=0;
+
+    if ( size > 1 && peek(f, size-1) == ' ' ) --size;
+    if ( peek(f,i) == ' ' ) ++i, --size;
+    
+    Qstring("<code>", f);
+    code(f, cursor(f)+(i-1), size);
+    Qstring("</code>", f);
+} /* codespan */
+
+
 /* 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;
@@ -802,7 +862,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
@@ -826,10 +886,9 @@ process_possible_link(MMIOT *f, int size)
 	Qstring("</a>", f);
 	return 1;
     }
-    else if ( isautoprefix(text) ) {
-	Qstring("<a href=\"", f);
-	puturl(text,size,f, 0);
-	Qstring("\">", f);
+    else if ( isautoprefix(text, size) ) {
+	printlinkyref(f, &linkt, text, size);
+	Qchar('>', f);
 	puturl(text,size,f, 1);
 	Qstring("</a>", f);
 	return 1;
@@ -850,7 +909,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++) {
@@ -879,7 +938,10 @@ maybe_tag_or_link(MMIOT *f)
 		else
 		    size++;
 	    
-	    Qstring(forbidden_tag(f) ? "&lt;" : "<", f);
+	    if ( forbidden_tag(f) )
+		return 0;
+
+	    Qchar('<', f);
 	    while ( ((c = peek(f, 1)) != EOF) && (c != '>') )
 		Qchar(pull(f), f);
 	    return 1;
@@ -981,6 +1043,11 @@ static struct smarties {
 } smarties[] = {
     { '\'', "'s>",      "rsquo",  0 },
     { '\'', "'t>",      "rsquo",  0 },
+    { '\'', "'re>",     "rsquo",  0 },
+    { '\'', "'ll>",     "rsquo",  0 },
+    { '\'', "'ve>",     "rsquo",  0 },
+    { '\'', "'m>",      "rsquo",  0 },
+    { '\'', "'d>",      "rsquo",  0 },
     { '-',  "--",       "mdash",  1 },
     { '-',  "<->",      "ndash",  0 },
     { '.',  "...",      "hellip", 2 },
@@ -1005,7 +1072,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++)
@@ -1049,7 +1116,31 @@ smartypants(int c, int *flags, MMIOT *f)
 } /* smartypants */
 
 
-#define tag_text(f)	(f->flags & INSIDE_TAG)
+/* process a body of text encased in some sort of tick marks.   If it
+ * works, generate the output and return 1, otherwise just return 0 and
+ * let the caller figure it out.
+ */
+static int
+tickhandler(MMIOT *f, int tickchar, int minticks, spanhandler spanner)
+{
+    int endticks, size;
+    int tick = nrticks(0, tickchar, f);
+
+    if ( (tick >= minticks) && (size = matchticks(f,tickchar,tick,&endticks)) ) {
+	if ( endticks < tick ) {
+	    size += (tick - endticks);
+	    tick = endticks;
+	}
+
+	shift(f, tick);
+	(*spanner)(f,size);
+	shift(f, size+tick-1);
+	return 1;
+    }
+    return 0;
+}
+
+#define tag_text(f)	(f->flags & MKD_TAGTEXT)
 
 
 static void
@@ -1060,7 +1151,7 @@ text(MMIOT *f)
     int smartyflags = 0;
 
     while (1) {
-        if ( (f->flags & AUTOLINK) && isalpha(peek(f,1)) )
+        if ( (f->flags & MKD_AUTOLINK) && isalpha(peek(f,1)) && !tag_text(f) )
 	    maybe_autolink(f);
 
         c = pull(f);
@@ -1073,7 +1164,7 @@ text(MMIOT *f)
 	switch (c) {
 	case 0:     break;
 
-	case 3:     Qstring("<br/>", f);
+	case 3:     Qstring(tag_text(f) ? "  " : "<br/>", f);
 		    break;
 
 	case '>':   if ( tag_text(f) )
@@ -1099,43 +1190,56 @@ 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 '*':
-#if RELAXED_EMPHASIS
 	/* Underscores & stars don't count if they're out in the middle
 	 * of whitespace */
-		    if ( !(f->flags & STRICT) && isthisspace(f,-1)
-					      && isthisspace(f,1) ) {
+		    if ( isthisspace(f,-1) && isthisspace(f,1) ) {
 			Qchar(c, f);
 			break;
 		    }
 		    /* else fall into the regular old emphasis case */
-#endif
 		    if ( tag_text(f) )
 			Qchar(c, f);
 		    else {
@@ -1145,18 +1249,12 @@ text(MMIOT *f)
 		    }
 		    break;
 	
-	case '`':   if ( tag_text(f) || !iscodeblock(f) )
+	case '~':   if ( (f->flags & (MKD_NOSTRIKETHROUGH|MKD_TAGTEXT|MKD_STRICT)) || !tickhandler(f,c,2,delspan) )
+			Qchar(c, f);
+		    break;
+
+	case '`':   if ( tag_text(f) || !tickhandler(f,c,1,codespan) )
 			Qchar(c, f);
-		    else {
-			Qstring("<code>", f);
-			if ( peek(f, 1) == '`' ) {
-			    pull(f);
-			    code(2, f);
-			}
-			else
-			    code(1, f);
-			Qstring("</code>", f);
-		    }
 		    break;
 
 	case '\\':  switch ( c = pull(f) ) {
@@ -1164,11 +1262,18 @@ text(MMIOT *f)
 				break;
 		    case '<':   Qstring("&lt;", f);
 				break;
-		    case '\\':
+		    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 '\'':
 		    case '!': case '[': case '*': case '_':
+		    case '\\':case '(': case ')':
 		    case '`':	Qchar(c, f);
 				break;
 		    default:
@@ -1202,86 +1307,17 @@ text(MMIOT *f)
 } /* text */
 
 
-static int
-iscodeblock(MMIOT *f)
-{
-    int i=1, single = 1, c;
-    
-    if ( peek(f,i) == '`' ) {
-	single=0;
-	i++;
-    }
-    while ( (c=peek(f,i)) != EOF ) {
-	if ( (c == '`') && (single || peek(f,i+1) == '`') )
-	    return 1;
-	else if ( c == '\\' )
-	    i++;
-	i++;
-    }
-    return 0;
-    
-}
-
-static int
-endofcode(int escape, int offset, MMIOT *f)
-{
-    switch (escape) {
-    case 2: if ( peek(f, offset+1) == '`' ) {
-		shift(f,1);
-    case 1:     shift(f,offset);
-		return 1;
-	    }
-    default:return 0;
-    }
-}
-
-
-/* the only characters that have special meaning in a code block are
- * `<' and `&' , which are /always/ expanded to &lt; and &amp;
- */
-static void
-code(int escape, MMIOT *f)
-{
-    int c;
-
-    if ( escape && (peek(f,1) == ' ') )
-	shift(f,1);
-
-    while ( (c = pull(f)) != EOF ) {
-	switch (c) {
-	case ' ':   if ( peek(f,1) == '`' && endofcode(escape, 1, f) )
-			return;
-		    Qchar(c, f);
-		    break;
-
-	case '`':   if ( endofcode(escape, 0, f) )
-			return;
-		    Qchar(c, f);
-		    break;
-
-	case '\\':  cputc(c, f);
-		    if ( peek(f,1) == '>' || (c = pull(f)) == EOF )
-			break;
-	
-	default:    cputc(c, f);
-		    break;
-	}
-    }
-} /* code */
-
-
 /* print a header block
  */
 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), 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);
@@ -1328,6 +1364,7 @@ splat(Line *p, char *block, Istring align, int force, MMIOT *f)
     return colno;
 }
 
+
 static int
 printtable(Paragraph *pp, MMIOT *f)
 {
@@ -1392,13 +1429,14 @@ static int
 printblock(Paragraph *pp, MMIOT *f)
 {
     Line *t = pp->text;
-    static char *Begin[] = { "", "<p>", "<center>"  };
-    static char *End[]   = { "", "</p>","</center>" };
+    static char *Begin[] = { "", "<p>", "<p style=\"text-align:center;\">"  };
+    static char *End[]   = { "", "</p>","</p>" };
 
     while (t) {
 	if ( S(t->text) ) {
-	    if ( S(t->text) > 2 && T(t->text)[S(t->text)-2] == ' '
-				&& T(t->text)[S(t->text)-1] == ' ') {
+	    if ( t->next && S(t->text) > 2
+			 && T(t->text)[S(t->text)-2] == ' '
+			 && T(t->text)[S(t->text)-1] == ' ' ) {
 		push(T(t->text), S(t->text)-2, f);
 		push("\003\n", 2, f);
 	    }
@@ -1423,19 +1461,18 @@ printcode(Line *t, MMIOT *f)
 {
     int blanks;
 
-    for ( blanks = 0; t ; t = t->next )
+    Qstring("<pre><code>", f);
+    for ( blanks = 0; t ; t = t->next ) {
 	if ( S(t->text) > t->dle ) {
 	    while ( blanks ) {
-		push("\n", 1, f);
+		Qchar('\n', f);
 		--blanks;
 	    }
-	    push(T(t->text), S(t->text), f);
-	    push("\n", 1, f);
+	    code(f, T(t->text), S(t->text));
+	    Qchar('\n', f);
 	}
 	else blanks++;
-
-    Qstring("<pre><code>", f);
-    code(0, f);
+    }
     Qstring("</code></pre>", f);
 }
 
@@ -1477,7 +1514,6 @@ htmlify(Paragraph *p, char *block, char *arguments, MMIOT *f)
 }
 
 
-#if DL_TAG_EXTENSION
 static void
 definitionlist(Paragraph *p, MMIOT *f)
 {
@@ -1500,7 +1536,6 @@ definitionlist(Paragraph *p, MMIOT *f)
 	Qstring("</dl>", f);
     }
 }
-#endif
 
 
 static void
@@ -1509,7 +1544,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 ) {
@@ -1552,11 +1587,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);
@@ -1588,14 +1621,21 @@ display(Paragraph *p, MMIOT *f)
 int
 mkd_document(Document *p, char **res)
 {
+    int size;
+    
     if ( p && p->compiled ) {
 	if ( ! p->html ) {
 	    htmlify(p->code, 0, 0, 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;
 }