bluecloth 2.0.9 → 2.0.10

data/ext/tags.h

@@ -12,6 +12,7 @@ struct kw {
 
 struct kw* mkd_search_tags(char *, int);
 void mkd_prepare_tags();
+void mkd_deallocate_tags();
 void mkd_sort_tags();
 void mkd_define_tag(char *, int);
 

data/lib/bluecloth.rb

@@ -21,7 +21,7 @@ require 'rbconfig'
 # 
 # == Version
 #
-#  $Id: bluecloth.rb,v 486a5a2a8cd2 2010/09/23 14:15:03 ged $
+#  $Id: bluecloth.rb,v 3dd45baec201 2011/01/17 17:14:20 ged $
 # 
 # == License
 # 
@@ -32,20 +32,31 @@ require 'rbconfig'
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.9'
+	VERSION = '2.0.10'
 
 	# The defaults for all supported options.
 	DEFAULT_OPTIONS = {
-		:remove_links    => false,
-		:remove_images   => false,
-		:smartypants     => true,
-		:pseudoprotocols => false,
-		:pandoc_headers  => false,
-		:header_labels   => false,
-		:escape_html     => false,
-		:strict_mode     => true,
-		:auto_links      => false,
-		:safe_links      => false,
+		:alphalists       => true,
+		:auto_links       => false,
+		:definition_lists => false,
+		:divquotes        => false,
+		:escape_html      => false,
+		:expand_tabs      => true,
+		:header_labels    => false,
+		:mdtest_1_compat  => false,
+		:pandoc_headers   => false,
+		:pseudoprotocols  => false,
+		:relaxed          => false,
+		:remove_images    => false,
+		:remove_links     => false,
+		:safe_links       => false,
+		:smartypants      => true,
+		:strict_mode      => true,
+		:strikethrough    => true,
+		:superscript      => false,
+		:tables           => false,
+		:tagtext_mode     => false,
+		:xml_cdata        => false,
 	}.freeze
 
 	# The number of characters of the original markdown source to include in the 
@@ -74,20 +85,27 @@ class BlueCloth
 
 		flags = 0
 
-        if   opthash[:remove_links]    then flags |= MKD_NOLINKS;         end
-        if   opthash[:remove_images]   then flags |= MKD_NOIMAGE;         end
-        if ! opthash[:smartypants]     then flags |= MKD_NOPANTS;         end
-        if ! opthash[:pseudoprotocols] then flags |= MKD_NO_EXT;          end
-        if ! opthash[:pandoc_headers]  then flags |= MKD_NOHEADER;        end
-        if   opthash[:header_labels]   then flags |= MKD_TOC;             end
-        if   opthash[:mdtest_1_compat] then flags |= MKD_1_COMPAT;        end
-        if   opthash[:escape_html]     then flags |= MKD_NOHTML;          end
-        if   opthash[:strict_mode]     then flags |= MKD_STRICT;          end
-        if   opthash[:tagtext_mode]    then flags |= MKD_TAGTEXT;         end
-        if   opthash[:auto_links]      then flags |= MKD_AUTOLINK;        end
-        if   opthash[:safe_links]      then flags |= MKD_SAFELINK;        end
-        if ! opthash[:tables]          then flags |= MKD_NOTABLES;        end
-        if ! opthash[:strikethrough]   then flags |= MKD_NOSTRIKETHROUGH; end
+		if   opthash[:remove_links]     then flags |= MKD_NOLINKS;         end
+		if   opthash[:remove_images]    then flags |= MKD_NOIMAGE;         end
+		if ! opthash[:smartypants]      then flags |= MKD_NOPANTS;         end
+		if   opthash[:escape_html]      then flags |= MKD_NOHTML;          end
+		if   opthash[:strict_mode]      then flags |= MKD_STRICT;          end
+		if   opthash[:tagtext_mode]     then flags |= MKD_TAGTEXT;         end
+		if ! opthash[:pseudoprotocols]  then flags |= MKD_NO_EXT;          end
+		if   opthash[:xml_cdata]        then flags |= MKD_CDATA;           end
+		if ! opthash[:superscript]      then flags |= MKD_NOSUPERSCRIPT;   end
+		if ! opthash[:relaxed]          then flags |= MKD_NORELAXED;       end
+		if ! opthash[:tables]           then flags |= MKD_NOTABLES;        end
+		if ! opthash[:strikethrough]    then flags |= MKD_NOSTRIKETHROUGH; end
+		if   opthash[:header_labels]    then flags |= MKD_TOC;             end
+		if   opthash[:mdtest_1_compat]  then flags |= MKD_1_COMPAT;        end
+		if   opthash[:auto_links]       then flags |= MKD_AUTOLINK;        end
+		if   opthash[:safe_links]       then flags |= MKD_SAFELINK;        end
+		if ! opthash[:pandoc_headers]   then flags |= MKD_NOHEADER;        end
+		if   opthash[:expand_tabs]      then flags |= MKD_TABSTOP;         end
+		if ! opthash[:divquotes]        then flags |= MKD_NODIVQUOTE;      end
+		if ! opthash[:alphalists]       then flags |= MKD_NOALPHALIST;     end
+		if ! opthash[:definition_lists] then flags |= MKD_NODLIST;         end
 
 		return flags
 	end
@@ -98,20 +116,27 @@ class BlueCloth
 		flags = flags.to_i
 
 		opthash = {}
-        if  ( flags & MKD_NOLINKS         ).nonzero? then opthash[:remove_links]    = true; end
-        if  ( flags & MKD_NOIMAGE         ).nonzero? then opthash[:remove_images]   = true; end
-        if !( flags & MKD_NOPANTS         ).nonzero? then opthash[:smartypants]     = true; end
-        if !( flags & MKD_NO_EXT          ).nonzero? then opthash[:pseudoprotocols] = true; end
-        if !( flags & MKD_NOHEADER        ).nonzero? then opthash[:pandoc_headers]  = true; end
-        if  ( flags & MKD_TOC             ).nonzero? then opthash[:header_labels]   = true; end
-        if  ( flags & MKD_1_COMPAT        ).nonzero? then opthash[:mdtest_1_compat] = true; end
-        if  ( flags & MKD_NOHTML          ).nonzero? then opthash[:escape_html]     = true; end
-        if  ( flags & MKD_STRICT          ).nonzero? then opthash[:strict_mode]     = true; end
-        if  ( flags & MKD_TAGTEXT         ).nonzero? then opthash[:tagtext_mode]    = true; end
-        if  ( flags & MKD_AUTOLINK        ).nonzero? then opthash[:auto_links]      = true; end
-        if  ( flags & MKD_SAFELINK        ).nonzero? then opthash[:safe_links]      = true; end
-        if !( flags & MKD_NOTABLES        ).nonzero? then opthash[:tables]          = true; end
-        if !( flags & MKD_NOSTRIKETHROUGH ).nonzero? then opthash[:strikethrough]   = true; end
+		if  ( flags & MKD_NOLINKS         ).nonzero? then opthash[:remove_links]     = true; end
+		if  ( flags & MKD_NOIMAGE         ).nonzero? then opthash[:remove_images]    = true; end
+		if !( flags & MKD_NOPANTS         ).nonzero? then opthash[:smartypants]      = true; end
+		if  ( flags & MKD_NOHTML          ).nonzero? then opthash[:escape_html]      = true; end
+		if  ( flags & MKD_STRICT          ).nonzero? then opthash[:strict_mode]      = true; end
+		if  ( flags & MKD_TAGTEXT         ).nonzero? then opthash[:tagtext_mode]     = true; end
+		if !( flags & MKD_NO_EXT          ).nonzero? then opthash[:pseudoprotocols]  = true; end
+		if  ( flags & MKD_CDATA           ).nonzero? then opthash[:xml_cdata]        = true; end
+		if !( flags & MKD_NOSUPERSCRIPT   ).nonzero? then opthash[:superscript]      = true; end
+		if !( flags & MKD_NORELAXED       ).nonzero? then opthash[:relaxed]          = true; end
+		if !( flags & MKD_NOTABLES        ).nonzero? then opthash[:tables]           = true; end
+		if !( flags & MKD_NOSTRIKETHROUGH ).nonzero? then opthash[:strikethrough]    = true; end
+		if  ( flags & MKD_TOC             ).nonzero? then opthash[:header_labels]    = true; end
+		if  ( flags & MKD_1_COMPAT        ).nonzero? then opthash[:mdtest_1_compat]  = true; end
+		if  ( flags & MKD_AUTOLINK        ).nonzero? then opthash[:auto_links]       = true; end
+		if  ( flags & MKD_SAFELINK        ).nonzero? then opthash[:safe_links]       = true; end
+		if !( flags & MKD_NOHEADER        ).nonzero? then opthash[:pandoc_headers]   = true; end
+		if  ( flags & MKD_TABSTOP         ).nonzero? then opthash[:expand_tabs]      = true; end
+		if !( flags & MKD_NODIVQUOTE      ).nonzero? then opthash[:divquotes]        = true; end
+		if !( flags & MKD_NOALPHALIST     ).nonzero? then opthash[:alphalists]       = true; end
+		if !( flags & MKD_NODLIST         ).nonzero? then opthash[:definition_lists] = true; end
 
 		return opthash
 	end

data/rake/documentation.rb

@@ -54,6 +54,7 @@ begin
 	class YARD::RegistryStore; include YardGlobals; end
 	class YARD::Docstring; include YardGlobals; end
 	module YARD::Templates::Helpers::ModuleHelper; include YardGlobals; end
+	module YARD::Templates::Helpers::HtmlHelper; include YardGlobals; end
 
 	if vvec(RUBY_VERSION) >= vvec("1.9.1")
 		# Monkeypatched to allow more than two '#' characters at the beginning
@@ -62,8 +63,15 @@ begin
 		require 'yard/parser/ruby/ruby_parser'
 		class YARD::Parser::Ruby::RipperParser < Ripper
 			def on_comment(comment)
-				$stderr.puts "Adding comment: %p" % [ comment ]
 				visit_ns_token(:comment, comment)
+				case comment
+				when /\A# @group\s+(.+)\s*\Z/
+					@groups.unshift [lineno, $1]
+					return
+				when /\A# @endgroup\s*\Z/
+					@groups.unshift [lineno, nil]
+					return
+				end
 
 				comment = comment.gsub(/^\#+\s{0,1}/, '').chomp
 				append_comment = @comments[lineno - 1]

data/rake/hg.rb

@@ -83,6 +83,15 @@ unless defined?( HG_DOTDIR )
 			return paths
 		end
 
+		### Return the list of files which are not of status 'clean'
+		def get_uncommitted_files
+			list = read_command_output( 'hg', 'status', '-n', '--color', 'never' )
+			list = list.split( /\n/ )
+
+			trace "Changed files: %p" % [ list ]
+			return list
+		end
+
 		### Return the list of files which are of status 'unknown'
 		def get_unknown_files
 			list = read_command_output( 'hg', 'status', '-un', '--color', 'never' )
@@ -149,11 +158,21 @@ unless defined?( HG_DOTDIR )
 
 		desc "Prepare for a new release"
 		task :prep_release do
+			uncommitted_files = get_uncommitted_files()
+			unless uncommitted_files.empty?
+				log "Uncommitted files:\n",
+				    *uncommitted_files.map {|fn| "  #{fn}\n" }
+				ask_for_confirmation( "\nRelease anyway?", true ) do
+					log "Okay, releasing with uncommitted versions."
+				end
+			end
+
 			tags = get_tags()
 			rev = get_current_rev()
+			pkg_version_tag = "v#{PKG_VERSION}"
 
 			# Look for a tag for the current release version, and if it exists abort
-			if tags.include?( PKG_VERSION )
+			if tags.include?( pkg_version_tag )
 				error "Version #{PKG_VERSION} already has a tag. Did you mean " +
 					"to increment the version in #{VERSION_FILE}?"
 				fail
@@ -164,8 +183,8 @@ unless defined?( HG_DOTDIR )
 			run 'hg', 'sign'
 
 			# Tag the current rev
-			log "Tagging rev #{rev} as #{PKG_VERSION}"
-			run 'hg', 'tag', PKG_VERSION
+			log "Tagging rev #{rev} as #{pkg_version_tag}"
+			run 'hg', 'tag', pkg_version_tag
 
 			# Offer to push
 			Rake::Task['hg:push'].invoke
@@ -229,6 +248,18 @@ unless defined?( HG_DOTDIR )
 		end
 
 
+		desc "Update to tip"
+		task :update do
+			run 'hg', 'update'
+		end
+
+
+		desc "Clobber all changes (hg up -C)"
+		task :update_and_clobber do
+			run 'hg', 'update', '-C'
+		end
+
+
 		desc "Check the current code in if tests pass"
 		task :checkin => ['hg:pull', 'hg:newfiles', 'test', COMMIT_MSG_FILE] do
 			targets = get_target_args()

data/rake/packaging.rb

@@ -12,7 +12,7 @@ include Config
 ### Task: prerelease
 desc "Append the package build number to package versions"
 task :prerelease do
-	GEMSPEC.version.version << ".#{PKG_BUILD}"
+	GEMSPEC.version.version << "pre#{PKG_BUILD}"
 	Rake::Task[:gem].clear
 
 	Gem::PackageTask.new( GEMSPEC ) do |pkg|

data/rake/publishing.rb

@@ -5,6 +5,8 @@
 RELEASE_NOTES_FILE    = 'release.notes'
 RELEASE_ANNOUNCE_FILE = 'release.ann'
 
+GEM_PUBHOST = '' unless defined?( GEM_PUBHOST )
+
 require 'net/smtp'
 require 'net/protocol'
 require 'openssl'
@@ -235,17 +237,8 @@ begin
 
 					== Installation
 
-					Via gems:
-
 					  $ sudo gem install #{GEMSPEC.name}
 
-					or from source:
-
-					  $ wget http://deveiate.org/code/#{PKG_FILE_NAME}.tar.gz
-					  $ tar -xzvf #{PKG_FILE_NAME}.tar.gz
-					  $ cd #{PKG_FILE_NAME}
-					  $ sudo rake install
-
 					== Changes
 					#{relnotes}
 				}.gsub( /^\t+/, '' )

data/rake/testing.rb

@@ -16,7 +16,7 @@ end
 SPEC_FILES       = [] unless defined?( SPEC_FILES )
 TEST_FILES       = [] unless defined?( TEST_FILES )
 
-COMMON_SPEC_OPTS = ['-Du'] unless defined?( COMMON_SPEC_OPTS )
+COMMON_RSPEC_OPTS = [] unless defined?( COMMON_RSPEC_OPTS )
 
 COVERAGE_TARGETDIR = BASEDIR + 'coverage' unless defined?( COVERAGE_TARGETDIR )
 RCOV_EXCLUDES      = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib' unless
@@ -39,149 +39,114 @@ end
 
 ### RSpec specifications
 begin
-	gem 'rspec', '>= 1.1.3'
+	gem 'rspec', '>= 2.0.0'
 
-	require 'spec'
-	require 'spec/rake/spectask'
+	require 'rspec'
+	require 'rspec/core/rake_task'
 
 	### Task: spec
 	desc "Run specs"
 	task :spec => 'spec:doc'
+	task :specs => :spec
 
 	namespace :spec do
 		desc "Run rspec every time there's a change to one of the files"
 		task :autotest do
-			require 'autotest/rspec'
-
-			autotester = Autotest::Rspec.new
-			autotester.run
+			require 'autotest'
+			Autotest.add_discovery { "rspec2" }
+			Autotest.run
 		end
 
 		desc "Generate regular color 'doc' spec output"
-		Spec::Rake::SpecTask.new( :doc ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 's', '-c']
+		RSpec::Core::RakeTask.new( :doc ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'd', '-c']
 		end
 
 		desc "Generate spec output with profiling"
-		Spec::Rake::SpecTask.new( :profile ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'o']
+		RSpec::Core::RakeTask.new( :profile ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'p', '-p']
 		end
 
 		desc "Generate quiet non-colored plain-text output"
-		Spec::Rake::SpecTask.new( :quiet ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'p']
+		RSpec::Core::RakeTask.new( :quiet ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'p']
 		end
 
 		desc "Generate HTML output"
-		Spec::Rake::SpecTask.new( :html ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = COMMON_SPEC_OPTS + ['-f', 'h']
+		RSpec::Core::RakeTask.new( :html ) do |task|
+			task.rspec_opts = COMMON_RSPEC_OPTS + ['-f', 'h']
 		end
 
-	end
-rescue LoadError => err
-	task :no_rspec do
-		$stderr.puts "Specification tasks not defined: %s" % [ err.message ]
-	end
-
-	task :spec => :no_rspec
-	namespace :spec do
-		task :autotest => :no_rspec
-		task :doc => :no_rspec
-		task :profile => :no_rspec
-		task :quiet => :no_rspec
-		task :html => :no_rspec
-	end
-end
-
-
-### Test::Unit tests
-begin
-	require 'rake/testtask'
-
-	Rake::TestTask.new( :unittests ) do |task|
-		task.libs += [LIBDIR]
-		task.test_files = TEST_FILES
-		task.verbose = true
-	end
 
-rescue LoadError => err
-	task :no_test do
-		$stderr.puts "Test tasks not defined: %s" % [ err.message ]
 	end
 
-	task :unittests => :no_rspec
-end
-
-
-### RCov (via RSpec) tasks
-begin
-	gem 'rcov'
-	gem 'rspec', '>= 1.1.3'
-
-	require 'spec'
-	require 'rcov'
-
 	### Task: coverage (via RCov)
 	desc "Build test coverage reports"
-	unless SPEC_FILES.empty?
-		Spec::Rake::SpecTask.new( :coverage ) do |task|
-			task.spec_files = SPEC_FILES
-			task.libs += [LIBDIR]
-			task.spec_opts = ['-f', 'p', '-b']
-			task.rcov_opts = RCOV_OPTS
-			task.rcov = true
-		end
+	RSpec::Core::RakeTask.new( :coverage ) do |task|
+		task.ruby_opts = [ "-I#{LIBDIR}" ]
+		task.rspec_opts = ['-f', 'p', '-b']
+		task.rcov_opts = RCOV_OPTS
+		task.rcov = true
 	end
 
-
 	### Task: rcov
 	task :rcov => :coverage
 
 	### Other coverage tasks
 	namespace :coverage do
 		desc "Generate a detailed text coverage report"
-		Spec::Rake::SpecTask.new( :text ) do |task|
-			task.spec_files = SPEC_FILES
+		RSpec::Core::RakeTask.new( :text ) do |task|
 			task.rcov_opts = RCOV_OPTS + ['--text-report']
 			task.rcov = true
 		end
 
 		desc "Show differences in coverage from last run"
-		Spec::Rake::SpecTask.new( :diff ) do |task|
-			task.spec_files = SPEC_FILES
-			task.spec_opts = ['-f', 'p', '-b']
+		RSpec::Core::RakeTask.new( :diff ) do |task|
+			task.rspec_opts = ['-f', 'p', '-b']
 			task.rcov_opts = RCOV_OPTS - ['--save'] + ['--text-coverage-diff']
 			task.rcov = true
 		end
 
 		desc "Run RCov in 'spec-only' mode to check coverage from specs"
-		Spec::Rake::SpecTask.new( :speconly ) do |task|
-			task.spec_files = SPEC_FILES
+		RSpec::Core::RakeTask.new( :speconly ) do |task|
 			task.rcov_opts = ['--exclude', RCOV_EXCLUDES, '--text-report', '--save']
 			task.rcov = true
 		end
 	end
 
 	CLOBBER.include( COVERAGE_TARGETDIR )
-
 rescue LoadError => err
-	task :no_rcov do
-		$stderr.puts "Coverage tasks not defined: RSpec+RCov tasklib not available: %s" %
-		[ err.message ]
+	task :no_rspec do
+		$stderr.puts "Specification tasks not defined: %s" % [ err.message ]
 	end
 
-	task :coverage => :no_rcov
-	task :clobber_coverage
-	task :rcov => :no_rcov
-	namespace :coverage do
-		task :text => :no_rcov
-		task :diff => :no_rcov
+	task :spec => :no_rspec
+	namespace :spec do
+		task :autotest => :no_rspec
+		task :doc => :no_rspec
+		task :profile => :no_rspec
+		task :quiet => :no_rspec
+		task :html => :no_rspec
 	end
-	task :verify => :no_rcov
+end
+
+
+### Test::Unit tests
+begin
+	require 'rake/testtask'
+
+	Rake::TestTask.new( :unittests ) do |task|
+		task.libs += [LIBDIR]
+		task.test_files = TEST_FILES
+		task.verbose = true
+	end
+
+rescue LoadError => err
+	task :no_test do
+		$stderr.puts "Test tasks not defined: %s" % [ err.message ]
+	end
+
+	task :unittests => :no_rspec
 end