Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

vendor/plugins/maruku/lib/maruku/output/to_html.rb

@@ -637,8 +637,7 @@ of the form `#ff00ff`.
 			code['lang'] = lang
 			code['class'] = lang
 		end
-		pre << code << text
-		pre
+		pre << (code << text)
 	end
 
 	def to_html_inline_code; 

vendor/plugins/maruku/lib/maruku/output/to_markdown.rb

@@ -27,7 +27,11 @@ class String
 	
 	# " andrea censi " => [" andrea ", "censi "]
 	def mysplit
-		split.map{|x| x+" "}
+        res = split.map{|x| x+" "}
+        if self[0] == 32
+             res[0] = " " + res[0]
+        end
+        res
 	end
 end
 
@@ -45,11 +49,82 @@ module MaRuKu; module Out; module Markdown
 		wrap(@children, line_length, context)+"\n"
 	end
 
+    def to_md_header(context)
+        pounds = "#" * @level
+    "#{pounds} #{children_to_md(context)} #{pounds}\n\n"
+    end
+
+    def to_md_inline_code(context)
+    "`#{@raw_code}`"
+     end
+
+     def to_md_code(context)
+        @raw_code.split("\n").collect { |line| "     " + line}.join("\n") + "\n"
+     end
+
+    def to_md_quote(context)
+        line_length = (context[:line_length] || DefaultLineLength) - 2
+         wrap(@children, line_length, context).split(/\n/).collect { |line| "> " + line}.join("\n") + "\n"
+    end
+
+    def to_md_hrule(context)
+        "* * *"
+    end
+
+    def to_md_emphasis(context)
+        "*#{children_to_md(context)}*"
+    end
+
+    def to_md_strong(context)
+         "**#{children_to_md(context)}**"
+     end
+
+    def to_md_immediate_link(context)
+        "<#{@url}>"
+    end
+
+    def to_md_email_address(context)
+        "<#{@email}>"
+     end
+
+    def to_md_entity(context)
+        "&#{@entity_name};"
+    end
+
+    def to_md_linebreak(context)
+        "\n"
+    end
+
+    def to_md_paragraph(context)
+        line_length = context[:line_length] || DefaultLineLength
+         wrap(@children, line_length, context)+"\n"
+     end
+
+    def to_md_im_link(context)
+         "[#{children_to_md(context)}](#{@url}#{" #{@title}" if @title})"
+    end
+
+    def to_md_link(context)
+        "[#{children_to_md(context)}][#{@ref_id}]"
+    end
+
+    def to_md_im_image(context)
+     "![#{children_to_md(context)}](#{@url}#{" #{@title}" if @title})"
+     end
+    def to_md_image(context)
+        "![#{children_to_md(context)}][#{@ref_id}]"
+    end
+
+    def to_md_ref_definition(context)
+        "[#{@ref_id}] #{@url}#{" #{@title}" if @title}"
+    end
+
     def to_md_li_span(context)
 		len = (context[:line_length] || DefaultLineLength) - 2
-		s = wrap(@children, len-2, context).rstrip.gsub(/^/, '  ')
-		s[0] = ?*
-		s + "\n"
+#		s = wrap(@children, len-2, context).rstrip.gsub(/^/, '  ')
+#		s[0] = ?*
+#		s + "\n"
+        s = "* " + wrap(@children, len-2, context).rstrip + "\n"
 	end
 	
 	def to_md_abbr_def(context)
@@ -60,9 +135,10 @@ module MaRuKu; module Out; module Markdown
 		len = (context[:line_length] || DefaultLineLength) - 2
 		md = ""
 		self.children.each_with_index do |li, i|
-			s = (w=wrap(li.children, len-2, context)).rstrip.gsub(/^/, '    ')+"\n"
-			s[0,4] = "#{i+1}.  "[0,4]
+#			s = (w=wrap(li.children, len-2, context)).rstrip.gsub(/^/, '    ')+"\n"
+#			s[0,4] = "#{i+1}.  "[0,4]
 #			puts w.inspect
+            s = "#{i+1}. " + (w=wrap(li.children, len-2, context)).rstrip + "\n"
 			md += s
 		end
 		md + "\n"
@@ -73,10 +149,11 @@ module MaRuKu; module Out; module Markdown
 		md = ""
 		self.children.each_with_index do |li, i|
 			w = wrap(li.children, len-2, context)
+			s = "- " + w
 #			puts "W: "+ w.inspect
-			s = add_indent(w)
+	#		s = add_indent(w)
 #			puts "S: " +s.inspect
-			s[0,1] = "-"
+	#		s[0,1] = "-"
 			md += s
 		end
 		md + "\n"
@@ -105,6 +182,10 @@ module MaRuKu; module Out; module Markdown
 			pieces =
 			if c.kind_of? String
 				c.to_md.mysplit
+            elsif c.kind_of?(MDElement)
+                method = "to_md_#{c.node_type}"
+                method = "to_md" unless c.respond_to?(method)
+                [c.send(method, context)].flatten
 			else
 				[c.to_md(context)].flatten
 			end

vendor/plugins/maruku/spec/block_docs/alt.md

@@ -12,6 +12,6 @@ md_el(:document,[md_par([md_im_image(["bar"], "/foo.jpg", nil)])],{},[])
 *** Output of to_latex ***
 
 *** Output of to_md ***
-bar
+![bar](/foo.jpg)
 *** Output of to_s ***
 bar

vendor/plugins/maruku/spec/block_docs/attributes/attributes.md

@@ -50,8 +50,19 @@ Paragraph with a.
 
 Paragraph with \emph{emphasis}
 *** Output of to_md ***
-Header with attributesHeader with attributesHeader no attributesParagraph with a.
 
-Paragraph with emphasis
+## Header with attributes ## {#header1}
+
+### Header with attributes ### {#header2}
+
+### Header no attributes ###
+
+{:warn2}Paragraph with a.
+{#par1}
+
+Paragraph with *emphasis*{:hello notfound}
+   {#par2}
+
+{:hello: .chello}
 *** Output of to_s ***
 Header with attributesHeader with attributesHeader no attributesParagraph with a.Paragraph with emphasis

vendor/plugins/maruku/spec/block_docs/blanks_in_code.md

@@ -68,8 +68,23 @@ This block is composed of 2
 *** Output of to_md ***
 This block is composed of three lines:
 
+     one
+     
+     three
+
 This block is composed of 5
 
+     
+     one
+     
+     
+     four
+
+
 This block is composed of 2
+
+     
+     two
+
 *** Output of to_s ***
 This block is composed of three lines:This block is composed of 5This block is composed of 2

vendor/plugins/maruku/spec/block_docs/bug_def.md

@@ -11,6 +11,6 @@ md_el(:document,[md_par([md_link(["test"],"test"), ":"])],{},[])
 *** Output of to_latex ***
 test:
 *** Output of to_md ***
-test:
+[test][]:
 *** Output of to_s ***
 test:

vendor/plugins/maruku/spec/block_docs/bug_table.md

@@ -28,8 +28,8 @@ md_el(:document,[
 ],{},[])
 *** Output of to_html ***
 <p class="class1" style="color:red">hello</p>
-<table class="class1" style="color:red" summary="Table summary"><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>
+<table class="class1" style="color:red" summary="Table summary"><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
 

vendor/plugins/maruku/spec/block_docs/code.md

@@ -30,5 +30,10 @@ end tell
 	tab\end{verbatim}
 *** Output of to_md ***
 Here is an example of AppleScript:
+
+     tell application "Foo"
+         beep
+     end tell
+     	tab
 *** Output of to_s ***
 Here is an example of AppleScript:

vendor/plugins/maruku/spec/block_docs/code2.md

@@ -23,6 +23,8 @@ Code
 
 \end{quote}
 *** Output of to_md ***
-Code
+> Code
+> 
+>      Ciao
 *** Output of to_s ***
 Code

vendor/plugins/maruku/spec/block_docs/code3.md

@@ -62,10 +62,16 @@ This is not code
 *** Output of to_md ***
 This is code (4 spaces):
 
+     Code
 This is not code
 
+     Code
+
 This is code (1 tab):
 
+     Code
 This is not code
+
+     Code
 *** Output of to_s ***
 This is code (4 spaces):This is not codeThis is code (1 tab):This is not code

vendor/plugins/maruku/spec/block_docs/easy.md

@@ -10,6 +10,6 @@ md_el(:document,[md_par([md_em(["Hello!"]), " how are ", md_strong(["you"]), "?"
 *** Output of to_latex ***
 \emph{Hello!} how are \textbf{you}?
 *** Output of to_md ***
-Hello!how are you?
+*Hello!* how are **you**?
 *** Output of to_s ***
 Hello! how are you?

vendor/plugins/maruku/spec/block_docs/email.md

@@ -15,6 +15,6 @@ md_el(:document,[
 *** Output of to_latex ***
 This is an email address: \href{mailto:andrea@invalid.it}{andrea\char64invalid\char46it}
 *** Output of to_md ***
-This is an email address:
+This is an email address: <andrea@invalid.it>
 *** Output of to_s ***
 This is an email address:

vendor/plugins/maruku/spec/block_docs/entities.md

@@ -48,12 +48,12 @@ md_el(:document,[
 ],{},[])
 *** Output of to_html ***
 <p>Maruku translates HTML entities to the equivalent in LaTeX:</p>
-<table><thead><tr><th>Entity</th><th>Result</th></tr></thead><tbody><tr><td style="text-align: left;"><code>&amp;copy;</code></td><td style="text-align: left;">&#169;</td>
-</tr><tr><td style="text-align: left;"><code>&amp;pound;</code></td><td style="text-align: left;">&#163;</td>
-</tr><tr><td style="text-align: left;"><code>a&amp;nbsp;b</code></td><td style="text-align: left;">a&#160;b</td>
-</tr><tr><td style="text-align: left;"><code>&amp;lambda;</code></td><td style="text-align: left;">&#955;</td>
-</tr><tr><td style="text-align: left;"><code>&amp;mdash;</code></td><td style="text-align: left;">&#8212;</td>
-</tr></tbody></table>
+<table><thead><tr><th>Entity</th><th>Result</th></tr></thead><tbody><tr><td style="text-align: left;"><code>&amp;copy;</code></td><td style="text-align: left;">&#169;</td></tr>
+<tr><td style="text-align: left;"><code>&amp;pound;</code></td><td style="text-align: left;">&#163;</td></tr>
+<tr><td style="text-align: left;"><code>a&amp;nbsp;b</code></td><td style="text-align: left;">a&#160;b</td></tr>
+<tr><td style="text-align: left;"><code>&amp;lambda;</code></td><td style="text-align: left;">&#955;</td></tr>
+<tr><td style="text-align: left;"><code>&amp;mdash;</code></td><td style="text-align: left;">&#8212;</td></tr>
+</tbody></table>
 <p>Entity-substitution does not happen in code blocks or inline code.</p>
 
 <p>The following should not be translated:</p>
@@ -84,11 +84,21 @@ It should read just like this: {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38copy\c
 Maruku translates HTML entities to the
 equivalent in LaTeX:
 
-EntityResultabEntity-substitution does not happen in
-code blocks or inline code.
+Entity      | Result
+------------|----------
+`&copy;`    |  &copy;
+`&pound;`   |  &pound;
+`a&nbsp;b`  |  a&nbsp;b
+`&lambda;`  |  &lambda;
+`&mdash;`   |  &mdash;
+
+
+Entity-substitution does not happen in code blocks or inline code.
 
 The following should not be translated:
 
-It should read just like this: .
+     &copy;
+
+It should read just like this: `&copy;`.
 *** Output of to_s ***
 Maruku translates HTML entities to the equivalent in LaTeX:EntityResultabEntity-substitution does not happen in code blocks or inline code.The following should not be translated:It should read just like this: .

vendor/plugins/maruku/spec/block_docs/escaping.md

@@ -52,16 +52,16 @@ This is {\colorbox[rgb]{1.00,0.93,1.00}{\tt Code~with~a~special\char58~\char45\c
 
 End of {\colorbox[rgb]{1.00,0.93,1.00}{\tt paragraph~}}
 *** Output of to_md ***
-Hello: ! ! ` { } [ ] ( ) # . ! * * *
+Hello: ! \! \` \{ \} \[ \] \( \) \# \. \! * \* *
 
-Ora, emphasis, bold, * <- due
-asterischi-> * , un underscore-> _ ,
-emphasis, incre diblee!
 
-This is (after)
+Ora, *emphasis*, **bold**, * <- due asterischi-> * , un underscore-> _ , _emphasis_,
+ incre*dible*e!
 
-of paragraph
+This is ``Code with a special: -> ` <- ``(after)
 
-End of
+`Start ` of paragraph
+
+End of `paragraph `
 *** Output of to_s ***
 Hello: ! ! ` { } [ ] ( ) # . ! * * *Ora, emphasis, bold, * <- due asterischi-> * , un underscore-> _ , emphasis, incrediblee!This is (after) of paragraphEnd of

vendor/plugins/maruku/spec/block_docs/extra_header_id.md

@@ -53,11 +53,17 @@ Then you can create links to different parts of the same document like this:
 
 \hyperlink{header1}{Link back to header 1}, \hyperlink{header2}{Link back to header 2}, \hyperlink{header3}{Link back to header 3}
 *** Output of to_md ***
-Header 1Header 2Header 3Then you can create links to different
+# Header 1 # {#header1}
+
+## Header 2 ## {#header2}
+
+### Header 3 ### {#header3}
+
+Then you can create links to different
 parts of the same document like this:
 
-Link back to header 1,
-Link back to header 2,
-Link back to header 3
+[Link back to header 1](#header1),
+[Link back to header 2](#header2),
+[Link back to header 3](#header3)
 *** Output of to_s ***
 Header 1Header 2Header 3Then you can create links to different parts of the same document like this:Link back to header 1, Link back to header 2, Link back to header 3

vendor/plugins/maruku/spec/block_docs/extra_table1.md

@@ -21,9 +21,9 @@ md_el(:document,[
 	],{:align=>[:left, :left]},[])
 ],{},[])
 *** Output of to_html ***
-<table><thead><tr><th>First Header</th><th>Second Header</th></tr></thead><tbody><tr><td style="text-align: left;">Content Cell</td><td style="text-align: left;">Content Cell</td>
-</tr><tr><td style="text-align: left;">Content Cell</td><td style="text-align: left;">Content Cell</td>
-</tr></tbody></table>
+<table><thead><tr><th>First Header</th><th>Second Header</th></tr></thead><tbody><tr><td style="text-align: left;">Content Cell</td><td style="text-align: left;">Content Cell</td></tr>
+<tr><td style="text-align: left;">Content Cell</td><td style="text-align: left;">Content Cell</td></tr>
+</tbody></table>
 *** Output of to_latex ***
 \begin{tabular}{l|l}
 First Header&Second Header\\

vendor/plugins/maruku/spec/block_docs/headers.md

@@ -32,6 +32,10 @@ md_el(:document,[
 
 \hypertarget{a_title_with_emphasis_3}{}\paragraph*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis_3}
 *** Output of to_md ***
-A title with emphasisA title with emphasisA title with emphasis
+# A title with *emphasis* #
+
+## A title with *emphasis* ##
+
+#### A title with *emphasis* ####
 *** Output of to_s ***
 A title with emphasisA title with emphasisA title with emphasis

vendor/plugins/maruku/spec/block_docs/hex_entities.md

@@ -29,9 +29,9 @@ md_el(:document,[
 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.
+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.
 *** 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.

vendor/plugins/maruku/spec/block_docs/ie.md

@@ -45,5 +45,18 @@ md_el(:document,[
 \begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
 *** Output of to_md ***
 
+`<p>here's an apostrophe & a quote "</p>`
+
+     <p>here's an apostrophe & a quote "</p>
+{:}
+
+     <p>here's an apostrophe & a quote "</p>
+{:lang=xml}
+
+     <p>here's an apostrophe & a quote "</p>
+{:html_use_syntax=true lang=not_supported}
+
+     <p>here's an apostrophe & a quote "</p>
+{:html_use_syntax=true lang=xml}
 *** Output of to_s ***
 

vendor/plugins/maruku/spec/block_docs/images.md

@@ -3,7 +3,7 @@ Write a comment abouth the test here.
 {}
 *** Markdown input: ***
 
-This page does not uilizes ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss)
+This page does not utilize ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss)
 
 
 Please mouseover to see the title: ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss "Title ok!")
@@ -27,7 +27,7 @@ This is double size: ![Cascading Style Sheets] [css2]
 *** Output of inspect ***
 md_el(:document,[
 	md_par([
-		"This page does not uilizes ",
+		"This page does not utilize ",
 		md_im_image(["Cascading Style Sheets"], "http://jigsaw.w3.org/css-validator/images/vcss", nil)
 	]),
 	md_par([
@@ -52,7 +52,7 @@ md_el(:document,[
 	md_ref_def("css2", "http://jigsaw.w3.org/css-validator/images/vcss", {:title=>"Optional title attribute"})
 ],{},[])
 *** Output of to_html ***
-<p>This page does not uilizes <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets"/></p>
+<p>This page does not utilize <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets"/></p>
 
 <p>Please mouseover to see the title: <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets" title="Title ok!"/></p>
 
@@ -62,7 +62,7 @@ md_el(:document,[
 
 <p>This is double size: <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets" title="Optional title attribute"/></p>
 *** Output of to_latex ***
-This page does not uilizes 
+This page does not utilize 
 
 Please mouseover to see the title: 
 
@@ -72,19 +72,19 @@ I'{}ll say it one more time: this page does not use
 
 This is double size:
 *** Output of to_md ***
-This page does not uilizes
-Cascading Style Sheets
+This page does not utilize ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss)
 
-Please mouseover to see the title:
-Cascading Style Sheets
+Please mouseover to see the title: ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss "Title ok!")
 
-Please mouseover to see the title:
-Cascading Style Sheets
+Please mouseover to see the title: ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss 'Title ok!')
 
-I ll say it one more time: this page
-does not use Cascading Style Sheets
+I'll say it one more time: this page does not use ![Cascading Style Sheets] [css]
 
-This is double size:
-Cascading Style Sheets
+This is double size: ![Cascading Style Sheets] [css2]
+
+[css]: http://jigsaw.w3.org/css-validator/images/vcss "Optional title attribute"
+
+[css2]: http://jigsaw.w3.org/css-validator/images/vcss "Optional title attribute" class=external
+   style="border:0;width:188px;height:131px"
 *** Output of to_s ***
-This page does not uilizes Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsIll say it one more time: this page does not use Cascading Style SheetsThis is double size: Cascading Style Sheets
+This page does not utilize Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsIll say it one more time: this page does not use Cascading Style SheetsThis is double size: Cascading Style Sheets

vendor/plugins/maruku/spec/block_docs/images2.md

@@ -24,8 +24,10 @@ This is an .
 
 This is an .
 *** Output of to_md ***
-This is an image.
+This is an ![image][].
 
-This is an image.
+This is an ![image].
+
+[image]: image.jpg
 *** Output of to_s ***
 This is an image.This is an image.

vendor/plugins/maruku/spec/block_docs/lists.md

@@ -154,39 +154,50 @@ This is the second paragraph in the list item. You'{}re only required to indent
 
 \end{itemize}
 *** Output of to_md ***
--orem ipsum dolor sit amet,
+- Lorem ipsum dolor sit amet,
 consectetuer adipiscing elit.
 Aliquam hendrerit mi posuere
 lectus. Vestibulum enim wisi,
 viverra nec, fringilla in, laoreet
 vitae, risus.
--onec sit amet nisl. Aliquam semper
+- Donec sit amet nisl. Aliquam semper
 ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus
 adipiscing.
--onec sit amet nisl. Aliquam semper
+- Donec sit amet nisl. Aliquam semper
 ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus
 adipiscing.
--onec sit amet nisl. Aliquam semper
+- Donec sit amet nisl. Aliquam semper
 ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus
 adipiscing.
--onec sit amet nisl. Aliquam semper
+- Donec sit amet nisl. Aliquam semper
 ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus
 adipiscing.
 
 Ancora
 
--This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+- 
+This is a list item with two
+paragraphs. Lorem ipsum dolor sit amet,
+consectetuer adipiscing elit. Aliquam
+hendrerit mi posuere lectus.
 ATTENZIONE!
--Suspendisse id sem consectetuer libero luctus adipiscing.
+- 
+Suspendisse id sem consectetuer libero
+luctus adipiscing.
 
 Ancora
 
--This is a list item with two paragraphs.
-This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
--nother item in the same list.
+- This is a list item with two
+paragraphs.
+  This is the second paragraph in the
+list item. You re only required to
+indent the first line. Lorem ipsum
+dolor sit amet, consectetuer adipiscing
+elit.
+- Another item in the same list.
 *** Output of to_s ***
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Another item in the same list.

vendor/plugins/maruku/spec/block_docs/lists12.md

@@ -0,0 +1,43 @@
+List Items with non alphanumeric content
+*** Parameters: ***
+{}
+*** Markdown input: ***
+* A
+* ?
+* B
+
+*** Output of inspect ***
+md_el(:document,[
+  md_el(:ul,[
+    md_el(:li_span,["A"],{:want_my_paragraph=>false},[]),
+    md_el(:li_span,["?"],{:want_my_paragraph=>false},[]),
+    md_el(:li_span,["B"],{:want_my_paragraph=>false},[])
+  ],{},[])
+],{},[])
+
+*** Output of to_html ***
+<ul>
+<li>A</li>
+
+<li>?</li>
+
+<li>B</li>
+</ul>
+
+*** Output of to_latex ***
+\begin{itemize}%
+\item A
+\item ?
+\item B
+
+\end{itemize}
+
+*** Output of to_md ***
+-
+-
+-
+
+*** Output of to_s ***
+A?B
+
+

vendor/plugins/maruku/spec/block_docs/lists_after_paragraph.md

@@ -194,9 +194,13 @@ Quoted
 
 Paragraph with header:
 
-headerParagraph with header on two lines:
+### header
 
-headerParagraph with html after
+Paragraph with header on two lines:
+
+## header
+
+Paragraph with html after
 
 Paragraph with html after, indented:
 

vendor/plugins/maruku/spec/block_docs/lists_ol.md

@@ -239,24 +239,32 @@ This is the second paragraph in the list item. You'{}re only required to indent
 Ancora
 
 1.  
-    This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+    This is a list item with two
+    paragraphs. Lorem ipsum dolor sit amet,
+    consectetuer adipiscing elit. Aliquam
+    hendrerit mi posuere lectus.
     ATTENZIONE!
-    Uno
-    
-    Due
+    - Uno
+    - Due
     
     1.  tre
     2.  tre
     3.  tre
-    
-    Due
+    - Due
 2.  
-    Suspendisse id sem consectetuer libero luctus adipiscing.
+    Suspendisse id sem consectetuer libero
+    luctus adipiscing.
 
 Ancora
 
--This is a list item with two paragraphs.
-This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
--nother item in the same list.
+- 
+This is a list item with two
+paragraphs.
+This is the second paragraph in the
+list item. You re only required to
+indent the first line. Lorem ipsum
+dolor sit amet, consectetuer adipiscing
+elit.
+- Another item in the same list.
 *** Output of to_s ***
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!UnoDuetretretreDueSuspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Another item in the same list.

vendor/plugins/maruku/spec/block_docs/math/table2.md

@@ -26,9 +26,9 @@ md_el(:document,[
 	md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"r"},[])
 ],{},[])
 *** Output of to_html ***
-<table><thead><tr><th>Symbol</th><th>Meaning</th><th>comments</th></tr></thead><tbody><tr><th scope="row" style="text-align: left;"> &#945;</th><td style="text-align: left;">The first</td><td style="text-align: left;">I like it.</td>
-</tr><tr><th scope="row" style="text-align: left;"> &aleph;</th><td style="text-align: left;">The first</td><td style="text-align: left;">I like it.</td>
-</tr></tbody></table>
+<table><thead><tr><th>Symbol</th><th>Meaning</th><th>comments</th></tr></thead><tbody><tr><th scope="row" style="text-align: left;"> &#945;</th><td style="text-align: left;">The first</td><td style="text-align: left;">I like it.</td></tr>
+<tr><th scope="row" style="text-align: left;"> &aleph;</th><td style="text-align: left;">The first</td><td style="text-align: left;">I like it.</td></tr>
+</tbody></table>
 *** Output of to_latex ***
 \begin{tabular}{l|l|l}
 Symbol&Meaning&comments\\

vendor/plugins/maruku/spec/block_docs/misc_sw.md

@@ -476,50 +476,111 @@ Type "help", "copyright", "credits" or "license" for more information.
 
 \end{itemize}
 *** Output of to_md ***
-General-perating System: Mac OS X: heaven,
-after the purgatory of Linux and
-the hell of Windows.
--rowser: Firefox. On a Mac, Camino.
--mail: GMail, search, don t sort
-really works.
--ext Editor: TextMate, you have to
-buy it, but it s worth every penny.
-There are rumours that it s been
-converting (recovering) Emacs users
-(addicts). Unfortunately, it s Mac
-only. An alternative is jedit(GPL,
-Java).
+Subject: Software not painful to use
+Subject_short: painless software
+Topic: /misc/coolsw
+Archive: no
+Date: Nov 20 2006
+Order: -9.5
+inMenu: true
 
-Development-Build system: cmake, throw the autotools away.
--Source code control system: ditch CVS for subversion.
--Project management: Trac tracks everything.
--Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob:
--Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced.
--Mark-up language: HTML is so 2001, why dont you take at look at Markdown? Look at the source of this page.
--C++ libraries: * QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else.
 
-Research-riting papers: LaTeX
--Writing papers & enjoying the process
-: LyX
--andsome figures in your papers:
-xfigor, better, jfig.
--The occasional presentation with many graphical content
-: OpenOffice Impress(using the
-OOOlatex plugin); the alternative
-is PowerPoint with the TexPoint
-plugin.
--anaging BibTeX: jabref:
-multi-platform, for all your bibtex
-needs.
--EEExplore and BibTeX: convert
-citations using BibConverter.
+### General
+
+* *Operating System* : [Mac OS X][switch]: heaven, after the purgatory of Linux
+  and the hell of Windows.
+* *Browser*: [Firefox][firefox]. On a Mac, [Camino][camino].
+* *Email*: [GMail][gmail], "search, don't sort" really works.
+* *Text Editor*: [TextMate][textmate], you have to buy it, but it's worth every
+  penny. There are rumours that it's been converting (recovering) Emacs
+  users (addicts). Unfortunately, it's Mac only. An alternative is
+  [jedit][jedit] (GPL, Java).
+
+### Development
+
+* *Build system*: [cmake][cmake], throw the [autotools][autotools] away.
+* *Source code control system*: ditch CVS for [subversion][subversion].
+* *Project management*: [Trac][trac] tracks everything.
+* *Scripting language*: [Ruby][ruby] is Japanese pragmatism (and has a [poignant][poignant] guide).
+   Python, you say? Python is too academic and snob:
+
+      $ python
+      Python 2.4.1 (\#1, Jun  4 2005, 00:54:33)
+      Type "help", "copyright", "credits" or "license" for more information.
+      >>> exit
+      'Use Ctrl-D (i.e. EOF) to exit.'
+      >>> quit
+      'Use Ctrl-D (i.e. EOF) to exit.'
+
+* *Java IDE*: [JBuilder][jbuilder] is great software and has a free version (IMHO better than Eclipse). Java
+ is not a pain anymore since it gained [generics][java-generics] and got opensourced.
+* *Mark-up language*: HTML is so 2001, why don't you take at look at [Markdown][markdown]? [Look at the source of this page](data/misc_markdown.png).
+* *C++ libraries*:
+    * [QT][qt] for GUIs.
+    * [GSL][gsl] for math.
+    * [Magick++][magick] for manipulating images.
+    * [Cairo][cairo] for creating PDFs.
+    * [Boost][boost] for just about everything else.
+
+
+### Research
+
+* *Writing papers*: [LaTeX][latex]
+* *Writing papers & enjoying the process*: [LyX][lyx]
+* *Handsome figures in your papers*: [xfig][xfig] or, better, [jfig][jfig].
+* *The occasional presentation with many graphical content*:
+  [OpenOffice Impress][impress] (using the [OOOlatex plugin][ooolatex]);
+  the alternative is PowerPoint with the [TexPoint][texpoint] plugin.
+* *Managing BibTeX*: [jabref][jabref]: multi-platform, for all your bibtex needs.
+* *IEEExplore and BibTeX*: convert citations using [BibConverter][bibconverter].
+
+### Cool websites
+
+* *Best site in the wwworld*: [Wikipedia][wikipedia]
+* [Mutopia][mutopia] for sheet music; [the Gutenberg Project][gutenberg] for books; [LiberLiber][liberliber] for books in italian.
+* *Blogs*: [Bloglines][bloglines]
+* *Sharing photos*: [flickr][flickr] exposes an API you can use.
+
+
+[firefox]:   http://getfirefox.com/
+[gmail]:     http://gmail.com/
+[bloglines]: http://bloglines.com/
+[wikipedia]: http://en.wikipedia.org/
+[ruby]:      http://www.ruby-lang.org/
+[poignant]:  http://poignantguide.net/ruby/
+[webgen]:    http://webgen.rubyforge.org/
+[markdown]:  http://daringfireball.net/projects/markdown/
+[latex]:     http://en.wikipedia.org/wiki/LaTeX
+[lyx]:       http://www.lyx.org
+[impress]:   http://www.openoffice.org/product/impress.html
+[ooolatex]:  http://ooolatex.sourceforge.net/
+[texpoint]:  http://texpoint.necula.org/
+[jabref]:    http://jabref.sourceforge.net/
+[camino]:    http://www.caminobrowser.org/
+[switch]:    http://www.apple.com/getamac/
+[textmate]:  http://www.apple.com/getamac/
+[cmake]:     http://www.cmake.org/
+[xfig]:      http://www.xfig.org/
+[jfig]:         http://tams-www.informatik.uni-hamburg.de/applets/jfig/
+[subversion]:   http://subversion.tigris.org
+[jbuilder]:     http://www.borland.com/us/products/jbuilder/index.html
+[flickr]:       http://www.flickr.com/
+[myflickr]:     http://www.flickr.com/photos/censi
+[bibconverter]: http://www.bibconverter.net/ieeexplore/
+[autotools]:    http://sources.redhat.com/autobook/
+[jedit]:        http://www.jedit.org/
+[qt]:           http://www.trolltech.no/
+[gsl]:          http://www.gnu.org/software/gsl/
+[magick]:       http://www.imagemagick.org/Magick++/
+[cairo]:        http://cairographics.org/
+[boost]:        http://www.boost.org/
+[markdown]:     http://en.wikipedia.org/wiki/Markdown
+[trac]:         http://trac.edgewall.org/
+[mutopia]:      http://www.mutopiaproject.org/
+[liberliber]:   http://www.liberliber.it/
+[gutenberg]:    http://www.gutenberg.org/
+[java-generics]: http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html
+
 
-Cool websites-est site in the wwworld: Wikipedia
--utopiafor sheet music;
-the Gutenberg Projectfor books;
-LiberLiberfor books in italian.
--logs: Bloglines
--haring photos: flickrexposes an
-API you can use.
 *** Output of to_s ***
 GeneralOperating System : Mac OS X: heaven, after the purgatory of Linux and the hell of Windows.Browser: Firefox. On a Mac, Camino.Email: GMail, search, dont sort really works.Text Editor: TextMate, you have to buy it, but its worth every penny. There are rumours that its been converting (recovering) Emacs users (addicts). Unfortunately, its Mac only. An alternative is jedit (GPL, Java).DevelopmentBuild system: cmake, throw the autotools away.Source code control system: ditch CVS for subversion.Project management: Trac tracks everything.Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob:Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced.Mark-up language: HTML is so 2001, why dont you take at look at Markdown? Look at the source of this page.C++ libraries: * QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else.ResearchWriting papers: LaTeXWriting papers & enjoying the process: LyXHandsome figures in your papers: xfig or, better, jfig.The occasional presentation with many graphical content: OpenOffice Impress (using the OOOlatex plugin); the alternative is PowerPoint with the TexPoint plugin.Managing BibTeX: jabref: multi-platform, for all your bibtex needs.IEEExplore and BibTeX: convert citations using BibConverter.Cool websitesBest site in the wwworld: WikipediaMutopia for sheet music; the Gutenberg Project for books; LiberLiber for books in italian.Blogs: BloglinesSharing photos: flickr exposes an API you can use.

vendor/plugins/maruku/spec/block_docs/notyet/header_after_par.md

@@ -49,10 +49,14 @@ Paragraph
 *** Output of to_md ***
 Paragraph
 
-headerParagraph
+### header
 
-headerParagraph
+Paragraph
 
-header
+## header
+
+Paragraph
+
+# header
 *** Output of to_s ***
 ParagraphheaderParagraphheaderParagraphheader

vendor/plugins/maruku/spec/block_docs/notyet/triggering.md

@@ -146,12 +146,13 @@ no space:
 
 Paragraph with block quote:
 
-Quoted
-
+> Quoted
 Paragraph with header:
 
-headerParagraph with header on two lines:
+### header
 
-header
+Paragraph with header on two lines:
+
+## header
 *** Output of to_s ***
 Paragraph, list with no space: * ciaoParagraph, list with 1 space: * ciaoParagraph, list with 3 space: * ciaoParagraph, list with 4 spaces: * ciaoParagraph, list with 1 tab: * ciaoParagraph (1 space after), list with no space: * ciaoParagraph (2 spaces after), list with no space:* ciaoParagraph (3 spaces after), list with no space: * ciaoParagraph with block quote:QuotedParagraph with header:headerParagraph with header on two lines:header

vendor/plugins/maruku/spec/block_docs/paragraph_rules/dont_merge_ref.md

@@ -34,9 +34,13 @@ Paragraph
 Paragraph
 *** Output of to_md ***
 Paragraph
+[google1]: #
 
 Paragraph
+ [google2]: #
 
 Paragraph
+  [google3]: #
+
 *** Output of to_s ***
 ParagraphParagraphParagraph

vendor/plugins/maruku/spec/block_docs/pending/empty_cells.md

@@ -21,9 +21,9 @@ md_el(:document,[
 	],{:align=>[:left, :left, :left]},[])
 ],{},[])
 *** Output of to_html ***
-<table><thead><tr><th/><th>1</th><th>2</th></tr></thead><tbody><tr><td style="text-align: left;">A</td><td style="text-align: left;">X</td><td style="text-align: left;"/>
-</tr><tr><td style="text-align: left;">B</td><td style="text-align: left;"/><td style="text-align: left;">X</td>
-</tr></tbody></table>
+<table><thead><tr><th/><th>1</th><th>2</th></tr></thead><tbody><tr><td style="text-align: left;">A</td><td style="text-align: left;">X</td><td style="text-align: left;"/></tr>
+<tr><td style="text-align: left;">B</td><td style="text-align: left;"/><td style="text-align: left;">X</td></tr>
+</tbody></table>
 *** Output of to_latex ***
 \begin{tabular}{l|l|l}
 &1&2\\

vendor/plugins/maruku/spec/block_docs/pending/link.md

@@ -67,6 +67,22 @@ md_el(:document,[
 
 \begin{verbatim}<a@invalid.it>\end{verbatim}
 *** Output of to_md ***
+<http://www.aa.com>
 
+ <http://www.bb.com>
+
+  <http://www.cc.com>
+
+   <http://www.dd.com>
+
+    <http://www.dd.com>
+
+<a@invalid.it>
+
+ <a@invalid.it>
+
+   <a@invalid.it>
+
+    <a@invalid.it>
 *** Output of to_s ***
 

vendor/plugins/maruku/spec/block_docs/pending/ref.md

@@ -16,6 +16,9 @@ md_el(:document,[
 *** Output of to_latex ***
 \href{http://site.com/}{a. b} is a link.
 *** Output of to_md ***
-a. bis a link.
+[a. b] is a link.
+
+[a. b]: http://site.com/
+
 *** Output of to_s ***
 a. b is a link.

vendor/plugins/maruku/spec/block_docs/recover/recover_links.md

@@ -10,6 +10,6 @@ md_el(:document,[md_par(["Search on ", md_link(["Google images"],"google_search"
 *** Output of to_latex ***
 Search on Google images
 *** Output of to_md ***
-Search on Google images
+Search on [Google images][ 	GoOgle search ]
 *** Output of to_s ***
 Search on Google images

vendor/plugins/maruku/spec/block_docs/references/long_example.md

@@ -59,13 +59,18 @@ filters --{} including \href{http://docutils.sourceforge.net/mirror/setext.html}
 
 To this end, Markdown'{}s syntax is comprised entirely of punctuation
 *** Output of to_md ***
-filters including Setext, atx, Textile,
-reStructuredText, Grutatext, and EtText
-the single biggest source of
-inspiration for Markdown s syntax is
-the format of plain text email.
 
-To this end, Markdown s syntax is
-comprised entirely of punctuation
+filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
+[Grutatext] [5], and [EtText] [6] -- the single biggest source of
+inspiration for Markdown's syntax is the format of plain text email.
+
+  [1]: http://docutils.sourceforge.net/mirror/setext.html
+  [2]: http://www.aaronsw.com/2002/atx/
+  [3]: http://textism.com/tools/textile/
+  [4]: http://docutils.sourceforge.net/rst.html
+  [5]: http://www.triptico.com/software/grutatxt.html
+  [6]: http://ettext.taint.org/doc/
+
+To this end, Markdown's syntax is comprised entirely of punctuation
 *** Output of to_s ***
 filters  including Setext, atx, Textile, reStructuredText, Grutatext, and EtText  the single biggest source of inspiration for Markdowns syntax is the format of plain text email.To this end, Markdowns syntax is comprised entirely of punctuation

vendor/plugins/maruku/spec/block_docs/smartypants.md

@@ -102,13 +102,18 @@ She was 6"{}12'{}.
 
 \end{quote}
 *** Output of to_md ***
-Twas a test to remember in the 90s.
+	'Twas a "test" to 'remember' in the '90s.
+'Twas a "test" to 'remember' in the '90s.
 
-It was in a sense really interesting.
+	It was --- in a sense --- really... interesting.
+It was --- in a sense --- really... interesting.
 
-I too met some curly quotes there or
-here No space.
+	I -- too -- met << some curly quotes >> there or <<here>>No space.
+I -- too -- met << some curly quotes >> there or <<here>>No space.
+
+
+	She was 6\"12\'.
+> She was 6\"12\'.
 
-She was 6 12 .
 *** Output of to_s ***
 Twas a test to remember in the 90s.It was  in a sense  really interesting.I  too  met some curly quotes there or hereNo space.She was 612.

vendor/plugins/maruku/spec/block_docs/syntax_hl.md

@@ -47,6 +47,15 @@ This is ruby code:
 *** Output of to_md ***
 This is ruby code:
 
+	require 'maruku'
+	
+	puts Maruku.new($stdin).to_html
+
 This is ruby code:
+
+	require 'maruku'
+{: lang=ruby html_use_syntax}
+
+	puts Maruku.new($stdin).to_html
 *** Output of to_s ***
 This is ruby code:This is ruby code:

vendor/plugins/maruku/spec/block_docs/table_attributes.md

@@ -20,8 +20,8 @@ md_el(:document,[
 	md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"t"},[])
 ],{},[])
 *** Output of to_html ***
-<table class="class1" style="color:red" summary="Table summary" width="50%" frame="lhs" rules="cols" border="3" cellspacing="2em" cellpadding="4px"><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>
+<table class="class1" style="color:red" summary="Table summary" width="50%" frame="lhs" rules="cols" border="3" cellspacing="2em" cellpadding="4px"><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 ***
 \begin{tabular}{l|l}
 h&h\\

vendor/plugins/maruku/spec/block_docs/wrapping.md

@@ -54,13 +54,13 @@ Lorem ipsum dolor amet. Lorem ipsum
 dolor amet. Lorem ipsum dolor amet.
 Lorem ipsum dolor amet.
 
--orem ipsum dolor amet. Lorem ipsum
+- Lorem ipsum dolor amet. Lorem ipsum
 dolor amet. Lorem ipsum dolor amet.
 Lorem ipsum dolor amet Lorem ipsum
 Break:  
 Lorem ipsum dolor amet. Lorem ipsum
 dolor amet. Lorem ipsum dolor amet
--orem ipsum dolor amet. Lorem ipsum
+- Lorem ipsum dolor amet. Lorem ipsum
 dolor amet. Lorem ipsum dolor amet.
 Lorem ipsum dolor amet
 *** Output of to_s ***