bluecloth 2.0.10 → 2.0.11pre158

data/ext/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/ext/bluecloth.c

@@ -1,6 +1,6 @@
 /* 
  * BlueCloth -- a Ruby implementation of Markdown
- * $Id: bluecloth.c,v a12b01a92197 2011/01/17 17:13:22 ged $
+ * $Id: bluecloth.c,v 0cda68a5fc00 2011/02/09 22:33:27 ged $
  * 
  * = Authors
  * 

data/ext/bluecloth.h

@@ -1,6 +1,6 @@
 /* 
  * BlueCloth -- a Ruby implementation of Markdown
- * $Id: bluecloth.h,v 055519ec5f78 2010/09/17 20:42:27 ged $
+ * $Id: bluecloth.h,v 0cda68a5fc00 2011/02/09 22:33:27 ged $
  * 
  */
 

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

@@ -571,7 +571,7 @@ 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 & (MKD_NO_EXT|MKD_SAFELINK) )
@@ -667,7 +667,7 @@ linkylinky(int image, MMIOT *f)
 					  sizeof key, (stfu)__mkd_footsort) )
 		    status = linkyformat(f, name, image, ref);
 		else if ( f->flags & IS_LABEL )
-		    status = linkyformat(f, name, image, &imaget);
+		    status = linkyformat(f, name, image, 0);
 	    }
 	}
     }
@@ -1312,13 +1312,12 @@ text(MMIOT *f)
 static void
 printheader(Paragraph *pp, MMIOT *f)
 {
-    Qprintf(f, "<h%d", pp->hnumber);
     if ( f->flags & MKD_TOC ) {
-	Qprintf(f, " id=\"", pp->hnumber);
+	Qstring("<a name=\"", f);
 	mkd_string_to_anchor(T(pp->text->text), S(pp->text->text), Qchar, f, 1);
-	Qchar('"', f);
+	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);

data/ext/markdown.c

@@ -669,25 +669,29 @@ szmarkerclass(char *p)
  * check if the first line of a quoted block is the special div-not-quote
  * marker %[kind:]name%
  */
+#define iscsschar(c) (isalpha(c) || (c == '-') || (c == '_') )
+
 static int
 isdivmarker(Line *p, int start, DWORD flags)
 {
     char *s;
-    int len, i;
+    int last, i;
 
     if ( flags & (MKD_NODIVQUOTE|MKD_STRICT) )
 	return 0;
 
-    len = S(p->text);
-    s   = T(p->text);
+    last= S(p->text) - (1 + start);
+    s   = T(p->text) + start;
 
-    if ( !(len && s[start] == '%' && s[len-1] == '%') ) return 0;
+    if ( (last <= 0) || (*s != '%') || (s[last] != '%') )
+	return 0;
 
-    i = szmarkerclass(s+start+1)+start;
-    len -= start+1;
+    i = szmarkerclass(s+1);
 
-    while ( ++i < len )
-	if ( !isalnum(s[i]) )
+    if ( !iscsschar(s[i+1]) )
+	return 0;
+    while ( ++i < last )
+	if ( !(isdigit(s[i]) || iscsschar(s[i])) )
 	    return 0;
 
     return 1;

data/lib/bluecloth.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/ruby
 
-require 'pathname'
-require 'rbconfig'
-
 # 
 # Bluecloth is a Ruby implementation of Markdown, a text-to-HTML conversion
 # tool.
@@ -21,7 +18,7 @@ require 'rbconfig'
 # 
 # == Version
 #
-#  $Id: bluecloth.rb,v 3dd45baec201 2011/01/17 17:14:20 ged $
+#  $Id: bluecloth.rb,v fd890510cecf 2011/02/10 15:39:54 ged $
 # 
 # == License
 # 
@@ -32,7 +29,7 @@ require 'rbconfig'
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.10'
+	VERSION = '2.0.11'
 
 	# The defaults for all supported options.
 	DEFAULT_OPTIONS = {
@@ -179,17 +176,23 @@ class BlueCloth
 
 end # class BlueCloth
 
-# Load the correct version if it's a Windows binary gem
-if RUBY_PLATFORM =~/(mswin|mingw)/i
-	major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
-		raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
-	require "#{major_minor}/bluecloth_ext"
-else
+begin
 	require 'bluecloth_ext'
+rescue LoadError => err
+	# If it's a Windows binary gem, try the <major>.<minor> subdirectory
+	if RUBY_PLATFORM =~/(mswin|mingw)/i
+		major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
+			raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+		require "#{major_minor}/bluecloth_ext"
+	else
+		raise
+	end
+
 end
 
 
 
+
 # Set the top-level 'Markdown' constant if it isn't already set
 ::Markdown = ::BlueCloth unless defined?( ::Markdown )
 

data/spec/bluecloth/101_changes_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "after the 1.0.1 changes" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "doesn't touch escapes in code blocks" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/TEMPLATE

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+	
+	libdir = basedir + 'lib'
+	extdir = basedir + 'ext'
+	
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+}
+
+require 'rspec'
+require 'bluecloth'
+
+require 'spec/lib/helpers'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe BlueCloth, "" do
+
+	it "does something cool" do
+		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
+		---
+		---
+	end
+
+end
+
+

data/spec/bluecloth/autolinks_spec.rb

@@ -4,10 +4,10 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
 	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "auto-links" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "supports HTTP auto-links" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/blockquotes_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "blockquotes" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	### [Blockquotes]
 
@@ -113,7 +109,7 @@ describe BlueCloth, "blockquotes" do
 	end
 
 	# Blockquotes with a <pre> section
-	it "supports block-level HTML inside of blockquotes" do
+	it "supports block-level HTML inside of blockquotes", :pedantic => true do
 		pending "a fix in Discount" do
 			the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
 			> The best approximation of the problem is the following code:

data/spec/bluecloth/code_spans_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "that contains code blocks or spans" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "wraps CODE tags around backticked spans" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/emphasis_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "emphasis" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "treats single asterisks as indicators of emphasis" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/entities_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "document with entities" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "escapes special characters" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/hrules_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "horizontal rules" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	# Hrule -- three asterisks
 	it "produces a horizontal rule tag from three asterisks on a line by themselves" do

data/spec/bluecloth/images_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "images" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	### [Images]
 

data/spec/bluecloth/inline_html_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "document with inline HTML" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "preserves TABLE block" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/links_spec.rb

@@ -16,8 +16,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -25,8 +23,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "links" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "supports inline links" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation

data/spec/bluecloth/lists_spec.rb

@@ -17,8 +17,6 @@ require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
@@ -26,8 +24,6 @@ require 'spec/lib/matchers'
 #####################################################################
 
 describe BlueCloth, "lists" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
 
 	it "support unordered lists with asterisk bullets" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation