maruku 0.5.9 → 0.6.0

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

@@ -1,5 +1,13 @@
 # This module groups all functions related to HTML export.
 module MaRuKu
+
+begin
+        require 'rexml/formatters/pretty'
+        require 'rexml/formatters/default'
+        $rexml_new_version = true
+rescue LoadError
+        $rexml_new_version = false      
+end
 	 
 	class MDDocument
 
@@ -105,7 +113,12 @@ module MaRuKu
 
 		xml  = "" 
 		if (content_only)
-		   body.write(xml,indent,transitive=true,ie_hack);
+		   if $rexml_new_version
+		     formatter = REXML::Formatters::Default.new(ie_hack)
+                     formatter.write(body, xml)
+		   else
+		     body.write(xml,indent,transitive=true,ie_hack);
+		  end
 		else
 		  doc2 = Document.new("<div>"+S5_external+"</div>",{:respect_whitespace =>:all})
 		  doc2.root.children.each{ |child| head << child }

data/lib/maruku/output/to_html.rb

@@ -188,6 +188,7 @@ Example:
 
 =end
 
+	METAS = %w{description keywords author revised}
 
 	# Render to a complete HTML document (returns a REXML document tree)
 	def to_html_document_tree
@@ -209,7 +210,25 @@ Example:
 #			me.attributes['content'] = 'text/html;charset=utf-8'	
 			me.attributes['content'] = 'application/xhtml+xml;charset=utf-8'	
 		
+			METAS.each do |m|
+				if value = self.attributes[m.to_sym]
+					meta = Element.new 'meta', head
+					meta.attributes['name'] = m
+					meta.attributes['content'] = value.to_s
+				end
+			end
+			
+			
+			self.attributes.each do |k,v|
+				if k.to_s =~ /\Ameta-(.*)\Z/
+					meta = Element.new 'meta', head
+					meta.attributes['name'] = $1
+					meta.attributes['content'] = v.to_s
+				end
+			end
+			
 
+			
 			# Create title element
 			doc_title = self.attributes[:title] || self.attributes[:subject] || ""
 			title = Element.new 'title', head
@@ -810,7 +829,7 @@ If true, raw HTML is discarded from the output.
 			pre = Element.new('pre')
 			pre.attributes['style'] = 'border: solid 3px red; background-color: pink'
 			pre.attributes['class'] = 'markdown-html-error'
-			pre << Text.new("HTML parse error: \n#{raw_html}", true)
+			pre << Text.new("REXML could not parse this XML/HTML: \n#{raw_html}", true)
 			return pre
 		end
 	end

data/lib/maruku/output/to_latex.rb

@@ -518,6 +518,33 @@ Otherwise, a standard `verbatim` environment is used.
 
 	end
 
+	def to_latex_div
+		type = self.attributes[:class]
+		id = self.attributes[:id]
+		case type
+		  when /^un_(\w*)/
+                	s = "\\begin{u#{$1}}"
+#			s += "[#{@children[0].send('children_to_latex')}]"
+			@children.delete_at(0)
+                	s += "\n" + children_to_latex
+                	s += "\\end{u#{$1}}\n"
+		  when /^num_(\w*)/
+                        s = "\\begin{#{$1}}"
+#			s += "[#{@children[0].send('children_to_latex')}]"
+			@children.delete_at(0)
+			s += "\n\\label{#{id}}\\hypertarget{#{id}}{}\n"
+                        s += children_to_latex
+                        s += "\\end{#{$1}}\n"
+                  when /^proof/
+                        s = "\\begin{proof}"
+                        @children.delete_at(0)
+                        s += "\n" + children_to_latex
+                        s += "\\end{proof}\n"
+		  else
+			s = children_to_latex
+		end
+                s
+	end
 
 	# Convert each child to html
 	def children_to_latex

data/lib/maruku/output/to_latex_entities.rb

@@ -215,7 +215,7 @@ module MaRuKu; module Out; module Latex
 	  <char num='8835' name='sup' convertTo='$\\supset$' />
 <!--	  <char num='8838' name='sube' convertTo='$\\subseteq$' />-->
 	  <char num='8839' name='supe' convertTo='$\\supseteq$' />
-<!--	  <char num='8836' name='nsub' convertTo='$\\nsubset$'  /> <!-- only AMS -->
+<!--	  <char num='8836' name='nsub' convertTo='$\\nsubset$'  /> --><!-- only AMS -->
 
 	  <char num='8853' name='oplus' convertTo='$\\oplus$' />
 	  <char num='8855' name='otimes' convertTo='$\\otimes$' />
@@ -276,7 +276,7 @@ module MaRuKu; module Out; module Latex
 	  <char num='174' name='reg' convertTo='\\textregistered' />
 	  <char num='170' name='ordf' convertTo='\\textordfeminine' />
 	  <char num='172' name='not' convertTo='$\\neg$' />
-	<!--  <char num='176' name='deg' convertTo='$\\degree$' /> <!-- mathabx -->
+	<!--  <char num='176' name='deg' convertTo='$\\degree$' /> --><!-- mathabx -->
 	  <char num='176' name='deg' convertTo='\\textdegree' package='textcomp'/>
 
 	  <char num='177' name='plusmn' convertTo='$\\pm$' />

data/lib/maruku/output/to_s.rb

@@ -34,6 +34,7 @@ class MDElement
 	
 	# Generate an id for headers. Assumes @children is set.
 	def generate_id
+		
 		title = children_to_s
 		title.gsub!(/ /,'_')
 		title.downcase!
@@ -45,9 +46,11 @@ class MDElement
 			$uid += 1
 			title = "id#{$uid}"
 		end
-		
+
+		# random is a very bad idea
+#		title << "_" + rand(10000).to_s
 		title
 	end
 end
 
-end
+end

data/lib/maruku/string_utils.rb

@@ -46,7 +46,7 @@ module MaRuKu; module Strings
 	#
 	def parse_email_headers(s)
 		keys={}
-		match = (s =~ /((\w[\w\s]+: .*\n)+)\n/)
+		match = (s =~ /\A((\w[\w\s\_\-]+: .*\n)+)\s*\n/)
 		if match != 0
 			keys[:data] = s
 		else
@@ -150,7 +150,7 @@ module MaRuKu; module Strings
 	
 	# change space to "_" and remove any non-word character
 	def sanitize_ref_id(x)
-		x.downcase.gsub(' ','_').gsub(/[^\w]/,'')
+		x.strip.downcase.gsub(' ','_').gsub(/[^\w]/,'')
 	end
 
 

data/lib/maruku/structures.rb

@@ -145,6 +145,8 @@ class MDDocument
 	
 	safe_attr_accessor :latex_required_packages, Array
 	
+	safe_attr_accessor :refid2ref, Hash
+	
 	def initialize(s=nil)
 		super(:document)
 		@doc       = self

data/lib/maruku/tests/new_parser.rb

@@ -106,6 +106,8 @@ module MaRuKu; module Tests
 		["_b_", [md_em('b')], 'Emphasis 7'],
 		["_b_ _c_", [md_em('b'),' ',md_em('c')], 'Emphasis 8'],
 		["_b__c_", [md_em('b'),md_em('c')], 'Emphasis 9'],
+		# underscores in word
+		["mod_ruby", ['mod_ruby'], 'Word with underscore'],
 		# strong
 		["**a*", :throw, 'Unclosed double ** 2'],
 		["\\**a*", ['*', md_em('a')], 'Escaping of *'],
@@ -116,7 +118,8 @@ module MaRuKu; module Tests
 		["**b****c**", [md_strong('b'),md_strong('c')], 'Emphasis 9'],
 		# strong (with underscore)
 		["__a_", :throw, 'Unclosed double __ 2'],
-		["\\__a_", ['_', md_em('a')], 'Escaping of _'],
+	
+	#	["\\__a_", ['_', md_em('a')], 'Escaping of _'],
 		["a __b__ ", ['a ', md_strong('b')], 'Emphasis 1'],
 		["a __b__", ['a ', md_strong('b')], 'Emphasis 2'],
 		["a __ b", ['a __ b'], 'Emphasis 3'],
@@ -133,7 +136,7 @@ module MaRuKu; module Tests
 		["a *** b***", :throw, 'Unclosed emphasis'],
 		# same with underscores
 		["___a__", :throw, 'Unclosed triple *** '],
-		["\\___a__", ['_', md_strong('a')], 'Escaping of *'],
+#		["\\___a__", ['_', md_strong('a')], 'Escaping of _'],
 		["a ___b___ ", ['a ', md_emstrong('b')], 'Strong elements'],
 		["a ___b___", ['a ', md_emstrong('b')]],
 		["a ___ b", ['a ___ b']],

data/lib/maruku/version.rb

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

data/tests/bugs/code_in_links.md

@@ -1,3 +1,7 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
 **This bug is now solved**
 
 Previously, a bug would not let you use `code` inside links text.
@@ -14,3 +18,84 @@ produces:
 
 [syntax]: http://gogole.com
 
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par([md_strong(["This bug is now solved"])]),
+	md_par([
+		"Previously, a bug would not let you use ",
+		md_code("code"),
+		" inside links text."
+	]),
+	md_par([
+		"So this: Use the ",
+		md_link([md_code("syntax")],"syntax"),
+		" produces:"
+	]),
+	md_el(:quote,[md_par(["Use the ", md_link([md_code("syntax")],"syntax")])],{},[]),
+	md_par(["And this: Use the ", md_code("[syntax][syntax]"), " produces:"]),
+	md_el(:quote,[md_par(["Use the ", md_code("[syntax][syntax]")])],{},[]),
+	md_ref_def("syntax", "http://gogole.com", {:title=>nil})
+],{},[])
+*** Output of to_html ***
+<p><strong>This bug is now solved</strong></p>
+
+<p>Previously, a bug would not let you use <code>code</code> inside links text.</p>
+
+<p>So this: Use the <a href='http://gogole.com'><code>syntax</code></a> produces:</p>
+
+<blockquote>
+<p>Use the <a href='http://gogole.com'><code>syntax</code></a></p>
+</blockquote>
+
+<p>And this: Use the <code>[syntax][syntax]</code> produces:</p>
+
+<blockquote>
+<p>Use the <code>[syntax][syntax]</code></p>
+</blockquote>
+*** Output of to_latex ***
+\textbf{This bug is now solved}
+
+Previously, a bug would not let you use {\colorbox[rgb]{1.00,0.93,1.00}{\tt code}} inside links text.
+
+So this: Use the \href{http://gogole.com}{{\colorbox[rgb]{1.00,0.93,1.00}{\tt syntax}}} produces:
+
+\begin{quote}%
+Use the \href{http://gogole.com}{{\colorbox[rgb]{1.00,0.93,1.00}{\tt syntax}}}
+
+
+\end{quote}
+And this: Use the {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char91syntax\char93\char91syntax\char93}} produces:
+
+\begin{quote}%
+Use the {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char91syntax\char93\char91syntax\char93}}
+
+
+\end{quote}
+*** Output of to_md ***
+This bug is now solved
+
+Previously, a bug would not let you use
+inside links text.
+
+So this: Use the produces:
+
+Use the
+
+And this: Use the produces:
+
+Use the
+*** Output of to_s ***
+This bug is now solvedPreviously, a bug would not let you use  inside links text.So this: Use the  produces:Use the And this: Use the  produces:Use the
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+(not used anymore)
+*** Output of Markdown.pl (parsed) ***
+(not used anymore)

data/tests/bugs/complex_escaping.md

@@ -1,4 +1,38 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
 
 
 What do you see here? `\\` it should be two backslashes.
 
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par([
+		"What do you see here? ",
+		md_code("\\\\"),
+		" it should be two backslashes."
+	])
+],{},[])
+*** Output of to_html ***
+<p>What do you see here? <code>\\</code> it should be two backslashes.</p>
+*** Output of to_latex ***
+What do you see here? {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char92\char92}} it should be two backslashes.
+*** Output of to_md ***
+What do you see here? it should be two
+backslashes.
+*** Output of to_s ***
+What do you see here?  it should be two backslashes.
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+(not used anymore)
+*** Output of Markdown.pl (parsed) ***
+(not used anymore)

data/tests/unittest/abbreviations.md

@@ -59,14 +59,6 @@ The HTML specification is maintained by the W3C.Operation Tigra Genesis is going
 
 
 *** Output of Markdown.pl ***
-<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>
-
+(not used anymore)
 *** Output of Markdown.pl (parsed) ***
-Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
+(not used anymore)

data/tests/unittest/alt.md

@@ -24,7 +24,6 @@ bar
 
 
 *** Output of Markdown.pl ***
-<p><img src="/foo.jpg" alt="bar" title="" /></p>
-
+(not used anymore)
 *** Output of Markdown.pl (parsed) ***
-Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
+(not used anymore)

data/tests/unittest/attributes/att2.md

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

data/tests/unittest/attributes/att3.md

@@ -35,11 +35,6 @@ Paragraph1Paragraph2
 
 
 *** Output of Markdown.pl ***
-<p>Paragraph1
-{:#par1}</p>
-
-<p>{:#par2}
-Paragraph2</p>
-
+(not used anymore)
 *** Output of Markdown.pl (parsed) ***
-Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
+(not used anymore)

data/tests/unittest/attributes/attributes.md

@@ -64,19 +64,6 @@ Header with attributesHeader with attributesHeader no attributesParagraph with a
 
 
 *** Output of Markdown.pl ***
-<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>
-
+(not used anymore)
 *** Output of Markdown.pl (parsed) ***
-Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
+(not used anymore)

data/tests/unittest/attributes/circular.md

@@ -33,11 +33,6 @@ Paragraph
 
 
 *** Output of Markdown.pl ***
-<p>Paragraph
-{:a}</p>
-
-<p>{:a: b}
-{:b: a}</p>
-
+(not used anymore)
 *** Output of Markdown.pl (parsed) ***
-Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
+(not used anymore)

data/tests/unittest/attributes/default.md

@@ -29,10 +29,6 @@ Paragraph2
 
 
 *** Output of Markdown.pl ***
-<p>Paragraph2 
-{#2}</p>
-
-<p>{paragraph}: .maruku-par</p>
-
+(not used anymore)
 *** Output of Markdown.pl (parsed) ***
-Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
+(not used anymore)