rdiscount 1.3.5 → 1.5.5

data/README.markdown

@@ -5,21 +5,25 @@ Discount is an implementation of John Gruber's Markdown markup language in C. It
 implements all of the language described in [the markdown syntax document][1] and
 passes the [Markdown 1.0 test suite][2].
 
-Discount was developed by [David Loren Parsons][3]. The Ruby extension was
-developed by [Ryan Tomayko][4].
+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>
+
+Discount was developed by [David Loren Parsons][3]. The Ruby extension
+is maintained by [Ryan Tomayko][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/
+[4]: http://tomayko.com/about
 
-Installation, Hacking
----------------------
+INSTALL, HACKING
+----------------
 
-RDiscount Gem releases are published to RubyForge and can be installed as
-follows:
+New releases of RDiscount are published to [gemcutter][]:
 
-    $ [sudo] gem install rdiscount
+    $ [sudo] gem install rdiscount -s http://gemcutter.org
 
 The RDiscount sources are available via Git:
 
@@ -27,9 +31,9 @@ The RDiscount sources are available via Git:
     $ cd rdiscount
     $ rake --tasks
 
-For more information, see [the project page](http://github.com/rtomayko/rdiscount).
+[gemcutter]: http://gemcutter.org/gems/rdiscount
 
-Usage
+USAGE
 -----
 
 RDiscount implements the basic protocol popularized by RedCloth and adopted
@@ -39,6 +43,11 @@ by BlueCloth:
     markdown = RDiscount.new("Hello World!")
     puts markdown.to_html
 
+Additional processing options can be turned on when creating the
+RDiscount object:
+
+    markdown = RDiscount.new("Hello World!", :smart, :filter_html)
+
 Inject RDiscount into your BlueCloth-using code by replacing your bluecloth
 require statements with the following:
 
@@ -56,3 +65,4 @@ Discount is free software;  it is released under a BSD-style license
 that allows you to do as you wish with it as long as you don't attempt
 to claim it as your own work. RDiscount adopts Discount's license
 verbatim. See the file `COPYING` for more information.
+

data/Rakefile

@@ -4,15 +4,8 @@ task :default => :test
 
 # PACKAGING =================================================================
 
-# Load the gemspec using the same limitations as github
-$spec =
-  begin
-    require 'rubygems/specification'
-    data = File.read('rdiscount.gemspec')
-    spec = nil
-    Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-    spec
-  end
+require 'rubygems/specification'
+$spec = eval(File.read('rdiscount.gemspec'))
 
 def package(ext='')
   "pkg/rdiscount-#{$spec.version}" + ext
@@ -91,9 +84,17 @@ task :build => "lib/rdiscount.#{DLEXT}"
 # Testing
 # ==========================================================
 
+def runner
+  if system("type turn 2>/dev/null 1>&2")
+    "turn"
+  else
+    "testrb"
+  end
+end
+
 desc 'Run unit tests'
 task 'test:unit' => [:build] do |t|
-  sh 'testrb test/markdown_test.rb test/rdiscount_test.rb'
+  sh "#{runner} test/markdown_test.rb test/rdiscount_test.rb"
 end
 
 desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
@@ -175,7 +176,7 @@ task :gather => 'discount' do |t|
   files =
     FileList[
       'discount/{markdown,mkdio,amalloc,cstring}.h',
-      'discount/{markdown,docheader,dumptree,generate,mkdio,resource,toc,Csio}.c'
+      'discount/{markdown,docheader,dumptree,generate,mkdio,resource,toc,Csio,xml,css}.c'
     ]
   cp files, 'ext/',
     :preserve => true,

data/ext/Csio.c

@@ -26,15 +26,27 @@ Csprintf(Cstring *iot, char *fmt, ...)
     do {
 	RESERVE(*iot, siz);
 	va_start(ptr, fmt);
-	siz = vsnprintf(T(*iot)+S(*iot), ALL(*iot)-S(*iot), fmt, ptr);
+	siz = vsnprintf(T(*iot)+S(*iot), ALLOCATED(*iot)-S(*iot), fmt, ptr);
 	va_end(ptr);
-    } while ( siz > (ALL(*iot)-S(*iot)) );
+    } while ( siz > (ALLOCATED(*iot)-S(*iot)) );
 
     S(*iot) += siz;
     return siz;
 }
 
 
+/* write() into a cstring
+ */
+int
+Cswrite(Cstring *iot, char *bfr, int size)
+{
+    RESERVE(*iot, size);
+    memcpy(T(*iot)+S(*iot), bfr, size);
+    S(*iot) += size;
+    return size;
+}
+
+
 /* reparse() into a cstring
  */
 void

data/ext/css.c

@@ -0,0 +1,76 @@
+/* markdown: a C implementation of John Gruber's Markdown markup language.
+ *
+ * Copyright (C) 2009 David L Parsons.
+ * The redistribution terms are provided in the COPYRIGHT file that must
+ * be distributed with this source code.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <time.h>
+#include <ctype.h>
+
+#include "config.h"
+
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+
+/*
+ * dump out stylesheet sections.
+ */
+static void
+stylesheets(Paragraph *p, Cstring *f)
+{
+    Line* q;
+
+    for ( ; p ; p = p->next ) {
+	if ( p->typ == STYLE ) {
+	    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);
+    }
+}
+
+
+/* dump any embedded styles to a string
+ */
+int
+mkd_css(Document *d, char **res)
+{
+    Cstring f;
+
+    if ( res && *res && d && d->compiled ) {
+	CREATE(f);
+	RESERVE(f, 100);
+	stylesheets(d->code, &f);
+			
+			/* HACK ALERT! HACK ALERT! HACK ALERT! */
+	*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 */
+			/* END HACK ALERT */
+    }
+    return EOF;
+}
+
+
+/* dump any embedded styles to a file
+ */
+int
+mkd_generatecss(Document *d, FILE *f)
+{
+    char *res;
+    int written = EOF, size = mkd_css(d, &res);
+
+    if ( size > 0 )
+	written = fwrite(res, size, 1, f);
+    if ( res )
+	free(res);
+    return (written == size) ? size : EOF;
+}

data/ext/cstring.h

@@ -22,8 +22,8 @@
 			    : (T(x) = T(x) ? realloc(T(x), sizeof T(x)[0] * ((x).alloc += 100)) \
 					   : malloc(sizeof T(x)[0] * ((x).alloc += 100)) )]
 
-#define DELETE(x)	(x).alloc ? (free(T(x)), S(x) = (x).alloc = 0) \
-				  : ( S(x) = 0 )
+#define DELETE(x)	ALLOCATED(x) ? (free(T(x)), S(x) = (x).alloc = 0) \
+				     : ( S(x) = 0 )
 #define CLIP(t,i,sz)	\
 	    ( ((i) >= 0) && ((sz) > 0) && (((i)+(sz)) <= S(t)) ) ? \
 	    (memmove(&T(t)[i], &T(t)[i+sz], (S(t)-(i+sz)+1)*sizeof(T(t)[0])), \
@@ -50,7 +50,7 @@
  */
 #define T(x)		(x).text
 #define S(x)		(x).size
-#define ALL(x)		(x).alloc
+#define ALLOCATED(x)	(x).alloc
 
 /* abstract anchor type that defines a list base
  * with a function that attaches an element to
@@ -60,14 +60,16 @@
  * macro will work with it.
  */
 #define ANCHOR(t)	struct { t *text, *end; }
+#define E(t)		((t).end)
 
-#define ATTACH(t, p)	( (t).text ?( ((t).end->next = (p)), ((t).end = (p)) ) \
-				   :( ((t).text = (t).end = (p)) ) )
+#define ATTACH(t, p)	( T(t) ? ( (E(t)->next = (p)), (E(t) = (p)) ) \
+			       : ( (T(t) = E(t) = (p)) ) )
 
 typedef STRING(char) Cstring;
 
 extern void Csputc(int, Cstring *);
 extern int Csprintf(Cstring *, char *, ...);
+extern int Cswrite(Cstring *, char *, int);
 extern void Csreparse(Cstring *, char *, int, int);
 
 #endif/*_CSTRING_D*/

data/ext/dumptree.c

@@ -30,7 +30,9 @@ Pptype(int typ)
     case OL        : return "ol";
     case LISTITEM  : return "item";
     case HDR       : return "header";
-    case HR        : return "HR";
+    case HR        : return "hr";
+    case TABLE     : return "table";
+    case SOURCE    : return "source";
     default        : return "mystery node!";
     }
 }
@@ -106,6 +108,8 @@ dumptree(Paragraph *pp, Stack *sp, FILE *f)
 	printpfx(sp, f);
 
 	d = fprintf(f, "[%s", Pptype(pp->typ));
+	if ( pp->ident )
+	    d += fprintf(f, " %s", pp->ident);
 	if ( pp->align )
 	    d += fprintf(f, ", <%s>", Begin[pp->align]);
 

data/ext/generate.c

@@ -17,11 +17,6 @@
 #include "markdown.h"
 #include "amalloc.h"
 
-/* prefixes for <automatic links>
- */
-static char *autoprefix[] = { "http://", "https://", "ftp://", "news://" };
-#define SZAUTOPREFIX	(sizeof autoprefix / sizeof autoprefix[0])
-
 typedef int (*stfu)(const void*,const void*);
 
 
@@ -119,7 +114,7 @@ shift(MMIOT *f, int i)
 /* Qchar()
  */
 static void
-Qchar(char c, MMIOT *f)
+Qchar(int c, MMIOT *f)
 {
     block *cur;
     
@@ -328,18 +323,27 @@ ___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
  * write out a url, escaping problematic characters
  */
 static void
-puturl(char *s, int size, MMIOT *f)
+puturl(char *s, int size, MMIOT *f, int display)
 {
     unsigned char c;
 
     while ( size-- > 0 ) {
 	c = *s++;
 
+	if ( c == '\\' && size-- > 0 ) {
+	    c = *s++;
+
+	    if ( !( ispunct(c) || isspace(c) ) )
+		Qchar('\\', f);
+	}
+	
 	if ( c == '&' )
 	    Qstring("&amp;", f);
 	else if ( c == '<' )
 	    Qstring("&lt;", f);
-	else if ( isalnum(c) || ispunct(c) )
+	else if ( c == '"' )
+	    Qstring("%22", f);
+	else if ( isalnum(c) || ispunct(c) || (display && isspace(c)) )
 	    Qchar(c, f);
 	else
 	    Qprintf(f, "%%%02X", c);
@@ -372,181 +376,164 @@ parenthetical(int in, int out, MMIOT *f)
 	    return EOF;
 	else if ( c == in )
 	    ++indent;
+	else if ( (c == '\\') && (peek(f,1) == out) ) {
+	    ++size;
+	    pull(f);
+	}
 	else if ( c == out )
 	    --indent;
     }
-    return size-1;
+    return size ? (size-1) : 0;
 }
 
 
 /* extract a []-delimited label from the input stream.
  */
-static char *
-linkylabel(MMIOT *f, int *sizep)
+static int
+linkylabel(MMIOT *f, Cstring *res)
 {
     char *ptr = cursor(f);
+    int size;
 
-    if ( (*sizep = parenthetical('[',']',f)) != EOF )
-	return ptr;
+    if ( (size = parenthetical('[',']',f)) != EOF ) {
+	T(*res) = ptr;
+	S(*res) = size;
+	return 1;
+    }
     return 0;
 }
 
 
-/* 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
- * `text`, where I extract until I reach a ')' or
- * whitespace.
+/* see if the quote-prefixed linky segment is actually a title.
  */
-static char*
-linkyurl(MMIOT *f, int *sizep)
+static int
+linkytitle(MMIOT *f, char quote, Footnote *ref)
 {
-    int size = 0;
-    char *ptr;
-    int c;
+    int whence = mmiottell(f);
+    char *title = cursor(f);
+    char *e;
+    register int c;
 
-    if ( (c = eatspace(f)) == EOF )
-	return 0;
-
-    ptr = cursor(f);
-
-    if ( c == '<' ) {
-	pull(f);
-	ptr++;
-	if ( (size = parenthetical('<', '>', f)) == EOF )
-	    return 0;
-    }
-    else {
-	for ( ; ((c=pull(f)) != ')') && !isspace(c); size++)
-	    if ( c == EOF ) return 0;
-	if ( c == ')' )
-	    shift(f, -1);
+    while ( (c = pull(f)) != EOF ) {
+	e = cursor(f);
+	if ( c == quote ) {
+	    if ( (c = eatspace(f)) == ')' ) {
+		T(ref->title) = 1+title;
+		S(ref->title) = (e-title)-2;
+		return 1;
+	    }
+	}
     }
-    *sizep = size;
-    return ptr;
+    mmiotseek(f, whence);
+    return 0;
 }
 
 
 /* extract a =HHHxWWW size from the input stream
  */
 static int
-linkysize(MMIOT *f, int *heightp, int *widthp)
+linkysize(MMIOT *f, Footnote *ref)
 {
     int height=0, width=0;
+    int whence = mmiottell(f);
     int c;
 
-    *heightp = 0;
-    *widthp = 0;
+    if ( isspace(peek(f,0)) ) {
+	pull(f);	/* eat '=' */
 
-    if ( (c = eatspace(f)) != '=' ) 
-	return (c != EOF);
-    pull(f);	/* eat '=' */
-
-    for ( c = pull(f); isdigit(c); c = pull(f))
-	width = (width * 10) + (c - '0');
-
-    if ( c == 'x' ) {
 	for ( c = pull(f); isdigit(c); c = pull(f))
-	    height = (height*10) + (c - '0');
-
-	if ( c != EOF ) {
-	    if ( !isspace(c) ) shift(f, -1);
-	    *heightp = height;
-	    *widthp = width;
-	    return 1;
-	}
-    }
-    return 0;
-}
+	    width = (width * 10) + (c - '0');
 
+	if ( c == 'x' ) {
+	    for ( c = pull(f); isdigit(c); c = pull(f))
+		height = (height*10) + (c - '0');
 
-/* extract a )-terminated title from the input stream.
- */
-static char*
-linkytitle(MMIOT *f, int *sizep)
-{
-    int countq=0, qc, c, size;
-    char *ret, *lastqc = 0;
-
-    eatspace(f);
-    if ( (qc=pull(f)) != '"' && qc != '\'' && qc != '(' )
-	return 0;
+	    if ( isspace(c) )
+		c = eatspace(f);
 
-    if ( qc == '(' ) qc = ')';
-
-    for ( ret = cursor(f); (c = pull(f)) != EOF;  ) {
-	if ( (c == ')') && countq ) {
-	    size = (lastqc ? lastqc : cursor(f)) - ret;
-	    *sizep = size-1;
-	    return ret;
-	}
-	else if ( c == qc ) {
-	    lastqc = cursor(f);
-	    countq++;
+	    if ( (c == ')') || ((c == '\'' || c == '"') && linkytitle(f, c, ref)) ) {
+		ref->height = height;
+		ref->width  = width;
+		return 1;
+	    }
 	}
     }
+    mmiotseek(f, whence);
     return 0;
 }
 
 
-/* look up (or construct) a footnote from the [xxx] link
- * at the head of the stream.
+/* 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
+ * `text`, where I extract until I reach a ')', a quote,
+ * or (if image) a '='
  */
 static int
-linkykey(int image, Footnote *val, MMIOT *f)
+linkyurl(MMIOT *f, int image, Footnote *p)
 {
-    Footnote *ret;
-    Cstring mylabel;
-    int here;
-
-    memset(val, 0, sizeof *val);
+    int c;
+    int mayneedtotrim=0;
 
-    if ( (T(val->tag) = linkylabel(f, &S(val->tag))) == 0 )
+    if ( (c = eatspace(f)) == EOF )
 	return 0;
 
-    here = mmiottell(f);
-    eatspace(f);
-    switch ( pull(f) ) {
-    case '(':
-	/* embedded link */
-	if ( (T(val->link) = linkyurl(f,&S(val->link))) == 0 )
-	    return 0;
+    if ( c == '<' ) {
+	pull(f);
+	mayneedtotrim=1;
+    }
 
-	if ( image && !linkysize(f, &val->height, &val->width) )
+    T(p->link) = cursor(f);
+    for ( S(p->link)=0; (c = peek(f,1)) != ')'; ++S(p->link) ) {
+	if ( c == EOF )
 	    return 0;
+	else if ( (c == '"' || c == '\'') && linkytitle(f, c, p) )
+	    break;
+	else if ( image && (c == '=') && linkysize(f, p) )
+	    break;
+	else if ( (c == '\\') && ispunct(peek(f,2)) ) {
+	    ++S(p->link);
+	    pull(f);
+	}
+	pull(f);
+    }
+    if ( peek(f, 1) == ')' )
+	pull(f);
+	
+    ___mkd_tidy(&p->link);
+    
+    if ( mayneedtotrim && (T(p->link)[S(p->link)-1] == '>') )
+	--S(p->link);
+    
+    return 1;
+}
 
-	T(val->title) = linkytitle(f, &S(val->title));
 
-	return peek(f,0) == ')';
 
-    case '[':		/* footnote links /as defined in the standard/ */
-    default:		/* footnote links -- undocumented extension */
-	/* footnote link */
-	mylabel = val->tag;
-	if ( peek(f,0) == '[' ) {
-	    if ( (T(val->tag) = linkylabel(f, &S(val->tag))) == 0 )
-		return 0;
+/* prefixes for <automatic links>
+ */
+static struct {
+    char *name;
+    int   nlen;
+} protocol[] = { 
+#define _aprotocol(x)	{ x, (sizeof x)-1 }
+    _aprotocol( "http://" ), 
+    _aprotocol( "https://" ), 
+    _aprotocol( "ftp://" ), 
+    _aprotocol( "news://" ),
+#undef _aprotocol
+};
+#define NRPROTOCOLS	(sizeof protocol / sizeof protocol[0])
 
-	    if ( !S(val->tag) )
-		val->tag = mylabel;
-	}
-	else if ( f->flags & MKD_1_COMPAT )
-	    break;
-	else
-	    mmiotseek(f,here);
 
-	ret = bsearch(val, T(*f->footnotes), S(*f->footnotes),
-	               sizeof *val, (stfu)__mkd_footsort);
+static int
+isautoprefix(char *text)
+{
+    int i;
 
-	if ( ret ) {
-	    val->tag = mylabel;
-	    val->link = ret->link;
-	    val->title = ret->title;
-	    val->height = ret->height;
-	    val->width = ret->width;
+    for (i=0; i < NRPROTOCOLS; i++)
+	if ( strncasecmp(text, protocol[i].name, protocol[i].nlen) == 0 )
 	    return 1;
-	}
-    }
     return 0;
 }
 
@@ -564,12 +551,14 @@ typedef struct linkytype {
     char *text_pfx;	/* text prefix                  (eg: ">"           */
     char *text_sfx;	/* text suffix			(eg: "</a>"        */
     int      flags;	/* reparse flags */
+    int      kind;	/* tag is url or something else? */
+#define IS_URL	0x01
 } linkytype;
 
 static linkytype imaget = { 0, 0, "<img src=\"", "\"",
-			     1, " alt=\"", "\" />", DENY_IMG|INSIDE_TAG };
+			     1, " alt=\"", "\" />", DENY_IMG|INSIDE_TAG, IS_URL };
 static linkytype linkt  = { 0, 0, "<a href=\"", "\"",
-                             0, ">", "</a>", DENY_A };
+                             0, ">", "</a>", DENY_A, IS_URL };
 
 /*
  * pseudo-protocols for [][];
@@ -579,9 +568,10 @@ 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 },
-    { "class:", 6, "<span class=\"", "\"", 0, ">", "</span>", 0 },
-    { "raw:", 4, 0, 0, 0, 0, 0, 0 },
+    { "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 },
+    { "abbr:", 5, "<abbr title=\"", "\"", 0, ">", "</abbr>", 0, 0 },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
@@ -589,7 +579,7 @@ static linkytype specials[] = {
 /* see if t contains one of our pseudo-protocols.
  */
 static linkytype *
-extratag(Cstring t)
+pseudo(Cstring t)
 {
     int i;
     linkytype *r;
@@ -603,57 +593,124 @@ extratag(Cstring t)
 }
 
 
-/*
- * process embedded links and images
+/* print out a linky (or fail if it's Not Allowed)
  */
 static int
-linkylinky(int image, MMIOT *f)
+linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
 {
-    int start = mmiottell(f);
-    Footnote link;
     linkytype *tag;
 
-    if ( !linkykey(image, &link, f) ) {
-	mmiotseek(f, start);
-	return 0;
-    }
-
     if ( image )
 	tag = &imaget;
-    else if ( (f->flags & NO_PSEUDO_PROTO) || (tag = extratag(link.link)) == 0 )
+    else if ( tag = pseudo(ref->link) ) {
+	if ( f->flags & (NO_PSEUDO_PROTO|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
+	 * a well-known protocol
+	 */
+	    return 0;
+    else
 	tag = &linkt;
 
-    if ( f->flags & tag-> flags ) {
-	mmiotseek(f, start);
+    if ( f->flags & tag->flags )
 	return 0;
-    }
 
     if ( tag->link_pfx ) {
 	Qstring(tag->link_pfx, f);
-	if ( f->base && (T(link.link)[tag->szpat] == '/') )
-	    puturl(f->base, strlen(f->base), f);
-	puturl(T(link.link) + tag->szpat, S(link.link) - tag->szpat, 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 ( tag->WxH && link.height && link.width ) {
-	    Qprintf(f," height=\"%d\"", link.height);
-	    Qprintf(f, " width=\"%d\"", link.width);
+	if ( tag->WxH && ref->height && ref->width ) {
+	    Qprintf(f," height=\"%d\"", ref->height);
+	    Qprintf(f, " width=\"%d\"", ref->width);
 	}
 
-	if ( S(link.title) ) {
+	if ( S(ref->title) ) {
 	    Qstring(" title=\"", f);
-	    ___mkd_reparse(T(link.title), S(link.title), INSIDE_TAG, f);
+	    ___mkd_reparse(T(ref->title), S(ref->title), INSIDE_TAG, f);
 	    Qchar('"', f);
 	}
 
 	Qstring(tag->text_pfx, f);
-	___mkd_reparse(T(link.tag), S(link.tag), tag->flags, f);
+	___mkd_reparse(T(text), S(text), tag->flags, f);
 	Qstring(tag->text_sfx, f);
     }
     else
-	Qwrite(T(link.link) + tag->szpat, S(link.link) - tag->szpat, f);
+	Qwrite(T(ref->link) + tag->szpat, S(ref->link) - tag->szpat, f);
 
     return 1;
+} /* linkyformat */
+
+
+/*
+ * process embedded links and images
+ */
+static int
+linkylinky(int image, MMIOT *f)
+{
+    int start = mmiottell(f);
+    Cstring name;
+    Footnote key, *ref;
+		
+    int status = 0;
+
+    CREATE(name);
+    bzero(&key, sizeof key);
+
+    if ( linkylabel(f, &name) ) {
+	if ( peek(f,1) == '(' ) {
+	    pull(f);
+	    if ( linkyurl(f, image, &key) )
+		status = linkyformat(f, name, image, &key);
+	}
+	else {
+	    int goodlink, implicit_mark = mmiottell(f);
+
+	    if ( eatspace(f) == '[' ) {
+		pull(f);	/* consume leading '[' */
+		goodlink = linkylabel(f, &key.tag);
+	    }
+	    else {
+		/* new markdown implicit name syntax doesn't
+		 * require a second []
+		 */
+		mmiotseek(f, implicit_mark);
+		goodlink = !(f->flags & MKD_1_COMPAT);
+	    }
+	    
+	    if ( goodlink ) {
+		if ( !S(key.tag) ) {
+		    DELETE(key.tag);
+		    T(key.tag) = T(name);
+		    S(key.tag) = S(name);
+		}
+
+		if ( ref = bsearch(&key, T(*f->footnotes), S(*f->footnotes),
+					  sizeof key, (stfu)__mkd_footsort) )
+		    status = linkyformat(f, name, image, ref);
+	    }
+	}
+    }
+
+    DELETE(name);
+    ___mkd_freefootnote(&key);
+
+    if ( status == 0 )
+	mmiotseek(f, start);
+
+    return status;
 }
 
 
@@ -706,6 +763,80 @@ forbidden_tag(MMIOT *f)
 }
 
 
+/* Check a string to see if it looks like a mail address
+ * "looks like a mail address" means alphanumeric + some
+ * specials, then a `@`, then alphanumeric + some specials,
+ * but with a `.`
+ */
+static int
+maybe_address(char *p, int size)
+{
+    int ok = 0;
+    
+    for ( ;size && (isalnum(*p) || strchr("._-+*", *p)); ++p, --size)
+	;
+
+    if ( ! (size && *p == '@') )
+	return 0;
+    
+    --size, ++p;
+
+    if ( size && *p == '.' ) return 0;
+    
+    for ( ;size && (isalnum(*p) || strchr("._-+", *p)); ++p, --size )
+	if ( *p == '.' && size > 1 ) ok = 1;
+
+    return size ? 0 : ok;
+}
+
+
+/* The size-length token at cursor(f) is either a mailto:, an
+ * implicit mailto:, one of the approved url protocols, or just
+ * plain old text.   If it's a mailto: or an approved protocol,
+ * linkify it, otherwise say "no"
+ */
+static int
+process_possible_link(MMIOT *f, int size)
+{
+    int address= 0;
+    int mailto = 0;
+    char *text = cursor(f);
+    
+    if ( f->flags & DENY_A ) return 0;
+
+    if ( (size > 7) && strncasecmp(text, "mailto:", 7) == 0 ) {
+	/* if it says it's a mailto, it's a mailto -- who am
+	 * I to second-guess the user?
+	 */
+	address = 1;
+	mailto = 7; 	/* 7 is the length of "mailto:"; we need this */
+    }
+    else 
+	address = maybe_address(text, size);
+
+    if ( address ) { 
+	Qstring("<a href=\"", f);
+	if ( !mailto ) {
+	    /* supply a mailto: protocol if one wasn't attached */
+	    mangle("mailto:", 7, f);
+	}
+	mangle(text, size, f);
+	Qstring("\">", f);
+	mangle(text+mailto, size-mailto, f);
+	Qstring("</a>", f);
+	return 1;
+    }
+    else if ( isautoprefix(text) ) {
+	Qstring("<a href=\"", f);
+	puturl(text,size,f, 0);
+	Qstring("\">", f);
+	puturl(text,size,f, 1);
+	Qstring("</a>", f);
+	return 1;
+    }
+    return 0;
+} /* process_possible_link */
+
 
 /* a < may be just a regular character, the start of an embedded html
  * tag, or the start of an <automatic link>.    If it's an automatic
@@ -716,68 +847,69 @@ forbidden_tag(MMIOT *f)
 static int
 maybe_tag_or_link(MMIOT *f)
 {
-    char *text;
-    int c, size, i;
-    int maybetag=1, maybeaddress=0;
-    int mailto;
+    int c, size;
+    int maybetag = 1;
 
     if ( f->flags & INSIDE_TAG )
 	return 0;
 
-    for ( size=0; ((c = peek(f,size+1)) != '>') && !isspace(c); size++ ) {
-	if ( ! (c == '/' || isalnum(c) || c == '~') )
-	    maybetag=0;
-	if ( c == '@' )
-	    maybeaddress=1;
-	else if ( c == EOF )
+    for ( size=0; (c = peek(f, size+1)) != '>'; size++) {
+	if ( c == EOF )
 	    return 0;
+	else if ( c == '\\' ) {
+	    maybetag=0;
+	    if ( peek(f, size+2) != EOF )
+		size++;
+	}
+	else if ( isspace(c) )
+	    break;
+	else if ( ! (c == '/' || isalnum(c) ) )
+	    maybetag=0;
     }
 
-    if ( size == 0 )
-	return 0;
-
-    if ( maybetag  || (size >= 3 && strncmp(cursor(f), "!--", 3) == 0) ) {
-	Qstring(forbidden_tag(f) ? "&lt;" : "<", f);
-	while ( ((c = peek(f, 1)) != EOF) && (c != '>') )
-	    cputc(pull(f), f);
-	return 1;
+    if ( size ) {
+	if ( maybetag || (size >= 3 && strncmp(cursor(f), "!--", 3) == 0) ) {
+	    Qstring(forbidden_tag(f) ? "&lt;" : "<", f);
+	    while ( ((c = peek(f, 1)) != EOF) && (c != '>') )
+		cputc(pull(f), f);
+	    return 1;
+	}
+	else if ( !isspace(c) && process_possible_link(f, size) ) {
+	    shift(f, size+1);
+	    return 1;
+	}
     }
+    
+    return 0;
+}
 
-    if ( f->flags & DENY_A ) return 0;
-
-    text = cursor(f);
-    shift(f, size+1);
 
-    for ( i=0; i < SZAUTOPREFIX; i++ )
-	if ( strncasecmp(text, autoprefix[i], strlen(autoprefix[i])) == 0 ) {
-	    Qstring("<a href=\"", f);
-	    puturl(text,size,f);
-	    Qstring("\">", f);
-	    puturl(text,size,f);
-	    Qstring("</a>", f);
-	    return 1;
-	}
-    if ( maybeaddress ) {
+/* autolinking means that all inline html is <a href'ified>.   A
+ * autolink url is alphanumerics, slashes, periods, underscores,
+ * the at sign, colon, and the % character.
+ */
+static int
+maybe_autolink(MMIOT *f)
+{
+    register int c;
+    int size;
 
-	Qstring("<a href=\"", f);
-	if ( (size > 7) && strncasecmp(text, "mailto:", 7) == 0 )
-	    mailto = 7;
-	else {
-	    mailto = 0;
-	    /* supply a mailto: protocol if one wasn't attached */
-	    mangle("mailto:", 7, f);
+    /* greedily scan forward for the end of a legitimate link.
+     */
+    for ( size=0; (c=peek(f, size+1)) != EOF; size++ )
+	if ( c == '\\' ) {
+	     if ( peek(f, size+2) != EOF )
+		++size;
 	}
+	else if ( isspace(c) || strchr("'\"()[]{}<>`", c) )
+	    break;
 
-	mangle(text, size, f);
-	Qstring("\">", f);
-	mangle(text+mailto, size-mailto, f);
-	Qstring("</a>", f);
+    if ( (size > 1) && process_possible_link(f, size) ) {
+	shift(f, size);
 	return 1;
     }
-
-    shift(f, -(size+1));
     return 0;
-} /* maybe_tag_or_link */
+}
 
 
 /* smartyquote code that's common for single and double quotes
@@ -865,7 +997,7 @@ smartypants(int c, int *flags, MMIOT *f)
 {
     int i;
 
-    if ( f->flags & DENY_SMARTY )
+    if ( f->flags & (DENY_SMARTY|INSIDE_TAG) )
 	return 0;
 
     for ( i=0; i < NRSMART; i++)
@@ -919,12 +1051,23 @@ text(MMIOT *f)
     int rep;
     int smartyflags = 0;
 
-    while ( (c = pull(f)) != EOF ) {
+    while (1) {
+        if ( (f->flags & AUTOLINK) && isalpha(peek(f,1)) )
+	    maybe_autolink(f);
+
+        c = pull(f);
+
+        if (c == EOF)
+          break;
+
 	if ( smartypants(c, &smartyflags, f) )
 	    continue;
 	switch (c) {
 	case 0:     break;
 
+	case 3:     Qstring("<br/>", f);
+		    break;
+
 	case '>':   if ( tag_text(f) )
 			Qstring("&gt;", f);
 		    else
@@ -968,15 +1111,24 @@ text(MMIOT *f)
 	case '_':
 #if RELAXED_EMPHASIS
 	/* Underscores don't count if they're in the middle of a word */
-		    if ( (!(f->flags & STRICT))
-			     && ((isthisspace(f,-1) && isthisspace(f,1))
-			      || (isthisalnum(f,-1) && isthisalnum(f,1))) ){
+		    if ( !(f->flags & 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) ) {
 			Qchar(c, f);
 			break;
 		    }
 		    /* else fall into the regular old emphasis case */
 #endif
-	case '*':   if ( tag_text(f) )
+		    if ( tag_text(f) )
 			Qchar(c, f);
 		    else {
 			for (rep = 1; peek(f,1) == c; pull(f) )
@@ -1128,6 +1280,106 @@ printheader(Paragraph *pp, MMIOT *f)
 }
 
 
+enum e_alignments { a_NONE, a_CENTER, a_LEFT, a_RIGHT };
+
+static char* alignments[] = { "", " align=\"center\"", " align=\"left\"",
+				  " align=\"right\"" };
+
+typedef STRING(int) Istring;
+
+static int
+splat(Line *p, char *block, Istring align, int force, MMIOT *f)
+{
+    int first,
+	idx = 0,
+	colno = 0;
+
+    Qstring("<tr>\n", f);
+    while ( idx < S(p->text) ) {
+	first = idx;
+	if ( force && (colno >= S(align)-1) )
+	    idx = S(p->text);
+	else
+	    while ( (idx < S(p->text)) && (T(p->text)[idx] != '|') )
+		++idx;
+
+	Qprintf(f, "<%s%s>",
+		   block,
+		   alignments[ (colno < S(align)) ? T(align)[colno] : a_NONE ]);
+	___mkd_reparse(T(p->text)+first, idx-first, 0, f);
+	Qprintf(f, "</%s>\n", block);
+	idx++;
+	colno++;
+    }
+    if ( force )
+	while (colno < S(align) ) {
+	    Qprintf(f, "<%s></%s>\n", block, block);
+	    ++colno;
+	}
+    Qstring("</tr>\n", f);
+    return colno;
+}
+
+static int
+printtable(Paragraph *pp, MMIOT *f)
+{
+    /* header, dashes, then lines of content */
+
+    Line *hdr, *dash, *body;
+    Istring align;
+    int start;
+    int hcols;
+    char *p;
+
+    if ( !(pp->text && pp->text->next && pp->text->next->next) )
+	return 0;
+
+    hdr = pp->text;
+    dash= hdr->next;
+    body= dash->next;
+
+    /* first figure out cell alignments */
+
+    CREATE(align);
+
+    for (p=T(dash->text), start=0; start < S(dash->text); ) {
+	char first, last;
+	int end;
+	
+	last=first=0;
+	for (end=start ; (end < S(dash->text)) && p[end] != '|'; ++ end ) {
+	    if ( !isspace(p[end]) ) {
+		if ( !first) first = p[end];
+		last = p[end];
+	    }
+	}
+	EXPAND(align) = ( first == ':' ) ? (( last == ':') ? a_CENTER : a_LEFT)
+					 : (( last == ':') ? a_RIGHT : a_NONE );
+	start = 1+end;
+    }
+
+    Qstring("<table>\n", f);
+    Qstring("<thead>\n", f);
+    hcols = splat(hdr, "th", align, 0, f);
+    Qstring("</thead>\n", f);
+
+    if ( hcols < S(align) )
+	S(align) = hcols;
+    else
+	while ( hcols > S(align) )
+	    EXPAND(align) = a_NONE;
+
+    Qstring("<tbody>\n", f);
+    for ( ; body; body = body->next)
+	splat(body, "td", align, 1, f);
+    Qstring("</tbody>\n", f);
+    Qstring("</table>\n", f);
+
+    DELETE(align);
+    return 1;
+}
+
+
 static int
 printblock(Paragraph *pp, MMIOT *f)
 {
@@ -1140,10 +1392,10 @@ printblock(Paragraph *pp, MMIOT *f)
 	    if ( 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("<br/>\n", 6, f);
+		push("\003\n", 2, f);
 	    }
 	    else {
-		___mkd_tidy(t);
+		___mkd_tidy(&t->text);
 		push(T(t->text), S(t->text), f);
 		if ( t->next )
 		    push("\n", 1, f);
@@ -1234,6 +1486,7 @@ definitionlist(Paragraph *p, MMIOT *f)
 	    }
 
 	    htmlify(p->down, "dd", p->ident, f);
+	    Qchar('\n', f);
 	}
 
 	Qstring("</dl>", f);
@@ -1305,6 +1558,14 @@ display(Paragraph *p, MMIOT *f)
 	printheader(p, f);
 	break;
 
+    case TABLE:
+	printtable(p, f);
+	break;
+
+    case SOURCE:
+	htmlify(p->down, 0, 0, f);
+	break;
+	
     default:
 	printblock(p, f);
 	break;
@@ -1313,29 +1574,6 @@ display(Paragraph *p, MMIOT *f)
 }
 
 
-/*
- * dump out stylesheet sections.
- */
-static int
-stylesheets(Paragraph *p, FILE *f)
-{
-    Line* q;
-
-    for ( ; p ; p = p->next ) {
-	if ( p->typ == STYLE ) {
-	    for ( q = p->text; q ; q = q->next )
-		if ( fwrite(T(q->text), S(q->text), 1, f) == 1 )
-		    putc('\n', f);
-		else
-		    return EOF;
-	}
-	if ( p->down && (stylesheets(p->down, f) == EOF) )
-	    return EOF;
-    }
-    return 0;
-}
-
-
 /* return a pointer to the compiled markdown
  * document.
  */
@@ -1354,36 +1592,3 @@ mkd_document(Document *p, char **res)
     return EOF;
 }
 
-
-/*  public interface for ___mkd_reparse()
- */
-int
-mkd_text(char *bfr, int size, FILE *output, int flags)
-{
-    MMIOT f;
-
-    ___mkd_initmmiot(&f, 0);
-    f.flags = flags & USER_FLAGS;
-    
-    ___mkd_reparse(bfr, size, 0, &f);
-    ___mkd_emblock(&f);
-    if ( flags & CDATA_OUTPUT )
-	___mkd_xml(T(f.out), S(f.out), output);
-    else
-	fwrite(T(f.out), S(f.out), 1, output);
-
-    ___mkd_freemmiot(&f, 0);
-    return 0;
-}
-
-
-/* dump any embedded styles
- */
-int
-mkd_style(Document *d, FILE *f)
-{
-    if ( d && d->compiled )
-	return stylesheets(d->code, f);
-    return EOF;
-}
-