pixeltrix-rdiscount 1.2.11 → 1.3.4

data/Rakefile

@@ -1,43 +1,75 @@
 require 'rake/clean'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
 
-task :default => 'test:unit'
+task :default => :test
 
-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
 # ==========================================================
@@ -68,14 +99,17 @@ end
 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'
+  test_version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
   chdir("test/MarkdownTest_#{test_version}") do
     sh "./MarkdownTest.pl --script='#{script}' --tidy"
   end
 end
 
 desc 'Run version 1.0 conformance suite'
-task 'test:conformance:1.0' => 'test:conformance'
+task 'test:conformance:1.0' => [:build] do |t|
+  ENV['MARKDOWN_TEST_VER'] = '1.0'
+  Rake::Task['test:conformance'].invoke
+end
 
 desc 'Run 1.0.3 conformance suite'
 task 'test:conformance:1.0.3' => [:build] do |t|
@@ -119,13 +153,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
 
@@ -143,7 +175,7 @@ task :gather => 'discount' do |t|
   files =
     FileList[
       'discount/{markdown,mkdio,amalloc,cstring}.h',
-      'discount/{markdown,docheader,dumptree,generate,mkdio,resource}.c'
+      'discount/{markdown,docheader,dumptree,generate,mkdio,resource,toc,Csio}.c'
     ]
   cp files, 'ext/',
     :preserve => true,

data/ext/Csio.c

@@ -0,0 +1,49 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+
+/* putc() into a cstring
+ */
+void
+Csputc(int c, Cstring *iot)
+{
+    EXPAND(*iot) = c;
+}
+
+
+/* printf() into a cstring
+ */
+int
+Csprintf(Cstring *iot, char *fmt, ...)
+{
+    va_list ptr;
+    int siz=100;
+
+    do {
+	RESERVE(*iot, siz);
+	va_start(ptr, fmt);
+	siz = vsnprintf(T(*iot)+S(*iot), ALL(*iot)-S(*iot), fmt, ptr);
+	va_end(ptr);
+    } while ( siz > (ALL(*iot)-S(*iot)) );
+
+    S(*iot) += siz;
+    return siz;
+}
+
+
+/* reparse() into a cstring
+ */
+void
+Csreparse(Cstring *iot, char *buf, int size, int flags)
+{
+    MMIOT f;
+    ___mkd_initmmiot(&f, 0);
+    ___mkd_reparse(buf, size, 0, &f);
+    ___mkd_emblock(&f);
+    SUFFIX(*iot, T(f.out), S(f.out));
+    ___mkd_freemmiot(&f, 0);
+}

data/ext/cstring.h

@@ -50,6 +50,7 @@
  */
 #define T(x)		(x).text
 #define S(x)		(x).size
+#define ALL(x)		(x).alloc
 
 /* abstract anchor type that defines a list base
  * with a function that attaches an element to
@@ -65,4 +66,8 @@
 
 typedef STRING(char) Cstring;
 
+extern void Csputc(int, Cstring *);
+extern int Csprintf(Cstring *, char *, ...);
+extern void Csreparse(Cstring *, char *, int, int);
+
 #endif/*_CSTRING_D*/

data/ext/extconf.rb

@@ -4,11 +4,5 @@ dir_config('rdiscount')
 
 HAVE_RANDOM = have_func('random')
 HAVE_SRANDOM = have_func('srandom')
-HAVE_FUNOPEN = have_func('funopen')
-HAVE_FOPENCOOKIE = have_func('fopencookie')
-
-unless HAVE_FUNOPEN || HAVE_FOPENCOOKIE
-  fail "No funopen or fopencookie support available."
-end
 
 create_makefile('rdiscount')

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)
@@ -251,10 +277,10 @@ emmatch(MMIOT *f, int go)
 }
 
 
-/* emblock()
+/* ___mkd_emblock()
  */
-static void
-emblock(MMIOT *f)
+void
+___mkd_emblock(MMIOT *f)
 {
     int i;
     block *p;
@@ -275,8 +301,8 @@ emblock(MMIOT *f)
 
 /* generate html from a markup fragment
  */
-static void
-reparse(char *bfr, int size, int flags, MMIOT *f)
+void
+___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
 {
     MMIOT sub;
 
@@ -290,7 +316,7 @@ reparse(char *bfr, int size, int flags, MMIOT *f)
     S(sub.in)--;
     
     text(&sub);
-    emblock(&sub);
+    ___mkd_emblock(&sub);
     
     Qwrite(T(sub.out), S(sub.out), f);
 
@@ -313,6 +339,8 @@ puturl(char *s, int size, MMIOT *f)
 	    Qstring("&", f);
 	else if ( c == '<' )
 	    Qstring("&lt;", f);
+	else if ( isalnum(c) || ispunct(c) )
+	    Qchar(c, f);
 	else
 	    Qchar(c, f);
     }
@@ -469,12 +497,14 @@ linkykey(int image, Footnote *val, MMIOT *f)
 {
     Footnote *ret;
     Cstring mylabel;
+    int here;
 
     memset(val, 0, sizeof *val);
 
     if ( (T(val->tag) = linkylabel(f, &S(val->tag))) == 0 )
 	return 0;
 
+    here = mmiottell(f);
     eatspace(f);
     switch ( pull(f) ) {
     case '(':
@@ -489,14 +519,21 @@ linkykey(int image, Footnote *val, MMIOT *f)
 
 	return peek(f,0) == ')';
 
-    case '[':
+    case '[':		/* footnote links /as defined in the standard/ */
+    default:		/* footnote links -- undocumented extension */
 	/* footnote link */
 	mylabel = val->tag;
-	if ( (T(val->tag) = linkylabel(f, &S(val->tag))) == 0 )
-	    return 0;
+	if ( peek(f,0) == '[' ) {
+	    if ( (T(val->tag) = linkylabel(f, &S(val->tag))) == 0 )
+		return 0;
 
-	if ( !S(val->tag) )
-	    val->tag = mylabel;
+	    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);
@@ -576,7 +613,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;
     }
@@ -605,12 +642,12 @@ linkylinky(int image, MMIOT *f)
 
 	if ( S(link.title) ) {
 	    Qstring(" title=\"", f);
-	    reparse(T(link.title), S(link.title), INSIDE_TAG, f);
+	    ___mkd_reparse(T(link.title), S(link.title), INSIDE_TAG, f);
 	    Qchar('"', f);
 	}
 
 	Qstring(tag->text_pfx, f);
-	reparse(T(link.tag), S(link.tag), tag->flags, f);
+	___mkd_reparse(T(link.tag), S(link.tag), tag->flags, f);
 	Qstring(tag->text_sfx, f);
     }
     else
@@ -659,11 +696,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;
 }
@@ -743,22 +780,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
@@ -873,7 +894,7 @@ smartypants(int c, int *flags, MMIOT *f)
 			    break;
 			else if ( c == '\'' && peek(f, j+1) == '\'' ) {
 			    Qstring("&ldquo;", f);
-			    reparse(cursor(f)+1, j-2, 0, f);
+			    ___mkd_reparse(cursor(f)+1, j-2, 0, f);
 			    Qstring("&rdquo;", f);
 			    shift(f,j+1);
 			    return 1;
@@ -928,7 +949,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);
@@ -938,18 +960,17 @@ text(MMIOT *f)
 			    ++len;
 			}
 			shift(f,len);
-			reparse(sup, len, 0, f);
+			___mkd_reparse(sup, len, 0, f);
 			Qstring("</sup>", f);
 		    }
 		    break;
 #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;
 		    }
@@ -964,7 +985,7 @@ text(MMIOT *f)
 		    }
 		    break;
 	
-	case '`':   if ( tag_text(f) )
+	case '`':   if ( tag_text(f) || !iscodeblock(f) )
 			Qchar(c, f);
 		    else {
 			Qstring("<code>", f);
@@ -1003,7 +1024,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) != ';' )
@@ -1016,9 +1037,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)
 {
@@ -1072,7 +1115,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);
@@ -1094,6 +1143,7 @@ printblock(Paragraph *pp, MMIOT *f)
 		push("<br/>\n", 6, f);
 	    }
 	    else {
+		___mkd_tidy(t);
 		push(T(t->text), S(t->text), f);
 		if ( t->next )
 		    push("\n", 1, f);
@@ -1149,19 +1199,21 @@ 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);
-    emblock(f);
+    ___mkd_emblock(f);
+    if ( block )
+	Qprintf(f, arguments ? "<%s %s>" : "<%s>", block, arguments);
+    ___mkd_emblock(f);
 
     while (( p = display(p, f) )) {
-	emblock(f);
+	___mkd_emblock(f);
 	Qstring("\n\n", f);
     }
 
-    if ( block ) Qprintf(f, "</%s>", block);
-    emblock(f);
+    if ( block )
+	 Qprintf(f, "</%s>", block);
+    ___mkd_emblock(f);
 }
 
 
@@ -1177,11 +1229,11 @@ definitionlist(Paragraph *p, MMIOT *f)
 	for ( ; p ; p = p->next) {
 	    for ( tag = p->text; tag; tag = tag->next ) {
 		Qstring("<dt>", f);
-		reparse(T(tag->text), S(tag->text), 0, f);
+		___mkd_reparse(T(tag->text), S(tag->text), 0, f);
 		Qstring("</dt>\n", f);
 	    }
 
-	    htmlify(p->down, "dd", f);
+	    htmlify(p->down, "dd", p->ident, f);
 	}
 
 	Qstring("</dl>", f);
@@ -1194,10 +1246,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);
 	}
 
@@ -1227,11 +1282,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;
 
@@ -1288,7 +1344,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;
 	}
 
@@ -1299,7 +1355,7 @@ mkd_document(Document *p, char **res)
 }
 
 
-/*  public interface for reparse()
+/*  public interface for ___mkd_reparse()
  */
 int
 mkd_text(char *bfr, int size, FILE *output, int flags)
@@ -1309,8 +1365,8 @@ mkd_text(char *bfr, int size, FILE *output, int flags)
     ___mkd_initmmiot(&f, 0);
     f.flags = flags & USER_FLAGS;
     
-    reparse(bfr, size, 0, &f);
-    emblock(&f);
+    ___mkd_reparse(bfr, size, 0, &f);
+    ___mkd_emblock(&f);
     if ( flags & CDATA_OUTPUT )
 	___mkd_xml(T(f.out), S(f.out), output);
     else