maruku 0.5.4 → 0.5.5

data/lib/maruku/input/parse_span_better.rb

@@ -152,8 +152,13 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 					con.push_char src.shift_char
 				end
 			when ?&
+				# named references
 				if m = src.read_regexp(/\&([\w\d]+);/)
 					con.push_element md_entity(m[1])
+				# numeric
+				elsif m = src.read_regexp(/\&\#(x)?([\w\d]+);/)
+					num = m[1]  ? m[2].hex : m[2].to_i
+					con.push_element md_entity(num)
 				else
 					con.push_char src.shift_char
 				end
@@ -446,22 +451,35 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
 		h = HTMLHelper.new
 		begin
 			# This is our current buffer in the context
-			start = src.current_remaining_buffer
+			next_stuff = src.current_remaining_buffer
 			
-			h.eat_this start
-			if not h.is_finished?
-				error "inline_html: Malformed:\n "+
-					"#{start.inspect}\n #{h.inspect}",src,con
+			consumed = 0
+			while true
+				h.eat_this next_stuff[consumed].chr; consumed += 1
+				break if h.is_finished? 
+				
+				if consumed >= next_stuff.size
+					maruku_error "Malformed HTML starting at #{next_stuff.inspect}", src, con
+				end
 			end
+			src.ignore_chars(consumed)
+			con.push_element md_html(h.stuff_you_read)
 			
-			consumed = start.size - h.rest.size 
-			if consumed > 0
-				con.push_element md_html(h.stuff_you_read)
-				src.ignore_chars(consumed)
-			else
-				puts "HTML helper did not work on #{start.inspect}"
-				con.push_char src.shift_char
-			end
+			#start = src.current_remaining_buffer
+			# h.eat_this start
+			# if not h.is_finished?
+			# 	error "inline_html: Malformed:\n "+
+			# 		"#{start.inspect}\n #{h.inspect}",src,con
+			# end
+			# 
+			# consumed = start.size - h.rest.size 
+			# if consumed > 0
+			# 	con.push_element md_html(h.stuff_you_read)
+			# 	src.ignore_chars(consumed)
+			# else
+			# 	puts "HTML helper did not work on #{start.inspect}"
+			# 	con.push_char src.shift_char
+			# end
 		rescue Exception => e
 			maruku_error "Bad html: \n" + 
 				add_tabs(e.inspect+e.backtrace.join("\n"),1,'>'),

data/lib/maruku/input/type_detection.rb

@@ -50,8 +50,11 @@ module MaRuKu; module Strings
 		return :xml_instr if l =~ %r{^\s*<\?}
 		return :raw_html if l =~ %r{^[ ]?[ ]?[ ]?</?\s*\w+}
 		return :raw_html if l =~ %r{^[ ]?[ ]?[ ]?<\!\-\-}
-		return :ulist    if l =~ /^\s?([\*\-\+])\s+.*\w+/
-		return :olist    if l =~ /^\s?\d+\..*\w+/
+		# Something is wrong with how we parse lists! :-(
+		#return :ulist    if l =~ /^[ ]{0,3}([\*\-\+])\s+.*\w+/
+		#return :olist    if l =~ /^[ ]{0,3}\d+\..*\w+/
+		return :ulist    if l =~ /^[ ]{0,1}([\*\-\+])\s+.*\w+/
+		return :olist    if l =~ /^[ ]{0,1}\d+\..*\w+/
 		return :header1  if l =~ /^(=)+/ 
 		return :header2  if l =~ /^([-\s])+$/ 
 		return :header3  if l =~ /^(#)+\s*\S+/ 
@@ -138,4 +141,4 @@ module MaRuKu; module Strings
 
 
 	EMailAddress = /<([^:]+@[^:]+)>/
-end end
+end end

data/lib/maruku/output/s5/to_s5.rb

@@ -5,46 +5,56 @@ module MaRuKu
 		
 	# Render as an HTML fragment (no head, just the content of BODY). (returns a string)
 	def to_s5(context={})
-		indent = context[:indent] || -1
-		ie_hack = context[:ie_hack] ||true
+		indent       = context[:indent]       || -1
+		ie_hack      = !context[:ie_hack].kind_of?(FalseClass)
+		content_only = !context[:content_only].kind_of?(FalseClass)
 
 		doc = Document.new(nil,{:respect_whitespace =>:all})
-		html = Element.new('html', doc)
-		html.add_namespace('http://www.w3.org/1999/xhtml')
-		html.add_namespace('svg', "http://www.w3.org/2000/svg" )
-		
-		head = Element.new('head', html)
+
+		if content_only
+			body = Element.new('div', doc)
+		else
+			html = Element.new('html', doc)
+			html.add_namespace('http://www.w3.org/1999/xhtml')
+			html.add_namespace('svg', "http://www.w3.org/2000/svg" )
+
+			head = Element.new('head', html)
 			me = Element.new 'meta', head
 			me.attributes['http-equiv'] = 'Content-type'
 			me.attributes['content'] = 'text/html;charset=utf-8'	
 
-
 			# Create title element
 			doc_title = self.attributes[:title] || self.attributes[:subject] || ""
 			title = Element.new 'title', head
-				title << Text.new(doc_title)
-		
-		
-		body = Element.new('body', html)
+				title << Text.new(doc_title)		
+			body = Element.new('body', html)
+			
+		end
 		
 		slide_header = self.attributes[:slide_header]
 		slide_footer = self.attributes[:slide_footer]
+		slide_subfooter = self.attributes[:slide_subfooter]
 		slide_topleft  = self.attributes[:slide_topleft]
 		slide_topright  = self.attributes[:slide_topright]
 		slide_bottomleft  = self.attributes[:slide_bottomleft]
 		slide_bottomright  = self.attributes[:slide_bottomright]
 
 		dummy_layout_slide = 
-		"<div class='layout'>
-			<div id='controls'><!-- DO NOT EDIT --></div>
-			<div id='currentSlide'><!-- DO NOT EDIT --></div>
-			<div id='header'> #{slide_header}</div>
-			<div id='footer'> #{slide_footer}</div>
-		  <div class='topleft'> #{slide_topleft}</div>
-		  <div class='topright'> #{slide_topright}</div>
-		  <div class='bottomleft'> #{slide_bottomleft}</div>
-		  <div class='bottomright'> #{slide_bottomright}</div>
-		</div>"
+		"
+		<div class='layout'>
+		<div id='controls'></div>
+		<div id='currentSlide'> </div>
+		<div id='header'> #{slide_header}</div>
+		<div id='footer'>
+		<h1>#{slide_footer}</h1>
+		<h2>#{slide_subfooter}</h2>
+		</div>
+		<div class='topleft'> #{slide_topleft}</div>
+		<div class='topright'> #{slide_topright}</div>
+		<div class='bottomleft'> #{slide_bottomleft}</div>
+		<div class='bottomright'> #{slide_bottomright}</div>
+		</div>
+                "
 		body.add_element Document.new(dummy_layout_slide, {:respect_whitespace =>:all}).root
 
 		presentation = Element.new 'div', body
@@ -52,10 +62,10 @@ module MaRuKu
 		
 		first_slide="
 	  <div class='slide'>
-	  <h1> #{self.attributes[:title]}</h1>
-	  <h2> #{self.attributes[:subtitle]}</h2>
-	  <h3> #{self.attributes[:author]}</h3>
-	  <h4> #{self.attributes[:company]}</h4>
+	  <h1> #{self.attributes[:title] ||context[:title]}</h1>
+	  <h2> #{self.attributes[:subtitle] ||context[:subtitle]}</h2>
+	  <h3> #{self.attributes[:author] ||context[:author]}</h3>
+	  <h4> #{self.attributes[:company] ||context[:company]}</h4>
 	  </div>
 		"
 		presentation.add_element Document.new(first_slide).root
@@ -71,7 +81,6 @@ module MaRuKu
 			
 			h1 = Element.new 'h1', div
 			slide.header_element.children_to_html.each do |e| h1 << e; end
-
 			
 			array_to_html(slide.immediate_children).each do |e|  div << e  end
 				
@@ -82,23 +91,23 @@ module MaRuKu
 			end
 		end
 
-
-		doc2 = Document.new("<div>"+S5_external+"</div>",{:respect_whitespace =>:all})
-		doc2.root.children.each{ |child| head << child }
-
-	
-		add_css_to(head)
-
 		xml  = "" 
-
-		# REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements
-		# containing code.
-		html.write(xml,indent,transitive=true,ie_hack);
-
-		Xhtml10strict + xml
+		if (content_only)
+		   body.write(xml,indent,transitive=true,ie_hack);
+		else
+		  doc2 = Document.new("<div>"+S5_external+"</div>",{:respect_whitespace =>:all})
+		  doc2.root.children.each{ |child| head << child }
+
+		  add_css_to(head)
+
+		  # REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements
+		  # containing code.
+		  html.write(xml,indent,transitive=true,ie_hack);
+		  Xhtml11_mathml2_svg11 + xml
+		end
 	end
 
 end 
 
 
-end
+end

data/lib/maruku/output/to_html.rb

@@ -79,8 +79,8 @@ module MaRuKu; module Out; module HTML
 	end
 	
 				
-		Xhtml10strict  = "
-<?xml version='1.0' encoding='utf-8'?>
+		Xhtml10strict  = 
+"<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>\n"
 		
@@ -717,7 +717,7 @@ of the form `#ff00ff`.
 			url = ref[:url]
 			title = ref[:title]
 			a.attributes['src'] = url.to_s
-			a.attributes['alt'] = title.to_s if not a.attributes['alt']
+			a.attributes['alt'] = children_to_s 
 		else
 			maruku_error"Could not find id = #{id.inspect} for\n #{self.inspect}"
 			tell_user "Could not create image with ref_id = #{id.inspect};"+
@@ -737,7 +737,7 @@ of the form `#ff00ff`.
 		title = self.title
 		a =  create_html_element 'img'
 			a.attributes['src'] = url.to_s
-			a.attributes['alt'] = title.to_s if not a.attributes['alt']
+			a.attributes['alt'] = children_to_s 
 		return a
 	end
 

data/lib/maruku/string_utils.rb

@@ -29,7 +29,7 @@ module MaRuKu; module Strings
 	TabSize = 4;
 	
 	def split_lines(s)
-		s.split("\n")
+		s.gsub("\r","").split("\n")
 	end
 	
 	# This parses email headers. Returns an hash. 

data/lib/maruku/version.rb

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

data/tests/s5/a.md

@@ -0,0 +1,13 @@
+Title
+=====
+
+Slide 1
+-------
+
+* point
+
+Slide 2
+-------
+
+* point
+

data/tests/s5/instiki+s5.md

@@ -0,0 +1,105 @@
+author: Jacques Distler
+company: University of Texas at Austin
+title: S5 Integration
+subtitle: slides in Instiki
+slide_footer: Released to the Internets
+slide_subfooter: March 1, 2007
+
+:category: S5-slideshow
+
+S5 Integration
+==============
+
+S5
+--------------------------------------
+
+1. [S5](http://meyerweb.com/eric/tools/s5/) is an open-source presentation package, written by Eric Meyer.
+2. Andrea Censi included some basic S5 support in [Maruku](http://maruku.rubyforge.org/), his Ruby Markdown implementation.
+2. My role was to
+   * make it compatible[^xhtml] with real XHTML
+   * integrate it into Instiki
+3. Driven by Maruku and itex2MML, it's trivial to include equations, inline SVG graphics, etc.
+   
+[^xhtml]: This consisted of fixing the Javascript to use DOM-scripting, instead of `innerHTML`.
+
+Composing a presentation
+--------------------------------------
+
+At the top of this presentation, is some header information:
+
+     author: Jacques Distler
+     company: University of Texas at Austin
+     title: S5 Integration
+     subtitle: slides in Instiki
+     slide_footer: Released to the Internets
+     slide_subfooter: March 1, 2007
+
+     :category: S5-slideshow
+
+The `:category: S5-slideshow` is essential. It tells Instiki that this page is an S5 slideshow. Any page in this category has an extra "S5" view, in addition to the "TeX" and "Print" views. The rest of the header fields are optional. If you omit `author: ...`, then the name of the person who last edited the page is used. If you omit `title: ...`, then the name of the page is used.
+
+Composing ...
+-----------------------------------------
+
+After that header information, is a series of slides
+
+     My Slideshow
+     ==============
+
+     First Slide Title
+     -----------------
+
+     * First point
+     * Second point
+
+     Second Slide Title
+     ------------------
+
+     * Another boring bullet point.
+
+etc.
+
+
+Features
+--------------------------------------
+
+* Mathematics, either inline $\left(\frac{\sin(\pi x)}{\pi x}\right)$ or block
+\[
+\label{gaussian}
+  \int_{\infty}^{\infty}e^{-x^2} \mathrm{d}x = \sqrt{\pi}
+\]
+are fully supported. You just type standard [itex](http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html), and equations like (eq:gaussian) just appear.
+* Incremental display is supported.
+* Notes are allowed, but there isn't (yet) a native Maruku syntax for entering them. _Horror of horrors!_ You need to type a little XHTML markup to get them.
+{: .incremental .show-first}
+
+<div markdown="1" class="notes">
+
+You have to type
+
+     &lt;div class="notes"&gt;
+
+     These are my notes for this slide.
+
+     &lt;/div&gt;
+
+Usually, these optional notes contain the gory details and complicated equations, like $E=m c^2$, too messy to be presented in the main thread of the talk.
+
+</div>
+
+
+Features II
+---------------------------------------------------
+
+To get incremental display, use Maruku's [metadata syntax](http://maruku.rubyforge.org/proposal.html)
+{: .incremental}
+
+* Place a `{: .incremental .show-first}` or `{: .incremental}` to get incremental display.
+
+   * This even works with nested lists.
+   {: .incremental}
+
+* Yes, all of S5's [other features](http://meyerweb.com/eric/tools/s5/features.html) are there, too.
+* Of course, it doesn't have all the garish visual effects of Apple's Keynote.
+* If you can't do without garish, tacky, visual effects, there's always SVG.
+{: .incremental}

data/tests/unittest/alt.md

@@ -0,0 +1,39 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+ ![bar](/foo.jpg)
+
+
+*** 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 ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+<p><img src="/foo.jpg" alt="bar" title="" /></p>
+
+*** Output of Markdown.pl (parsed) ***
+<p
+     ><img title='' src='/foo.jpg' alt='bar'/
+   ></p
+ >

data/tests/unittest/email.md

@@ -33,9 +33,9 @@ This is an email address:
 
 
 *** Output of Markdown.pl ***
-<p>This is an email address: <a href="&#x6D;a&#x69;&#108;&#x74;&#x6F;:&#97;&#x6E;&#x64;&#x72;e&#x61;&#64;&#x69;&#110;&#x76;&#97;l&#x69;d&#x2E;&#105;t">&#97;&#x6E;&#x64;&#x72;e&#x61;&#64;&#x69;&#110;&#x76;&#97;l&#x69;d&#x2E;&#105;t</a></p>
+<p>This is an email address: <a href="&#x6D;&#x61;&#x69;l&#116;&#111;:&#97;&#x6E;&#x64;&#x72;&#101;&#97;&#64;&#x69;&#110;&#118;&#x61;&#x6C;&#x69;&#x64;&#46;&#x69;&#116;">&#97;&#x6E;&#x64;&#x72;&#101;&#97;&#64;&#x69;&#110;&#118;&#x61;&#x6C;&#x69;&#x64;&#46;&#x69;&#116;</a></p>
 
 *** Output of Markdown.pl (parsed) ***
-<p>This is an email address: <a href='&amp;#x6D;a&amp;#x69;&amp;#108;&amp;#x74;&amp;#x6F;:&amp;#97;&amp;#x6E;&amp;#x64;&amp;#x72;e&amp;#x61;&amp;#64;&amp;#x69;&amp;#110;&amp;#x76;&amp;#97;l&amp;#x69;d&amp;#x2E;&amp;#105;t'>&#97;&#x6E;&#x64;&#x72;e&#x61;&#64;&#x69;&#110;&#x76;&#97;l&#x69;d&#x2E;&#105;t</a
+<p>This is an email address: <a href='&amp;#x6D;&amp;#x61;&amp;#x69;l&amp;#116;&amp;#111;:&amp;#97;&amp;#x6E;&amp;#x64;&amp;#x72;&amp;#101;&amp;#97;&amp;#64;&amp;#x69;&amp;#110;&amp;#118;&amp;#x61;&amp;#x6C;&amp;#x69;&amp;#x64;&amp;#46;&amp;#x69;&amp;#116;'>&#97;&#x6E;&#x64;&#x72;&#101;&#97;&#64;&#x69;&#110;&#118;&#x61;&#x6C;&#x69;&#x64;&#46;&#x69;&#116;</a
    ></p
  >

data/tests/unittest/hex_entities.md

@@ -0,0 +1,57 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+Examples of numeric character references include © or © for the copyright symbol, Α or Α for the Greek capital letter alpha, and ا or ا for the Arabic letter alef.
+
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par([
+		"Examples of numeric character references include ",
+		md_entity(169),
+		" or ",
+		md_entity(169),
+		" for the copyright symbol, ",
+		md_entity(913),
+		" or ",
+		md_entity(913),
+		" for the Greek capital letter alpha, and ",
+		md_entity(1575),
+		" or ",
+		md_entity(1575),
+		" for the Arabic letter alef."
+	])
+],{},[])
+*** Output of to_html ***
+
+<p>Examples of numeric character references include &#169; or &#169; for the copyright symbol, &#913; or &#913; for the Greek capital letter alpha, and &#1575; or &#1575; for the Arabic letter alef.</p>
+
+*** Output of to_latex ***
+Examples of numeric character references include \copyright{} or \copyright{} for the copyright symbol, $A${} or $A${} for the Greek capital letter alpha, and  or  for the Arabic letter alef.
+
+
+*** Output of to_md ***
+Examples of numeric character
+references include or for the copyright
+symbol, or for the Greek capital letter
+alpha, and or for the Arabic letter
+alef.
+
+
+*** Output of to_s ***
+Examples of numeric character references include  or  for the copyright symbol,  or  for the Greek capital letter alpha, and  or  for the Arabic letter alef.
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+<p>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.</p>
+
+*** Output of Markdown.pl (parsed) ***
+<p>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.</p
+ >