rdiscount 1.2.11 → 1.3.1

data/Rakefile

@@ -1,43 +1,75 @@
 require 'rake/clean'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
 
 task :default => 'test:unit'
 
-DLEXT = Config::CONFIG['DLEXT']
-VERS = '1.2.11'
-
-spec =
-  Gem::Specification.new do |s|
-    s.name              = "rdiscount"
-    s.version           = VERS
-    s.summary           = "Fast Implementation of Gruber's Markdown in C"
-    s.files             = FileList['README.markdown','COPYING','Rakefile','test/**','{lib,ext}/**.rb','ext/*.{c,h}']
-    s.bindir            = 'bin'
-    s.require_path      = 'lib'
-    s.has_rdoc          = true
-    s.extra_rdoc_files  = ['COPYING']
-    s.test_files        = FileList['test/*_test.rb']
-    s.extensions        = ['ext/extconf.rb']
-
-    s.author            = 'Ryan Tomayko'
-    s.email             = 'r@tomayko.com'
-    s.homepage          = 'http://github.com/rtomayko/rdiscount'
-    s.rubyforge_project = 'wink'
-  end
+# PACKAGING =================================================================
 
-  Rake::GemPackageTask.new(spec) do |p|
-    p.gem_spec = spec
-    p.need_tar_gz = true
-    p.need_tar = false
-    p.need_zip = false
+# 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
 
+def package(ext='')
+  "pkg/rdiscount-#{$spec.version}" + ext
+end
+
+desc 'Build packages'
+task :package => %w[.gem .tar.gz].map {|e| package(e)}
+
+desc 'Build and install as local gem'
+task :install => package('.gem') do
+  sh "gem install #{package('.gem')}"
+end
+
+directory 'pkg/'
+
+file package('.gem') => %w[pkg/ rdiscount.gemspec] + $spec.files do |f|
+  sh "gem build rdiscount.gemspec"
+  mv File.basename(f.name), f.name
+end
+
+file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
+  sh "git archive --format=tar HEAD | gzip > #{f.name}"
+end
+
+# GEMSPEC HELPERS ==========================================================
+
+def source_version
+  line = File.read('lib/rdiscount.rb')[/^\s*VERSION = .*/]
+  line.match(/.*VERSION = '(.*)'/)[1]
+end
+
+file 'rdiscount.gemspec' => FileList['Rakefile','lib/rdiscount.rb'] do |f|
+  # read spec file and split out manifest section
+  spec = File.read(f.name)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+  head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
+  head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject{ |file| file =~ /^\./ || file =~ /^test\/MarkdownTest/ }.
+    map{ |file| "    #{file}" }.
+    join("\n")
+  # 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}"
+end
 
 # ==========================================================
 # Ruby Extension
 # ==========================================================
 
+DLEXT = Config::CONFIG['DLEXT']
+
 file 'ext/Makefile' => FileList['ext/{*.c,*.h,*.rb}'] do
   chdir('ext') { ruby 'extconf.rb' }
 end
@@ -55,7 +87,6 @@ end
 desc 'Build the rdiscount extension'
 task :build => "lib/rdiscount.#{DLEXT}"
 
-
 # ==========================================================
 # Testing
 # ==========================================================
@@ -119,13 +150,11 @@ CLEAN.include 'doc'
 # Rubyforge
 # ==========================================================
 
-PKGNAME = "pkg/rdiscount-#{VERS}"
-
 desc 'Publish new release to rubyforge'
-task :release => [ "#{PKGNAME}.gem", "#{PKGNAME}.tar.gz" ] do |t|
+task :release => [package('.gem'), package('.tar.gz')] do |t|
   sh <<-end
-    rubyforge add_release wink rdiscount #{VERS} #{PKGNAME}.gem &&
-    rubyforge add_file    wink rdiscount #{VERS} #{PKGNAME}.tar.gz
+    rubyforge add_release wink rdiscount #{$spec.version} #{package('.gem')} &&
+    rubyforge add_file    wink rdiscount #{$spec.version} #{package('.tar.gz')}
   end
 end
 

data/bin/rdiscount

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
+require 'rdiscount'
+STDOUT.write(RDiscount.new(ARGF.read).to_html)

data/ext/generate.c

@@ -26,6 +26,7 @@ typedef int (*stfu)(const void*,const void*);
 
 
 /* forward declarations */
+static int iscodeblock(MMIOT*);
 static void code(int, MMIOT*);
 static void text(MMIOT *f);
 static Paragraph *display(Paragraph*, MMIOT*);
@@ -74,6 +75,31 @@ cursor(MMIOT *f)
 }
 
 
+static int
+isthisspace(MMIOT *f, int i)
+{
+    int c = peek(f, i);
+
+    return isspace(c) || (c == EOF);
+}
+
+
+static int
+isthisalnum(MMIOT *f, int i)
+{
+    int c = peek(f, i);
+
+    return (c != EOF) && isalnum(c);
+}
+
+
+static int
+isthisnonword(MMIOT *f, int i)
+{
+    return isthisspace(f, i) || ispunct(peek(f,i));
+}
+
+
 /* return/set the current cursor position
  */
 #define mmiotseek(f,x)	(f->isp = x)
@@ -313,8 +339,7 @@ puturl(char *s, int size, MMIOT *f)
 	    Qstring("&", f);
 	else if ( c == '<' )
 	    Qstring("&lt;", f);
-	else if ( isalnum(c) || c == '.' || c == '-' || c == '_' || c == '/'
-			     || c == '=' || c == '?' || c == ':' || c == '#' )
+	else if ( isalnum(c) || ispunct(c) )
 	    Qchar(c, f);
 	else
 	    Qprintf(f, "%%%02X", c);
@@ -579,7 +604,7 @@ linkylinky(int image, MMIOT *f)
     Footnote link;
     linkytype *tag;
 
-    if ( !(linkykey(image, &link, f) && S(link.tag)) ) {
+    if ( !linkykey(image, &link, f) ) {
 	mmiotseek(f, start);
 	return 0;
     }
@@ -662,11 +687,11 @@ forbidden_tag(MMIOT *f)
     if ( f->flags & DENY_HTML )
 	return 1;
 
-    if ( c == 'A' && (f->flags & DENY_A) && !isalnum(peek(f,2)) )
+    if ( c == 'A' && (f->flags & DENY_A) && !isthisalnum(f,2) )
 	return 1;
     if ( c == 'I' && (f->flags & DENY_IMG)
 		  && strncasecmp(cursor(f)+1, "MG", 2) == 0
-		  && !isalnum(peek(f,4)) )
+		  && !isthisalnum(f,4) )
 	return 1;
     return 0;
 }
@@ -746,22 +771,6 @@ maybe_tag_or_link(MMIOT *f)
 } /* maybe_tag_or_link */
 
 
-static int
-isthisspace(MMIOT *f, int i)
-{
-    int c = peek(f, i);
-
-    return isspace(c) || (c == EOF);
-}
-
-
-static int
-isthisnonword(MMIOT *f, int i)
-{
-    return isthisspace(f, i) || ispunct(peek(f,i));
-}
-
-
 /* smartyquote code that's common for single and double quotes
  */
 static int
@@ -931,7 +940,8 @@ text(MMIOT *f)
 			Qchar(c, f);
 		    break;
 #if SUPERSCRIPT
-	case '^':   if ( isthisspace(f,-1) || isthisspace(f,1) )
+	/* A^B -> A<sup>B</sup> */
+	case '^':   if ( (f->flags & (STRICT|INSIDE_TAG)) || isthisspace(f,-1) || isthisspace(f,1) )
 			Qchar(c,f);
 		    else {
 			char *sup = cursor(f);
@@ -948,11 +958,10 @@ text(MMIOT *f)
 #endif
 	case '_':
 #if RELAXED_EMPHASIS
-		    /* If RELAXED_EMPHASIS, underscores don't count when
-		     * they're in the middle of a word.
-		     */
-		    if ( (isthisspace(f,-1) && isthisspace(f,1))
-			    || (isalnum(peek(f,-1)) && isalnum(peek(f,1))) ) {
+	/* 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))) ){
 			Qchar(c, f);
 			break;
 		    }
@@ -967,7 +976,7 @@ text(MMIOT *f)
 		    }
 		    break;
 	
-	case '`':   if ( tag_text(f) )
+	case '`':   if ( tag_text(f) || !iscodeblock(f) )
 			Qchar(c, f);
 		    else {
 			Qstring("<code>", f);
@@ -1006,7 +1015,7 @@ text(MMIOT *f)
 		    break;
 
 	case '&':   j = (peek(f,1) == '#' ) ? 2 : 1;
-		    while ( isalnum(peek(f,j)) )
+		    while ( isthisalnum(f,j) )
 			++j;
 
 		    if ( peek(f,j) != ';' )
@@ -1019,9 +1028,31 @@ text(MMIOT *f)
 		    break;
 	}
     }
+    /* truncate the input string after we've finished processing it */
+    S(f->in) = f->isp = 0;
 } /* 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)
 {
@@ -1075,7 +1106,13 @@ code(int escape, MMIOT *f)
 static void
 printheader(Paragraph *pp, MMIOT *f)
 {
-    Qprintf(f, "<h%d>", pp->hnumber);
+    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);
+    }
+    Qchar('>', f);
     push(T(pp->text->text), S(pp->text->text), f);
     text(f);
     Qprintf(f, "</h%d>", pp->hnumber);
@@ -1152,10 +1189,11 @@ printhtml(Line *t, MMIOT *f)
 
 
 static void
-htmlify(Paragraph *p, char *block, MMIOT *f)
+htmlify(Paragraph *p, char *block, char *arguments, MMIOT *f)
 {
     emblock(f);
-    if ( block ) Qprintf(f, "<%s>", block);
+    if ( block )
+	Qprintf(f, arguments ? "<%s %s>" : "<%s>", block, arguments);
     emblock(f);
 
     while (( p = display(p, f) )) {
@@ -1163,7 +1201,8 @@ htmlify(Paragraph *p, char *block, MMIOT *f)
 	Qstring("\n\n", f);
     }
 
-    if ( block ) Qprintf(f, "</%s>", block);
+    if ( block )
+	 Qprintf(f, "</%s>", block);
     emblock(f);
 }
 
@@ -1184,7 +1223,7 @@ definitionlist(Paragraph *p, MMIOT *f)
 		Qstring("</dt>\n", f);
 	    }
 
-	    htmlify(p->down, "dd", f);
+	    htmlify(p->down, "dd", p->ident, f);
 	}
 
 	Qstring("</dl>", f);
@@ -1197,10 +1236,13 @@ static void
 listdisplay(int typ, Paragraph *p, MMIOT* f)
 {
     if ( p ) {
-	Qprintf(f, "<%cl>\n", (typ==UL)?'u':'o');
+	Qprintf(f, "<%cl", (typ==UL)?'u':'o');
+	if ( typ == AL )
+	    Qprintf(f, " type=a");
+	Qprintf(f, ">\n");
 
 	for ( ; p ; p = p->next ) {
-	    htmlify(p->down, "li", f);
+	    htmlify(p->down, "li", p->ident, f);
 	    Qchar('\n', f);
 	}
 
@@ -1230,11 +1272,12 @@ display(Paragraph *p, MMIOT *f)
 	break;
 	
     case QUOTE:
-	htmlify(p->down, "blockquote", f);
+	htmlify(p->down, p->ident ? "div" : "blockquote", p->ident, f);
 	break;
 	
     case UL:
     case OL:
+    case AL:
 	listdisplay(p->typ, p->down, f);
 	break;
 
@@ -1291,7 +1334,7 @@ mkd_document(Document *p, char **res)
 {
     if ( p && p->compiled ) {
 	if ( ! p->html ) {
-	    htmlify(p->code, 0, p->ctx);
+	    htmlify(p->code, 0, 0, p->ctx);
 	    p->html = 1;
 	}
 

data/ext/markdown.c

@@ -286,7 +286,7 @@ ishr(Line *t)
 static int
 ishdr(Line *t, int *htyp)
 {
-    int i, j;
+    int i;
 
 
     /* first check for etx-style ###HEADER###
@@ -297,21 +297,11 @@ ishdr(Line *t, int *htyp)
     for ( i=0; T(t->text)[i] == '#'; ++i)
 	;
 
+    /* ANY leading `#`'s make this into an ETX header
+     */
     if ( i ) {
-	i = nextnonblank(t, i);
-
-	j = S(t->text)-1;
-
-	while ( (j > i) && (T(t->text)[j] == '#') )
-	    --j;
-	
-	while ( (j > 1) && isspace(T(t->text)[j]) )
-	    --j;
-
-	if ( i < j ) {
-	    *htyp = ETX;
-	    return 1;
-	}
+	*htyp = ETX;
+	return 1;
     }
 
     /* then check for setext-style HEADER
@@ -362,7 +352,7 @@ islist(Line *t, int *trim)
 	*trim = 4;
 	return DL;
     }
-    
+
     if ( strchr("*-+", T(t->text)[t->dle]) && isspace(T(t->text)[t->dle+1]) ) {
 	i = nextnonblank(t, t->dle+1);
 	*trim = (i > 4) ? 4 : i;
@@ -371,6 +361,13 @@ islist(Line *t, int *trim)
 
     if ( (j = nextblank(t,t->dle)) > t->dle ) {
 	if ( T(t->text)[j-1] == '.' ) {
+#if ALPHA_LIST
+	if ( (j == t->dle + 2) && isalpha(T(t->text)[t->dle]) ) {
+	    j = nextnonblank(t,j);
+	    *trim = j;
+	    return AL;
+	}
+#endif
 	    strtoul(T(t->text)+t->dle, &q, 10);
 	    if ( (q > T(t->text)+t->dle) && (q == T(t->text) + (j-1)) ) {
 		j = nextnonblank(t,j);
@@ -406,7 +403,7 @@ headerblock(Paragraph *pp, int htyp)
 	     * the leading and trailing `#`'s
 	     */
 
-	    for (i=0; T(p->text)[i] == T(p->text)[0]; i++)
+	    for (i=0; (T(p->text)[i] == T(p->text)[0]) && (i < S(p->text)-1); i++)
 		;
 
 	    pp->hnumber = i;
@@ -416,9 +413,12 @@ headerblock(Paragraph *pp, int htyp)
 
 	    CLIP(p->text, 0, i);
 
-	    for (j=S(p->text); j && (T(p->text)[j-1] == '#'); --j)
+	    for (j=S(p->text); (j > 1) && (T(p->text)[j-1] == '#'); --j)
 		;
 
+	    while ( j && isspace(T(p->text)[j-1]) )
+		--j;
+
 	    S(p->text) = j;
 
 	    ret = p->next;
@@ -502,6 +502,47 @@ textblock(Paragraph *p, int toplevel)
 }
 
 
+/* length of the id: or class: kind in a special div-not-quote block
+ */
+static int
+szmarkerclass(char *p)
+{
+    if ( strncasecmp(p, "id:", 3) == 0 )
+	return 3;
+    if ( strncasecmp(p, "class:", 6) == 0 )
+	return 6;
+    return 0;
+}
+
+
+/*
+ * check if the first line of a quoted block is the special div-not-quote
+ * marker %[kind:]name%
+ */
+static int
+isdivmarker(Line *p)
+{
+#if DIV_QUOTE
+    char *s = T(p->text);
+    int len = S(p->text);
+    int i;
+
+    if ( !(len && s[0] == '%' && s[len-1] == '%') ) return 0;
+
+    i = szmarkerclass(s+1);
+    --len;
+
+    while ( ++i < len )
+	if ( !isalnum(s[i]) )
+	    return 0;
+
+    return 1;
+#else
+    return 0;
+#endif
+}
+
+
 /*
  * accumulate a blockquote.
  *
@@ -528,9 +569,27 @@ quoteblock(Paragraph *p)
 
 	if ( !(q = skipempty(t->next)) || ((q != t->next) && !isquote(q)) ) {
 	    ___mkd_freeLineRange(t, q);
-	    return q;
+	    t = q;
+	    break;
 	}
     }
+    if ( isdivmarker(p->text) ) {
+	char *prefix = "class";
+	int i;
+	
+	q = p->text;
+	p->text = p->text->next;
+
+	if ( (i = szmarkerclass(1+T(q->text))) == 3 )
+	    /* and this would be an "%id:" prefix */
+	    prefix="id";
+	    
+	if ( p->ident = malloc(4+i+S(q->text)) )
+	    sprintf(p->ident, "%s=\"%.*s\"", prefix, S(q->text)-(i+2),
+						     T(q->text)+(i+1) );
+
+	___mkd_freeLine(q);
+    }
     return t;
 }
 
@@ -574,7 +633,7 @@ listitem(Paragraph *p, int indent)
 	    indent = 4;
 	}
 
-	if ( (q->dle < indent) && (ishr(q) || ishdr(q,&z) || islist(q,&z)) ) {
+	if ( (q->dle < indent) && (ishr(q) || islist(q,&z)) && !ishdr(q,&z) ) {
 	    q = t->next;
 	    t->next = 0;
 	    return q;
@@ -617,7 +676,7 @@ listblock(Paragraph *top, int trim, MMIOT *f)
 
 	if ( para && (top->typ != DL) && p->down ) p->down->align = PARA;
 
-	if ( !(q = skipempty(text)) || (islist(q,&trim) != top->typ) )
+	if ( !(q = skipempty(text)) || (islist(q, &trim) == 0) )
 	    break;
 
 	if ( para = (q != text) ) {

data/ext/markdown.h

@@ -33,8 +33,9 @@ typedef struct paragraph {
     struct paragraph *next;	/* next paragraph */
     struct paragraph *down;	/* recompiled contents of this paragraph */
     struct line *text;		/* all the text in this paragraph */
+    char *ident;		/* %id% tag for QUOTE */
     enum { WHITESPACE=0, CODE, QUOTE, MARKUP,
-	   HTML, STYLE, DL, UL, OL, LISTITEM,
+	   HTML, STYLE, DL, UL, OL, AL, LISTITEM,
 	   HDR, HR } typ;
     enum { IMPLICIT=0, PARA, CENTER} align;
     int hnumber;		/* <Hn> for typ == HDR */
@@ -68,10 +69,12 @@ typedef struct mmiot {
 #define DENY_IMG	0x0002
 #define DENY_SMARTY	0x0004
 #define DENY_HTML	0x0008
+#define STRICT		0x0010
 #define INSIDE_TAG	0x0020
 #define NO_PSEUDO_PROTO	0x0040
 #define CDATA_OUTPUT	0x0080
-#define USER_FLAGS	0x00FF
+#define TOC		0x1000
+#define USER_FLAGS	0xF0FF
 #define EMBEDDED	DENY_A|DENY_IMG|NO_PSEUDO_PROTO|CDATA_OUTPUT
     char *base;
 } MMIOT;
@@ -100,9 +103,11 @@ extern int  mkd_firstnonblank(Line *);
 extern int  mkd_compile(Document *, int);
 extern int  mkd_document(Document *, char **);
 extern int  mkd_generatehtml(Document *, FILE *);
+extern int  mkd_style(Document *, FILE *);
 extern void mkd_cleanup(Document *);
 extern int  mkd_text(char *, int, FILE*, int);
 extern void mkd_basename(Document*, char *);
+extern void mkd_string_to_anchor(char*,int, void(*)(int,void*), void*);
 
 extern Document *mkd_in(FILE *, int);
 extern Document *mkd_string(char*,int, int);

data/ext/mkdio.c

@@ -223,3 +223,19 @@ mkd_basename(Document *document, char *base)
     if ( document )
 	document->base = base;
 }
+
+
+/* write out a Cstring, mangled into a form suitable for `<a href=` or `<a id=`
+ */
+void
+mkd_string_to_anchor(char *s, int len, void(*outchar)(int,void*), void *out)
+{
+    for ( ; len-- > 0; ++s ) {
+	if ( *s == ' ' || *s == '&' || *s == '<' || *s == '"' )
+	    (*outchar)('+', out);
+	else if ( isalnum(*s) || ispunct(*s) )
+	    (*outchar)(*s, out);
+	else
+	    (*outchar)('~',out);
+    }
+}

data/ext/mkdio.h

@@ -16,6 +16,8 @@ void mkd_basename(MMIOT*,char*);
  */
 int mkd_compile(MMIOT*, int);
 int mkd_generatehtml(MMIOT*,FILE*);
+int mkd_generatetoc(MMIOT*,FILE*);
+int mkd_xhtmlpage(MMIOT*,int,FILE*);
 int mkd_cleanup(MMIOT*);
 
 /* markup functions
@@ -25,6 +27,7 @@ int mkd_style(MMIOT*, FILE*);
 int mkd_dump(MMIOT*, FILE*, int, char*);
 int markdown(MMIOT*, FILE*, int);
 void mkd_basename(MMIOT*,char*);
+void mkd_string_to_anchor(char *, int, int (*)(int,void*), void*);
 
 /* header block access
  */
@@ -46,9 +49,11 @@ extern char markdown_version[];
 #define MKD_NOIMAGE	0x0002	/* don't do image processing, block <img> */
 #define MKD_NOPANTS	0x0004	/* don't run smartypants() */
 #define MKD_NOHTML	0x0008	/* don't allow raw html through AT ALL */
+#define MKD_STRICT	0x0010	/* disable SUPERSCRIPT, RELAXED_EMPHASIS */
 #define MKD_TAGTEXT	0x0020	/* don't expand `_` and `*` */
 #define MKD_NO_EXT	0x0040	/* don't allow pseudo-protocols */
 #define MKD_CDATA	0x0080	/* generate code for xml ![CDATA[...]] */
+#define MKD_TOC		0x1000	/* do table-of-contents processing */
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
 /* special flags for mkd_in() and mkd_string()
@@ -56,4 +61,5 @@ extern char markdown_version[];
 #define MKD_NOHEADER	0x0100	/* don't process header blocks */
 #define MKD_TABSTOP	0x0200	/* expand tabs to 4 spaces */
 
+
 #endif/*_MKDIO_D*/

data/ext/resource.c

@@ -49,6 +49,8 @@ ___mkd_freeParagraph(Paragraph *p)
 	___mkd_freeParagraph(p->down);
     if (p->text)
 	___mkd_freeLines(p->text);
+    if (p->ident)
+	free(p->ident);
     free(p);
 }
 

data/lib/rdiscount.rb

@@ -24,6 +24,7 @@
 #   end
 #
 class RDiscount
+  VERSION = '1.3.1'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -0,0 +1,46 @@
+Gem::Specification.new do |s|
+  s.name = 'rdiscount'
+  s.version = '1.3.1'
+  s.summary = "Fast Implementation of Gruber's Markdown in C"
+  s.date = '2009-01-10'
+  s.email = 'r@tomayko.com'
+  s.homepage = 'http://github.com/rtomayko/rdiscount'
+  s.has_rdoc = true
+  s.authors = ["Ryan Tomayko", "Andrew White"]
+  # = MANIFEST =
+  s.files = %w[
+    COPYING
+    README.markdown
+    Rakefile
+    bin/rdiscount
+    ext/amalloc.h
+    ext/config.h
+    ext/cstring.h
+    ext/docheader.c
+    ext/dumptree.c
+    ext/extconf.rb
+    ext/generate.c
+    ext/markdown.c
+    ext/markdown.h
+    ext/mkdio.c
+    ext/mkdio.h
+    ext/rbstrio.c
+    ext/rbstrio.h
+    ext/rdiscount.c
+    ext/resource.c
+    lib/markdown.rb
+    lib/rdiscount.rb
+    rdiscount.gemspec
+    test/benchmark.rb
+    test/benchmark.txt
+    test/markdown_test.rb
+    test/rdiscount_test.rb
+  ]
+  # = MANIFEST =
+  s.test_files = ["test/markdown_test.rb", "test/rdiscount_test.rb"]
+  s.extra_rdoc_files = ["COPYING"]
+  s.extensions = ["ext/extconf.rb"]
+  s.executables = ["rdiscount"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = 'wink'
+end

data/test/markdown_test.rb

@@ -74,6 +74,11 @@ class MarkdownTest < Test::Unit::TestCase
     assert_equal "<p>Well that&rsquo;ll be the day</p>\n", markdown.to_html
   end
 
+  def test_that_urls_are_not_doubly_escaped
+    markdown = Markdown.new('[Page 2](/search?query=Markdown+Test&page=2)')
+    assert_equal "<p><a href=\"/search?query=Markdown+Test&amp;page=2\">Page 2</a></p>\n", markdown.to_html
+  end
+
   # Build tests for each file in the MarkdownTest test suite
 
   Dir["#{MARKDOWN_TEST_DIR}/Tests/*.text"].each do |text_file|

data/test/rdiscount_test.rb

@@ -12,4 +12,19 @@ class RDiscountTest < Test::Unit::TestCase
     TEXT
     RDiscount.new(text).to_html
   end
+
+  def test_that_smart_converts_double_quotes_to_curly_quotes
+    rd = RDiscount.new(%("Quoted text"), :smart)
+    assert_equal %(<p>&ldquo;Quoted text&rdquo;</p>\n), rd.to_html
+  end
+
+  def test_that_smart_converts_double_quotes_to_curly_quotes_before_a_heading
+    rd = RDiscount.new(%("Quoted text"\n\n# Heading), :smart)
+    assert_equal %(<p>&ldquo;Quoted text&rdquo;</p>\n\n<h1>Heading</h1>\n), rd.to_html
+  end
+
+  def test_that_smart_converts_double_quotes_to_curly_quotes_after_a_heading
+    rd = RDiscount.new(%(# Heading\n\n"Quoted text"), :smart)
+    assert_equal %(<h1>Heading</h1>\n\n<p>&ldquo;Quoted text&rdquo;</p>\n), rd.to_html
+  end
 end

metadata

@@ -1,53 +1,54 @@
 --- !ruby/object:Gem::Specification 
 name: rdiscount
 version: !ruby/object:Gem::Version 
-  version: 1.2.11
+  version: 1.3.1
 platform: ruby
 authors: 
 - Ryan Tomayko
+- Andrew White
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-11-02 01:00:00 -07:00
+date: 2009-01-10 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: 
 email: r@tomayko.com
-executables: []
-
+executables: 
+- rdiscount
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
 - COPYING
 files: 
-- README.markdown
 - COPYING
+- README.markdown
 - Rakefile
-- test/MarkdownTest_1.0
-- test/MarkdownTest_1.0.3
-- test/benchmark.rb
-- test/benchmark.txt
-- test/markdown_test.rb
-- test/rdiscount_test.rb
-- lib/markdown.rb
-- lib/rdiscount.rb
-- ext/extconf.rb
+- bin/rdiscount
+- ext/amalloc.h
+- ext/config.h
+- ext/cstring.h
 - ext/docheader.c
 - ext/dumptree.c
+- ext/extconf.rb
 - ext/generate.c
 - ext/markdown.c
+- ext/markdown.h
 - ext/mkdio.c
+- ext/mkdio.h
 - ext/rbstrio.c
+- ext/rbstrio.h
 - ext/rdiscount.c
 - ext/resource.c
-- ext/amalloc.h
-- ext/config.h
-- ext/cstring.h
-- ext/markdown.h
-- ext/mkdio.h
-- ext/rbstrio.h
+- lib/markdown.rb
+- lib/rdiscount.rb
+- rdiscount.gemspec
+- test/benchmark.rb
+- test/benchmark.txt
+- test/markdown_test.rb
+- test/rdiscount_test.rb
 has_rdoc: true
 homepage: http://github.com/rtomayko/rdiscount
 post_install_message: 
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wink
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Fast Implementation of Gruber's Markdown in C