maruku 0.5.8 → 0.5.9

data/bin/maruku

@@ -3,6 +3,11 @@
 require 'maruku'
 require 'optparse'
 
+def cli_puts(s)
+	$stderr.puts(s) if MaRuKu::Globals[:verbose]	
+end
+
+
 export = :html
 break_on_error = false
 using_math = false
@@ -26,7 +31,7 @@ opt = OptionParser.new do |opts|
 		MaRuKu::Globals[:html_math_output_png] = true
 		MaRuKu::Globals[:html_math_output_mathml] = false
 		MaRuKu::Globals[:html_png_engine] = s
-		$stderr.puts "Using png engine #{s}."
+		cli_puts "Using png engine #{s}."
 	end
 
 	opts.on("-m", "--math-engine ENGINE", "Uses ENGINE to render MathML") do |s|
@@ -49,8 +54,7 @@ opt = OptionParser.new do |opts|
 	opts.on_tail("--inspect",  "Shows the parsing result" ) do export = :inspect  end
 
 	opts.on_tail("--version", "Show version") do
-		puts OptionParser::Version.join('.')
-		exit
+		puts "Maruku #{MaRuKu::Version}"; exit
 	end
 
 	opts.on_tail("-h", "--help", "Show this message") do
@@ -68,27 +72,29 @@ rescue OptionParser::InvalidOption=>e
 	exit
 end
 
+
 if using_math
-	$stderr.puts "Using Math extensions."
+	cli_puts "Using Math extensions."
 	require 'maruku/ext/math'
 end
 
 #p ARGV
 #p MaRuKu::Globals
 
+
 inputs =
 # If we are given filenames, convert each file 
 if not ARGV.empty?
 	ARGV.map do |f|
 		# read file content
-		$stderr.puts "Reading from #{f}."
+		cli_puts "Reading from file #{f.inspect}." 
 		[f, File.open(f,'r').read]
 	end
 else
 	export = :html_frag if export == :html
 	export = :tex_frag if export == :tex
 	
-	$stderr.puts "Reading from standard input."
+	cli_puts  "Reading from standard input."
 	[[nil, $stdin.read]]
 end
 
@@ -100,7 +106,8 @@ inputs.each do |f, input|
 
 		t = Time.now
 		doc = Maruku.new(input, params)
-		$stderr.puts "Parsing in %.2f seconds." % (Time.now-t)
+
+		cli_puts ("Parsing in %.2f seconds." % (Time.now-t))
 
 		out=""; suffix = "?"
 		t = Time.now
@@ -127,8 +134,9 @@ inputs.each do |f, input|
 			suffix='_s5slides.xhtml'
 			out = doc.to_s5({:content_only => false})
 		end
-		$stderr.puts "Rendering in %.2f seconds." % (Time.now-t)
-			
+
+		cli_puts("Rendering in %.2f seconds." % (Time.now-t))
+	
 		# write to file or stdout
 		if f
 			
@@ -141,19 +149,19 @@ inputs.each do |f, input|
 			end
 			
 			if output_file == "-"
-				$stderr.puts "Writing to standard output"
+				cli_puts "Writing to standard output"
 				$stdout.puts out
 			else
 			
 				if not (export == :pdf)
-					$stderr.puts "Writing to #{output_file}"
+					cli_puts "Writing to #{output_file}"
 					File.open(output_file,'w') do |f| f.puts out end
 				else
-					$stderr.puts "Writing to #{job}.tex"
+					cli_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}"
+					cli_puts "maruku: executing $ #{cmd}"
 					# run twice for cross references
 					system cmd 
 					system cmd
@@ -161,7 +169,7 @@ inputs.each do |f, input|
 			
 			end
 		else # write to stdout
-			$stderr.puts "Writing to standard output"
+			cli_puts "Writing to standard output"
 			$stdout.puts out
 		end
 	end

data/lib/maruku/defaults.rb

@@ -42,11 +42,12 @@ Globals = {
 	:html_png_dir => 'pngs',
 	:html_png_url => 'pngs/',
 	:html_png_resolution => 200,
-	
+  
 	:html_use_syntax => false,
 	
 	:latex_use_listings => false,
 	:latex_cjk => false,
+  :latex_cache_file  => "blahtex_cache.pstore", # cache file for blahtex filter
 	
 	:debug_keep_ials => false,
 	:doc_prefix => ''

data/lib/maruku/ext/div.rb

@@ -0,0 +1,100 @@
+
+
+OpenDiv = /^[ ]{0,3}\+\-\-+\s*([^\s-]*)\s*\-*\s*$/
+CloseDiv = /^[ ]{0,3}\=\-\-+\s*([^\s-]*)\s*\-*\s*$/
+StartPipe = /^[ ]{0,3}\|(.*)$/ # $1 is rest of line
+DecorativeClosing = OpenDiv
+
+MaRuKu::In::Markdown::register_block_extension(
+	:regexp  => OpenDiv,
+	:handler => lambda { |doc, src, context|
+		# return false if not doc.is_math_enabled?
+		first = src.shift_line
+		first =~ OpenDiv
+		ial_at_beginning = $1
+		ial_at_end = nil
+		
+		lines = []
+		# if second line starts with "|"
+		if src.cur_line =~ StartPipe
+			# then we read until no more "|"
+			while src.cur_line && (src.cur_line =~ StartPipe)
+				content = $1
+				lines.push content
+				src.shift_line
+			end
+			if src.cur_line =~ DecorativeClosing
+				ial_at_end = $1
+				src.shift_line 
+			end
+		else
+			# else we read until CloseDiv
+			divs_open = 1
+			while src.cur_line && (divs_open>0)
+				if src.cur_line =~ CloseDiv
+					divs_open -= 1
+					if divs_open == 0
+						ial_at_end = $1
+						src.shift_line
+						break
+					else
+						lines.push src.shift_line
+					end
+				else
+					if src.cur_line =~ OpenDiv
+						divs_open += 1 
+					end
+					lines.push src.shift_line
+				end
+			end
+			
+			if divs_open > 0
+				e = "At end of input, I still have #{divs_open} DIVs open."
+				doc.maruku_error(e, src, context)
+				return true
+			end
+		end
+		
+		ial_at_beginning = nil unless 
+			(ial_at_beginning&&ial_at_beginning.size > 0)
+		ial_at_end = nil unless (ial_at_end && ial_at_end.size > 0)
+
+		if ial_at_beginning && ial_at_end
+			e = "Found two conflicting IALs: #{ial_at_beginning.inspect} and #{ial_at_end.inspect}"
+			doc.maruku_error(e, src, context)
+		end
+		
+		al_string = ial_at_beginning || ial_at_end
+		al = nil
+		
+		if al_string =~ /^\{(.*)\}$/
+			inside = $1
+		cs = MaRuKu::In::Markdown::SpanLevelParser::CharSource
+		al = al_string &&
+			doc.read_attribute_list(cs.new(inside), its_context=nil, break_on=[nil])
+		end
+		
+		src = MaRuKu::In::Markdown::BlockLevelParser::LineSource.new(lines)
+		children = doc.parse_blocks(src)
+
+		context.push doc.md_div(children, al)
+		true
+	})
+	
+
+module MaRuKu; class MDElement
+
+	def md_div(children, a=nil)
+		self.md_el(:div, children, meta={}, a)
+	end
+	
+end end
+
+
+module MaRuKu; module Out; module HTML
+
+	def to_html_div
+		add_ws  wrap_as_element('div')
+	end
+	
+end end end

data/lib/maruku/ext/math.rb

@@ -33,7 +33,7 @@ Summary: Math openings which should be numerated
 
 Array containing any of `'\\['`, `'\\begin{equation}'`, `'$$'`.
 
-	MaRuKu::Globals[math_numbered] = ['\\[']
+	MaRuKu::Globals[:math_numbered] = ['\\[']
 	
 =end
 

data/lib/maruku/ext/math/mathml_engines/blahtex.rb

@@ -15,36 +15,34 @@ module MaRuKu; module Out; module HTML
 			# first, we check whether this image has already been processed
 			md5sum = Digest::MD5.hexdigest(tex+" params: ")
 			result_file = File.join(MaRuKu::Globals[:html_png_dir], md5sum+".txt")
-			
+
 			if not File.exists?(result_file) 
 				tmp_in = Tempfile.new('maruku_blahtex')
-				f = tmp_in.open
+        f = tmp_in.open
 				f.write tex
 				f.close
-				
+
 				resolution = get_setting(:html_png_resolution)
-			
-				options = "--png --use-preview-package --shell-dvipng 'dvipng -D #{resolution}' "
+
+				options = "--png --use-preview-package --shell-dvipng '/usr/bin/dvipng -D #{resolution}' "
+				options += ("--temp-directory '%s' " % MaRuKu::Globals[:html_png_dir])
 				options += ("--png-directory '%s'" % MaRuKu::Globals[:html_png_dir])
-			
+
 				cmd = "blahtex #{options} < #{tmp_in.path} > #{result_file}"
-				$stderr.puts "$ #{cmd}"
-				system cmd
+				#$stderr.puts "$ #{cmd}"
+        system cmd
 				tmp_in.delete
-				
 			end
 			
-			result = nil
-			f = File.open(result_file)
-			result = f.read
-			f.close
-			
-			
+      result = File.read(result_file)
+      if result.nil? || result.empty?
+        raise "Blahtex error: empty output"
+      end
+      
 			doc = Document.new(result, {:respect_whitespace =>:all})
 			png = doc.root.elements[1]
 			if png.name != 'png'
-				maruku_error "Blahtex error: \n#{doc}"
-				return nil
+				raise "Blahtex error: \n#{doc}"
 			end
 			depth = png.elements['depth'] || (raise "No depth element in:\n #{doc}")
 			height = png.elements['height'] || (raise "No height element in:\n #{doc}")
@@ -56,19 +54,19 @@ module MaRuKu; module Out; module HTML
 			
 			dir_url = MaRuKu::Globals[:html_png_url]
 			return PNG.new("#{dir_url}#{md5}.png", depth, height)
-			
 		rescue Exception => e
 			maruku_error "Error: #{e}"
 		end
 		nil
 	end
 
-	BlahtexCache = PStore.new("blahtex_cache.pstore")
-
+  
 	def convert_to_mathml_blahtex(kind, tex)
+    @@BlahtexCache = PStore.new(MaRuKu::Globals[:latex_cache_file])
+    
 		begin
-			BlahtexCache.transaction do 
-				if BlahtexCache[tex].nil?
+			@@BlahtexCache.transaction do 
+				if @@BlahtexCache[tex].nil?
 					tmp_in = Tempfile.new('maruku_blahtex')
 						f = tmp_in.open
 						f.write tex
@@ -77,7 +75,7 @@ module MaRuKu; module Out; module HTML
 	
 					options = "--mathml"
 					cmd = "blahtex #{options} < #{tmp_in.path} > #{tmp_out.path}"
-					$stderr.puts "$ #{cmd}"
+					#$stderr.puts "$ #{cmd}"
 					system cmd
 					tmp_in.delete
 					
@@ -85,10 +83,10 @@ module MaRuKu; module Out; module HTML
 					File.open(tmp_out.path) do |f| result=f.read end
 						puts result
 					
-					BlahtexCache[tex] = result
+          @@BlahtexCache[tex] = result
 				end
 			
-				blahtex = BlahtexCache[tex]
+				blahtex = @@BlahtexCache[tex]
 				doc = Document.new(blahtex, {:respect_whitespace =>:all})
 				mathml = doc.root.elements['mathml']
 				if not mathml

data/lib/maruku/input/parse_block.rb

@@ -337,7 +337,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 		
 #		puts "id =_#{id}_; text=_#{text}_ indent=#{indentation}"
 		
-		break_list = [:footnote_text]
+		break_list = [:footnote_text, :ref_definition, :definition, :abbreviation]
 		item_type = :footnote_text
 		lines, want_my_paragraph = 
 			read_indented_content(src,indentation, break_list, item_type)
@@ -471,9 +471,10 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 	def read_ref_definition(src, out)	
 		line = src.shift_line
 		
+		
 		# if link is incomplete, shift next line
-		if src.cur_line && (src.cur_line.md_type != :ref_definition) && 
-			([1,2,3].include? number_of_leading_spaces(src.cur_line) )
+		if src.cur_line && !([:footnote_text, :ref_definition, :definition, :abbreviation].include? src.cur_line.md_type) && 
+			([1,2,3].include? number_of_leading_spaces(src.cur_line) ) 
 			line += " "+ src.shift_line
 		end
 		

data/lib/maruku/input/parse_span_better.rb

@@ -647,14 +647,19 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 			con.push_element md_im_image(alt_text, url, title)
 		when ?[ # link ref
 			ref_id = read_ref_id(src,con)
+			if not ref_id # TODO: check around
+				error('Reference not closed.', src, con)
+				ref_id = ""
+			end
 			if ref_id.size == 0
-				ref_id =  alt_text.to_s.downcase.gsub(' ','_')
-			else
-				ref_id = ref_id.downcase
+				ref_id =  alt_text.to_s
 			end
+
+			ref_id = sanitize_ref_id(ref_id)
+
 			con.push_element md_image(alt_text, ref_id)
 		else # no stuff
-			ref_id =  alt_text.to_s.downcase.gsub(' ','_')
+			ref_id =  sanitize_ref_id(alt_text.to_s)
 			con.push_element md_image(alt_text, ref_id)
 		end
 	end # read link

data/lib/maruku/input/type_detection.rb

@@ -94,6 +94,7 @@ module MaRuKu; module Strings
 	#     *[HTML]: Hyper Text Markup Language
 	Abbreviation = %r{
 		^  # begin of line
+		[ ]{0,3} # up to 3 spaces
 		\* # one asterisk
 		\[ # opening bracket
 		([^\]]+) # any non-closing bracket:  id = $1
@@ -106,7 +107,9 @@ module MaRuKu; module Strings
 	}x
 
 	FootnoteText = %r{
-		^\s*\[(\^.+)\]: # id = $1 (including '^')
+		^  # begin of line
+		[ ]{0,3} # up to 3 spaces
+		\[(\^.+)\]: # id = $1 (including '^')
 		\s*(\S.*)?$    # text = $2 (not obb.)
 	}x
 
@@ -115,7 +118,7 @@ module MaRuKu; module Strings
 	LinkRegex = %r{
 		^[ ]{0,3}\[([^\[\]]+)\]:		# id = $1
 		  [ ]*
-		<?(\S+)>?				# url = $2
+		<?([^>\s]+)>?				# url = $2
 		  [ ]*
 		(?:# Titles are delimited by "quotes" or (parens).
 			["(']

data/lib/maruku/output/to_html.rb

@@ -312,7 +312,8 @@ Example:
 					li.insert_after(li.children.last, a)
 					ol << li
 				else
-					maruku_error"Could not find footnote '#{fid}'"
+					maruku_error "Could not find footnote id '#{fid}' among ["+
+					 self.footnotes.keys.map{|s|"'"+s+"'"}.join(', ')+"]."
 				end
 			end
 		div << ol
@@ -827,10 +828,21 @@ If true, raw HTML is discarded from the output.
 		# save the order of used footnotes
 		order = @doc.footnotes_order
 		
+		if order.include? id
+		  # footnote has already been used
+		  return []
+	  end
+	  
+	  if not @doc.footnotes[id]
+	    return []
+    end
+	  
 		# take next number
 		order << id
-		num = order.size; 
 		
+		#num = order.size; 
+		num = order.index(id) + 1
+		  
 		sup = Element.new 'sup'
 		sup.attributes['id'] = "#{get_setting(:doc_prefix)}fnref:#{num}"
 			a = Element.new 'a'