maruku 0.5.9 → 0.6.0

data/bin/maruku

@@ -3,6 +3,7 @@
 require 'maruku'
 require 'optparse'
 
+
 def cli_puts(s)
 	$stderr.puts(s) if MaRuKu::Globals[:verbose]	
 end
@@ -57,6 +58,10 @@ opt = OptionParser.new do |opts|
 		puts "Maruku #{MaRuKu::Version}"; exit
 	end
 
+	opts.on_tail("--ext EXTENSIONS",  "Use maruku extensions (comma separated)" ) do |s|
+	  s.split(",").each do |e| require "maruku/ext/#{e}"; end
+	end
+
 	opts.on_tail("-h", "--help", "Show this message") do
 		puts opts
 		exit
@@ -131,7 +136,7 @@ inputs.each do |f, input|
 			suffix='.pretty_md'
 			out = doc.to_markdown
 		when :s5
-			suffix='_s5slides.xhtml'
+			suffix='_s5slides.html'
 			out = doc.to_s5({:content_only => false})
 		end
 

data/bin/marutest

@@ -189,27 +189,34 @@ def run_test(filename, its_ok, verbose=true)
 	end
 
 	
-	md_pl = markdown_pl(markdown)
+	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 ***\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
+		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

data/lib/maruku.rb

@@ -111,6 +111,9 @@ require 'maruku/errors_management'
 # Code for creating a table of contents
 require 'maruku/toc'
 
+# Support for div Markdown extension
+require 'maruku/ext/div'
+
 # Version and URL
 require 'maruku/version'
 

data/lib/maruku/ext/div.rb

@@ -1,7 +1,20 @@
 
 
-OpenDiv = /^[ ]{0,3}\+\-\-+\s*([^\s-]*)\s*\-*\s*$/
-CloseDiv = /^[ ]{0,3}\=\-\-+\s*([^\s-]*)\s*\-*\s*$/
+#+-----------------------------------{.warning}------
+#| this is the last warning!
+#|
+#| please, go away!
+#|
+#| +------------------------------------- {.menace} --
+#| | or else terrible things will happen
+#| +--------------------------------------------------
+#+---------------------------------------------------
+
+OpenDiv = /^[ ]{0,3}\+\-\-+\s*(\{([^{}]*|".*"|'.*')*\})?\s*\-*\s*$/
+CloseDiv = /^[ ]{0,3}\=\-\-+\s*(\{([^{}]*|".*"|'.*')*\})?\s*\-*\s*$/
+# note these are not enough for parsing the above example:
+#OpenDiv = /^[ ]{0,3}\+\-\-+\s*(.*)$/
+#CloseDiv = /^[ ]{0,3}\=\-\-+\s*(.*)$/
 StartPipe = /^[ ]{0,3}\|(.*)$/ # $1 is rest of line
 DecorativeClosing = OpenDiv
 
@@ -67,7 +80,7 @@ MaRuKu::In::Markdown::register_block_extension(
 		al_string = ial_at_beginning || ial_at_end
 		al = nil
 		
-		if al_string =~ /^\{(.*)\}$/
+		if al_string =~ /^\{(.*)\}\s*$/
 			inside = $1
 		cs = MaRuKu::In::Markdown::SpanLevelParser::CharSource
 		al = al_string &&
@@ -84,8 +97,28 @@ MaRuKu::In::Markdown::register_block_extension(
 
 module MaRuKu; class MDElement
 
-	def md_div(children, a=nil)
-		self.md_el(:div, children, meta={}, a)
+	def md_div(children, al=nil)
+		type = label = num = nil
+		doc.refid2ref ||= {}
+		if al
+			al.each do |k, v|
+				case k
+				when :class
+					type = $1 if v =~ /^num_(\w*)/
+        	                when :id
+					label = v
+				end
+			end
+		end
+		if type
+			doc.refid2ref[type] ||= {}
+			num = doc.refid2ref[type].length + 1 || 1
+		end
+		e = self.md_el(:div, children, meta={:label => label, :type => type, :num => num}, al)
+		if type && label
+			doc.refid2ref[type].update({label => e})
+		end
+		e
 	end
 	
 end end
@@ -97,4 +130,4 @@ module MaRuKu; module Out; module HTML
 		add_ws  wrap_as_element('div')
 	end
 	
-end end end
+end end end

data/lib/maruku/ext/math/latex_fix.rb

@@ -3,6 +3,7 @@ class String
 	def fix_latex
 		if #{html_math_engine} == 'itex2mml'
 			s = self.gsub("\\mathop{", "\\operatorname{")
+			s.gsub!(/\\begin\{svg\}.*?\\end\{svg\}/m, " ")
 			s.gsub("\\space{", "\\itexspace{")
 		else
 			self

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

@@ -10,23 +10,24 @@ module MaRuKu; module Out; module HTML
 	
 	def convert_to_png_blahtex(kind, tex)
 		begin
-			FileUtils::mkdir_p MaRuKu::Globals[:html_png_dir]
+			FileUtils::mkdir_p get_setting(:html_png_dir)
 
 			# 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")
+			result_file = File.join(get_setting(: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 '/usr/bin/dvipng -D #{resolution}' "
-				options += ("--temp-directory '%s' " % MaRuKu::Globals[:html_png_dir])
-				options += ("--png-directory '%s'" % MaRuKu::Globals[:html_png_dir])
+				options = "--png --use-preview-package --shell-dvipng 'dvipng -D #{resolution}' "
+				options += "--displaymath " if kind == :equation
+				options += ("--temp-directory '%s' " % get_setting(:html_png_dir))
+				options += ("--png-directory '%s'" % get_setting(:html_png_dir))
 
 				cmd = "blahtex #{options} < #{tmp_in.path} > #{result_file}"
 				#$stderr.puts "$ #{cmd}"
@@ -52,7 +53,7 @@ module MaRuKu; module Out; module HTML
 			height = height.text.to_f # XXX check != 0
 			md5 = md5.text
 			
-			dir_url = MaRuKu::Globals[:html_png_url]
+			dir_url = get_setting(:html_png_url)
 			return PNG.new("#{dir_url}#{md5}.png", depth, height)
 		rescue Exception => e
 			maruku_error "Error: #{e}"
@@ -62,7 +63,7 @@ module MaRuKu; module Out; module HTML
 
   
 	def convert_to_mathml_blahtex(kind, tex)
-    @@BlahtexCache = PStore.new(MaRuKu::Globals[:latex_cache_file])
+    @@BlahtexCache = PStore.new(get_setting(:latex_cache_file))
     
 		begin
 			@@BlahtexCache.transaction do 

data/lib/maruku/ext/math/parsing.rb

@@ -2,7 +2,7 @@ module MaRuKu
 	
 	class MDDocument
 		# Hash equation id (String) to equation element (MDElement)
-		attr_accessor :eqid2eq
+		safe_attr_accessor :eqid2eq, Hash
 		
 		def is_math_enabled? 
 			get_setting :math_enabled
@@ -103,3 +103,17 @@ end
 	 		true 
 		}
 	)
+
+	# This adds support for \ref
+	RegRef = /\\ref\{(\w*)\}/
+        MaRuKu::In::Markdown::register_span_extension(
+                :chars => [?\\, ?(], 
+                :regexp => RegRef,
+                :handler => lambda { |doc, src, con|
+                        return false if not doc.is_math_enabled?
+                        refid = src.read_regexp(RegRef).captures.compact.first
+                        r = doc.md_el(:divref, [], meta={:refid=>refid})
+                        con.push r
+                        true 
+                }
+        )

data/lib/maruku/ext/math/to_html.rb

@@ -90,7 +90,7 @@ module MaRuKu; module Out; module HTML
 		img = Element.new 'img'
 		img.attributes['src'] = src
 		img.attributes['style'] = style
-		img.attributes['alt'] = "equation"
+		img.attributes['alt'] = "$#{self.math.strip}$"
 		img
 	end
 	
@@ -103,7 +103,7 @@ module MaRuKu; module Out; module HTML
 			
 			if mathml
 				add_class_to(mathml, 'maruku-mathml')
-				span << mathml 
+				return mathml
 			end
 	
 			if png
@@ -121,15 +121,6 @@ module MaRuKu; module Out; module HTML
 		
 		div = create_html_element 'div'
 		add_class_to(div, 'maruku-equation')
-			if self.label  # then numerate
-				span = Element.new 'span'
-				span.attributes['class'] = 'maruku-eq-number'
-				num = self.num
-				span << Text.new("(#{num})")
-				div << span
-				div.attributes['id'] = "eq:#{self.label}"
-			end
-			
 			if mathml
 				add_class_to(mathml, 'maruku-mathml')
 				div << mathml 
@@ -141,12 +132,21 @@ module MaRuKu; module Out; module HTML
 				div << img
 			end
 			
-			source_div = Element.new 'div'
-				add_class_to(source_div, 'maruku-eq-tex')
-				code = convert_to_mathml_none(:equation, self.math)	
-				code.attributes['style'] = 'display: none'
-			source_div << code
-			div << source_div
+			source_span = Element.new 'span'
+			add_class_to(source_span, 'maruku-eq-tex')
+			code = convert_to_mathml_none(:equation, self.math.strip)	
+			code.attributes['style'] = 'display: none'
+			source_span << code
+			div << source_span
+
+			if self.label  # then numerate
+				span = Element.new 'span'
+				span.attributes['class'] = 'maruku-eq-number'
+				num = self.num
+				span << Text.new("(#{num})")
+				div << span
+				div.attributes['id'] = "eq:#{self.label}"
+			end
 		div
 	end
 	
@@ -164,6 +164,23 @@ module MaRuKu; module Out; module HTML
 		end
 	end
 
+	def to_html_divref
+		ref= nil
+		self.doc.refid2ref.each_value { |h|
+			ref = h[self.refid] if h.has_key?(self.refid)			
+		}
+		if ref
+			num = ref.num
+                        a = Element.new 'a'
+                        a.attributes['class'] = 'maruku-ref'
+                        a.attributes['href'] = "#" + self.refid
+                        a << Text.new(num.to_s)
+                        a
+                else
+                        maruku_error "Cannot find div #{self.refid.inspect}"
+                        Text.new "\\ref{#{self.refid}}"
+                end
+	end
 	
 end end end
 

data/lib/maruku/ext/math/to_latex.rb

@@ -19,4 +19,8 @@ module MaRuKu; module Out; module Latex
 		"\\eqref{#{self.eqid}}"
 	end
 
+	def to_latex_divref
+       "\\ref{#{self.refid}}"
+	end
+
 end end end

data/lib/maruku/helpers.rb

@@ -91,10 +91,10 @@ module Helpers
 			raw_html = "<marukuwrap>#{raw_html}</marukuwrap>"
 			e.instance_variable_set :@parsed_html,
 			 	REXML::Document.new(raw_html)
-		rescue  #Exception => ex
+		rescue   	REXML::ParseException => ex
 			e.instance_variable_set :@parsed_html, nil
-#			tell_user "Malformed block of HTML:\n"+
-#			add_tabs(raw_html,1,'|')
+			maruku_recover "REXML cannot parse this block of HTML/XML:\n"+
+			add_tabs(raw_html,1,'|') + "\n"+ex.inspect
 #			"  #{raw_html.inspect}\n\n"+ex.inspect
 		end
 		e

data/lib/maruku/input/charsource.rb

@@ -122,7 +122,7 @@ class CharSourceManual
 	
 	def consume_whitespace
 		while c = cur_char 
-			if (c == 32 || c == ?\t)
+		  if (c == ?\s || c == ?\t)
 #				puts "ignoring #{c}"
 				ignore_char
 			else

data/lib/maruku/input/parse_block.rb

@@ -251,6 +251,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
 				"I see that #{h.rest.inspect} is left after the raw HTML.", src
 		end
 		raw_html = h.stuff_you_read
+		
 		return md_html(raw_html)
 	end
 	

data/lib/maruku/input/parse_doc.rb

@@ -198,14 +198,17 @@ Disabled by default because of security concerns.
 				XPath.match(doc, "//*[attribute::markdown]" ).each do |e|
 #					puts "Found #{e}"
 					# should we parse block-level or span-level?
-					parse_blocks = (e.attributes['markdown'] == 'block') || 
-					               block_tags.include?(e.name)
-					# remove 'markdown' attribute
-					e.delete_attribute 'markdown'
+					
+					how = e.attributes['markdown']
+					parse_blocks = (how == 'block') || block_tags.include?(e.name)
+					               
 					# Select all text elements of e
 					XPath.match(e, "//text()" ).each { |original_text| 
 						s = original_text.value.strip
 						if s.size > 0
+
+					#	    puts "Parsing #{s.inspect} as blocks: #{parse_blocks}  (#{e.name}, #{e.attributes['markdown']})  "
+
 							el = md_el(:dummy,
 							 	parse_blocks ? parse_text_as_markdown(s) :
 							                  parse_lines_as_span([s]) )
@@ -217,7 +220,11 @@ Disabled by default because of security concerns.
 							
 						end
 					}
-						
+					
+					
+          # remove 'markdown' attribute
+          e.delete_attribute 'markdown'
+          
 				end
 				
 			end

data/lib/maruku/input/parse_span_better.rb

@@ -185,15 +185,27 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 					maruku_recover "Threating as literal", src, con
 					con.push_char src.shift_char
 				else
-					follows = src.cur_chars(4)
-					if  follows =~ /^\_\_\_[^\s\_]/
-						con.push_element read_emstrong(src,'___')
-					elsif follows  =~ /^\_\_[^\s\_]/
-						con.push_element read_strong(src,'__')
-					elsif follows =~ /^\_[^\s\_]/
-						con.push_element read_em(src,'_')
-					else # _ is just a normal char
-						con.push_char src.shift_char
+					# we don't want "mod_ruby" to start an emphasis
+					# so we start one only if
+					# 1) there's nothing else in the span (first char)
+					# or 2) the last char was a space
+					# or 3) the current string is empty
+					#if con.elements.empty? ||
+					if	 (con.cur_string =~ /\s\Z/) || (con.cur_string.size == 0)
+						# also, we check the next characters
+						follows = src.cur_chars(4)
+						if  follows =~ /^\_\_\_[^\s\_]/
+							con.push_element read_emstrong(src,'___')
+						elsif follows  =~ /^\_\_[^\s\_]/
+							con.push_element read_strong(src,'__')
+						elsif follows =~ /^\_[^\s\_]/
+							con.push_element read_em(src,'_')
+						else # _ is just a normal char
+							con.push_char src.shift_char
+						end
+					else
+						# _ is just a normal char
+							con.push_char src.shift_char
 					end
 				end
 			when ?{ # extension
@@ -430,7 +442,8 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 	SPACE = ?\ # = 32
 	
 #	R_REF_ID = Regexp.compile(/([^\]\s]*)(\s*\])/)
-	R_REF_ID = Regexp.compile(/([^\]\s]*)(\s*\])/)
+#	R_REF_ID = Regexp.compile(/([^\]\s]*)(\s*\])/)
+	R_REF_ID = Regexp.compile(/([^\]]*)\]/)
 	
 	# Reads a bracketed id "[refid]". Consumes also both brackets.
 	def read_ref_id(src, con)
@@ -696,6 +709,7 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 				end
 			end
 		end
+		
 		def push_string_if_present
 			if @cur_string.size > 0
 				@elements << @cur_string