maruku 0.6.0 → 0.7.3

data/Rakefile

@@ -1,73 +0,0 @@
-require 'rubygems'
-Gem::manage_gems
-require 'rake/gempackagetask'
-
-require 'maruku_gem'
-
-task :default => [:package]
-
-Rake::GemPackageTask.new($spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-end
-
-PKG_NAME = 'maruku'
-PKG_FILE_NAME = "#{PKG_NAME}-#{MaRuKu::Version}"
-RUBY_FORGE_PROJECT = PKG_NAME
-RUBY_FORGE_USER = 'andrea'
-
-RELEASE_NAME  = MaRuKu::Version
-RUBY_FORGE_GROUPID = '2795'
-RUBY_FORGE_PACKAGEID = '3292'
-
-desc "Publish the release files to RubyForge."
-task :release => [:gem, :package] do
-	system("rubyforge login --username #{RUBY_FORGE_USER}")
-
-	gem = "pkg/#{PKG_FILE_NAME}.gem"
-	# -n notes/#{Maruku::Version}.txt
-	cmd = "rubyforge  add_release %s %s \"%s\" %s" %
-		[RUBY_FORGE_GROUPID, RUBY_FORGE_PACKAGEID, RELEASE_NAME, gem]
-	
-	puts cmd
-	system(cmd)
-	
-	files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-	files.each do |file|
-#		system("rubyforge add_file %s %s %s %s" %
-#		[RUBY_FORGE_GROUPID, RUBY_FORGE_PACKAGEID, RELEASE_NAME, file])
-  end
-end
-
-task :test => [:markdown_span_tests, :markdown_block_tests]
-
-task :markdown_block_tests do
-	tests = Dir['tests/unittest/**/*.md'].join(' ')
-	puts "Executing tests #{tests}"
-#	ok = marutest(tests)
-	ok = system "ruby -Ilib bin/marutest #{tests}"
-	raise "Failed block unittest" if not ok
-end
-
-task :markdown_span_tests do
-	ok = system( "ruby -Ilib lib/maruku/tests/new_parser.rb v b")
-	raise "Failed span unittest" if not ok
-end
-
-require 'rake/rdoctask'
-
-Rake::RDocTask.new do |rdoc|
-	files = [#'README', 'LICENSE', 'COPYING', 
-		'lib/**/*.rb', 
-		'rdoc/*.rdoc'#, 'test/*.rb'
-	]
-	rdoc.rdoc_files.add(files)
-	rdoc.main = "rdoc/main.rdoc" # page to start on
-	rdoc.title = "Maruku Documentation"
-	rdoc.template = "jamis.rb"
-	rdoc.rdoc_dir = 'doc' # rdoc output folder
-	rdoc.options << '--line-numbers' << '--inline-source'
-end
-
-
-

data/bin/marudown

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'maruku'
-
-	# If we are given filenames, convert each file 
-	if not ARGV.empty?
-		ARGV.each do |f|
-			puts "Opening #{f}"
-	
-			# read file content
-			input =  File.open(f,'r').read
-		
-			# create Maruku
-			doc = Maruku.new(input, {:on_error=>:warning})
-			# convert to a complete html document
-			output = doc.to_md
-	
-			# write to file
-			dir = File.dirname(f)
-			filename = File.basename(f, File.extname(f)) + ".txt"
-
-			output = File.join(dir, filename)	
-			File.open(output,'w') do |f| f.puts html end
-		end
-	else
-		# else, act as a filter
-		data = $stdin.read
-		puts Maruku.new(data, {:on_error=>:warning}).to_md
-	end

data/bin/marutest

@@ -1,345 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'maruku'
-require 'maruku/textile2'
-
-$marutest_language = :markdown
-
-#MARKER = "\n***EOF***\n"
-SPLIT = %r{\n\*\*\*[^\*]+\*\*\*\n}m
-
-def marker(x)
-	"\n*** Output of #{x} ***\n"
-end
-
-def write_lines(i, j, lines, prefix, i_star)
-	i = [i, 0].max
-	j = [j, lines.size-1].min
-	for a in i..j
-		l = lines[a].gsub(/\t/,'  ')
-		puts( ("%s %3d" % [prefix, a]) + 
-			(a==i_star ? " -->" : "    ")+lines[a])
-	end
-end
-
-# a = expected   b = found 
-def equals(a, b)
-	a = a.split("\n")
-	b = b.split("\n")
-	
-	for i in 0..([a.size-1,b.size-1].max)
-		la = a[i]
-		lb = b[i]
-		if la != lb
-			puts "\n"
-			
-			
-			write_lines(i-3, i+3, a, "expected", i )
-			write_lines(i-3, i+3, b, "   found", i )
-			return false
-		end
-	end
-	return true
-end
-
-TOTEST = [:inspect,:to_html,:to_latex,:to_md,:to_s]
-
-def run_test(filename, its_ok, verbose=true)
-	# read file content
-	input =  (f=File.open(filename,'r')).read; f.close
-	
-	output_html = File.join(File.dirname(filename), 
-		File.basename(filename, File.extname(filename)) + ".html")	
-	
-	# split the input in sections
-	
-	stuff = input.split(SPLIT)
-	if stuff.size == 1
-		stuff[2] = stuff[0]
-		stuff[0] = "Write a comment here"
-		stuff[1] = "{} # params "
-	end
-
-	comment   = stuff.shift
-	params_s = stuff.shift
-	
-	params = eval(params_s||'{}')
-	if params == nil
-		raise "Null params? #{params_s.inspect}"
-	end
-	
-	markdown  = stuff.shift
-
-#	puts "comment: #{markdown.inspect}"	
-#	puts "markdown: #{markdown.inspect}"
-	
-	failed = []
-	relaxed = []
-	crashed = []
-	actual = {}
-	
-	doc = 
-		if $marutest_language == :markdown
-			Maruku.new(markdown, params)
-		else
-			MaRuKu.textile2(markdown, params)
-		end
-
-	for s in TOTEST
-		begin
-			if s==:to_html
-				actual[s] = doc.to_html
-			else
-				actual[s] = doc.send s
-				raise "Methods #{s} gave nil" if not actual[s]
-			end
-		rescue Exception => e
-			crashed << s
-			actual[s] = e.inspect+ "\n"+ e.backtrace.join("\n")
-			puts actual[s]
-		end
-	end
-
-	File.open(output_html, 'w') do |f|
-		f.write doc.to_html_document
-	end
-
-		begin
-			m = Maruku.new
-			d = m.instance_eval(actual[:inspect])
-		rescue Exception => e
-			s = e.inspect + e.backtrace.join("\n")
-			raise "Inspect is not correct:\n ========\n#{actual[:inspect]}"+
-			"============\n #{s}"
-		end
-
-	expected = {}
-	if (stuff.size < TOTEST.size)
-		$stdout.write " (first time!) "
-		TOTEST.each do |x| expected[x] = actual[x] end
-	else
-		TOTEST.each_index do |i|
-			symbol = TOTEST[i]
-			expected[symbol] = stuff[i]
-#			puts "symbol: #{symbol.inspect} = #{stuff[i].inspect}"
-		end
-	end
-
-	m = Maruku.new
-	
-	
-	if not its_ok.include? :inspect
-		begin
-			d = m.instance_eval(expected[:inspect])
-	#		puts "Eval: #{d.inspect}"
-			expected[:inspect] = d.inspect
-		rescue Exception => e
-			s = e.inspect + e.backtrace.join("\n")
-			raise "Cannot eval user-provided string:\n #{expected[:inspect].to_s}"+
-			"\n #{s}"
-		end
-	end
-
-#	 m.instance_eval(actual[:inspect]) != m.instance_eval(expected[:inspect])	
-
-#	actual[:inspect] = m.instance_eval(actual[:inspect]) 
-#	expected[:inspect] =  m.instance_eval(expected[:inspect])
-
-
-	TOTEST.each do |x|
-		expected[x].strip!
-		actual[x].strip!
-		if not equals(expected[x], actual[x])
-			if its_ok.include? x
-				expected[x] = actual[x]
-				$stdout.write " relax:#{x} "
-				relaxed << x
-			else
-				actual[x] = "-----| WARNING | -----\n" + actual[x].to_s
-				failed << x
-			end
-		end
-	end
-	
-	f = File.open(filename, 'w')
-	
-	f.write comment
-	f.write "\n*** Parameters: ***\n"
-	f.write params_s
-	f.write "\n*** Markdown input: ***\n"
-	f.write markdown
-
-	TOTEST.each do |x|
-		f.write marker(x) 
-		f.write expected[x]
-	end
-	f.write "\n*** EOF ***\n"
-	
-	if not failed.empty? or not crashed.empty? 
-		
-		f.puts "\n\n\n\nFailed tests:   #{failed.inspect} \n" 
-	
-		TOTEST.each do |x|
-			f.write marker(x) 
-			f.write actual[x]
-		end
-
-	else
-		f.puts "\n\n\n\tOK!\n\n\n"
-	end
-
-	
-	if false
-		md_pl = markdown_pl(markdown)
-		
-		f.write "\n*** Output of Markdown.pl ***\n" 
-		f.write md_pl
-	
-		f.write "\n*** Output of Markdown.pl (parsed) ***\n"
-		begin 
-			doc = REXML::Document.new("<div>#{md_pl}</div>",{
-				:compress_whitespace=>['div','p'],
-				:ignore_whitespace_nodes=>['div','p'],
-				:respect_whitespace=>['pre','code']
-			})
-			div = doc.root
-			xml =""
-			div.write_children(xml,indent=1,transitive=true,ie_hack=false)
-			f.write xml
-		rescue Exception=>e
-			f.puts "Error: #{e.inspect}"
-		end
-		f.close
-	else
-		f.write "\n*** Output of Markdown.pl ***\n" 
-		f.write "(not used anymore)"
-	
-		f.write "\n*** Output of Markdown.pl (parsed) ***\n"
-		f.write "(not used anymore)"		
-	end
-	
-	return failed, relaxed, crashed
-end
-
-def markdown_pl(markdown)
-	tmp1 = "/tmp/marutest1"
-	tmp2 = "/tmp/marutest2"
-	File.open(tmp1,'w') do |f| f.puts markdown end
-	system "Markdown.pl < #{tmp1} > #{tmp2}"
-	f = File.open(tmp2,'r')
-	s = f.read
-	f.close
-	s
-end
-
-def passed?(args, arg)
-	if args.include? arg
-		args.delete arg
-		true
-	else
-		false
-	end
-end
-
-def marutest(args)
-	dont_worry = []
-	TOTEST.each do |x|
-		arg = "ok:#{x}"
-	#	puts arg
-		if passed?(args, arg)
-			dont_worry << x
-		end
-	end
-	
-	if passed?(args, 'ok')
-		dont_worry = TOTEST.clone
-	end
-	
-	if dont_worry.size > 0
-		puts "Relaxed on #{dont_worry.inspect}"
-	end
-	
-
-	failed = {}
-	relaxed = {}
-	
-	args.each do |f|
-		$stdout.write  f + ' '*(50-f.size) + " "
-		$stdout.flush
-		tf, tr, tcrashed = run_test(f, dont_worry)
-		
-		tf = tf + tcrashed
-
-		
-		if tr.size > 0
-			$stdout.write " relax #{tr.inspect} "
-		end
-		
-		if tf.size>0
-			$stdout.write " failed on #{tf.inspect} "
-		else
-			$stdout.write " OK "
-		end
-
-		if tcrashed.size > 0
-			$stdout.write "    CRASHED on #{tcrashed.inspect}"
-		end
-
-			$stdout.write "\n"		
-			
-		failed[f]  = tf
-		relaxed[f]  = tr	
-	end
-	
-	num_failed = 0
-	failed_cat = {}
-
-	puts "\n\n\n**** FINAL REPORT ****\n\n"
-
-	
-	if failed.size > 0
-		failed.each do |file, fl|
-			num_failed += fl.size
-			if fl.size > 0
-				puts "\t#{file}\tfailed on #{fl.inspect}"
-			end
-			fl.each do |x|
-				failed_cat[x] = failed_cat[x] || 0
-				failed_cat[x] = failed_cat[x]  + 1
-			end
-		end
-	end
-
-	if dont_worry.size > 0
-		puts "Relaxed on #{dont_worry.inspect}"
-	end
-
-	if relaxed.size > 0
-		relaxed.each do |file, r|
-			if r.size > 0
-				puts "\t#{file}\t\trelaxed on #{r.inspect}"
-			end
-		end
-	end
-	
-	if failed_cat.size > 0
-		puts "\nCategories:\n"
-	
-		failed_cat.each do |x, num|
-			puts "\t#{x.inspect} \tfailed #{num}/#{args.size}"
-		end
-	end
-	
-	return num_failed == 0
-end
-
-if File.basename(__FILE__) == 'marutest'
-	if ARGV.empty?
-		puts "marutest is a tool for running Maruku's unittest."
-		exit 1
-	end
-	ok = marutest(ARGV.clone)
-	
-	exit ok ? 0 : -1 
-end
-

data/docs/changelog.md

@@ -1,334 +0,0 @@
-CSS: style.css
-LaTeX CJK: true
-HTML use syntax: true
-
-<!-- #### Changes in the development version (**not yet released**)  ####     {#last} -->
-
-#### Changes in 0.5.6  ####     {#stable}
-
-*	News:
-
-	-	Now Maruku is in the official Gentoo Portage tree (done by [Aggelos Orfanakos])
-	
-*	New stuff: 
-
-	- Attribute `maruku_signature` defaults to false. (many people asked this)
-	- unittests scripts are included in the distribution.
-	- New attribute `filter_html`: if true, raw HTML/XML is discarded. (asked by Marik)
-	- Command line: if output file is `-`, Maruku writes to stdout.
-
-*	Bug fixes:
-
-	*	Another tiny bug in HTML parsing.
-	*	In latex, `\linebreak` was used instead of `\newline` (reported by Sam Kleinman)
-	*	Fixed bug with non-alpha numeric characters in ref.ids (reported by Aggelos Orfanakos)
-
-	
-*	Pending bugs/feature requests:
-
-	- Maruku does not allow 3-space indented lists.
-	- Lists item whose first character is UTF8 are not recognized (reported by Aggelos Orfanakos)
-	- Maruku cannot output `"`-delimited attributes, because `REXML` does not support it.
-	
-[Aggelos Orfanakos]: http://agorf.gr/
-
-#### Changes in 0.5.5  ####    
-
-*	Features:
-
-	*	Input of HTML numeric entities:
-	
-			Examples of numeric character references include &#169; or &#xA9; 
-			for the copyright symbol, &#913; or &#x391; for the Greek capital 
-			letter alpha, and &#1575; or &#x627; for the Arabic letter alef.
-
-		> Examples of numeric character references include &#169; or &#xA9; 
-		> for the copyright symbol, &#913; or &#x391; for the Greek capital 
-		> letter alpha, and &#1575; or &#x627; for the Arabic letter alef.
-
-*	Bug fixes:
-	
-	*	Alt text was ignored for images.
-	*	Fixed minor bug in reading HTML inside paragraph.
-	*	Changed rules for block-level HTML to make it similar to Markdown.pl. 
-		For example:
-		
-			Paragraph
-			<div></div>
-		
-		will be translated to 
-
-			<p>Paragraph
-			<div></div></p>
-			
-		while this:
-			
-			Paragraph
-			
-			<div></div>
-		
-		becomes
-		
-			<p>Paragraph</p>
-		
-			<div></div>
-
-*	**Pending bugs**: there are some problems when parsing lists. It is difficult
-	to get it right because the spec is very fuzzy. At the moment, list items 
-	cannot be indented by more than 1 space.
-
-#### Changes in 0.5.4 ####  
-
-*	Features:
-
-	*	[All HTML attributes](http://www.w3.org/TR/html4/index/attributes.html) are supported. 
-	
-			>  Science is a wonderful thing if one does not
-			>  have to earn one's living at it.
-			{: cite="http://en.wikiquote.org/wiki/Albert_Einstein"}
-
-	*	Attribute `doc_prefix`.
-	
-	*	Math:
-		
-		*	`\begin{equation}` and `\end{equation}` are understood.
-		*	Math parsing enabled per-instance using the `math_enabled` attribute.
-		*	`math_numbered` attribute.
-		
-*	Bug fixes:
-
-	*	Runs quietly with `ruby -w`.
-	*	Fixed a bug which could cause data-loss when reading indented lines.
-
-
-#### Changes in 0.5.3 ####  
-
-*	Features:
-
-	*	[All HTML `table` attributes](http://www.w3.org/TR/html4/struct/tables.html#h-11.2.1)
-		can be used (`summary`, `width`, `frame`, `rules`,
-		`border`, `cellspacing`, `cellpadding`).
-		
-		The next version will hopefully use all HTML attributes.
-		
-
-	<!-- A version of Markdown that is more Japanese or something --> 
-	
-*	Bug fixes:
-
-	*	Crash on this line: (found by Aggelos Orfanakos) 
-	
-			[test][]:
-	
-	*	Regression with attribute system (found by Charles)
-
-#### Changes in 0.5.1 ####    
-
-*	Bug fixes:
-	
-	*	Workaround for Internet Explorer bug: 
-		be very sure that `&apos;` is always written as `&#39;`.
-		
-	*	Support for empty images ref: `![image]` and `![image][]`.
-
-	*	Fixed bug in parsing attribute lists definitions.
-
-*	Minor things:
-	
-	*	Now code blocks are written as a `<code>` element inside a `<pre>`, and
-		`<code>` elements have both `class` and `lang` attributes set 
-		to the specified language.
-		
-		Example:
-
-			    Example
-			{:lang=ruby}
-		{:lang=markdown}
-		
-		produces:
-		
-			<pre><code class='ruby' lang='ruby'>Example</code></pre>
-		{:lang=xml}
-		
-#### Changes in 0.5.0 ####  
-
-*	Syntax changes:
-
-	*	Compatibility with newest Markdown.pl: `[text]` as a synonim of `[text][]`.
-
-	*	Meta data: the first IAL in a span environment now refers to the parent.
-		This makes it possible to set attributes for cells:
-
-			Head           |  Head |
-			---------------+-------+--
-			{:r}  Hello    + ...
-
-			{:r: scope='row'}
-
-		The first cell will have the `scope` attribute set to `row`.
-
-*	New settings:
-
-	*	Disable the Maruku signature by setting `maruku signature: false`
-
-*	Stricter doctype. By the way -- did I mention it? -- 
-	**Maruku HTML has always been proper validating XHTML strict** 
-	(if a page does not validate, please report it as a bug).
-
-	Of course, this only matters when using `maruku` as a standalone
-	program.
-
-	*	I have updated the XHTML DTD used to support MathML: 
-		currently using XHTML+MathML+SVG.
-	*	Content-type set to `application/xhtml+xml`	
-	*	All entities are written as numeric entities.
-
-*	Bug fixes
-
-	*	Many fixes in the code handling the sanitizing of inline HTML.
-	*	`markdown=1` did not propagate to children.
-	*	LaTeX: An exception was raised if an unknown entity was used.
-
-#### Changes in 0.4.2 ####    
-
-*	Adapted syntax to the [new meta-data proposal][proposal].
-
-*	Changes in LaTeX export: 
-
-	*	Links to external URLs are blue by default.
-
-	*	New attributes: `latex_preamble` to add a custom preamble,
-		and `latex_cjk` to add packages for UTF-8 Japanese characters.
-		(**support for this is still shaky**). Example:
-	
-			Title: my document
-			LaTeX CJK: true
-			LaTeX preamble: preamble.tex
-		
-			Content
-
-*	Bug fixes
-
-	+ Images were not given `id` or `class` attributes.
-
-	+ Fixed bug in LaTeX export with handling of `<`,`>` enclosed URLs: `<google.com>`.
-
-#### Changes in 0.4.1 aka "Typographer" ####
-
-*	Implemented SmartyPants support:
-
-		'Twas a "test" to 'remember' -- in the '90s 
-		--- while I was <<ok>>. She was 6\"12\'.
-	> 'Twas a "test" to 'remember' -- in the '90s --- while I was <<ok>>.
-	> She was 6\"12\'.
-
-	I adapted the code from RubyPants.
-	
-*	Server directives between `<? ?>` are properly preserved.
-*	Changes in LaTeX export:
-
-	*	Now Japanese text rendering sort of works, using the following packages:
-
-			\usepackage[C40]{fontenc}
-			\usepackage[cjkjis]{ucs}
-			\usepackage[utf8x]{inputenc}
-		
-		Nevertheless, I could only get bitmap fonts working -- probably it's a problem
-		with my setup.
-
-		A quick test: 日本、中国、ひらがな、カタカナ。
-
-	*	Fixed bugs in rendering of immediate links.
-	*	External packages are `require`d only if needed.
-	*	More symbols supported.
-		See the symbol list 
-		[in HTML](http://maruku.rubyforge.org/entity_test.html) and
-		[in PDF](http://maruku.rubyforge.org/entity_test.pdf).
-
-
-#### Changes in 0.4 ####
-
-* First implementation of [the new meta-data syntax][meta].
-* General refactorization of the code and much cleaner error reporting.
-* Created [the RDOC documentation][rdoc].
-* The `add_whitespace` method took too much time -- it was O(n^2).
-* Added unit-tests for block-level elements.
-
-[rdoc]: http://maruku.rubyforge.org/rdoc/
-[meta]: http://maruku.rubyforge.org/proposal.html
-
-
-
-[Jacques Distler]: http://golem.ph.utexas.edu/~distler
-[itex2MML]:  http://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-[math]: http://rubyforge.maruku.org/math.html
-
-
-#### Changes in 0.3 ####
-
-*	A real parser is used instead of a regexp-based system, also for span-level 
-	elements.
-
-	Now Maruku is almost 2x faster than Bluecloth, while having more features.
-
-	Here are some benchmarks:
-	
-		BlueCloth (to_html): parsing 0.00 sec + rendering 1.54 sec = 1.55 sec 
-		Maruku (to_html):    parsing 0.47 sec + rendering 0.38 sec = 0.85 sec 
-		Maruku (to_latex):   parsing 0.49 sec + rendering 0.25 sec = 0.73 sec
-		
-	This is the result of running `lib/maruku/tests/benchmark.rb` on the Markdown 
-	specification.
-
-*	Prettier HTML output by adding whitespace.
- 
-*	Added a full suite of unit-tests for the span-level parser.
-
-*	Error management: Having a real parser, Maruku warns you about syntax issues.
-	
-	The default action is to warn and try to continue. If you do this:
-
-		Maruku.new(string, {:on_error => :raise})
-
-	then syntax errors will cause an exception to be raised (you can catch this
-	and retry).
-
-*	Fixed a series of bugs in handling inline HTML code.
-
-Immediate TODO-list:
-
-*	UTF-8 input/output works OK for HTML, however I am having pain trying to export
-	to LaTeX. I want at least Japanese characters support, so if you know how to 
-	do this you are very welcome to give me an hand.
-	
-	For example: in the HTML version, you should see accented characters in this
-	parenthesis: 
-	
-	> (àèìòù)
-	
-	and Japanese text in these other parentheses: 
-	
-	> (カタカナで 私の 名前は アンドレア チェンシ です).
-	>
-	> (日本のガルは 大好き、でも、日本語は難しですから、そうぞ 英語話すガルを おしえてください).
-	
-	In the LaTeX version, these do not appear. I know how to do LaTeX with 
-	ISO-8859-1 encoding (European characters), but I'm struggling with half-baked 
-	solutions for UTF-8 encoded documents.
-
-*	Implement the [new meta-data proposal][proposal].
-
-*	Exporting to Markdown (pretty printing).
-
-*	Exporting to HTML splitting in multiple files.
-
-*	RubyPants.
-
-*	Support for images in PDF.
-
-
-[proposal]: http://maruku.rubyforge.org/proposal.html
-[contact]: http://www.dis.uniroma1.it/~acensi/contact.html
-[markdown-discuss]: http://six.pairlist.net/mailman/listinfo/markdown-discuss
-[tracker]: http://rubyforge.org/tracker/?group_id=2795
-