diff --git a/app/views/wiki/tex.rhtml b/app/views/wiki/tex.rhtml index ddc87320..dfee856c 100644 --- a/app/views/wiki/tex.rhtml +++ b/app/views/wiki/tex.rhtml @@ -101,6 +101,7 @@ \re@DeclareMathSymbol{\swArrow}{\mathrel}{symbolsC}{119} \re@DeclareMathSymbol{\swArr}{\mathrel}{symbolsC}{119} \re@DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46} +\re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121} \makeatother % Widecheck diff --git a/vendor/plugins/maruku/lib/maruku/ext/div.rb b/vendor/plugins/maruku/lib/maruku/ext/div.rb new file mode 100644 index 00000000..5cad251b --- /dev/null +++ b/vendor/plugins/maruku/lib/maruku/ext/div.rb @@ -0,0 +1,100 @@ + + +OpenDiv = /^[ ]{0,3}\+\-\-+\s*([^\s-]*)\s*\-*\s*$/ +CloseDiv = /^[ ]{0,3}\=\-\-+\s*([^\s-]*)\s*\-*\s*$/ +StartPipe = /^[ ]{0,3}\|(.*)$/ # $1 is rest of line +DecorativeClosing = OpenDiv + +MaRuKu::In::Markdown::register_block_extension( + :regexp => OpenDiv, + :handler => lambda { |doc, src, context| + # return false if not doc.is_math_enabled? + first = src.shift_line + first =~ OpenDiv + ial_at_beginning = $1 + ial_at_end = nil + + lines = [] + # if second line starts with "|" + if src.cur_line =~ StartPipe + # then we read until no more "|" + while src.cur_line && (src.cur_line =~ StartPipe) + content = $1 + lines.push content + src.shift_line + end + if src.cur_line =~ DecorativeClosing + ial_at_end = $1 + src.shift_line + end + else + # else we read until CloseDiv + divs_open = 1 + while src.cur_line && (divs_open>0) + if src.cur_line =~ CloseDiv + divs_open -= 1 + if divs_open == 0 + ial_at_end = $1 + src.shift_line + break + else + lines.push src.shift_line + end + else + if src.cur_line =~ OpenDiv + divs_open += 1 + end + lines.push src.shift_line + end + end + + if divs_open > 0 + e = "At end of input, I still have #{divs_open} DIVs open." + doc.maruku_error(e, src, context) + return true + end + end + + ial_at_beginning = nil unless + (ial_at_beginning&&ial_at_beginning.size > 0) + ial_at_end = nil unless (ial_at_end && ial_at_end.size > 0) + + if ial_at_beginning && ial_at_end + e = "Found two conflicting IALs: #{ial_at_beginning.inspect} and #{ial_at_end.inspect}" + doc.maruku_error(e, src, context) + end + + al_string = ial_at_beginning || ial_at_end + al = nil + + if al_string =~ /^\{(.*)\}$/ + inside = $1 + cs = MaRuKu::In::Markdown::SpanLevelParser::CharSource + al = al_string && + doc.read_attribute_list(cs.new(inside), its_context=nil, break_on=[nil]) + end + + src = MaRuKu::In::Markdown::BlockLevelParser::LineSource.new(lines) + children = doc.parse_blocks(src) + + context.push doc.md_div(children, al) + true + }) + + +module MaRuKu; class MDElement + + def md_div(children, a=nil) + self.md_el(:div, children, meta={}, a) + end + +end end + + +module MaRuKu; module Out; module HTML + + def to_html_div + add_ws wrap_as_element('div') + end + +end end end \ No newline at end of file diff --git a/vendor/plugins/maruku/lib/maruku/ext/math.rb b/vendor/plugins/maruku/lib/maruku/ext/math.rb index 06b296b3..8f65371c 100644 --- a/vendor/plugins/maruku/lib/maruku/ext/math.rb +++ b/vendor/plugins/maruku/lib/maruku/ext/math.rb @@ -33,7 +33,7 @@ Summary: Math openings which should be numerated Array containing any of `'\\['`, `'\\begin{equation}'`, `'$$'`. - MaRuKu::Globals[math_numbered] = ['\\['] + MaRuKu::Globals[:math_numbered] = ['\\['] =end diff --git a/vendor/plugins/maruku/lib/maruku/input/parse_block.rb b/vendor/plugins/maruku/lib/maruku/input/parse_block.rb index ea9a1d81..687dfbea 100644 --- a/vendor/plugins/maruku/lib/maruku/input/parse_block.rb +++ b/vendor/plugins/maruku/lib/maruku/input/parse_block.rb @@ -508,7 +508,9 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser end def split_cells(s) - s.strip.split('|').select{|x|x.strip.size>0}.map{|x|x.strip} +# s.strip.split('|').select{|x|x.strip.size>0}.map{|x|x.strip} +# changed to allow empty cells + s.strip.split('|').select{|x|x.size>0}.map{|x|x.strip} end def read_table(src) diff --git a/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb b/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb index ee1f38f8..c944f699 100644 --- a/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb +++ b/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb @@ -271,7 +271,7 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser extension_meta(src, con, break_on_chars) else stuff = read_simple(src, escaped=[?}], break_on_chars, []) - if stuff =~ /^(\w+\s|[^\w])/u + if stuff =~ /^(\w+\s|[^\w])/ extension_id = $1.strip if false else @@ -594,7 +594,7 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser return end else # empty [link] - id = children.to_s.downcase.gsub(' ','_') + id = sanitize_ref_id(children.to_s) #. downcase.gsub(' ','_') con.push_element md_link(children, id) end end # read link @@ -647,14 +647,19 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser con.push_element md_im_image(alt_text, url, title) when ?[ # link ref ref_id = read_ref_id(src,con) - if ref_id.size == 0 - ref_id = alt_text.to_s.downcase.gsub(' ','_') - else - ref_id = ref_id.downcase + if not ref_id # TODO: check around + error('Reference not closed.', src, con) + ref_id = "" end + if ref_id.size == 0 + ref_id = alt_text.to_s + end + + ref_id = sanitize_ref_id(ref_id) + con.push_element md_image(alt_text, ref_id) else # no stuff - ref_id = alt_text.to_s.downcase.gsub(' ','_') + ref_id = sanitize_ref_id(alt_text.to_s) con.push_element md_image(alt_text, ref_id) end end # read link diff --git a/vendor/plugins/maruku/lib/maruku/input/type_detection.rb b/vendor/plugins/maruku/lib/maruku/input/type_detection.rb index f4d0c269..b2e234b2 100644 --- a/vendor/plugins/maruku/lib/maruku/input/type_detection.rb +++ b/vendor/plugins/maruku/lib/maruku/input/type_detection.rb @@ -44,8 +44,8 @@ module MaRuKu; module Strings return :definition if l =~ Definition # I had a bug with emails and urls at the beginning of the # line that were mistaken for raw_html - return :text if l=~ /^#{EMailAddress}/ - return :text if l=~ /^*[Tigra Genesis]:

*** Output of Markdown.pl (parsed) *** -

The HTML specification is maintained by the W3C.

*[HTML]: Hyper Text Markup Language -*[W3C]: World Wide Web Consortium

Operation Tigra Genesis is going well.

*[Tigra Genesis]:

\ No newline at end of file +
+

+ The HTML specification is maintained by the W3C. +

+

+ *[HTML]: Hyper Text Markup Language *[W3C]: World Wide Web Consortium +

+

+ Operation Tigra Genesis is going well. +

+

+ *[Tigra Genesis]: +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/alt.md b/vendor/plugins/maruku/tests/unittest/alt.md index b0fc8e4e..6d9915b2 100644 --- a/vendor/plugins/maruku/tests/unittest/alt.md +++ b/vendor/plugins/maruku/tests/unittest/alt.md @@ -27,9 +27,8 @@ bar

bar

*** Output of Markdown.pl (parsed) *** -

bar

\ No newline at end of file +
+

+ bar +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/att2.md b/vendor/plugins/maruku/tests/unittest/attributes/att2.md index 876e25b7..6a7432eb 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/att2.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/att2.md @@ -31,8 +31,8 @@ md_el(:document,[ {:b: a}

*** Output of Markdown.pl (parsed) *** -

{a}: a -{:b: a}

\ No newline at end of file +
+

+ {a}: a {:b: a} +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/att3.md b/vendor/plugins/maruku/tests/unittest/attributes/att3.md index 0f48e74c..6e5e1fa3 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/att3.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/att3.md @@ -42,10 +42,11 @@ Paragraph1Paragraph2 Paragraph2

*** Output of Markdown.pl (parsed) *** -

Paragraph1 -{:#par1}

{:#par2} -Paragraph2

\ No newline at end of file +
+

+ Paragraph1 {:#par1} +

+

+ {:#par2} Paragraph2 +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/attributes.md b/vendor/plugins/maruku/tests/unittest/attributes/attributes.md index f9f669bd..75926854 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/attributes.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/attributes.md @@ -79,15 +79,27 @@ Header with attributesHeader with attributesHeader no attributesParagraph with a

{:hello: .chello}

*** Output of Markdown.pl (parsed) *** -

Header with attributes {#header1}

Header with attributes ### {#header2}

Header no attributes

{:warn2}Paragraph with a. -{#par1}

Paragraph with emphasis{:hello notfound} - {#par2}

{:hello: .chello}

\ No newline at end of file +
+

+ Header with attributes {#header1} +

+

+ Header with attributes ### {#header2} +

+

+ Header no attributes +

+

+ {:warn2}Paragraph with a. {#par1} +

+

+ Paragraph with + + emphasis + + {:hello notfound} {#par2} +

+

+ {:hello: .chello} +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/circular.md b/vendor/plugins/maruku/tests/unittest/attributes/circular.md index beaea96f..698f2f71 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/circular.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/circular.md @@ -40,10 +40,11 @@ Paragraph {:b: a}

*** Output of Markdown.pl (parsed) *** -

Paragraph -{:a}

{:a: b} -{:b: a}

\ No newline at end of file +
+

+ Paragraph {:a} +

+

+ {:a: b} {:b: a} +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/default.md b/vendor/plugins/maruku/tests/unittest/attributes/default.md index 52dbdbbd..4daaddb6 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/default.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/default.md @@ -35,9 +35,11 @@ Paragraph2

{paragraph}: .maruku-par

*** Output of Markdown.pl (parsed) *** -

Paragraph2 -{#2}

{paragraph}: .maruku-par

\ No newline at end of file +
+

+ Paragraph2 {#2} +

+

+ {paragraph}: .maruku-par +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/blank.md b/vendor/plugins/maruku/tests/unittest/blank.md index 22604118..eddd756a 100644 --- a/vendor/plugins/maruku/tests/unittest/blank.md +++ b/vendor/plugins/maruku/tests/unittest/blank.md @@ -36,8 +36,11 @@ Linea 1Linea 2

Linea 2

*** Output of Markdown.pl (parsed) *** -

Linea 1

Linea 2

\ No newline at end of file +
+

+ Linea 1 +

+

+ Linea 2 +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/blanks_in_code.md b/vendor/plugins/maruku/tests/unittest/blanks_in_code.md index 86c3b0e5..f35f6916 100644 --- a/vendor/plugins/maruku/tests/unittest/blanks_in_code.md +++ b/vendor/plugins/maruku/tests/unittest/blanks_in_code.md @@ -103,26 +103,29 @@ four *** Output of Markdown.pl (parsed) *** -

This block is composed of three lines:

one
-
-three
-

This block is composed of 5

one
-
-
-four
-

This block is composed of 2

two
-
\ No newline at end of file +
+

+ This block is composed of three lines: +

+ 
+  
+   one three 
+  
+
+

+ This block is composed of 5 +

+ 
+  
+   one four 
+  
+
+

+ This block is composed of 2 +

+ 
+  
+   two 
+  
+
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/bug_def.md b/vendor/plugins/maruku/tests/unittest/bug_def.md index 46ff083c..0723ae4f 100644 --- a/vendor/plugins/maruku/tests/unittest/bug_def.md +++ b/vendor/plugins/maruku/tests/unittest/bug_def.md @@ -26,7 +26,8 @@ test:

[test][]:

*** Output of Markdown.pl (parsed) *** -

[test][]:

\ No newline at end of file +
+

+ [test][]: +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/bug_table.md b/vendor/plugins/maruku/tests/unittest/bug_table.md index 26b50248..0db6dfbf 100644 --- a/vendor/plugins/maruku/tests/unittest/bug_table.md +++ b/vendor/plugins/maruku/tests/unittest/bug_table.md @@ -64,13 +64,15 @@ hellohh c1c2

{:t: scope="row"}

*** Output of Markdown.pl (parsed) *** -

hello -{: summary="Table summary" .class1 style="color:red"}

h | h -----------|-- -{:t} c1 | c2 -{: summary="Table summary" .class1 style="color:red"}

{:t: scope="row"}

\ No newline at end of file +
+

+ hello {: summary="Table summary" .class1 style="color:red"} +

+

+ h | h ----------|-- {:t} c1 | c2 {: summary="Table summary" .class1 + style="color:red"} +

+

+ {:t: scope="row"} +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/code.md b/vendor/plugins/maruku/tests/unittest/code.md index 4d03c9c3..dcbacadb 100644 --- a/vendor/plugins/maruku/tests/unittest/code.md +++ b/vendor/plugins/maruku/tests/unittest/code.md @@ -50,14 +50,13 @@ end tell *** Output of Markdown.pl (parsed) *** -

Here is an example of AppleScript:

tell application "Foo"
-    beep
-end tell
-    tab
-
\ No newline at end of file +
+

+ Here is an example of AppleScript: +

+ 
+  
+   tell application "Foo" beep end tell tab 
+  
+
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/code2.md b/vendor/plugins/maruku/tests/unittest/code2.md index 5de75075..705895ca 100644 --- a/vendor/plugins/maruku/tests/unittest/code2.md +++ b/vendor/plugins/maruku/tests/unittest/code2.md @@ -43,15 +43,15 @@ Code *** Output of Markdown.pl (parsed) *** -
-

Code

-
Ciao
-
-
\ No newline at end of file +
+
+

+ Code +

+ 
+   
+    Ciao 
+   
+
+
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/code3.md b/vendor/plugins/maruku/tests/unittest/code3.md index 255b3185..667c19fc 100644 --- a/vendor/plugins/maruku/tests/unittest/code3.md +++ b/vendor/plugins/maruku/tests/unittest/code3.md @@ -99,26 +99,37 @@ This is code (4 spaces):This is not codeThis is code (1 tab):This is not code *** Output of Markdown.pl (parsed) *** -

This is code (4 spaces):

Code
-

This is not code

Code
-

This is code (1 tab):

Code
-

This is not code

Code
-
\ No newline at end of file +
+

+ This is code (4 spaces): +

+ 
+  
+   Code 
+  
+
+

+ This is not code +

+ 
+  
+   Code 
+  
+
+

+ This is code (1 tab): +

+ 
+  
+   Code 
+  
+
+

+ This is not code +

+ 
+  
+   Code 
+  
+
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/data_loss.md b/vendor/plugins/maruku/tests/unittest/data_loss.md index 2ee4ab6d..0e976cd2 100644 --- a/vendor/plugins/maruku/tests/unittest/data_loss.md +++ b/vendor/plugins/maruku/tests/unittest/data_loss.md @@ -39,12 +39,10 @@ ijkl *** Output of Markdown.pl (parsed) *** -
    -
  1. abcd -efgh -ijkl
    2. -
\ No newline at end of file +
+
    +
  1. + abcd efgh ijkl +
    2. +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/divs/div1.md b/vendor/plugins/maruku/tests/unittest/divs/div1.md new file mode 100644 index 00000000..523e02f4 --- /dev/null +++ b/vendor/plugins/maruku/tests/unittest/divs/div1.md @@ -0,0 +1,204 @@ +Write a comment here +*** Parameters: *** +require 'maruku/ext/div'; {} # params +*** Markdown input: *** ++--------- +| text ++---------- + ++--------- +|text + ++-- + text + +=-- + + + +--------- + | text + +---------- + + +--------- + |text + + +-- + text + + =-- + + + +--------- + | text + +---------- + + +--------- + |text + + +-- + text + + =-- + + +--------- + | text + +---------- + + +--------- + |text + + +-- + text + + =-- + +*** Output of inspect *** +md_el(:document,[ + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]), + md_el(:div,[md_par(["text"])],{},[]) +],{},[]) +*** Output of to_html *** +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+ +
+

text

+
+*** Output of to_latex *** + +*** Output of to_md *** +text + +text + +text + +text + +text + +text + +text + +text + +text + +text + +text + +text +*** Output of to_s *** +texttexttexttexttexttexttexttexttexttexttexttext +*** EOF *** + + + + OK! + + + +*** Output of Markdown.pl *** +

+--------- +| text ++----------

+ +

+--------- +|text

+ +

+-- + text

+ +

=--

+ +

+--------- + | text + +----------

+ +

+--------- + |text

+ +

+-- + text

+ +

=--

+ +

+--------- + | text + +----------

+ +

+--------- + |text

+ +

+-- + text

+ +

=--

+ +

+--------- + | text + +----------

+ +

+--------- + |text

+ +

+-- + text

+ +

=--

+ +*** Output of Markdown.pl (parsed) *** +Error: # ... :REXML::Element> diff --git a/vendor/plugins/maruku/tests/unittest/divs/div2.md b/vendor/plugins/maruku/tests/unittest/divs/div2.md new file mode 100644 index 00000000..8c891e5b --- /dev/null +++ b/vendor/plugins/maruku/tests/unittest/divs/div2.md @@ -0,0 +1,34 @@ +Write a comment here +*** Parameters: *** +require 'maruku/ext/div'; {} # params +*** Markdown input: *** ++-- +ciao +=-- +*** Output of inspect *** +md_el(:document,[md_el(:div,[md_par(["ciao"])],{},[])],{},[]) +*** Output of to_html *** +
+

ciao

+
+*** Output of to_latex *** + +*** Output of to_md *** +ciao +*** Output of to_s *** +ciao +*** EOF *** + + + + OK! + + + +*** Output of Markdown.pl *** +

+-- +ciao +=--

+ +*** Output of Markdown.pl (parsed) *** +Error: # ... :REXML::Element> diff --git a/vendor/plugins/maruku/tests/unittest/divs/div3_nest.md b/vendor/plugins/maruku/tests/unittest/divs/div3_nest.md new file mode 100644 index 00000000..065b932e --- /dev/null +++ b/vendor/plugins/maruku/tests/unittest/divs/div3_nest.md @@ -0,0 +1,62 @@ +Write a comment here +*** Parameters: *** +require 'maruku/ext/div'; {} # params +*** Markdown input: *** ++-----------------------------------{.warning}------ +| this is the last warning! +| +| please, go away! +| +| +------------------------------------- {.menace} -- +| | or else terrible things will happen +| +-------------------------------------------------- ++--------------------------------------------------- +*** Output of inspect *** +md_el(:document,[ + md_el(:div,[ + md_par(["this is the last warning!"]), + md_par(["please, go away!"]), + md_el(:div,[md_par(["or else terrible things will happen"])],{},[[:class, "menace"]]) + ],{},[[:class, "warning"]]) +],{},[]) +*** Output of to_html *** +
+

this is the last warning!

+ +

please, go away!

+ +
+

or else terrible things will happen

+
+
+*** Output of to_latex *** + +*** Output of to_md *** +this is the last warning! + +please, go away! + +or else terrible things will happen +*** Output of to_s *** +this is the last warning!please, go away!or else terrible things will happen +*** EOF *** + + + + OK! + + + +*** Output of Markdown.pl *** +

+-----------------------------------{.warning}------ +| this is the last warning! +| +| please, go away! +| +| +------------------------------------- {.menace} -- +| | or else terrible things will happen +| +-------------------------------------------------- ++---------------------------------------------------

+ +*** Output of Markdown.pl (parsed) *** +Error: # ... :REXML::Element> diff --git a/vendor/plugins/maruku/tests/unittest/easy.md b/vendor/plugins/maruku/tests/unittest/easy.md index 29569cb8..461f1afe 100644 --- a/vendor/plugins/maruku/tests/unittest/easy.md +++ b/vendor/plugins/maruku/tests/unittest/easy.md @@ -25,10 +25,15 @@ Hello! how are you?

Hello! how are you?

*** Output of Markdown.pl (parsed) *** -

Hello! how are you?

\ No newline at end of file +
+

+ + Hello! + + how are + + you + + ? +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/email.md b/vendor/plugins/maruku/tests/unittest/email.md index 67906a5c..738bb83b 100644 --- a/vendor/plugins/maruku/tests/unittest/email.md +++ b/vendor/plugins/maruku/tests/unittest/email.md @@ -27,11 +27,7 @@ This is an email address: *** Output of Markdown.pl *** -

This is an email address: andrea@invalid.it

+

This is an email address: andrea@invalid.it

*** Output of Markdown.pl (parsed) *** -

This is an email address: andrea@invalid.it

\ No newline at end of file +Error: # diff --git a/vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md b/vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md index aec05985..c9702cde 100644 --- a/vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md +++ b/vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md @@ -35,8 +35,11 @@ This is iso-8859-1: àèìàù.

This is iso-8859-1: àèìàù.

*** Output of Markdown.pl (parsed) *** -

Encoding: iso-8859-1

This is iso-8859-1: àèìàù.

\ No newline at end of file +
+

+ Encoding: iso-8859-1 +

+

+ This is iso-8859-1: àèìàù. +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/encoding/utf-8.md b/vendor/plugins/maruku/tests/unittest/encoding/utf-8.md index 8f715644..5fc95349 100644 --- a/vendor/plugins/maruku/tests/unittest/encoding/utf-8.md +++ b/vendor/plugins/maruku/tests/unittest/encoding/utf-8.md @@ -30,8 +30,11 @@ Japanese: マルク

Japanese: マルク

*** Output of Markdown.pl (parsed) *** -

Italian: àèìòù.

Japanese: マルク

\ No newline at end of file +
+

+ Italian: àèìòù. +

+

+ Japanese: マルク +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/entities.md b/vendor/plugins/maruku/tests/unittest/entities.md index 84901f88..29b8546b 100644 --- a/vendor/plugins/maruku/tests/unittest/entities.md +++ b/vendor/plugins/maruku/tests/unittest/entities.md @@ -121,27 +121,49 @@ Maruku translates HTML entities to the equivalent in LaTeX:EntityResultabEntity-

It should read just like this: ©.

*** Output of Markdown.pl (parsed) *** -

Maruku translates HTML entities to the equivalent in LaTeX:

Entity | Result -------------|---------- -© | © -£ | £ -a b | a b -λ | λ -— | —

Entity-substitution does not happen in code blocks or inline code.

The following should not be translated:

©
-

It should read just like this: ©.

\ No newline at end of file +
+

+ Maruku translates HTML entities to the equivalent in LaTeX: +

+

+ Entity | Result ------------|---------- + + © + + | © + + £ + + | £ + + a b + + | a b + + λ + + | λ + + — + + | — +

+

+ Entity-substitution does not happen in code blocks or inline code. +

+

+ The following should not be translated: +

+ 
+  
+   © 
+  
+
+

+ It should read just like this: + + © + + . +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/escaping.md b/vendor/plugins/maruku/tests/unittest/escaping.md index a9dc708e..b6e7f1ef 100644 --- a/vendor/plugins/maruku/tests/unittest/escaping.md +++ b/vendor/plugins/maruku/tests/unittest/escaping.md @@ -86,20 +86,46 @@ Hello: ! ! ` { } [ ] ( ) # . ! * * *Ora, emphasis, bold, * <- due asterischi-> *

End of paragraph

*** Output of Markdown.pl (parsed) *** -

Hello: ! ! ` { } [ ] ( ) # . ! * * *

Ora, emphasis, bold, * <- due asterischi-> * , un underscore-> _ , emphasis, - incrediblee!

This is Code with a special: -> ` <-(after)

Start of paragraph

End of paragraph

\ No newline at end of file +
+

+ Hello: ! ! ` { } [ ] ( ) # . ! * * * +

+

+ Ora, + + emphasis + + , + + bold + + , * <- due asterischi-> * , un underscore-> _ , + + emphasis + + , incre + + dible + + e! +

+

+ This is + + Code with a special: -> ` <- + + (after) +

+

+ + Start + + of paragraph +

+

+ End of + + paragraph + +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/extra_dl.md b/vendor/plugins/maruku/tests/unittest/extra_dl.md index f9704c09..cae5d6fd 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_dl.md +++ b/vendor/plugins/maruku/tests/unittest/extra_dl.md @@ -69,12 +69,14 @@ ApplePomaceous fruit of plants of the genus Malus in the family Rosaceae.OrangeT : The fruit of an evergreen tree of the genus Citrus.

*** Output of Markdown.pl (parsed) *** -

CSS: style.css

Apple -: Pomaceous fruit of plants of the genus Malus in - the family Rosaceae.

Orange -: The fruit of an evergreen tree of the genus Citrus.

\ No newline at end of file +
+

+ CSS: style.css +

+

+ Apple : Pomaceous fruit of plants of the genus Malus in the family Rosaceae. +

+

+ Orange : The fruit of an evergreen tree of the genus Citrus. +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/extra_header_id.md b/vendor/plugins/maruku/tests/unittest/extra_header_id.md index b6b8f544..fb78c3f4 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_header_id.md +++ b/vendor/plugins/maruku/tests/unittest/extra_header_id.md @@ -83,17 +83,30 @@ Header 1Header 2Header 3Then you can create links to different parts of the same Link back to header 3

*** Output of Markdown.pl (parsed) *** -

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

\ No newline at end of file +
+

+ 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 + +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/extra_table1.md b/vendor/plugins/maruku/tests/unittest/extra_table1.md index c68cc678..e705c1c2 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_table1.md +++ b/vendor/plugins/maruku/tests/unittest/extra_table1.md @@ -52,11 +52,12 @@ Content Cell | Content Cell Content Cell | Content Cell

*** Output of Markdown.pl (parsed) *** -

CSS: style.css

First Header | Second Header -------------- | ------------- -Content Cell | Content Cell -Content Cell | Content Cell

\ No newline at end of file +
+

+ CSS: style.css +

+

+ First Header | Second Header ------------- | ------------- Content Cell | + Content Cell Content Cell | Content Cell +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/footnotes.md b/vendor/plugins/maruku/tests/unittest/footnotes.md index 3a07d202..99f93ae4 100644 --- a/vendor/plugins/maruku/tests/unittest/footnotes.md +++ b/vendor/plugins/maruku/tests/unittest/footnotes.md @@ -123,21 +123,30 @@ This is second sentence (same paragraph).

This is not a footnote.

*** Output of Markdown.pl (parsed) *** -

That's some text with a footnote [^b] and another [^c] and another [^a].

[^a]: And that's the footnote.

That's the second paragraph of the footnote.
-

[^b]: And that's the footnote. -This is second sentence (same paragraph).

[^c]: - This is the very long one.

That's the second paragraph.
-

This is not a footnote.

\ No newline at end of file +
+

+ That's some text with a footnote [^b] and another [^c] and another [^a]. +

+

+ [^a]: And that's the footnote. +

+ 
+  
+   That's the second paragraph of the footnote. 
+  
+
+

+ [^b]: And that's the footnote. This is second sentence (same paragraph). +

+

+ [^c]: This is the very long one. +

+ 
+  
+   That's the second paragraph. 
+  
+
+

+ This is not a footnote. +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/headers.md b/vendor/plugins/maruku/tests/unittest/headers.md index fe22aa44..fe7ecb01 100644 --- a/vendor/plugins/maruku/tests/unittest/headers.md +++ b/vendor/plugins/maruku/tests/unittest/headers.md @@ -51,12 +51,23 @@ A title with emphasisA title with emphasisA title with emphasis

A title with emphasis

*** Output of Markdown.pl (parsed) *** -

A title with emphasis

A title with emphasis

A title with emphasis

\ No newline at end of file +
+

+ A title with + + emphasis + +

+

+ A title with + + emphasis + +

+

+ A title with + + emphasis + +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/hex_entities.md b/vendor/plugins/maruku/tests/unittest/hex_entities.md index 178bbc59..6de31f8b 100644 --- a/vendor/plugins/maruku/tests/unittest/hex_entities.md +++ b/vendor/plugins/maruku/tests/unittest/hex_entities.md @@ -47,7 +47,10 @@ Examples of numeric character references include or for the copyright symbol,

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 Markdown.pl (parsed) *** -

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.

\ No newline at end of file +
+

+ 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. +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/hrule.md b/vendor/plugins/maruku/tests/unittest/hrule.md index 18ba2ae4..03e93f82 100644 --- a/vendor/plugins/maruku/tests/unittest/hrule.md +++ b/vendor/plugins/maruku/tests/unittest/hrule.md @@ -57,11 +57,10 @@ md_el(:document,[
*** Output of Markdown.pl (parsed) *** -
\ No newline at end of file +
+
+
+
+
+
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/html2.md b/vendor/plugins/maruku/tests/unittest/html2.md index 66beca4b..6ec64eac 100644 --- a/vendor/plugins/maruku/tests/unittest/html2.md +++ b/vendor/plugins/maruku/tests/unittest/html2.md @@ -35,12 +35,14 @@ One 123

123

*** Output of Markdown.pl (parsed) *** -

One -

123

123

\ No newline at end of file +
+

+ One +

+ 123 +

+

+

+ 123 +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/html3.md b/vendor/plugins/maruku/tests/unittest/html3.md index cfde7011..31dc27be 100644 --- a/vendor/plugins/maruku/tests/unittest/html3.md +++ b/vendor/plugins/maruku/tests/unittest/html3.md @@ -44,14 +44,24 @@ involve coffee, sushi,

*** Output of Markdown.pl (parsed) *** -

taking part in some arcane conspirations which -involve coffee, -robots, -sushi,

\ No newline at end of file +
+

+ taking part in + + some arcane conspirations + + which involve + + coffee + + , + + robots + + , + + sushi + + , +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/html4.md b/vendor/plugins/maruku/tests/unittest/html4.md index a5a68a7b..ef9b22d4 100644 --- a/vendor/plugins/maruku/tests/unittest/html4.md +++ b/vendor/plugins/maruku/tests/unittest/html4.md @@ -39,11 +39,10 @@ md_el(:document,[
*** Output of Markdown.pl (parsed) *** -
\ No newline at end of file +
+
+ + + +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/html5.md b/vendor/plugins/maruku/tests/unittest/html5.md index beea773e..4c5df156 100644 --- a/vendor/plugins/maruku/tests/unittest/html5.md +++ b/vendor/plugins/maruku/tests/unittest/html5.md @@ -35,13 +35,12 @@ md_el(:document,[

*** Output of Markdown.pl (parsed) *** -

Aperitif

\ No newline at end of file +
+

+

+ + Aperitif + +
+

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/ie.md b/vendor/plugins/maruku/tests/unittest/ie.md index d532db33..5bbd4583 100644 --- a/vendor/plugins/maruku/tests/unittest/ie.md +++ b/vendor/plugins/maruku/tests/unittest/ie.md @@ -79,31 +79,50 @@ md_el(:document,[

{:htmlusesyntax=true lang=xml}

*** Output of Markdown.pl (parsed) *** -

<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>
-

{:htmlusesyntax=true lang=not_supported}

<p>here's an apostrophe & a quote "</p>
-

{:htmlusesyntax=true lang=xml}

\ No newline at end of file +
+

+ + <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} +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/images.md b/vendor/plugins/maruku/tests/unittest/images.md index b8f96951..afe77911 100644 --- a/vendor/plugins/maruku/tests/unittest/images.md +++ b/vendor/plugins/maruku/tests/unittest/images.md @@ -111,17 +111,28 @@ This page does not uilizes Cascading Style SheetsPlease mouseover to see the tit style="border:0;width:188px;height:131px"

*** Output of Markdown.pl (parsed) *** -

This page does not uilizes Cascading Style Sheets

Please mouseover to see the title: Cascading Style Sheets

Please mouseover to see the title: Cascading Style Sheets

I'll say it one more time: this page does not use Cascading Style Sheets

This is double size: ![Cascading Style Sheets] [css2]

[css2]: http://jigsaw.w3.org/css-validator/images/vcss "Optional title attribute" class=external - style="border:0;width:188px;height:131px"

\ No newline at end of file +
+

+ This page does not uilizes + Cascading Style Sheets +

+

+ Please mouseover to see the title: + Cascading Style Sheets +

+

+ Please mouseover to see the title: + Cascading Style Sheets +

+

+ I'll say it one more time: this page does not use + Cascading Style Sheets +

+

+ This is double size: ![Cascading Style Sheets] [css2] +

+

+ [css2]: http://jigsaw.w3.org/css-validator/images/vcss "Optional title + attribute" class=external style="border:0;width:188px;height:131px" +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/images2.md b/vendor/plugins/maruku/tests/unittest/images2.md index 1e0998db..a5363342 100644 --- a/vendor/plugins/maruku/tests/unittest/images2.md +++ b/vendor/plugins/maruku/tests/unittest/images2.md @@ -43,9 +43,13 @@ This is an image.This is an image.

This is an ![image].

*** Output of Markdown.pl (parsed) *** -

This is an image.

This is an ![image].

\ No newline at end of file +
+

+ This is an + image + . +

+

+ This is an ![image]. +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/inline_html.md b/vendor/plugins/maruku/tests/unittest/inline_html.md index c659f7ae..a6942024 100644 --- a/vendor/plugins/maruku/tests/unittest/inline_html.md +++ b/vendor/plugins/maruku/tests/unittest/inline_html.md @@ -238,10 +238,10 @@ Line: Position: Last 80 unconsumed characters:
This is *true* markdown text (paragraph)

-/sw/lib/ruby/1.8/rexml/parsers/baseparser.rb:320:in `pull' -/sw/lib/ruby/1.8/rexml/parsers/treeparser.rb:21:in `parse' -/sw/lib/ruby/1.8/rexml/document.rb:190:in `build' -/sw/lib/ruby/1.8/rexml/document.rb:45:in `initialize' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/parsers/baseparser.rb:320:in `pull' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/parsers/treeparser.rb:21:in `parse' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/document.rb:204:in `build' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/document.rb:42:in `initialize' bin/marutest:200:in `new' bin/marutest:200:in `run_test' bin/marutest:274:in `marutest' diff --git a/vendor/plugins/maruku/tests/unittest/inline_html2.md b/vendor/plugins/maruku/tests/unittest/inline_html2.md index f94b5c91..01c9a9b0 100644 --- a/vendor/plugins/maruku/tests/unittest/inline_html2.md +++ b/vendor/plugins/maruku/tests/unittest/inline_html2.md @@ -33,8 +33,11 @@ md_el(:document,[

Test **bold**

*** Output of Markdown.pl (parsed) *** -
Test **bold**

Test **bold**

\ No newline at end of file +
+
+ Test **bold** +
+

+ Test **bold** +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/links.md b/vendor/plugins/maruku/tests/unittest/links.md index c5fabee6..0a063eb6 100644 --- a/vendor/plugins/maruku/tests/unittest/links.md +++ b/vendor/plugins/maruku/tests/unittest/links.md @@ -162,7 +162,7 @@ Search on GoogleSearch on GoogleSearch on GoogleSearch on GoogleSearch on Google

Inline with title: Google images

-

Search on http://www.gogole.com or http://Here.com or ask bill@google.com +

Search on http://www.gogole.com or http://Here.com or ask bill@google.com or you might ask bill@google.com.

If all else fails, ask Google

@@ -175,10 +175,10 @@ Line: Position: Last 80 unconsumed characters: > -/sw/lib/ruby/1.8/rexml/parsers/baseparser.rb:320:in `pull' -/sw/lib/ruby/1.8/rexml/parsers/treeparser.rb:21:in `parse' -/sw/lib/ruby/1.8/rexml/document.rb:190:in `build' -/sw/lib/ruby/1.8/rexml/document.rb:45:in `initialize' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/parsers/baseparser.rb:320:in `pull' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/parsers/treeparser.rb:21:in `parse' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/document.rb:204:in `build' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/document.rb:42:in `initialize' bin/marutest:200:in `new' bin/marutest:200:in `run_test' bin/marutest:274:in `marutest' diff --git a/vendor/plugins/maruku/tests/unittest/list1.md b/vendor/plugins/maruku/tests/unittest/list1.md index 4e81fb6d..8de39d6b 100644 --- a/vendor/plugins/maruku/tests/unittest/list1.md +++ b/vendor/plugins/maruku/tests/unittest/list1.md @@ -63,18 +63,17 @@ A list item with a blockquote:This is a blockquote inside a list item. *** Output of Markdown.pl (parsed) *** -
    -

  • A list item with a blockquote:

    -
    -

    This is a blockquote - inside a list item.

    -
    • -
\ No newline at end of file +
+
    +
  • +

    + A list item with a blockquote: +

    +
    +

    + This is a blockquote inside a list item. +

    +
    +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/list2.md b/vendor/plugins/maruku/tests/unittest/list2.md index b86bff06..e863ef44 100644 --- a/vendor/plugins/maruku/tests/unittest/list2.md +++ b/vendor/plugins/maruku/tests/unittest/list2.md @@ -73,20 +73,22 @@ sit amet, consectetuer adipiscing elit.

*** Output of Markdown.pl (parsed) *** -
    -

  • 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.

    • -

  • other

    • -
\ No newline at end of file +
+
    +
  • +

    + 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. +

    +
    • +
  • +

    + other +

    +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/list3.md b/vendor/plugins/maruku/tests/unittest/list3.md index 7d4aedf6..3596fb0e 100644 --- a/vendor/plugins/maruku/tests/unittest/list3.md +++ b/vendor/plugins/maruku/tests/unittest/list3.md @@ -85,27 +85,27 @@ A list item with a blockquote:This is a blockquote inside a list item.A list ite *** Output of Markdown.pl (parsed) *** -
    -

  • A list item with a blockquote:

    -
    -

    This is a blockquote - inside a list item.

    -
    • -

  • A list item with a code block:

    -
    <code goes here>
-
    • -
\ No newline at end of file +
+
    +
  • +

    + A list item with a blockquote: +

    +
    +

    + This is a blockquote inside a list item. +

    +
    +
    • +
  • +

    + A list item with a code block: +

    + 
    +    
+     <code goes here> 
+    
+
    +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/list4.md b/vendor/plugins/maruku/tests/unittest/list4.md index 776d914e..e733cf41 100644 --- a/vendor/plugins/maruku/tests/unittest/list4.md +++ b/vendor/plugins/maruku/tests/unittest/list4.md @@ -113,18 +113,17 @@ ciao

ciao

*** Output of Markdown.pl (parsed) *** -

This is a list: -* one -* two

This is not a list: -* one -ciao

This is a list: -1. one -1. two

This is not a list: -1987. one -ciao

\ No newline at end of file +
+

+ This is a list: * one * two +

+

+ This is not a list: * one ciao +

+

+ This is a list: 1. one 1. two +

+

+ This is not a list: 1987. one ciao +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists.md b/vendor/plugins/maruku/tests/unittest/lists.md index 043f95f5..8bf57a7d 100644 --- a/vendor/plugins/maruku/tests/unittest/lists.md +++ b/vendor/plugins/maruku/tests/unittest/lists.md @@ -238,57 +238,69 @@ sit amet, consectetuer adipiscing elit.

*** Output of Markdown.pl (parsed) *** -
    -
  • 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.
      • -
    • -

Ancora

    -

  • 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.

    • -

Ancora

    -

  • 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.

    • -
\ No newline at end of file +
+
    +
  • + 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. +
      • +
    +
    • +
+

+ Ancora +

+
    +
  • +

    + 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. +

    +
    • +
+

+ Ancora +

+
    +
  • +

    + 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. +

    +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists11.md b/vendor/plugins/maruku/tests/unittest/lists11.md index b74df732..0ae62d25 100644 --- a/vendor/plugins/maruku/tests/unittest/lists11.md +++ b/vendor/plugins/maruku/tests/unittest/lists11.md @@ -28,10 +28,10 @@ md_el(:document,[md_par(["- \316\255\316\275\316\261"])],{},[]) *** Output of Markdown.pl (parsed) *** -
    -
  • ένα
    • -
\ No newline at end of file +
+
    +
  • + ένα +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists6.md b/vendor/plugins/maruku/tests/unittest/lists6.md index 85df9084..268b5d39 100644 --- a/vendor/plugins/maruku/tests/unittest/lists6.md +++ b/vendor/plugins/maruku/tests/unittest/lists6.md @@ -51,5 +51,4 @@ md_el(:document,[],{},[]) *** Output of Markdown.pl (parsed) *** -
\ No newline at end of file +
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists7.md b/vendor/plugins/maruku/tests/unittest/lists7.md index c5420af9..d9316c52 100644 --- a/vendor/plugins/maruku/tests/unittest/lists7.md +++ b/vendor/plugins/maruku/tests/unittest/lists7.md @@ -76,21 +76,23 @@ CiaoTab * Tab * Tab *** Output of Markdown.pl (parsed) *** -

Ciao

    -
  • Tab -
      -
    • Tab -
        -
      • Tab
        • -
      • -
    • -
\ No newline at end of file +
+

+ Ciao +

+
    +
  • + Tab +
      +
    • + Tab +
        +
      • + Tab +
        • +
      +
      • +
    +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists7b.md b/vendor/plugins/maruku/tests/unittest/lists7b.md index 1d8ac9e8..867b8e90 100644 --- a/vendor/plugins/maruku/tests/unittest/lists7b.md +++ b/vendor/plugins/maruku/tests/unittest/lists7b.md @@ -133,19 +133,21 @@ aa1a2b *** Output of Markdown.pl (parsed) *** -
    -
  • a -
      -
    • a1
      • -
    • a2
      • -
    • -
  • b
    • -
\ No newline at end of file +
+
    +
  • + a +
      +
    • + a1 +
      • +
    • + a2 +
      • +
    +
    • +
  • + b +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists8.md b/vendor/plugins/maruku/tests/unittest/lists8.md index bbe6a829..0f418fcb 100644 --- a/vendor/plugins/maruku/tests/unittest/lists8.md +++ b/vendor/plugins/maruku/tests/unittest/lists8.md @@ -80,15 +80,19 @@ Here is a paragraph.* Item 1 * Item 2 * Item 3 *** Output of Markdown.pl (parsed) *** -

Here is a paragraph.

    -
  • Item 1
    • -
  • Item 2
    • -
  • Item 3
    • -
\ No newline at end of file +
+

+ Here is a paragraph. +

+
    +
  • + Item 1 +
    • +
  • + Item 2 +
    • +
  • + Item 3 +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists9.md b/vendor/plugins/maruku/tests/unittest/lists9.md index f6666377..b197cd84 100644 --- a/vendor/plugins/maruku/tests/unittest/lists9.md +++ b/vendor/plugins/maruku/tests/unittest/lists9.md @@ -82,21 +82,24 @@ DuetretretreDue *** Output of Markdown.pl (parsed) *** -
    -
  • Due -
      -
    1. tre
      2. -
    2. tre
      3. -
    3. tre
      4. -
    • -
  • Due
    • -
\ No newline at end of file +
+
    +
  • + Due +
      +
    1. + tre +
      2. +
    2. + tre +
      3. +
    3. + tre +
      4. +
    +
    • +
  • + Due +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md b/vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md index 330b25d8..91aa9c3d 100644 --- a/vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md +++ b/vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md @@ -265,45 +265,85 @@ Paragraph, list with no space: * ciaoParagraph, list with 1 space: * ciaoParagra

Paragraph with html after, indented: Emphasis tralla Emph

*** Output of Markdown.pl (parsed) *** -

Paragraph, list with no space: -* ciao

Paragraph, list with 1 space: - * ciao

Paragraph, list with 3 space: - * ciao

Paragraph, list with 4 spaces: - * ciao

Paragraph, list with 1 tab: - * ciao

Paragraph (1 space after), list with no space: -* ciao

Paragraph (2 spaces after), list with no space:
-* ciao

Paragraph (3 spaces after), list with no space:
-* ciao

Paragraph with block quote:

-

Quoted

-

Paragraph with header:

header

Paragraph with header on two lines:

header

Paragraph with html after

Paragraph with html after, indented: - Emphasis

Paragraph with html after, indented: EmphasistrallaEmph

Paragraph with html after, indented: Emphasis tralla Emph

\ No newline at end of file +
+

+ Paragraph, list with no space: * ciao +

+

+ Paragraph, list with 1 space: * ciao +

+

+ Paragraph, list with 3 space: * ciao +

+

+ Paragraph, list with 4 spaces: * ciao +

+

+ Paragraph, list with 1 tab: * ciao +

+

+ Paragraph (1 space after), list with no space: * ciao +

+

+ Paragraph (2 spaces after), list with no space: +
+ * ciao +

+

+ Paragraph (3 spaces after), list with no space: +
+ * ciao +

+

+ Paragraph with block quote: +

+
+

+ Quoted +

+
+

+ Paragraph with header: +

+

+ header +

+

+ Paragraph with header on two lines: +

+

+ header +

+

+ Paragraph with html after +

+
+

+ Paragraph with html after, indented: + + Emphasis + +

+

+ Paragraph with html after, indented: + + Emphasis + + + tralla + + + Emph + +

+

+ Paragraph with html after, indented: + + Emphasis + + tralla + + Emph + +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists_ol.md b/vendor/plugins/maruku/tests/unittest/lists_ol.md index 42a7e608..bc927dec 100644 --- a/vendor/plugins/maruku/tests/unittest/lists_ol.md +++ b/vendor/plugins/maruku/tests/unittest/lists_ol.md @@ -321,78 +321,93 @@ sit amet, consectetuer adipiscing elit.

*** Output of Markdown.pl (parsed) *** -
    -
  1. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. -Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, -viverra nec, fringilla in, laoreet vitae, risus. -
      -
    1. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. -Suspendisse id sem consectetuer libero luctus adipiscing.
      2. -
    2. -
  2. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. -Suspendisse id sem consectetuer libero luctus adipiscing. -
      -
    1. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. -Suspendisse id sem consectetuer libero luctus adipiscing.
      2. -
    2. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. -Suspendisse id sem consectetuer libero luctus adipiscing.
      3. -
    3. -

Ancora

    -

  1. This is a list item with two paragraphs. Lorem ipsum dolor -sit amet, consectetuer adipiscing elit. Aliquam hendrerit -mi posuere lectus.

    -

    ATTENZIONE!

    -
      -
    • Uno
      • -
    • Due -
        -
      1. tre
        2. -
      2. tre
        3. -
      3. tre
        4. -
      • -
    • Due
      • -
    2. -

  2. Suspendisse id sem consectetuer libero luctus adipiscing.

    3. -

Ancora

    -

  • 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.

    • -
\ No newline at end of file +
+
    +
  1. + Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit + mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet + vitae, risus. +
      +
    1. + Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id + sem consectetuer libero luctus adipiscing. +
      2. +
    +
    2. +
  2. + Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem + consectetuer libero luctus adipiscing. +
      +
    1. + Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id + sem consectetuer libero luctus adipiscing. +
      2. +
    2. + Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id + sem consectetuer libero luctus adipiscing. +
      3. +
    +
    3. +
+

+ Ancora +

+
    +
  1. +

    + This is a list item with two paragraphs. Lorem ipsum dolor sit amet, + consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. +

    +

    + ATTENZIONE! +

    +
      +
    • + Uno +
      • +
    • + Due +
        +
      1. + tre +
        2. +
      2. + tre +
        3. +
      3. + tre +
        4. +
      +
      • +
    • + Due +
      • +
    +
    2. +
  2. +

    + Suspendisse id sem consectetuer libero luctus adipiscing. +

    +
    3. +
+

+ Ancora +

+
    +
  • +

    + 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. +

    +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/loss.md b/vendor/plugins/maruku/tests/unittest/loss.md index 0ef74dba..69c5527a 100644 --- a/vendor/plugins/maruku/tests/unittest/loss.md +++ b/vendor/plugins/maruku/tests/unittest/loss.md @@ -26,9 +26,9 @@ md_el(:document,[md_html("
")],{},[])


123

*** Output of Markdown.pl (parsed) *** -


123

\ No newline at end of file +
+

+
+ 123 +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/math/equations.md b/vendor/plugins/maruku/tests/unittest/math/equations.md index 9b9c7020..03fe2e80 100644 --- a/vendor/plugins/maruku/tests/unittest/math/equations.md +++ b/vendor/plugins/maruku/tests/unittest/math/equations.md @@ -66,13 +66,17 @@ x = y $$

$$

*** Output of Markdown.pl (parsed) *** -

$$ x = y $$

$$ x -= y $$

$$ -x = y $$

$$ x = y -$$

\ No newline at end of file +
+

+ $$ x = y $$ +

+

+ $$ x = y $$ +

+

+ $$ x = y $$ +

+

+ $$ x = y $$ +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/math/inline.html b/vendor/plugins/maruku/tests/unittest/math/inline.html index d2cc6bf8..57c52bba 100644 --- a/vendor/plugins/maruku/tests/unittest/math/inline.html +++ b/vendor/plugins/maruku/tests/unittest/math/inline.html @@ -8,9 +8,9 @@

Here are some formulas:

    -
  • \alpha
    • +
  • \alpha
    • -
  • x^{n}+y^{n} \neq z^{n}
    • +
  • x^{n}+y^{n} \neq z^{n}

That’s it, nothing else is supported.

diff --git a/vendor/plugins/maruku/tests/unittest/math/inline.md b/vendor/plugins/maruku/tests/unittest/math/inline.md index 66712932..69c87b8b 100644 --- a/vendor/plugins/maruku/tests/unittest/math/inline.md +++ b/vendor/plugins/maruku/tests/unittest/math/inline.md @@ -48,10 +48,45 @@ Here are some formulas:Thats it, nothing else is supported. - OK! +Failed tests: [:to_html] +*** Output of inspect *** +md_el(:document,[ + md_par(["Here are some formulas:"]), + md_el(:ul,[ + md_el(:li_span,[md_el(:inline_math,[],{:math=>"\\alpha"},[])],{:want_my_paragraph=>false},[]), + md_el(:li_span,[md_el(:inline_math,[],{:math=>"x^{n}+y^{n} \\neq z^{n}"},[])],{:want_my_paragraph=>false},[]) + ],{},[]), + md_par(["That", md_entity("rsquo"), "s it, nothing else is supported."]) +],{},[]) +*** Output of to_html *** +-----| WARNING | ----- +

Here are some formulas:

+
    +
  • \alpha
    • + +
  • x^{n}+y^{n} \neq z^{n}
    • +
+ +

That’s it, nothing else is supported.

+*** Output of to_latex *** +Here are some formulas: + +\begin{itemize}% +\item $\alpha$ +\item $x^{n}+y^{n} \neq z^{n}$ + +\end{itemize} +That'{}s it, nothing else is supported. +*** Output of to_md *** +Here are some formulas: + +-- +That s it, nothing else is supported. +*** Output of to_s *** +Here are some formulas:Thats it, nothing else is supported. *** Output of Markdown.pl ***

Here are some formulas:

@@ -63,14 +98,19 @@ Here are some formulas:Thats it, nothing else is supported.

That's it, nothing else is supported.

*** Output of Markdown.pl (parsed) *** -

Here are some formulas:

    -
  • $\alpha$
    • -
  • $x^{n}+y^{n} \neq z^{n}$
    • -

That's it, nothing else is supported.

\ No newline at end of file +
+

+ Here are some formulas: +

+
    +
  • + $\alpha$ +
    • +
  • + $x^{n}+y^{n} \neq z^{n}$ +
    • +
+

+ That's it, nothing else is supported. +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/math/math2.md b/vendor/plugins/maruku/tests/unittest/math/math2.md index adbe7702..290a024f 100644 --- a/vendor/plugins/maruku/tests/unittest/math/math2.md +++ b/vendor/plugins/maruku/tests/unittest/math/math2.md @@ -107,15 +107,17 @@ md_el(:document,[

\begin{equation} \gamma \end{equation}

*** Output of Markdown.pl (parsed) *** -

[ - \alpha -]

\begin{equation} - \alpha -\end{equation}

\begin{equation} \beta -\end{equation}

\begin{equation} \gamma \end{equation}

\ No newline at end of file +
+

+ [ \alpha ] +

+

+ \begin{equation} \alpha \end{equation} +

+

+ \begin{equation} \beta \end{equation} +

+

+ \begin{equation} \gamma \end{equation} +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/math/notmath.md b/vendor/plugins/maruku/tests/unittest/math/notmath.md index 72ce94a3..36ae913d 100644 --- a/vendor/plugins/maruku/tests/unittest/math/notmath.md +++ b/vendor/plugins/maruku/tests/unittest/math/notmath.md @@ -37,8 +37,11 @@ This is not $math$.[ \alpha ]

[ \alpha ]

*** Output of Markdown.pl (parsed) *** -

This is not $math$.

[ \alpha ]

\ No newline at end of file +
+

+ This is not $math$. +

+

+ [ \alpha ] +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/math/table.md b/vendor/plugins/maruku/tests/unittest/math/table.md index 7a5f8de2..4025e3d2 100644 --- a/vendor/plugins/maruku/tests/unittest/math/table.md +++ b/vendor/plugins/maruku/tests/unittest/math/table.md @@ -27,9 +27,24 @@ md_el(:document,[ - OK! +Failed tests: [:to_html] +*** Output of inspect *** +md_el(:document,[ + md_html("\n\t$\\alpha$\n\t\n\t\t\n\t\n
$\\beta$
") +],{},[]) +*** Output of to_html *** +-----| WARNING | ----- +\alpha + + +
\beta
+*** Output of to_latex *** + +*** Output of to_md *** + +*** Output of to_s *** *** Output of Markdown.pl *** @@ -40,14 +55,13 @@ md_el(:document,[
*** Output of Markdown.pl (parsed) *** -
- $\alpha$ - - - -
$\beta$
\ No newline at end of file +
+ + $\alpha$ + + + +
+ $\beta$ +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/math/table2.md b/vendor/plugins/maruku/tests/unittest/math/table2.md index 98b412f8..18e3e4ae 100644 --- a/vendor/plugins/maruku/tests/unittest/math/table2.md +++ b/vendor/plugins/maruku/tests/unittest/math/table2.md @@ -57,11 +57,12 @@ SymbolMeaningcomments The firstI like it. The firstI like it.

{:r: scope='row'}

*** Output of Markdown.pl (parsed) *** -

Symbol | Meaning | comments -------------|---------|--------- -{:r} α | The first | I like it. -{:r} ℵ | The first | I like it.

{:r: scope='row'}

\ No newline at end of file +
+

+ Symbol | Meaning | comments ------------|---------|--------- {:r} α | + The first | I like it. {:r} ℵ | The first | I like it. +

+

+ {:r: scope='row'} +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/misc_sw.md b/vendor/plugins/maruku/tests/unittest/misc_sw.md index 954ed9bf..159ee8e9 100644 --- a/vendor/plugins/maruku/tests/unittest/misc_sw.md +++ b/vendor/plugins/maruku/tests/unittest/misc_sw.md @@ -612,193 +612,326 @@ the alternative is PowerPoint with the Tex *** Output of Markdown.pl (parsed) *** -

Subject: Software not painful to use -Subject_short: painless software -Topic: /misc/coolsw -Archive: no -Date: Nov 20 2006 -Order: -9.5 -inMenu: true

General

    -
  • Operating System : Mac OS X: heaven, after the purgatory of Linux -and the hell of Windows.
    • -
  • Browser: Firefox. On a Mac, Camino.
    • -
  • Email: GMail, "search, don't sort" really works.
    • -
  • Text 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).
    • -

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:

    -

    $ 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 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 don't 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

    -
  • Writing papers: LaTeX
    • -
  • Writing papers & enjoying the process: LyX
    • -
  • Handsome 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 websites

\ No newline at end of file +
+

+ Subject: Software not painful to use Subject_short: painless software Topic: + /misc/coolsw Archive: no Date: Nov 20 2006 Order: -9.5 inMenu: true +

+

+ General +

+
    +
  • + + Operating System + + : + + Mac OS X + + : heaven, after the purgatory of Linux and the hell of Windows. +
    • +
  • + + Browser + + : + + Firefox + + . On a Mac, + + Camino + + . +
    • +
  • + + Email + + : + + GMail + + , "search, don't sort" really works. +
    • +
  • + + Text 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). +
    • +
+

+ 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: +

    +

    + $ 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 + + 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 don't you take at look at + + Markdown + + ? + + Look at the source of this page + + . +
    • +
  • + + C++ libraries + + : + +
    • +
+

+ Research +

+ +

+ Cool websites +

+ +
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/notyet/escape.md b/vendor/plugins/maruku/tests/unittest/notyet/escape.md index d821d744..058211b7 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/escape.md +++ b/vendor/plugins/maruku/tests/unittest/notyet/escape.md @@ -33,12 +33,15 @@ md_el(:document,[md_par([md_code("\\\\")]), md_par([md_code("\\")])],{},[])

\

*** Output of Markdown.pl (parsed) *** -

\\

\

\ No newline at end of file +
+

+ + \\ + +

+

+ + \ + +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md b/vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md index 4decb6b8..d7affc26 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md +++ b/vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md @@ -78,12 +78,23 @@ ParagraphheaderParagraphheaderParagraphheader

header

*** Output of Markdown.pl (parsed) *** -

Paragraph

header

Paragraph

header

Paragraph

header

\ No newline at end of file +
+

+ Paragraph +

+

+ header +

+

+ Paragraph +

+

+ header +

+

+ Paragraph +

+

+ header +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/notyet/ticks.md b/vendor/plugins/maruku/tests/unittest/notyet/ticks.md index cf38f4db..515cfb56 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/ticks.md +++ b/vendor/plugins/maruku/tests/unittest/notyet/ticks.md @@ -28,9 +28,10 @@ md_el(:document,[md_par([md_code("There is a literal backtick (`) here.")])],{},

There is a literal backtick (`) here.

*** Output of Markdown.pl (parsed) *** -

There is a literal backtick (`) here.

\ No newline at end of file +
+

+ + There is a literal backtick (`) here. + +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/notyet/triggering.md b/vendor/plugins/maruku/tests/unittest/notyet/triggering.md index ce6b03c8..d0acc4ae 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/triggering.md +++ b/vendor/plugins/maruku/tests/unittest/notyet/triggering.md @@ -203,33 +203,53 @@ Paragraph, list with no space: * ciaoParagraph, list with 1 space: * ciaoParagra

header

*** Output of Markdown.pl (parsed) *** -

Paragraph, list with no space: -* ciao

Paragraph, list with 1 space: - * ciao

Paragraph, list with 3 space: - * ciao

Paragraph, list with 4 spaces: - * ciao

Paragraph, list with 1 tab: - * ciao

Paragraph (1 space after), list with no space: -* ciao

Paragraph (2 spaces after), list with no space:
-* ciao

Paragraph (3 spaces after), list with no space:
-* ciao

Paragraph with block quote:

-

Quoted

-

Paragraph with header:

header

Paragraph with header on two lines:

header

\ No newline at end of file +
+

+ Paragraph, list with no space: * ciao +

+

+ Paragraph, list with 1 space: * ciao +

+

+ Paragraph, list with 3 space: * ciao +

+

+ Paragraph, list with 4 spaces: * ciao +

+

+ Paragraph, list with 1 tab: * ciao +

+

+ Paragraph (1 space after), list with no space: * ciao +

+

+ Paragraph (2 spaces after), list with no space: +
+ * ciao +

+

+ Paragraph (3 spaces after), list with no space: +
+ * ciao +

+

+ Paragraph with block quote: +

+
+

+ Quoted +

+
+

+ Paragraph with header: +

+

+ header +

+

+ Paragraph with header on two lines: +

+

+ header +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/olist.md b/vendor/plugins/maruku/tests/unittest/olist.md index e0ccec2a..43f939ce 100644 --- a/vendor/plugins/maruku/tests/unittest/olist.md +++ b/vendor/plugins/maruku/tests/unittest/olist.md @@ -61,15 +61,19 @@ This is a list:onetwothree *** Output of Markdown.pl (parsed) *** -

This is a list:

    -
  1. one
    2. -
  2. two
    3. -
  3. three
    4. -
\ No newline at end of file +
+

+ This is a list: +

+
    +
  1. + one +
    2. +
  2. + two +
    3. +
  3. + three +
    4. +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/one.md b/vendor/plugins/maruku/tests/unittest/one.md index f517cdd1..4b62db34 100644 --- a/vendor/plugins/maruku/tests/unittest/one.md +++ b/vendor/plugins/maruku/tests/unittest/one.md @@ -25,7 +25,8 @@ One line

One line

*** Output of Markdown.pl (parsed) *** -

One line

\ No newline at end of file +
+

+ One line +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/paragraph.md b/vendor/plugins/maruku/tests/unittest/paragraph.md index 711c1e57..01e500d3 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraph.md +++ b/vendor/plugins/maruku/tests/unittest/paragraph.md @@ -26,7 +26,8 @@ Paragraph

Paragraph

*** Output of Markdown.pl (parsed) *** -

Paragraph

\ No newline at end of file +
+

+ Paragraph +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/paragraph_rules/dont_merge_ref.md b/vendor/plugins/maruku/tests/unittest/paragraph_rules/dont_merge_ref.md index c5d6e8eb..348acb31 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraph_rules/dont_merge_ref.md +++ b/vendor/plugins/maruku/tests/unittest/paragraph_rules/dont_merge_ref.md @@ -54,9 +54,8 @@ Paragraph Paragraph

*** Output of Markdown.pl (parsed) *** -

Paragraph -Paragraph -Paragraph

\ No newline at end of file +
+

+ Paragraph Paragraph Paragraph +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/paragraph_rules/tab_is_blank.md b/vendor/plugins/maruku/tests/unittest/paragraph_rules/tab_is_blank.md index 5b074d96..fc3869b5 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraph_rules/tab_is_blank.md +++ b/vendor/plugins/maruku/tests/unittest/paragraph_rules/tab_is_blank.md @@ -36,8 +36,11 @@ Paragraph1Paragraph2

Paragraph2

*** Output of Markdown.pl (parsed) *** -

Paragraph1

Paragraph2

\ No newline at end of file +
+

+ Paragraph1 +

+

+ Paragraph2 +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/paragraphs.md b/vendor/plugins/maruku/tests/unittest/paragraphs.md index aa0da151..7357182b 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraphs.md +++ b/vendor/plugins/maruku/tests/unittest/paragraphs.md @@ -63,13 +63,16 @@ Paragraph Br->
Paragraph 5

*** Output of Markdown.pl (parsed) *** -

Paragraph 1

Paragraph 2

Paragraph 3 -Paragraph 4 -Paragraph Br->
-Paragraph 5

\ No newline at end of file +
+

+ Paragraph 1 +

+

+ Paragraph 2 +

+

+ Paragraph 3 Paragraph 4 Paragraph Br-> +
+ Paragraph 5 +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/recover/recover_links.md b/vendor/plugins/maruku/tests/unittest/recover/recover_links.md index 441a250f..b1445f55 100644 --- a/vendor/plugins/maruku/tests/unittest/recover/recover_links.md +++ b/vendor/plugins/maruku/tests/unittest/recover/recover_links.md @@ -25,7 +25,8 @@ Search on Google imagesGoOgle search ]

Search on [Google images][ GoOgle search ]

*** Output of Markdown.pl (parsed) *** -

Search on [Google images][ GoOgle search ]

\ No newline at end of file +
+

+ Search on [Google images][ GoOgle search ] +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/references/long_example.md b/vendor/plugins/maruku/tests/unittest/references/long_example.md index 3fa6dc1a..fcf57570 100644 --- a/vendor/plugins/maruku/tests/unittest/references/long_example.md +++ b/vendor/plugins/maruku/tests/unittest/references/long_example.md @@ -85,16 +85,36 @@ inspiration for Markdown's syntax is the format of plain text email.

To this end, Markdown's syntax is comprised entirely of punctuation

*** Output of Markdown.pl (parsed) *** -

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

\ No newline at end of file +
+

+ 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 +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md b/vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md index 734cdaf8..5549e977 100644 --- a/vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md +++ b/vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md @@ -25,5 +25,4 @@ md_el(:document,[md_ref_def("6", "http://ettext.taint.org/doc/", {:title=>nil})] *** Output of Markdown.pl (parsed) *** -
\ No newline at end of file +
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/smartypants.md b/vendor/plugins/maruku/tests/unittest/smartypants.md index 190de379..b6e92c7d 100644 --- a/vendor/plugins/maruku/tests/unittest/smartypants.md +++ b/vendor/plugins/maruku/tests/unittest/smartypants.md @@ -149,10 +149,10 @@ Line: Position: Last 80 unconsumed characters: 
She was 6\"12\'.

She was 6\"12\'. -/sw/lib/ruby/1.8/rexml/parsers/baseparser.rb:320:in `pull' -/sw/lib/ruby/1.8/rexml/parsers/treeparser.rb:21:in `parse' -/sw/lib/ruby/1.8/rexml/document.rb:190:in `build' -/sw/lib/ruby/1.8/rexml/document.rb:45:in `initialize' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/parsers/baseparser.rb:320:in `pull' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/parsers/treeparser.rb:21:in `parse' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/document.rb:204:in `build' +/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/rexml/document.rb:42:in `initialize' bin/marutest:200:in `new' bin/marutest:200:in `run_test' bin/marutest:274:in `marutest' diff --git a/vendor/plugins/maruku/tests/unittest/syntax_hl.md b/vendor/plugins/maruku/tests/unittest/syntax_hl.md index 526f6f46..bb1e4986 100644 --- a/vendor/plugins/maruku/tests/unittest/syntax_hl.md +++ b/vendor/plugins/maruku/tests/unittest/syntax_hl.md @@ -77,24 +77,33 @@ puts Maruku.new($stdin).to_html *** Output of Markdown.pl (parsed) *** -

This is ruby code:

require 'maruku'
-
-puts Maruku.new($stdin).to_html
-

This is ruby code:

require 'maruku'
-

{: lang=ruby htmlusesyntax}

puts Maruku.new($stdin).to_html
-
\ No newline at end of file +
+

+ 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 
+  
+
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/table_attributes.md b/vendor/plugins/maruku/tests/unittest/table_attributes.md index 2c9b8e9e..d9c8dc7f 100644 --- a/vendor/plugins/maruku/tests/unittest/table_attributes.md +++ b/vendor/plugins/maruku/tests/unittest/table_attributes.md @@ -49,11 +49,13 @@ hh c1c2

{:t: scope="row"}

*** Output of Markdown.pl (parsed) *** -

h | h -----------|-- -{:t} c1 | c2 -{: summary="Table summary" .class1 style="color:red" border=3 width="50%" frame=lhs rules=cols cellspacing=2em cellpadding=4px}

{:t: scope="row"}

\ No newline at end of file +
+

+ h | h ----------|-- {:t} c1 | c2 {: summary="Table summary" .class1 + style="color:red" border=3 width="50%" frame=lhs rules=cols cellspacing=2em + cellpadding=4px} +

+

+ {:t: scope="row"} +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/test.md b/vendor/plugins/maruku/tests/unittest/test.md index 95ecd7cb..d8eea239 100644 --- a/vendor/plugins/maruku/tests/unittest/test.md +++ b/vendor/plugins/maruku/tests/unittest/test.md @@ -29,7 +29,8 @@ md_el(:document,[md_el(:code,[],{:raw_code=>" $ python "},[])],{},[]

$ python

*** Output of Markdown.pl (parsed) *** -

$ python

\ No newline at end of file +
+

+ $ python +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/wrapping.md b/vendor/plugins/maruku/tests/unittest/wrapping.md index ff171db9..4cb64de7 100644 --- a/vendor/plugins/maruku/tests/unittest/wrapping.md +++ b/vendor/plugins/maruku/tests/unittest/wrapping.md @@ -85,18 +85,25 @@ Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet *** Output of Markdown.pl (parsed) *** -

Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Break:
-Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet.

    -
  • 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
    • -
  • Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet
    • -
\ No newline at end of file +
+

+ Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem + ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum + dolor amet. Break: +
+ Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem + ipsum dolor amet. +

+
    +
  • + 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 +
    • +
  • + Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem + ipsum dolor amet +
    • +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/xml.md b/vendor/plugins/maruku/tests/unittest/xml.md index 7a4702e6..598df0a8 100644 --- a/vendor/plugins/maruku/tests/unittest/xml.md +++ b/vendor/plugins/maruku/tests/unittest/xml.md @@ -51,20 +51,16 @@ width="600px" height="400px">

*** Output of Markdown.pl (parsed) *** -

- - - - -

\ No newline at end of file +
+

+ +

+

+ + + + + + +

+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/xml2.md b/vendor/plugins/maruku/tests/unittest/xml2.md index 9bdcb6b4..a2c25b97 100644 --- a/vendor/plugins/maruku/tests/unittest/xml2.md +++ b/vendor/plugins/maruku/tests/unittest/xml2.md @@ -31,8 +31,8 @@ md_el(:document,[md_html("")],{},[]) --> *** Output of Markdown.pl (parsed) *** -
\ No newline at end of file +--> +
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/xml3.md b/vendor/plugins/maruku/tests/unittest/xml3.md index 12d8aa89..4ded6cba 100644 --- a/vendor/plugins/maruku/tests/unittest/xml3.md +++ b/vendor/plugins/maruku/tests/unittest/xml3.md @@ -41,14 +41,13 @@ md_el(:document,[ *** Output of Markdown.pl (parsed) *** -
- Blah - - - -
*em*
\ No newline at end of file +
+ + Blah + + + +
+ *em* +
+
\ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/xml_instruction.md b/vendor/plugins/maruku/tests/unittest/xml_instruction.md index 17d71a7a..2bbff43d 100644 --- a/vendor/plugins/maruku/tests/unittest/xml_instruction.md +++ b/vendor/plugins/maruku/tests/unittest/xml_instruction.md @@ -69,10 +69,23 @@ Targets Inside: last

Inside: last

*** Output of Markdown.pl (parsed) *** -

Targets

Inside: last

\ No newline at end of file +
+

+ + + + +

+

+ Targets + + + + +

+

+ Inside: + + last +

+
\ No newline at end of file