maruku 0.5.6 → 0.5.7

data/bin/maruku

@@ -136,22 +136,29 @@ inputs.each do |f, input|
 				dir = File.dirname(f)
 				job = File.join(dir, File.basename(f, File.extname(f)))
 				output_file = job  + suffix
+			else
+				job = File.basename(output_file, File.extname(output_file))
 			end
 			
 			if output_file == "-"
 				$stderr.puts "Writing to standard output"
 				$stdout.puts out
 			else
-				$stderr.puts "Writing to #{output_file}"
-				File.open(output_file,'w') do |f| f.puts out end
-			end
 			
-			if export == :pdf
-				cmd = "pdflatex '#{job}' -interaction=nonstopmode "+
-				      "'-output-directory=#{dir}' "
-				# run twice for cross references
-				system cmd 
-				system cmd
+				if not (export == :pdf)
+					$stderr.puts "Writing to #{output_file}"
+					File.open(output_file,'w') do |f| f.puts out end
+				else
+					$stderr.puts "Writing to #{job}.tex"
+					File.open("#{job}.tex",'w') do |f| f.puts out end
+					cmd = "pdflatex '#{job}.tex' -interaction=nonstopmode "+
+					      "'-output-directory=#{dir}' "
+					$stderr.puts "maruku: executing $ #{cmd}"
+					# run twice for cross references
+					system cmd 
+					system cmd
+				end
+			
 			end
 		else # write to stdout
 			$stderr.puts "Writing to standard output"

data/bin/marutest

@@ -147,6 +147,8 @@ def run_test(filename, its_ok, verbose=true)
 
 
 	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]

data/docs/maruku.md

@@ -123,29 +123,6 @@ Have fun!
 
 See the [changelog](http://maruku.rubyforge.org/changelog.html#stable).
 
-Download       {#download}
---------
-
-The development site is <http://rubyforge.org/projects/maruku/>.
-
-Install with:
-
-	$ gem install maruku
-{:shell}
-
-Released files can also be seen at <http://rubyforge.org/frs/?group_id=2795>.
-
-Anonymous access to the repository is possible with:
-
-	$ svn checkout svn://rubyforge.org/var/svn/maruku/trunk
-{:shell}
-
-If you want commit access to the repository, just create an account on Rubyforge and [drop me a mail][contact].
-
-### Bugs report ###
-
-Use the [tracker][tracker] or [drop me an email][contact].
-
 
 Usage
 --------
@@ -187,34 +164,6 @@ transform to PDF:
 {:shell}
 
 
-Maruku and Bluecloth          {#maruku-and-bluecloth}
---------------------
-
-The other Ruby implementation of Markdown is [Bluecloth]. 
-
-Maruku is much different in philosophy from Bluecloth: the biggest 
-difference is that *parsing* is separated from *rendering*.
-In Maruku, an in-memory representation of the Markdown
-document is created. Instead, Bluecloth mantains the document in
-memory as a String at all times, and does a series of `gsub` 
-to transform to HTML.
-
-Maruku is usually faster than Bluecloth. Bluecloth is faster 
-for very small documents. Bluecloth sometimes chokes on very big
-documents (it is reported that the blame should be on Ruby's regexp 
-implementation).
-
-This is the canonical benchmark (the Markdown specification), 
-executed with Ruby 1.8.5 on a Powerbook 1.5GhZ:
-
-	BlueCloth (to_html): parsing 0.01 sec + rendering 1.87 sec = 1.88 sec   (1.00x)
-	   Maruku (to_html): parsing 0.66 sec + rendering 0.43 sec = 1.09 sec   (1.73x)
-	  Maruku (to_latex): parsing 0.67 sec + rendering 0.23 sec = 0.90 sec   (2.10x)
-
-Please note that Maruku has a lot more features and therefore is 
-looking for much more patterns in the file.
-
-
 
 Maruku summary of features                {#features}
 --------------------------

data/lib/maruku/input/linesource.rb

@@ -28,6 +28,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 	
 class LineSource
 	include MaRuKu::Strings
+	attr_reader :parent
 	
 	def initialize(lines, parent=nil, parent_offset=nil)
 		raise "NIL lines? " if not lines

data/lib/maruku/input/parse_block.rb

@@ -65,22 +65,8 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 				when :ald
 					output.push read_ald(src)
 				when :text
-					if src.cur_line =~ MightBeTableHeader and 
-						(src.next_line && src.next_line =~ TableSeparator)
-						output.push read_table(src)
-					elsif [:header1,:header2].include? src.next_line.md_type
-						output.push read_header12(src)
-					elsif eventually_comes_a_def_list(src)
-					 	definition = read_definition(src)
-						if output.last.kind_of?(MDElement) && 
-							output.last.node_type == :definition_list then
-							output.last.children << definition
-						else
-							output.push md_el(:definition_list, [definition])
-						end
-					else # Start of a paragraph
-						output.push read_paragraph(src)
-					end
+					# paragraph, or table, or definition list
+					read_text_material(src, output)
 				when :header2, :hrule
 					# hrule
 					src.shift_line
@@ -102,7 +88,12 @@ 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;  read_ref_definition(src, output)
+				when :ref_definition;  
+					if src.parent && (src.cur_index == 0)
+						read_text_material(src, output)
+					else
+						read_ref_definition(src, output)
+					end
 				when :abbreviation;    output.push read_abbreviation(src)
 				when :xml_instr;       read_xml_instruction(src, output)
 				when :metadata;        
@@ -149,6 +140,24 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 		output
 	end
 	
+	def read_text_material(src, output)
+		if src.cur_line =~ MightBeTableHeader and 
+			(src.next_line && src.next_line =~ TableSeparator)
+			output.push read_table(src)
+		elsif [:header1,:header2].include? src.next_line.md_type
+			output.push read_header12(src)
+		elsif eventually_comes_a_def_list(src)
+		 	definition = read_definition(src)
+			if output.last.kind_of?(MDElement) && 
+				output.last.node_type == :definition_list then
+				output.last.children << definition
+			else
+				output.push md_el(:definition_list, [definition])
+			end
+		else # Start of a paragraph
+			output.push read_paragraph(src)
+		end
+	end
 	
 	
 	def read_ald(src)
@@ -274,9 +283,9 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 		item_type = src.cur_line.md_type
 		first = src.shift_line
 
-		# Ugly things going on inside `read_indented_content`
 		indentation = spaces_before_first_char(first)
 		break_list = [:ulist, :olist, :ial]
+		# Ugly things going on inside `read_indented_content`
 		lines, want_my_paragraph = 
 			read_indented_content(src,indentation, break_list, item_type)
 
@@ -285,7 +294,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 			stripped = first[indentation, first.size-1]
 		lines.unshift stripped
 		
-		#dbg_describe_ary(lines, 'LIST ITEM ')
+		# dbg_describe_ary(lines, 'LIST ITEM ')
 
 		src2 = LineSource.new(lines, src, parent_offset)
 		children = parse_blocks(src2)

data/lib/maruku/input/parse_doc.rb

@@ -173,6 +173,7 @@ Disabled by default because of security concerns.
 		self.abbreviations.each do |abbrev, title|
 			reg = Regexp.new(Regexp.escape(abbrev))
 			self.replace_each_string do |s|
+				# bug if many abbreviations are present (agorf)
 				if m = reg.match(s)
 					e = md_abbr(abbrev.dup, title ? title.dup : nil)
 					[m.pre_match, e, m.post_match]

data/lib/maruku/output/to_html.rb

@@ -18,9 +18,16 @@
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #++
 
-
 require 'rexml/document'
 
+begin
+	require 'rexml/formatters/pretty'
+	require 'rexml/formatters/default'
+	$rexml_new_version = true
+rescue LoadError
+	$rexml_new_version = false	
+end
+
 class String
 	# A string is rendered into HTML by creating
 	# a REXML::Text node. REXML takes care of all the encoding.
@@ -30,11 +37,6 @@ class String
 end
 
 
-class REXML::Element
-	# We only want to output the children in Maruku::to_html
-	 public :write_children 
-end
-
 # This module groups all functions related to HTML export.
 module MaRuKu; module Out; module HTML
 	include REXML
@@ -42,7 +44,7 @@ module MaRuKu; module Out; module HTML
 	# Render as an HTML fragment (no head, just the content of BODY). (returns a string)
 	def to_html(context={})
 		indent = context[:indent] || -1
-		ie_hack = context[:ie_hack] ||true
+		ie_hack = context[:ie_hack] || true
 		
 		div = Element.new 'dummy'
 			children_to_html.each do |e|
@@ -60,7 +62,21 @@ module MaRuKu; module Out; module HTML
 		# REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements
 		# containing code.
 		xml =""
-		div.write_children(xml,indent,transitive=true,ie_hack)
+
+		if $rexml_new_version
+			formatter = if indent > -1
+	          REXML::Formatters::Pretty.new( indent, ie_hack )
+	        else
+	          REXML::Formatters::Default.new( ie_hack )
+	        end
+			formatter.write( div, xml)
+		else
+			div.write(xml,indent,transitive=true,ie_hack)
+		end
+
+		xml.gsub!(/\A<dummy>\s*/,'')
+		xml.gsub!(/\s*<\/dummy>\Z/,'')
+		xml.gsub!(/\A<dummy\s*\/>/,'')
 		xml
 	end
 	

data/lib/maruku/output/to_latex.rb

@@ -365,7 +365,7 @@ Otherwise, a standard `verbatim` environment is used.
 		color = get_setting(:code_background_color)
 		colorspec = latex_color(color, 'colorbox')
 
-		"#{colorspec}{\\tt #{s}}"
+		"{#{colorspec}{\\tt #{s}}}"
 	end
 
 	def to_latex_immediate_link

data/lib/maruku/version.rb

@@ -19,7 +19,7 @@
 #++
 
 module MaRuKu
-	Version = '0.5.6'
+	Version = '0.5.7'
 	
 	MarukuURL = 'http://maruku.rubyforge.org/'
 	

data/tests/unittest/abbreviations.md

@@ -32,17 +32,13 @@ md_el(:document,[
 	md_el(:abbr_def,[],{:abbr=>"Tigra Genesis",:text=>nil},[])
 ],{},[])
 *** Output of to_html ***
-
 <p>The <abbr title='Hyper Text Markup Language'>HTML</abbr> specification is maintained by the <abbr title='World Wide Web Consortium'>W3C</abbr>.</p>
 
 <p>Operation <abbr>Tigra Genesis</abbr> is going well.</p>
-
 *** Output of to_latex ***
 The HTML specification is maintained by the W3C.
 
 Operation Tigra Genesis is going well.
-
-
 *** Output of to_md ***
 The HTMLspecification is maintained by
 the W3C.
@@ -51,8 +47,7 @@ the W3C.
 *[W3C]: World Wide Web Consortium
 Operation Tigra Genesisis going well.
 
-*[Tigra Genesis]: 
-
+*[Tigra Genesis]:
 *** Output of to_s ***
 The HTML specification is maintained by the W3C.Operation Tigra Genesis is going well.
 *** EOF ***
@@ -74,9 +69,4 @@ The HTML specification is maintained by the W3C.Operation Tigra Genesis is going
 <p>*[Tigra Genesis]:</p>
 
 *** Output of Markdown.pl (parsed) ***
-<p>The HTML specification is maintained by the W3C.</p
-   ><p>*[HTML]: Hyper Text Markup Language
-*[W3C]:  World Wide Web Consortium</p
-   ><p>Operation Tigra Genesis is going well.</p
-   ><p>*[Tigra Genesis]:</p
- >
+Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>

data/tests/unittest/alt.md

@@ -8,17 +8,11 @@ Write a comment here
 *** Output of inspect ***
 md_el(:document,[md_par([md_im_image(["bar"], "/foo.jpg", nil)])],{},[])
 *** Output of to_html ***
-
 <p><img src='/foo.jpg' alt='bar' /></p>
-
 *** Output of to_latex ***
 
-
-
 *** Output of to_md ***
 bar
-
-
 *** Output of to_s ***
 bar
 *** EOF ***
@@ -33,7 +27,4 @@ bar
 <p><img src="/foo.jpg" alt="bar" title="" /></p>
 
 *** Output of Markdown.pl (parsed) ***
-<p
-     ><img title='' src='/foo.jpg' alt='bar'/
-   ></p
- >
+Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>

data/tests/unittest/attributes/att2.md

@@ -31,6 +31,4 @@ md_el(:document,[
 {:b: a}</p>
 
 *** Output of Markdown.pl (parsed) ***
-<p>{a}: a
-{:b: a}</p
- >
+Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>

data/tests/unittest/attributes/att3.md

@@ -13,23 +13,17 @@ md_el(:document,[
 	md_par(["Paragraph2"], [[:id, "par2"]])
 ],{},[])
 *** Output of to_html ***
-
 <p id='par1'>Paragraph1</p>
 
 <p id='par2'>Paragraph2</p>
-
 *** Output of to_latex ***
 Paragraph1
 
 Paragraph2
-
-
 *** Output of to_md ***
 Paragraph1
 
 Paragraph2
-
-
 *** Output of to_s ***
 Paragraph1Paragraph2
 *** EOF ***
@@ -48,8 +42,4 @@ Paragraph1Paragraph2
 Paragraph2</p>
 
 *** Output of Markdown.pl (parsed) ***
-<p>Paragraph1
-{:#par1}</p
-   ><p>{:#par2}
-Paragraph2</p
- >
+Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>

data/tests/unittest/attributes/attributes.md

@@ -30,7 +30,6 @@ md_el(:document,[
 	md_el(:ald,[],{:ald=>[[:class, "chello"]],:ald_id=>"hello"},[])
 ],{},[])
 *** Output of to_html ***
-
 <h2 id='header1'>Header with attributes</h2>
 
 <h3 id='header2'>Header with attributes</h3>
@@ -40,7 +39,6 @@ md_el(:document,[
 <p id='par1'>Paragraph with a.</p>
 
 <p id='par2'>Paragraph with <em class='chello'>emphasis</em></p>
-
 *** Output of to_latex ***
 \hypertarget{header1}{}\subsection*{{Header with attributes}}\label{header1}
 
@@ -51,14 +49,10 @@ md_el(:document,[
 Paragraph with a.
 
 Paragraph with \emph{emphasis}
-
-
 *** Output of to_md ***
 Header with attributesHeader with attributesHeader no attributesParagraph with a.
 
 Paragraph with emphasis
-
-
 *** Output of to_s ***
 Header with attributesHeader with attributesHeader no attributesParagraph with a.Paragraph with emphasis
 *** EOF ***
@@ -85,13 +79,4 @@ Header with attributesHeader with attributesHeader no attributesParagraph with a
 <p>{:hello: .chello}</p>
 
 *** Output of Markdown.pl (parsed) ***
-<h2>Header with attributes  {#header1}  </h2
-   ><h3>Header with attributes ###  {#header2}</h3
-   ><h3>Header no attributes</h3
-   ><p>{:warn2}Paragraph with a.
-{#par1}</p
-   ><p>Paragraph with <em>emphasis</em
-     >{:hello notfound}
-   {#par2}</p
-   ><p>{:hello: .chello}</p
- >
+Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>