maruku 0.5.2 → 0.5.3

data/lib/maruku/output/to_html.rb

@@ -762,7 +762,8 @@ of the form `#ff00ff`.
 			i += num_columns
 		end
 		
-		table = create_html_element 'table'
+		table = create_html_element 'table', 
+			[:summary, :width, :frame, :rules, :border, :cellspacing, :cellpadding]
 			thead = Element.new 'thead'
 			tr = Element.new 'tr'
 				array_to_html(head).each do |x| tr<<x end

data/lib/maruku/output/to_latex.rb

@@ -127,7 +127,6 @@ will produce:
 \\usepackage{hyperref}
 \\usepackage{xspace}
 \\usepackage[usenames,dvipsnames]{color}
-\\usepackage[margin=1in]{geometry}
 \\hypersetup{colorlinks=true,urlcolor=blue}
 
 #{user_preamble}
@@ -550,13 +549,13 @@ Otherwise, a standard `verbatim` environment is used.
 		end
 		
 		# puts a space after commands if needed
-		e.each_index do |i|
-			if e[i] =~ /\\\w+\s*$/ # command
-				if (s=e[i+1]) && s[0] == ?\ # space
-					e[i]  = e[i] + "\\ "
-				end
-			end
-		end
+		# e.each_index do |i|
+		# 	if e[i] =~ /\\\w+\s*$/ # command
+		# 		if (s=e[i+1]) && s[0] == ?\ # space
+		# 			e[i]  = e[i] + "\\ "
+		# 		end
+		# 	end
+		# end
 		
 		e.join(join_char)
 	end

data/lib/maruku/output/to_latex_entities.rb

@@ -42,12 +42,12 @@ module MaRuKu; module Out; module Latex
 			@doc.latex_require_package p
 		end
 		
-		if replace =~ /^\\/
-			replace = replace + " "
-		end
+#		if replace =~ /^\\/
+#			replace = replace + " "
+#		end
 		
  		if replace
-			return replace
+			return replace + "{}"
 		else
 			tell_user "Cannot translate entity #{entity_name.inspect} to LaTeX."
 			return entity_name

data/lib/maruku/tests/new_parser.rb

@@ -266,8 +266,8 @@ module MaRuKu; module Tests
 #		['$ 20,000$', ['$ 20,000$']],
 #		['$20,000 $ $20,000$', ['$20,000 $ ', md_inline_math('20,000')]],
 		["#{Maruku8}", [Maruku8], "Reading UTF-8"],
-		["#{AccIta1}", [AccIta8], "Converting ISO-8859-1 to UTF-8", 
-			{:encoding => 'iso-8859-1'}],
+#		["#{AccIta1}", [AccIta8], "Converting ISO-8859-1 to UTF-8", 
+#			{:encoding => 'iso-8859-1'}],
 						
 	]
 
@@ -294,6 +294,7 @@ module MaRuKu; module Tests
 		m.attributes[:on_error] = :raise
 		Globals[:debug_keep_ials] = true
 		
+		num_ok = 0
 		good_cases.each do |input, expected, comment|
 				output = nil
 				begin
@@ -309,6 +310,7 @@ module MaRuKu; module Tests
 						raise e if @break_on_first_error 
 					else
 						quiet || print_status(comment,'OK')
+						num_ok += 1
 					end
 				end
 				
@@ -318,6 +320,7 @@ module MaRuKu; module Tests
 						print_status(comment, 'FAILED', s)
 						break if break_on_first_error
 					else
+						num_ok += 1
 						quiet || print_status(comment, 'OK')
 					end
 				else # I expected a raise
@@ -327,8 +330,12 @@ module MaRuKu; module Tests
 						print_status(comment, 'FAILED (no throw)', s)
 						break if break_on_first_error
 					end
-				end
-				
+				end		
+		end  # do 
+		if num_ok != good_cases.size
+			return false
+		else
+			return true
 		end
 	end
 	
@@ -358,6 +365,6 @@ end
 verbose = ARGV.include? 'v'
 break_on_first = ARGV.include? 'b'
 quiet = ARGV.include? 'q'
-Maruku.new.test_span_parser(verbose, break_on_first, quiet)
-
+ok = Maruku.new.test_span_parser(verbose, break_on_first, quiet)
 
+exit (ok ? 0 : 1)

data/lib/maruku/version.rb

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

data/tests/diagrams/diagrams.md

@@ -1,3 +1,7 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
 
 I would like to add a syntax for drawing basic diagrams
 and convert them to PNG/PDF/SVG.
@@ -52,3 +56,247 @@ Or
 
 
 
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par([
+		"I would like to add a syntax for drawing basic diagrams and convert them to PNG/PDF/SVG."
+	]),
+	md_el(:code,[],{:raw_code=>"+----------+      +----------+\n| Makefile | ---> | Compiler |  ==> ...\n+----------+      +----------+\n     |                ^\n     v                |\n ---------            "},[[:ref, "diagram"], ["title", "My diagram"]]),
+	md_el(:ald,[],{:ald=>[],:ald_id=>"diagram"},[]),
+	md_par(["How to do vertical bold arrows?"]),
+	md_el(:code,[],{:raw_code=>"!\nV \n"},[]),
+	md_par([
+		"Curved arrows: +-> | Yes: | ___________________ / | is the agent ok? | ",
+		md_entity("ndash"),
+		"| ",
+		md_entity("mdash"),
+		md_entity("mdash"),
+		md_entity("mdash"),
+		md_entity("mdash"),
+		md_entity("ndash"),
+		"+"
+	]),
+	md_el(:code,[],{:raw_code=>"{:r: border=\"solid 3px red\"}\n"},[]),
+	md_par(["Big boxes:"]),
+	md_el(:code,[],{:raw_code=>"+-------+\n|{:long}|  ---> \n+-------+\n\n{+long: This is a long box}"},[]),
+	md_par(["Or"]),
+	md_el(:code,[],{:raw_code=>"+----------------+         ________\n| This is a very |  --->  | Box    |\n| long cell      |        |________|\n+----------------+\n          - Yes\n        /  \n-------+ \n        \\\n          - No"},[])
+],{},[])
+*** Output of to_html ***
+
+<p>I would like to add a syntax for drawing basic diagrams and convert them to PNG/PDF/SVG.</p>
+
+<pre><code>+----------+      +----------+
+| Makefile | ---&gt; | Compiler |  ==&gt; ...
++----------+      +----------+
+     |                ^
+     v                |
+ ---------            </code></pre>
+
+<p>How to do vertical bold arrows?</p>
+
+<pre><code>!
+V 
+</code></pre>
+
+<p>Curved arrows: +-&gt; | Yes: | ___________________ / | is the agent ok? | &#8211;| &#8212;&#8212;&#8212;&#8212;&#8211;+</p>
+
+<pre><code>{:r: border=&quot;solid 3px red&quot;}
+</code></pre>
+
+<p>Big boxes:</p>
+
+<pre><code>+-------+
+|{:long}|  ---&gt; 
++-------+
+
+{+long: This is a long box}</code></pre>
+
+<p>Or</p>
+
+<pre><code>+----------------+         ________
+| This is a very |  ---&gt;  | Box    |
+| long cell      |        |________|
++----------------+
+          - Yes
+        /  
+-------+ 
+        \
+          - No</code></pre>
+
+*** Output of to_latex ***
+I would like to add a syntax for drawing basic diagrams and convert them to PNG/PDF/SVG.
+
+\begin{verbatim}+----------+      +----------+
+| Makefile | ---> | Compiler |  ==> ...
++----------+      +----------+
+     |                ^
+     v                |
+ ---------            \end{verbatim}
+How to do vertical bold arrows?
+
+\begin{verbatim}!
+V 
+\end{verbatim}
+Curved arrows: +-{\tt \char62} | Yes: | \_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_ / | is the agent ok? | --{}| ---{}---{}---{}---{}--{}+
+
+\begin{verbatim}{:r: border="solid 3px red"}
+\end{verbatim}
+Big boxes:
+
+\begin{verbatim}+-------+
+|{:long}|  ---> 
++-------+
+
+{+long: This is a long box}\end{verbatim}
+Or
+
+\begin{verbatim}+----------------+         ________
+| This is a very |  --->  | Box    |
+| long cell      |        |________|
++----------------+
+          - Yes
+        /  
+-------+ 
+        \
+          - No\end{verbatim}
+
+*** Output of to_md ***
+I would like to add a syntax for
+drawing basic diagrams and convert them
+to PNG/PDF/SVG.
+
+How to do vertical bold arrows?
+
+Curved arrows: +-> | Yes: |
+___________________ / | is the agent
+ok? | | +
+
+Big boxes:
+
+Or
+
+
+*** Output of to_s ***
+I would like to add a syntax for drawing basic diagrams and convert them to PNG/PDF/SVG.How to do vertical bold arrows?Curved arrows: +-> | Yes: | ___________________ / | is the agent ok? | | +Big boxes:Or
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+<p>I would like to add a syntax for drawing basic diagrams
+and convert them to PNG/PDF/SVG.</p>
+
+<pre><code>+----------+      +----------+
+| Makefile | ---&gt; | Compiler |  ==&gt; ...
++----------+      +----------+
+     |                ^
+     v                |
+ ---------
+</code></pre>
+
+<p>{:diagram title="My diagram"}</p>
+
+<p>{:diagram: style=""}</p>
+
+<p>How to do vertical bold arrows?</p>
+
+<pre><code>!
+V
+</code></pre>
+
+<p>Curved arrows:
+                             +-> | Yes: |
+     <strong><em>_</em><em>_</em><em>_</em><em>_</em><em>_</em></strong>    /
+    | is the agent ok? | --|
+     --------------{:r}+</p>
+
+<pre><code>{:r: border="solid 3px red"}
+</code></pre>
+
+<p>Big boxes:</p>
+
+<pre><code>+-------+
+|{:long}|  ---&gt; 
++-------+
+
+{+long: This is a long box}
+</code></pre>
+
+<p>Or</p>
+
+<pre><code>+----------------+         ________
+| This is a very |  ---&gt;  | Box    |
+| long cell      |        |________|
++----------------+
+          - Yes
+        /  
+-------+ 
+        \
+          - No
+</code></pre>
+
+*** Output of Markdown.pl (parsed) ***
+<p>I would like to add a syntax for drawing basic diagrams
+and convert them to PNG/PDF/SVG.</p
+   ><pre
+     ><code>+----------+      +----------+
+| Makefile | ---&gt; | Compiler |  ==&gt; ...
++----------+      +----------+
+     |                ^
+     v                |
+ ---------
+</code
+   ></pre
+   ><p>{:diagram title="My diagram"}</p
+   ><p>{:diagram: style=""}</p
+   ><p>How to do vertical bold arrows?</p
+   ><pre
+     ><code>!
+V
+</code
+   ></pre
+   ><p>Curved arrows:
+                             +-> | Yes: |
+     <strong
+       ><em>_</em
+       ><em>_</em
+       ><em>_</em
+       ><em>_</em
+       ><em>_</em
+     ></strong
+     >    /
+    | is the agent ok? | --|
+     --------------{:r}+</p
+   ><pre
+     ><code>{:r: border="solid 3px red"}
+</code
+   ></pre
+   ><p>Big boxes:</p
+   ><pre
+     ><code>+-------+
+|{:long}|  ---&gt; 
++-------+
+
+{+long: This is a long box}
+</code
+   ></pre
+   ><p>Or</p
+   ><pre
+     ><code>+----------------+         ________
+| This is a very |  ---&gt;  | Box    |
+| long cell      |        |________|
++----------------+
+          - Yes
+        /  
+-------+ 
+        \
+          - No
+</code
+   ></pre
+ >

data/tests/unittest/bug_def.md

@@ -0,0 +1,36 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+[test][]:
+
+*** Output of inspect ***
+md_el(:document,[md_par([md_link(["test"],"test"), ":"])],{},[])
+*** Output of to_html ***
+
+<p><span>test</span>:</p>
+
+*** Output of to_latex ***
+test:
+
+
+*** Output of to_md ***
+test:
+
+
+*** Output of to_s ***
+test:
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+<p>[test][]:</p>
+
+*** Output of Markdown.pl (parsed) ***
+<p>[test][]:</p
+ >

data/tests/unittest/bug_table.md

@@ -0,0 +1,77 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+
+
+hello
+{: summary="Table summary" .class1 style="color:red"}
+
+h         | h
+----------|--
+{:t}  c1  | c2
+{: summary="Table summary" .class1 style="color:red"}
+
+
+
+{:t: scope="row"}
+*** Output of inspect ***
+md_el(:document,[
+	md_par(["hello"], [["summary", "Table summary"], [:class, "class1"], ["style", "color:red"]]),
+	md_el(:table,[
+		md_el(:head_cell,["h"],{},[]),
+		md_el(:head_cell,["h"],{},[]),
+		md_el(:cell,[" c1"],{},[[:ref, "t"]]),
+		md_el(:cell,["c2"],{},[])
+	],{:align=>[:left, :left]},[["summary", "Table summary"], [:class, "class1"], ["style", "color:red"]]),
+	md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"t"},[])
+],{},[])
+*** Output of to_html ***
+
+<p class='class1' style='color:red'>hello</p>
+<table class='class1' summary='Table summary' style='color:red'><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><th scope='row' style='text-align: left;'> c1</th><td style='text-align: left;'>c2</td>
+</tr></tbody></table>
+*** Output of to_latex ***
+hello
+
+\begin{tabular}{l|l}
+h&h\\
+\hline 
+ c1&c2\\
+\end{tabular}
+
+
+*** Output of to_md ***
+hello
+
+hh c1c2
+*** Output of to_s ***
+hellohh c1c2
+*** EOF ***
+
+
+
+	OK!
+
+
+
+*** Output of Markdown.pl ***
+<p>hello
+{: summary="Table summary" .class1 style="color:red"}</p>
+
+<p>h         | h
+----------|--
+{:t}  c1  | c2
+{: summary="Table summary" .class1 style="color:red"}</p>
+
+<p>{:t: scope="row"}</p>
+
+*** Output of Markdown.pl (parsed) ***
+<p>hello
+{: summary="Table summary" .class1 style="color:red"}</p
+   ><p>h         | h
+----------|--
+{:t}  c1  | c2
+{: summary="Table summary" .class1 style="color:red"}</p
+   ><p>{:t: scope="row"}</p
+ >