maruku 0.5.2 → 0.5.3

data/Rakefile

@@ -0,0 +1,73 @@
+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/marutest

@@ -223,9 +223,7 @@ def passed?(args, arg)
 	end
 end
 
-def marutest
-	args = ARGV.clone
-
+def marutest(args)
 	dont_worry = []
 	TOTEST.each do |x|
 		arg = "ok:#{x}"
@@ -248,7 +246,8 @@ def marutest
 	relaxed = {}
 	
 	args.each do |f|
-		$stdout.write "#{f}\n\t\t"
+		$stdout.write  f + ' '*(50-f.size) + " "
+		$stdout.flush
 		tf, tr, tcrashed = run_test(f, dont_worry)
 		
 		tf = tf + tcrashed
@@ -282,7 +281,7 @@ def marutest
 	
 	if failed.size > 0
 		failed.each do |file, fl|
-			num_failed += failed.size
+			num_failed += fl.size
 			if fl.size > 0
 				puts "\t#{file}\tfailed on #{fl.inspect}"
 			end
@@ -313,15 +312,16 @@ def marutest
 		end
 	end
 	
-	num_failed
+	return num_failed == 0
 end
 
-
-if ARGV.empty?
-	puts "marutest is a tool for running Maruku's unittest."
-	exit
+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
 
-marutest
-
-

data/docs/changelog.html

@@ -80,13 +80,45 @@ Maruku (to_latex): parsing 4.04 sec + rendering 1.12 sec = 5.16 sec</code></pre>
 </li>
 
 <li>
-<p>There are a couple of hidden features&#8230;</p>
+<p>There are a couple of hidden, unsafe, features that are not enabled by default.</p>
 </li>
 </ul>
 </li>
 </ul>
 
-<h4 id='stable'>Changes in 0.5.1</h4>
+<h4 id='stable'>Changes in 0.5.3</h4>
+
+<ul>
+<li>
+<p>Features:</p>
+
+<ul>
+<li>
+<p><a href='http://www.w3.org/TR/html4/struct/tables.html#h-11.2.1'>All HTML <code>table</code> attributes</a> can be used (<code>summary</code>, <code>width</code>, <code>frame</code>, <code>rules</code>, <code>border</code>, <code>cellspacing</code>, <code>cellpadding</code>).</p>
+
+<p>The next version will hopefully use all HTML attributes.</p>
+</li>
+</ul>
+<!-- A version of Markdown that is more Japanese or something --></li>
+
+<li>
+<p>Bug fixes:</p>
+
+<ul>
+<li>
+<p>Crash on this line: (found by Aggelos Orfanakos)</p>
+
+<pre><code>[test][]:</code></pre>
+</li>
+
+<li>
+<p>Regression with attribute system (found by Charles)</p>
+</li>
+</ul>
+</li>
+</ul>
+
+<h4 id='changes_in_051'>Changes in 0.5.1</h4>
 
 <ul>
 <li>
@@ -380,4 +412,4 @@ Maruku (to_latex):   parsing 0.49 sec + rendering 0.25 sec = 0.73 sec</code></pr
 <p>Support for images in PDF.</p>
 </li>
 </ul>
-<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 14:05 on Wednesday, January 24th, 2007.</span></div></body></html>
+<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 15:31 on Monday, February 05th, 2007.</span></div></body></html>

data/docs/changelog.md

@@ -58,10 +58,29 @@ HTML use syntax: true
 	*	Created the embryo of an extension system. Please don't use it
 		yet, as probably the API is bound to change.
 
-	*	There are a couple of hidden features...
+	*	There are a couple of hidden, unsafe, features that are not enabled by default.
 
+#### Changes in 0.5.3 ####   {#stable}
 
-#### Changes in 0.5.1 ####    {#stable}
+*	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:
 	

data/docs/entity_test.html

@@ -255,4 +255,4 @@
 &#160;&#160;&#160;<code style='background-color: #eef;'>&amp;mu;</code> &#956; (<code style='background-color: #ffe;'>$\mu$</code>) 
 &#160;&#160;&#160;<code style='background-color: #eef;'>&amp;hellip;</code> &#8230; (<code style='background-color: #ffe;'>\ldots</code>) 
 &#160;&#160;&#160;</p>
-<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 13:49 on Wednesday, January 24th, 2007.</span></div></body></html>
+<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 14:11 on Monday, February 05th, 2007.</span></div></body></html>

data/docs/exd.html

@@ -53,7 +53,7 @@ Expanded documentation (Markdown format)
 
 <p class='maruku-att-default'>Default: <code>false</code></p>
 
-<p class='maruku-att-origin'>Read from file <code>output/to_latex.rb</code>, line 193:</p>
+<p class='maruku-att-origin'>Read from file <code>output/to_latex.rb</code>, line 192:</p>
 
 <p>If <code>true</code>, shows spaces and tabs in code blocks.</p>
 
@@ -198,7 +198,7 @@ Latex preamble: preamble.tex
 
 <p class='maruku-att-default'>Default: <code>false</code></p>
 
-<p class='maruku-att-origin'>Read from file <code>output/to_latex.rb</code>, line 218:</p>
+<p class='maruku-att-origin'>Read from file <code>output/to_latex.rb</code>, line 217:</p>
 
 <p>If the <code>latex_use_listings</code> attribute is specified, then code block are rendered using the <code>listings</code> package. Otherwise, a standard <code>verbatim</code> environment is used.</p>
 
@@ -285,4 +285,4 @@ Content
 <p>If <code>true</code>, section headers will be numbered.</p>
 
 <p>In LaTeX export, the numbering of headers is managed by Maruku, to have the same results in both HTML and LaTeX.</p>
-<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 13:49 on Wednesday, January 24th, 2007.</span></div></body></html>
+<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 14:11 on Monday, February 05th, 2007.</span></div></body></html>

data/docs/index.html

@@ -13,7 +13,7 @@
 <p><a href='http://maruku.rubyforge.org/'>Maruku</a> is a Markdown interpreter written in <a href='http://www.ruby-lang.org'>Ruby</a>.</p>
 
 <blockquote id='news'>
-<p><a href='#release_notes'>Last release</a> is version 0.5.1 &#8211; 2007-01-24.</p>
+<p><a href='#release_notes'>Last release</a> is version 0.5.3 &#8211; 2007-02-05.</p>
 
 <p>Use this command to update:</p>
 
@@ -59,7 +59,7 @@
 <p><strong>The name of the game</strong>: Maruku is the <a href='http://en.wikipedia.org/wiki/Romaji'>romaji</a> transliteration of the <a href='http://en.wikipedia.org/wiki/Katakana'>katakana</a> transliteration of &#8220;Mark&#8221;, the first word in Markdown. I chose this name because Ruby is Japanese, and also the sillable &#8220;ru&#8221; appears in Maruku.</p>
 <hr />
 <p>Table of contents: (<strong>auto-generated by Maruku!</strong>)</p>
-<div class='maruku_toc'><ul style='list-style: none;'><li><span class='maruku_section_number'>1. </span><a href='#release_notes'>Release notes</a></li><li><span class='maruku_section_number'>2. </span><a href='#download'>Download</a><ul style='list-style: none;'><li><span class='maruku_section_number'>2.1. </span><a href='#bugs_report'>Bugs report</a></li></ul></li><li><span class='maruku_section_number'>3. </span><a href='#usage'>Usage</a><ul style='list-style: none;'><li><span class='maruku_section_number'>3.1. </span><a href='#embedded_maruku'>Embedded Maruku</a></li><li><span class='maruku_section_number'>3.2. </span><a href='#from_the_command_line'>From the command line</a></li></ul></li><li><span class='maruku_section_number'>4. </span><a href='#maruku-and-bluecloth'>Maruku and Bluecloth</a></li><li><span class='maruku_section_number'>5. </span><a href='#maruku_summary_of_features'>Maruku summary of features</a><ul style='list-style: none;'><li><span class='maruku_section_number'>5.1. </span><a href='#meta'>New meta-data syntax</a></li><li><span class='maruku_section_number'>5.2. </span><a href='#toc-generation'>Automatic generation of the table of contents</a></li><li><span class='maruku_section_number'>5.3. </span><a href='#entities'>Use HTML entities</a></li><li><span class='maruku_section_number'>5.4. </span><a href='#this_header_contains_emphasis_strong_text_and_'>This header contains <em>emphasis</em> <strong>strong text</strong> and <code>code</code></a></li></ul></li><li><span class='maruku_section_number'>6. </span><a href='#extra'>Examples of PHP Markdown Extra syntax</a></li></ul></div><hr />
+<div class='maruku_toc'><ul style='list-style: none;'><li><span class='maruku_section_number'>1. </span><a href='#release_notes'>Release notes</a></li><li><span class='maruku_section_number'>2. </span><a href='#download'>Download</a><ul style='list-style: none;'><li><span class='maruku_section_number'>2.1. </span><a href='#bugs_report'>Bugs report</a></li></ul></li><li><span class='maruku_section_number'>3. </span><a href='#usage'>Usage</a><ul style='list-style: none;'><li><span class='maruku_section_number'>3.1. </span><a href='#embedded_maruku'>Embedded Maruku</a></li><li><span class='maruku_section_number'>3.2. </span><a href='#from_the_command_line'>From the command line</a></li></ul></li><li><span class='maruku_section_number'>4. </span><a href='#maruku-and-bluecloth'>Maruku and Bluecloth</a></li><li><span class='maruku_section_number'>5. </span><a href='#features'>Maruku summary of features</a><ul style='list-style: none;'><li><span class='maruku_section_number'>5.1. </span><a href='#meta'>New meta-data syntax</a></li><li><span class='maruku_section_number'>5.2. </span><a href='#toc-generation'>Automatic generation of the table of contents</a></li><li><span class='maruku_section_number'>5.3. </span><a href='#entities'>Use HTML entities</a></li><li><span class='maruku_section_number'>5.4. </span><a href='#this_header_contains_emphasis_strong_text_and_'>This header contains <em>emphasis</em> <strong>strong text</strong> and <code>code</code></a></li></ul></li><li><span class='maruku_section_number'>6. </span><a href='#extra'>Examples of PHP Markdown Extra syntax</a></li></ul></div><hr />
 <h2 id='release_notes'><span class='maruku_section_number'>1. </span>Release notes</h2>
 
 <p>Note: Maruku seems to be very robust, nevertheless it is still beta-level software. So if you want to use it in production environments, please check back in a month or so, while we squash the remaining bugs.</p>
@@ -139,7 +139,7 @@
 
 <p>Please note that Maruku has a lot more features and therefore is looking for much more patterns in the file.</p>
 
-<h2 id='maruku_summary_of_features'><span class='maruku_section_number'>5. </span>Maruku summary of features</h2>
+<h2 id='features'><span class='maruku_section_number'>5. </span>Maruku summary of features</h2>
 
 <ul>
 <li>
@@ -323,4 +323,4 @@ I would love to have an equivalent in Ruby.
 
 --><div class='footnotes'><hr /><ol><li id='fn:1'>
 <p>I really was missing those.</p>
-<a href='#fnref:1' rev='footnote'>&#8617;</a></li></ol></div><div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 13:51 on Wednesday, January 24th, 2007.</span></div></body></html>
+<a href='#fnref:1' rev='footnote'>&#8617;</a></li></ol></div><div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 15:30 on Monday, February 05th, 2007.</span></div></body></html>

data/docs/markdown_syntax.html

@@ -776,4 +776,4 @@ _   underscore
 -	minus sign (hyphen)
 .   dot
 !   exclamation mark</code></pre>
-<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 13:49 on Wednesday, January 24th, 2007.</span></div></body></html>
+<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 14:11 on Monday, February 05th, 2007.</span></div></body></html>

data/docs/maruku.html

@@ -13,7 +13,7 @@
 <p><a href='http://maruku.rubyforge.org/'>Maruku</a> is a Markdown interpreter written in <a href='http://www.ruby-lang.org'>Ruby</a>.</p>
 
 <blockquote id='news'>
-<p><a href='#release_notes'>Last release</a> is version 0.5.1 &#8211; 2007-01-24.</p>
+<p><a href='#release_notes'>Last release</a> is version 0.5.3 &#8211; 2007-02-05.</p>
 
 <p>Use this command to update:</p>
 
@@ -59,7 +59,7 @@
 <p><strong>The name of the game</strong>: Maruku is the <a href='http://en.wikipedia.org/wiki/Romaji'>romaji</a> transliteration of the <a href='http://en.wikipedia.org/wiki/Katakana'>katakana</a> transliteration of &#8220;Mark&#8221;, the first word in Markdown. I chose this name because Ruby is Japanese, and also the sillable &#8220;ru&#8221; appears in Maruku.</p>
 <hr />
 <p>Table of contents: (<strong>auto-generated by Maruku!</strong>)</p>
-<div class='maruku_toc'><ul style='list-style: none;'><li><span class='maruku_section_number'>1. </span><a href='#release_notes'>Release notes</a></li><li><span class='maruku_section_number'>2. </span><a href='#download'>Download</a><ul style='list-style: none;'><li><span class='maruku_section_number'>2.1. </span><a href='#bugs_report'>Bugs report</a></li></ul></li><li><span class='maruku_section_number'>3. </span><a href='#usage'>Usage</a><ul style='list-style: none;'><li><span class='maruku_section_number'>3.1. </span><a href='#embedded_maruku'>Embedded Maruku</a></li><li><span class='maruku_section_number'>3.2. </span><a href='#from_the_command_line'>From the command line</a></li></ul></li><li><span class='maruku_section_number'>4. </span><a href='#maruku-and-bluecloth'>Maruku and Bluecloth</a></li><li><span class='maruku_section_number'>5. </span><a href='#maruku_summary_of_features'>Maruku summary of features</a><ul style='list-style: none;'><li><span class='maruku_section_number'>5.1. </span><a href='#meta'>New meta-data syntax</a></li><li><span class='maruku_section_number'>5.2. </span><a href='#toc-generation'>Automatic generation of the table of contents</a></li><li><span class='maruku_section_number'>5.3. </span><a href='#entities'>Use HTML entities</a></li><li><span class='maruku_section_number'>5.4. </span><a href='#this_header_contains_emphasis_strong_text_and_'>This header contains <em>emphasis</em> <strong>strong text</strong> and <code>code</code></a></li></ul></li><li><span class='maruku_section_number'>6. </span><a href='#extra'>Examples of PHP Markdown Extra syntax</a></li></ul></div><hr />
+<div class='maruku_toc'><ul style='list-style: none;'><li><span class='maruku_section_number'>1. </span><a href='#release_notes'>Release notes</a></li><li><span class='maruku_section_number'>2. </span><a href='#download'>Download</a><ul style='list-style: none;'><li><span class='maruku_section_number'>2.1. </span><a href='#bugs_report'>Bugs report</a></li></ul></li><li><span class='maruku_section_number'>3. </span><a href='#usage'>Usage</a><ul style='list-style: none;'><li><span class='maruku_section_number'>3.1. </span><a href='#embedded_maruku'>Embedded Maruku</a></li><li><span class='maruku_section_number'>3.2. </span><a href='#from_the_command_line'>From the command line</a></li></ul></li><li><span class='maruku_section_number'>4. </span><a href='#maruku-and-bluecloth'>Maruku and Bluecloth</a></li><li><span class='maruku_section_number'>5. </span><a href='#features'>Maruku summary of features</a><ul style='list-style: none;'><li><span class='maruku_section_number'>5.1. </span><a href='#meta'>New meta-data syntax</a></li><li><span class='maruku_section_number'>5.2. </span><a href='#toc-generation'>Automatic generation of the table of contents</a></li><li><span class='maruku_section_number'>5.3. </span><a href='#entities'>Use HTML entities</a></li><li><span class='maruku_section_number'>5.4. </span><a href='#this_header_contains_emphasis_strong_text_and_'>This header contains <em>emphasis</em> <strong>strong text</strong> and <code>code</code></a></li></ul></li><li><span class='maruku_section_number'>6. </span><a href='#extra'>Examples of PHP Markdown Extra syntax</a></li></ul></div><hr />
 <h2 id='release_notes'><span class='maruku_section_number'>1. </span>Release notes</h2>
 
 <p>Note: Maruku seems to be very robust, nevertheless it is still beta-level software. So if you want to use it in production environments, please check back in a month or so, while we squash the remaining bugs.</p>
@@ -139,7 +139,7 @@
 
 <p>Please note that Maruku has a lot more features and therefore is looking for much more patterns in the file.</p>
 
-<h2 id='maruku_summary_of_features'><span class='maruku_section_number'>5. </span>Maruku summary of features</h2>
+<h2 id='features'><span class='maruku_section_number'>5. </span>Maruku summary of features</h2>
 
 <ul>
 <li>
@@ -323,4 +323,4 @@ I would love to have an equivalent in Ruby.
 
 --><div class='footnotes'><hr /><ol><li id='fn:1'>
 <p>I really was missing those.</p>
-<a href='#fnref:1' rev='footnote'>&#8617;</a></li></ol></div><div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 13:51 on Wednesday, January 24th, 2007.</span></div></body></html>
+<a href='#fnref:1' rev='footnote'>&#8617;</a></li></ol></div><div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 15:30 on Monday, February 05th, 2007.</span></div></body></html>

data/docs/maruku.md

@@ -3,23 +3,28 @@ Use numbered headers: true
 HTML use syntax: true
 LaTeX use listings: true
 LaTeX CJK: false
+LaTeX preamble: preamble.tex
 
 ![MaRuKu](logo.png){#logo}
 
+
 Mar**u**k**u**: a Markdown-superset interpreter 
 ===============================================
 
 [Maruku] is a Markdown interpreter written in [Ruby].
 
-> [Last release](#release_notes) is version 0.5.1 -- 2007-01-24.
+> [Last release](#release_notes) is version 0.5.3 -- 2007-02-05.
 >
 > Use this command to update:
 >
 > 	$ gem update maruku
 {#news}
 
+
+
 * * *
 
+
 Maruku allows you to write in an easy-to-read-and-write syntax, like this:
 
 > [This document in Markdown][this_md] 
@@ -206,7 +211,7 @@ looking for much more patterns in the file.
 
 
 
-Maruku summary of features
+Maruku summary of features                {#features}
 --------------------------
 
 *	Supported syntax

data/docs/proposal.html

@@ -343,4 +343,4 @@ for me
  
 
 for me </code></pre>
-<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 13:49 on Wednesday, January 24th, 2007.</span></div></body></html>
+<div class='maruku_signature'><hr /><span style='font-size: small; font-style: italic'>Created by <a href='http://maruku.rubyforge.org' title='Maruku: a Markdown-superset interpreter for Ruby'>Maruku</a> at 14:11 on Monday, February 05th, 2007.</span></div></body></html>

data/docs/tmp.md

@@ -0,0 +1,2 @@
+	α α, αβ . β.
+α α, αβ . β.

data/lib/maruku/attributes.rb

@@ -206,10 +206,13 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 			elsif after.kind_of? MDElement
 				after.al = e.ial
 			else
-				maruku_error "I don't know who you are referring to:"+
-					" {#{e.ial.to_md}}", src, con
+				maruku_error "It is not clear to me what element this IAL {:#{e.ial.to_md}} \n"+
+				"is referring to. The element before is a #{before.class.to_s}, \n"+
+				"the element after is a #{after.class.to_s}.\n"+
+				"\n before: #{before.inspect}"+
+				"\n after: #{after.inspect}",
+				src, con
 				# xxx dire se c'è empty vicino
-				maruku_recover "Ignoring IAL: {#{e.ial.to_md}}", src, con
 			end
 		end 
 		end

data/lib/maruku/input/parse_block.rb

@@ -102,7 +102,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 				when :raw_html; e = read_raw_html(src); output << e if e
 
 				when :footnote_text;   output.push read_footnote_text(src)
-				when :ref_definition;  output.push read_ref_definition(src)
+				when :ref_definition;  read_ref_definition(src, output)
 				when :abbreviation;    output.push read_abbreviation(src)
 				when :xml_instr;       read_xml_instruction(src, output)
 				when :metadata;        
@@ -452,7 +452,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 	end
 	
 		
-	def read_ref_definition(src)
+	def read_ref_definition(src, out)	
 		line = src.shift_line
 		
 		# if link is incomplete, shift next line
@@ -465,7 +465,8 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 		
 		match = LinkRegex.match(line)
 		if not match
-			error "Link does not respect format: '#{line}'"
+			maruku_error "Link does not respect format: '#{line}'"
+			return
 		end
 		
 		id = match[1]; url = match[2]; title = match[3]; 
@@ -487,7 +488,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 		end
 #			puts hash.inspect
 		
-		return md_ref_def(id, url, meta={:title=>title})
+		out.push md_ref_def(id, url, meta={:title=>title})
 	end
 	
 	def read_table(src)

data/lib/maruku/input/parse_span_better.rb

@@ -278,7 +278,7 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 	end
 
 	def extension_meta(src, con, break_on_chars)
-		if m = src.read_regexp(/([^:]+):/)
+		if m = src.read_regexp(/([^\s\:]+):/)
 			name = m[1]
 			al = read_attribute_list(src, con, break_on_chars)
 #			puts "#{name}=#{al.inspect}"

data/lib/maruku/input/type_detection.rb

@@ -110,7 +110,7 @@ module MaRuKu; module Strings
 	# This regex is taken from BlueCloth sources
 	# Link defs are in the form: ^[id]: \n? url "optional title"
 	LinkRegex = %r{
-		^[ ]*\[([^\]]+)\]:		# id = $1
+		^[ ]{0,3}\[([^\[\]]+)\]:		# id = $1
 		  [ ]*
 		<?(\S+)>?				# url = $2
 		  [ ]*
@@ -122,7 +122,7 @@ module MaRuKu; module Strings
 		)?	# title is optional
 	  }x
 
-	IncompleteLink = %r{^\s*\[(.+)\]:\s*$}
+	IncompleteLink = %r{^[ ]{0,3}\[([^\[\]]+)\]:\s*$}
 
 	HeaderWithId = /^(.*)\{\#([\w_-]+)\}\s*$/