bluecloth 2.0.5-x86-mingw32 → 2.0.6.pre120-x86-mingw32

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2008, Michael Granger
+Copyright (c) 2004-2010, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README

@@ -60,10 +60,10 @@ You can also install as a site library via the Rakefile:
 
 == Source 
 
-You can check out the current development source with Subversion from
+You can check out the current development source with Mercurial from
 the following URL:
 
-  svn://deveiate.org/BlueCloth/trunk
+  http://repo.deveiate.org/BlueCloth
 
 You can report bugs, suggest improvements, or check on development
 activity at the project page:

data/Rakefile

@@ -1,10 +1,10 @@
-#!rake
+#!rake -*- ruby -*-
 #
 # BlueCloth rakefile
 #
 # Based on various other Rakefiles, especially one by Ben Bleything
 #
-# Copyright (c) 2007-2009 The FaerieMUD Consortium
+# Copyright (c) 2007-2010 The FaerieMUD Consortium
 #
 # Authors:
 #  * Michael Granger <ged@FaerieMUD.org>
@@ -32,6 +32,14 @@ rescue LoadError
 	end
 end
 
+begin
+	require 'rubygems'
+rescue LoadError
+	module Gem
+		class Specification; end
+	end
+end
+
 require 'rbconfig'
 require 'rake'
 require 'rake/testtask'
@@ -105,9 +113,9 @@ RAKE_TASKLIBS_URL = 'http://repo.deveiate.org/rake-tasklibs'
 LOCAL_RAKEFILE = BASEDIR + 'Rakefile.local'
 
 EXTRA_PKGFILES = Rake::FileList.new
-EXTRA_PKGFILES.include "#{BASEDIR}/LICENSE.discount"
-EXTRA_PKGFILES.include "#{BASEDIR}/spec/data/**/*.{txt,text,html}"
-EXTRA_PKGFILES.include "#{BASEDIR}/ext/VERSION"
+EXTRA_PKGFILES.include( "#{BASEDIR}/LICENSE.discount" )
+EXTRA_PKGFILES.include( "#{BASEDIR}/spec/data/**/*.{txt,text,html}" )
+EXTRA_PKGFILES.include( "#{BASEDIR}/ext/VERSION" )
 
 RELEASE_FILES = TEXT_FILES + 
 	SPEC_FILES + 
@@ -119,8 +127,13 @@ RELEASE_FILES = TEXT_FILES +
 	RAKE_TASKLIBS +
 	EXTRA_PKGFILES
 
+
 RELEASE_FILES << LOCAL_RAKEFILE.to_s if LOCAL_RAKEFILE.exist?
 
+RELEASE_ANNOUNCE_ADDRESSES = [
+	"Ruby-Talk List <ruby-talk@ruby-lang.org>",
+]
+
 COVERAGE_MINIMUM = ENV['COVERAGE_MINIMUM'] ? Float( ENV['COVERAGE_MINIMUM'] ) : 85.0
 RCOV_EXCLUDES = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib'
 RCOV_OPTS = [
@@ -140,7 +153,7 @@ if !RAKE_TASKDIR.exist?
 
 	if ans =~ /^y/i
 		$stderr.puts "Okay, fetching #{RAKE_TASKLIBS_URL} into #{RAKE_TASKDIR}..."
-		system 'hg', 'clone', RAKE_TASKLIBS_URL, RAKE_TASKDIR
+		system 'hg', 'clone', RAKE_TASKLIBS_URL, "./#{RAKE_TASKDIR}"
 		if ! $?.success?
 			fail "Damn. That didn't work. Giving up; maybe try manually fetching?"
 		end
@@ -154,12 +167,12 @@ end
 
 require RAKE_TASKDIR + 'helpers.rb'
 
-# Define some constants that depend on the 'svn' tasklib
+# Set the build ID if the mercurial executable is available
 if hg = which( 'hg' )
-	id = IO.read('|-') or exec hg, 'id', '-q'
-	PKG_BUILD = id.chomp
+	id = IO.read('|-') or exec hg.to_s, 'id', '-n'
+	PKG_BUILD = 'pre' + (id.chomp[ /^[[:xdigit:]]+/ ] || '1')
 else
-	PKG_BUILD = 0
+	PKG_BUILD = 'pre0'
 end
 SNAPSHOT_PKG_NAME = "#{PKG_FILE_NAME}.#{PKG_BUILD}"
 SNAPSHOT_GEM_NAME = "#{SNAPSHOT_PKG_NAME}.gem"
@@ -176,7 +189,7 @@ RDOC_OPTIONS = [
   ]
 
 # Release constants
-SMTP_HOST = 'mail.faeriemud.org'
+SMTP_HOST = "mail.faeriemud.org"
 SMTP_PORT = 465 # SMTP + SSL
 
 # Project constants
@@ -186,29 +199,23 @@ PROJECT_DOCDIR = "#{PROJECT_PUBDIR}/#{PKG_NAME}"
 PROJECT_SCPPUBURL = "#{PROJECT_HOST}:#{PROJECT_PUBDIR}"
 PROJECT_SCPDOCURL = "#{PROJECT_HOST}:#{PROJECT_DOCDIR}"
 
-# Rubyforge stuff
-RUBYFORGE_GROUP = 'deveiate'
-RUBYFORGE_PROJECT = 'bluecloth'
-
 # Gem dependencies: gemname => version
 DEPENDENCIES = {
 }
 
 # Developer Gem dependencies: gemname => version
 DEVELOPMENT_DEPENDENCIES = {
-	'amatch'      => '>= 0.2.3',
-	'rake'        => '>= 0.8.1',
+	'rake'        => '>= 0.8.7',
 	'rcodetools'  => '>= 0.7.0.0',
-	'rcov'        => '>= 0',
+	'rcov'        => '>= 0.8.1.2.0',
+	'rdoc'        => '>= 2.4.3',
 	'RedCloth'    => '>= 4.0.3',
-	'rspec'       => '>= 0',
-	'rubyforge'   => '>= 0',
+	'rspec'       => '>= 1.2.6',
 	'termios'     => '>= 0',
 	'text-format' => '>= 1.0.0',
 	'tmail'       => '>= 1.2.3.1',
-	'ultraviolet' => '>= 0.10.2',
-	'libxml-ruby' => '>= 0.8.3',
-	'rdoc'        => '>= 2.4.3',
+	'diff-lcs'    => '>= 1.1.2',
+	'rake-compiler' => '>= 0.7.0',
 }
 
 # Non-gem requirements: packagename => version
@@ -231,7 +238,6 @@ GEMSPEC   = Gem::Specification.new do |gem|
 	gem.authors           = "Michael Granger"
 	gem.email             = ["ged@FaerieMUD.org"]
 	gem.homepage          = 'http://deveiate.org/projects/BlueCloth/'
-	gem.rubyforge_project = RUBYFORGE_PROJECT
 
 	gem.has_rdoc          = true
 	gem.rdoc_options      = RDOC_OPTIONS
@@ -240,7 +246,7 @@ GEMSPEC   = Gem::Specification.new do |gem|
 	gem.bindir            = BINDIR.relative_path_from(BASEDIR).to_s
 	gem.executables       = BIN_FILES.select {|pn| File.executable?(pn) }.
 	                            collect {|pn| File.basename(pn) }
-	gem.require_paths << EXTDIR.relative_path_from( BASEDIR ).to_s
+	gem.require_paths << EXTDIR.relative_path_from( BASEDIR ).to_s if EXTDIR.exist?
 
 	if EXTCONF.exist?
 		gem.extensions << EXTCONF.relative_path_from( BASEDIR ).to_s
@@ -254,22 +260,20 @@ GEMSPEC   = Gem::Specification.new do |gem|
 		gem.add_runtime_dependency( name, version )
 	end
 
-	# Developmental dependencies don't work as of RubyGems 1.2.0
-	unless Gem::Version.new( Gem::RubyGemsVersion ) <= Gem::Version.new( "1.2.0" )
-		DEVELOPMENT_DEPENDENCIES.each do |name, version|
-			version = '>= 0' if version.length.zero?
-			gem.add_development_dependency( name, version )
-		end
-	end
-
 	REQUIREMENTS.each do |name, version|
 		gem.requirements << [ name, version ].compact.join(' ')
 	end
 end
 
+
+task :prerelease do
+	GEMSPEC.version.version += '.' + PKG_BUILD
+end
+
+
 $trace = Rake.application.options.trace ? true : false
 $dryrun = Rake.application.options.dryrun ? true : false
-
+$include_dev_dependencies = false
 
 # Load any remaining task libraries
 RAKE_TASKLIBS.each do |tasklib|
@@ -302,10 +306,9 @@ task :default  => [:clean, :local, :spec, :rdoc, :package]
 ### Task the local Rakefile can append to -- no-op by default
 task :local
 
-
 ### Task: clean
-CLEAN.include 'coverage'
-CLOBBER.include 'artifacts', 'coverage.info', PKGDIR
+CLEAN.include 'coverage', '**/*.orig', '**/*.rej'
+CLOBBER.include 'artifacts', 'coverage.info', 'ChangeLog', PKGDIR
 
 ### Task: changelog
 file 'ChangeLog' do |task|

data/Rakefile.local

@@ -1,5 +1,7 @@
 #!rake
 
+require 'rake/extensiontask'
+
 # C extension constants
 EXT_MAKEFILE       = EXTDIR + 'Makefile'
 EXT_SOURCES        = FileList[ EXTDIR + '*.c' ]
@@ -14,50 +16,28 @@ DOCFILES << 'LICENSE.discount'
 #####################################################################
 
 # Make both the default task and the spec task depend on building the extension
-task :local => :build
-task :spec => :build
+task :local => :compile
+task :spec => :compile
 namespace :spec do
-	task :doc   => [ :build ]
-	task :quiet => [ :build ]
-	task :html  => [ :build ]
-	task :text  => [ :build ]
+	task :doc   => [ :compile ]
+	task :quiet => [ :compile ]
+	task :html  => [ :compile ]
+	task :text  => [ :compile ]
 end
 
-desc "Make the Makefile for the C extension"
-file EXT_MAKEFILE.to_s => EXT_SOURCES do
-	log "Configuring BlueCloth C extension"
-	in_subdirectory( EXTDIR ) do
-		ruby 'extconf.rb'
-	end
-end
-CLOBBER.include( EXTDIR + 'mkmf.log', EXTDIR + 'conftest.dSYM', EXT_SO )
-
-desc "Build the C extension"
-task :build => EXT_SO
-file EXT_SO => [ EXT_MAKEFILE.to_s, *EXT_SOURCES ] do
-	in_subdirectory( EXTDIR ) do
-		sh 'make'
-	end
+ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
+
+Rake::ExtensionTask.new do |ext|
+	ext.name = 'bluecloth_ext'
+	ext.gem_spec = GEMSPEC
+	ext.ext_dir = 'ext'
+	ext.lib_dir = 'lib'
+	ext.source_pattern = "*.{c,h}"
+	ext.cross_compile = true
+	ext.cross_platform = %w[i386-mswin32 i386-mingw32]
 end
 
-desc "Rebuild the C extension"
-task :rebuild => [ :clobber, :build ]
-
-
-task :clean do
-	if EXT_MAKEFILE.exist?
-		in_subdirectory( EXTDIR ) do
-			sh 'make clean'
-		end
-	end
-end	
-
-task :clobber do
-	if EXT_MAKEFILE.exist?
-		in_subdirectory( EXTDIR ) do
-			sh 'make distclean'
-		end
-	end
-end	
-CLOBBER.include( EXT_MAKEFILE )
+WINFAT_DIRS = Rake::FileList[ LIBDIR + '{1.8,1.9}' ]
+
+CLEAN.include( WINFAT_DIRS )
 

data/ext/VERSION

@@ -1 +1 @@
-1.4.4
+1.5.8

data/ext/bluecloth.c

@@ -22,8 +22,7 @@
  * 
  */
 
-#include "mkdio.h"
-#include "ruby.h"
+#include "bluecloth.h"
 
 VALUE bluecloth_cBlueCloth;
 VALUE bluecloth_default_opthash;
@@ -146,7 +145,12 @@ bluecloth_s_allocate( VALUE klass ) {
  */
 static VALUE
 bluecloth_s_discount_version( VALUE klass ) {
+#ifdef HAVE_RUBY_ENCODING_H
+	return rb_external_str_new_with_enc( markdown_version, strlen(markdown_version),
+		rb_default_external_encoding() );
+#else
 	return rb_str_new2( markdown_version );
+#endif
 }
 
 /* --------------------------------------------------------------
@@ -201,6 +205,9 @@ bluecloth_initialize( int argc, VALUE *argv, VALUE self ) {
 			opthash = text;
 			text = rb_str_new( "", 0 );
 		}
+		else {
+			text = rb_obj_as_string( text );
+		}
 
 		/* Merge the options hash with the defaults and turn it into a flags int */
 		if ( NIL_P(opthash) ) opthash = rb_hash_new();
@@ -217,6 +224,9 @@ bluecloth_initialize( int argc, VALUE *argv, VALUE self ) {
 		rb_iv_set( self, "@text", textcopy );
 		OBJ_FREEZE( fullhash );
 		rb_iv_set( self, "@options", fullhash );
+#ifdef HAVE_RUBY_ENCODING_H
+		rb_enc_copy( self, text );
+#endif
 
 		OBJ_INFECT( self, text );
 	}
@@ -245,6 +255,9 @@ bluecloth_to_html( VALUE self ) {
 		bluecloth_debug( "Pointer to results: %p, length = %d", output, length );
 		result = rb_str_new( output, length );
 
+#ifdef HAVE_RUBY_ENCODING_H
+		rb_enc_copy( result, self );
+#endif
 		OBJ_INFECT( result, self );
 		return result;
 	} else {
@@ -325,7 +338,8 @@ void Init_bluecloth_ext( void ) {
 	
 	/* The options hash that describes the options in effect when the object was created */
 	rb_define_attr( bluecloth_cBlueCloth, "options", 1, 0 );
-	
+
+
 	/* --- Constants ----- */
 
 	/* Do not process `[]' and remove A tags from the output. */

data/ext/bluecloth.h

@@ -0,0 +1,19 @@
+/* 
+ * BlueCloth -- a Ruby implementation of Markdown
+ * $Id$
+ * 
+ */
+
+#ifndef BLUECLOTH_H
+#define BLUECLOTH_H
+
+#include "config.h"
+
+#include "mkdio.h"
+#include "ruby.h"
+
+#ifdef HAVE_RUBY_ENCODING_H
+#	include "ruby/encoding.h"
+#endif
+
+#endif

data/ext/config.h

@@ -6,6 +6,10 @@
 #ifndef CONFIG_H_RZLE3ADO
 #define CONFIG_H_RZLE3ADO
 
+#ifdef RUBY_EXTCONF_H
+#	include RUBY_EXTCONF_H
+#endif
+
 #ifdef HAVE_SRANDOM
 #	define INITRNG(x) srandom((unsigned int)x)
 #elif  HAVE_SRAND

data/ext/cstring.h

@@ -60,9 +60,10 @@
  * 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;
 

data/ext/extconf.rb

@@ -19,7 +19,7 @@ $CPPFLAGS << %Q{ -DVERSION=\\"#{version}\\"}
 
 # Add my own debugging hooks if building for me
 if ENV['DEBUGGING_BUILD']
-	$CFLAGS << ' -ggdb' << ' -DDEBUG' 
+	$CFLAGS << ' -ggdb' << ' -DDEBUG'
 end
 
 def fail( *messages )
@@ -43,6 +43,10 @@ end
 
 have_header( 'mkdio.h' ) or fail( "missing mkdio.h" )
 
+# Check for 1.9.xish encoding header
+have_header( 'ruby/encoding.h' )
+
+create_header()
 create_makefile( 'bluecloth_ext' )
 
 FileUtils.rm_rf( 'conftest.dSYM' ) # MacOS X cleanup

data/ext/generate.c

@@ -632,9 +632,9 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
 	
 	Qstring(tag->link_sfx, f);
 
-	if ( tag->WxH && ref->height && ref->width ) {
-	    Qprintf(f," height=\"%d\"", ref->height);
-	    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) ) {
@@ -661,44 +661,46 @@ static int
 linkylinky(int image, MMIOT *f)
 {
     int start = mmiottell(f);
-    int implicit_mark;
     Cstring name;
     Footnote key, *ref;
 		
     int status = 0;
 
     CREATE(name);
-    bzero(&key, sizeof key);
+    memset(&key, 0, sizeof key);
 
     if ( linkylabel(f, &name) ) {
-	implicit_mark = mmiottell(f);
-	eatspace(f);
-
-	switch ( pull(f) ) {
-	case '(':  /* embedded link */
+	if ( peek(f,1) == '(' ) {
+	    pull(f);
 	    if ( linkyurl(f, image, &key) )
 		status = linkyformat(f, name, image, &key);
-	    break;
+	}
+	else {
+	    int goodlink, implicit_mark = mmiottell(f);
 	
-	case '[':/* footnote link */
-	default: /* (undocumented) implicit link */
-	    if ( peek(f, 0) != '[' ) {
+	    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);
-		if ( f->flags & MKD_1_COMPAT )
-		    break;
+		goodlink = !(f->flags & MKD_1_COMPAT);
 	    }
-	    else if ( !linkylabel(f, &key.tag) )
-		break;
 	    
-	    if ( !S(key.tag) ) {
-		DELETE(key.tag);
-		T(key.tag) = T(name);
-		S(key.tag) = S(name);
-	    }
+	    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);
+		if ( ref = bsearch(&key, T(*f->footnotes), S(*f->footnotes),
+					  sizeof key, (stfu)__mkd_footsort) )
+		    status = linkyformat(f, name, image, ref);
+	    }
 	}
     }
 
@@ -867,9 +869,19 @@ maybe_tag_or_link(MMIOT *f)
 
     if ( size ) {
 	if ( maybetag || (size >= 3 && strncmp(cursor(f), "!--", 3) == 0) ) {
+
+	    /* It is not a html tag unless we find the closing '>' in
+	     * the same block.
+	     */
+	    while ( (c = peek(f, size+1)) != '>' )
+		if ( c == EOF )
+		    return 0;
+		else
+		    size++;
+	    
 	    Qstring(forbidden_tag(f) ? "&lt;" : "<", f);
 	    while ( ((c = peek(f, 1)) != EOF) && (c != '>') )
-		cputc(pull(f), f);
+		Qchar(pull(f), f);
 	    return 1;
 	}
 	else if ( !isspace(c) && process_possible_link(f, size) ) {
@@ -1276,6 +1288,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) )
+	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)
 {
@@ -1382,6 +1494,7 @@ definitionlist(Paragraph *p, MMIOT *f)
 	    }
 
 	    htmlify(p->down, "dd", p->ident, f);
+	    Qchar('\n', f);
 	}
 
 	Qstring("</dl>", f);
@@ -1453,6 +1566,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;