diff --git a/config/mime_types.yml b/config/mime_types.yml new file mode 100644 index 00000000..76ad41fe --- /dev/null +++ b/config/mime_types.yml @@ -0,0 +1,12 @@ +--- +.avi: video/avi +.gz: application/x-gzip +.js: application/x-javascript +.nb: application/mathematica +.pdf: application/pdf +.svg: application/svg+xml +.tar: application/x-tar +.tex: application/x-tex +.xhtml: application/xhtml+xml +.xml: application/xml +.xslt: application/xslt+xml diff --git a/lib/chunks/chunk.rb b/lib/chunks/chunk.rb index 55c96748..ee65cc77 100644 --- a/lib/chunks/chunk.rb +++ b/lib/chunks/chunk.rb @@ -1,4 +1,4 @@ -require 'uri/common' +#require 'uri/common' # A chunk is a pattern of text that can be protected # and interrogated by a renderer. Each Chunk class has a diff --git a/lib/chunks/engines.rb b/lib/chunks/engines.rb index 7d82a18d..013c424a 100644 --- a/lib/chunks/engines.rb +++ b/lib/chunks/engines.rb @@ -24,9 +24,8 @@ module Engines end class Textile < AbstractEngine - require 'sanitize' - include Sanitize def mask + require 'sanitize' require 'redcloth' redcloth = RedCloth.new(@content, [:hard_breaks] + @content.options[:engine_opts]) redcloth.filter_html = false @@ -37,9 +36,8 @@ module Engines end class Markdown < AbstractEngine - require 'sanitize' - include Sanitize def mask + require 'sanitize' require 'maruku' require 'maruku/ext/math' @@ -61,9 +59,8 @@ module Engines end class MarkdownMML < AbstractEngine - require 'sanitize' - include Sanitize def mask + require 'sanitize' require 'maruku' require 'maruku/ext/math' @@ -87,9 +84,8 @@ module Engines end class Mixed < AbstractEngine - require 'sanitize' - include Sanitize def mask + require 'sanitize' require 'redcloth' redcloth = RedCloth.new(@content, @content.options[:engine_opts]) redcloth.filter_html = false @@ -100,9 +96,8 @@ module Engines end class RDoc < AbstractEngine - require 'sanitize' - include Sanitize def mask + require 'sanitize' require_dependency 'rdocsupport' html = RDocSupport::RDocFormatter.new(@content).to_html sanitize_xhtml(html) diff --git a/lib/chunks/wiki.rb b/lib/chunks/wiki.rb index bbe02494..27168c87 100644 --- a/lib/chunks/wiki.rb +++ b/lib/chunks/wiki.rb @@ -1,7 +1,4 @@ -require 'wiki_words' require 'chunks/chunk' -require 'chunks/wiki' -require 'cgi' # Contains all the methods for finding and replacing wiki related links. module WikiChunk diff --git a/test/unit/wiki_words_test.rb b/test/unit/wiki_words_test.rb index f90a8d12..62a7a908 100755 --- a/test/unit/wiki_words_test.rb +++ b/test/unit/wiki_words_test.rb @@ -1,7 +1,6 @@ #!/usr/bin/env ruby require File.expand_path(File.dirname(__FILE__) + '/../test_helper') -require 'wiki_words' class WikiWordsTest < Test::Unit::TestCase diff --git a/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/itex2mml.rb b/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/itex2mml.rb index 69d273d3..bf79fb81 100644 --- a/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/itex2mml.rb +++ b/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/itex2mml.rb @@ -4,13 +4,14 @@ module MaRuKu; module Out; module HTML def convert_to_mathml_itex2mml(kind, tex) begin if not $itex2mml_parser + require 'sanitize' require 'itextomml' $itex2mml_parser = Itex2MML::Parser.new end itex_method = {:equation=>:block_filter,:inline=>:inline_filter} - mathml = $itex2mml_parser.send(itex_method[kind], tex) + mathml = $itex2mml_parser.send(itex_method[kind], tex).to_utf8 doc = Document.new(mathml, {:respect_whitespace =>:all}).root return doc rescue LoadError => e diff --git a/vendor/plugins/maruku/tests/unittest/abbreviations.md b/vendor/plugins/maruku/tests/unittest/abbreviations.md index 5fc4df9b..277c1df3 100644 --- a/vendor/plugins/maruku/tests/unittest/abbreviations.md +++ b/vendor/plugins/maruku/tests/unittest/abbreviations.md @@ -69,17 +69,11 @@ The HTML specification is maintained by the W3C.Operation Tigra Genesis is going

*[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 6d9915b2..b0fc8e4e 100644 --- a/vendor/plugins/maruku/tests/unittest/alt.md +++ b/vendor/plugins/maruku/tests/unittest/alt.md @@ -27,8 +27,9 @@ 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 6a7432eb..876e25b7 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 6e5e1fa3..0f48e74c 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/att3.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/att3.md @@ -42,11 +42,10 @@ 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 75926854..f9f669bd 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/attributes.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/attributes.md @@ -79,27 +79,15 @@ 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 698f2f71..beaea96f 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/circular.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/circular.md @@ -40,11 +40,10 @@ 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 4daaddb6..52dbdbbd 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/default.md +++ b/vendor/plugins/maruku/tests/unittest/attributes/default.md @@ -35,11 +35,9 @@ 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 eddd756a..22604118 100644 --- a/vendor/plugins/maruku/tests/unittest/blank.md +++ b/vendor/plugins/maruku/tests/unittest/blank.md @@ -36,11 +36,8 @@ 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 f35f6916..86c3b0e5 100644 --- a/vendor/plugins/maruku/tests/unittest/blanks_in_code.md +++ b/vendor/plugins/maruku/tests/unittest/blanks_in_code.md @@ -103,29 +103,26 @@ 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 0723ae4f..46ff083c 100644 --- a/vendor/plugins/maruku/tests/unittest/bug_def.md +++ b/vendor/plugins/maruku/tests/unittest/bug_def.md @@ -26,8 +26,7 @@ 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 0db6dfbf..26b50248 100644 --- a/vendor/plugins/maruku/tests/unittest/bug_table.md +++ b/vendor/plugins/maruku/tests/unittest/bug_table.md @@ -64,15 +64,13 @@ 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 dcbacadb..4d03c9c3 100644 --- a/vendor/plugins/maruku/tests/unittest/code.md +++ b/vendor/plugins/maruku/tests/unittest/code.md @@ -50,13 +50,14 @@ 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 705895ca..5de75075 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 667c19fc..255b3185 100644 --- a/vendor/plugins/maruku/tests/unittest/code3.md +++ b/vendor/plugins/maruku/tests/unittest/code3.md @@ -99,37 +99,26 @@ 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 0e976cd2..2ee4ab6d 100644 --- a/vendor/plugins/maruku/tests/unittest/data_loss.md +++ b/vendor/plugins/maruku/tests/unittest/data_loss.md @@ -39,10 +39,12 @@ 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/easy.md b/vendor/plugins/maruku/tests/unittest/easy.md index 461f1afe..29569cb8 100644 --- a/vendor/plugins/maruku/tests/unittest/easy.md +++ b/vendor/plugins/maruku/tests/unittest/easy.md @@ -25,15 +25,10 @@ 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 d498eabf..67906a5c 100644 --- a/vendor/plugins/maruku/tests/unittest/email.md +++ b/vendor/plugins/maruku/tests/unittest/email.md @@ -27,7 +27,11 @@ 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) *** -Error: # +

This is an email address: andrea@invalid.it

\ No newline at end of file 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 c9702cde..aec05985 100644 --- a/vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md +++ b/vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md @@ -35,11 +35,8 @@ 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 5fc95349..8f715644 100644 --- a/vendor/plugins/maruku/tests/unittest/encoding/utf-8.md +++ b/vendor/plugins/maruku/tests/unittest/encoding/utf-8.md @@ -30,11 +30,8 @@ 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 29b8546b..84901f88 100644 --- a/vendor/plugins/maruku/tests/unittest/entities.md +++ b/vendor/plugins/maruku/tests/unittest/entities.md @@ -121,49 +121,27 @@ Maruku translates HTML entities to the equivalent in LaTeX:EntityResultabEntity-

It should read just like this: &copy;.

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

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

-

- Entity | Result ------------|---------- - - &copy; - - | © - - &pound; - - | £ - - a&nbsp;b - - | a b - - &lambda; - - | λ - - &mdash; - - | — -

-

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

-

- The following should not be translated: -

-
-  
-   &copy; 
-  
- 
-

- It should read just like this: - - &copy; - - . -

-
\ No newline at end of file +

Maruku translates HTML entities to the equivalent in LaTeX:

Entity | Result +------------|---------- +&copy; | © +&pound; | £ +a&nbsp;b | a b +&lambda; | λ +&mdash; | —

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

The following should not be translated:

&copy;
+

It should read just like this: &copy;.

\ 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 cae9a208..a9dc708e 100644 --- a/vendor/plugins/maruku/tests/unittest/escaping.md +++ b/vendor/plugins/maruku/tests/unittest/escaping.md @@ -74,7 +74,7 @@ Hello: ! ! ` { } [ ] ( ) # . ! * * *Ora, emphasis, bold, * <- due asterischi-> * *** Output of Markdown.pl *** -

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

+

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

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

@@ -86,52 +86,20 @@ Hello: ! ! ` { } [ ] ( ) # . ! * * *Ora, emphasis, bold, * <- due asterischi-> *

End of paragraph

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

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

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 diff --git a/vendor/plugins/maruku/tests/unittest/extra_dl.md b/vendor/plugins/maruku/tests/unittest/extra_dl.md index cae5d6fd..f9704c09 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_dl.md +++ b/vendor/plugins/maruku/tests/unittest/extra_dl.md @@ -69,14 +69,12 @@ 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 fb78c3f4..b6b8f544 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_header_id.md +++ b/vendor/plugins/maruku/tests/unittest/extra_header_id.md @@ -83,30 +83,17 @@ 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 e705c1c2..c68cc678 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_table1.md +++ b/vendor/plugins/maruku/tests/unittest/extra_table1.md @@ -52,12 +52,11 @@ 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 99f93ae4..3a07d202 100644 --- a/vendor/plugins/maruku/tests/unittest/footnotes.md +++ b/vendor/plugins/maruku/tests/unittest/footnotes.md @@ -123,30 +123,21 @@ 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 fe7ecb01..fe22aa44 100644 --- a/vendor/plugins/maruku/tests/unittest/headers.md +++ b/vendor/plugins/maruku/tests/unittest/headers.md @@ -51,23 +51,12 @@ 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 6de31f8b..178bbc59 100644 --- a/vendor/plugins/maruku/tests/unittest/hex_entities.md +++ b/vendor/plugins/maruku/tests/unittest/hex_entities.md @@ -47,10 +47,7 @@ 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 03e93f82..18ba2ae4 100644 --- a/vendor/plugins/maruku/tests/unittest/hrule.md +++ b/vendor/plugins/maruku/tests/unittest/hrule.md @@ -57,10 +57,11 @@ 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 6ec64eac..66beca4b 100644 --- a/vendor/plugins/maruku/tests/unittest/html2.md +++ b/vendor/plugins/maruku/tests/unittest/html2.md @@ -35,14 +35,12 @@ 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 31dc27be..cfde7011 100644 --- a/vendor/plugins/maruku/tests/unittest/html3.md +++ b/vendor/plugins/maruku/tests/unittest/html3.md @@ -44,24 +44,14 @@ 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 ef9b22d4..a5a68a7b 100644 --- a/vendor/plugins/maruku/tests/unittest/html4.md +++ b/vendor/plugins/maruku/tests/unittest/html4.md @@ -39,10 +39,11 @@ 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 4c5df156..beea773e 100644 --- a/vendor/plugins/maruku/tests/unittest/html5.md +++ b/vendor/plugins/maruku/tests/unittest/html5.md @@ -35,12 +35,13 @@ 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 5bbd4583..d532db33 100644 --- a/vendor/plugins/maruku/tests/unittest/ie.md +++ b/vendor/plugins/maruku/tests/unittest/ie.md @@ -79,50 +79,31 @@ 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> 
-  
- 
-

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

<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 diff --git a/vendor/plugins/maruku/tests/unittest/images.md b/vendor/plugins/maruku/tests/unittest/images.md index afe77911..b8f96951 100644 --- a/vendor/plugins/maruku/tests/unittest/images.md +++ b/vendor/plugins/maruku/tests/unittest/images.md @@ -111,28 +111,17 @@ 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 a5363342..1e0998db 100644 --- a/vendor/plugins/maruku/tests/unittest/images2.md +++ b/vendor/plugins/maruku/tests/unittest/images2.md @@ -43,13 +43,9 @@ 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 d0101107..c659f7ae 100644 --- a/vendor/plugins/maruku/tests/unittest/inline_html.md +++ b/vendor/plugins/maruku/tests/unittest/inline_html.md @@ -238,16 +238,16 @@ Line: Position: Last 80 unconsumed characters:
This is *true* markdown text (paragraph)

-/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' +/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' bin/marutest:200:in `new' bin/marutest:200:in `run_test' -bin/marutest:275:in `marutest' -bin/marutest:272:in `each' -bin/marutest:272:in `marutest' -bin/marutest:347 +bin/marutest:274:in `marutest' +bin/marutest:271:in `each' +bin/marutest:271:in `marutest' +bin/marutest:346 ... Missing end tag for 'img' (got "p") Line: diff --git a/vendor/plugins/maruku/tests/unittest/inline_html2.md b/vendor/plugins/maruku/tests/unittest/inline_html2.md index 01c9a9b0..f94b5c91 100644 --- a/vendor/plugins/maruku/tests/unittest/inline_html2.md +++ b/vendor/plugins/maruku/tests/unittest/inline_html2.md @@ -33,11 +33,8 @@ 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 10f3f525..c5fabee6 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,16 +175,16 @@ Line: Position: Last 80 unconsumed characters: > -/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' +/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' bin/marutest:200:in `new' bin/marutest:200:in `run_test' -bin/marutest:275:in `marutest' -bin/marutest:272:in `each' -bin/marutest:272:in `marutest' -bin/marutest:347 +bin/marutest:274:in `marutest' +bin/marutest:271:in `each' +bin/marutest:271:in `marutest' +bin/marutest:346 ... Missing end tag for 'p' (got "div") Line: diff --git a/vendor/plugins/maruku/tests/unittest/list1.md b/vendor/plugins/maruku/tests/unittest/list1.md index 8de39d6b..4e81fb6d 100644 --- a/vendor/plugins/maruku/tests/unittest/list1.md +++ b/vendor/plugins/maruku/tests/unittest/list1.md @@ -63,17 +63,18 @@ 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 e863ef44..b86bff06 100644 --- a/vendor/plugins/maruku/tests/unittest/list2.md +++ b/vendor/plugins/maruku/tests/unittest/list2.md @@ -73,22 +73,20 @@ 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 3596fb0e..7d4aedf6 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 e733cf41..776d914e 100644 --- a/vendor/plugins/maruku/tests/unittest/list4.md +++ b/vendor/plugins/maruku/tests/unittest/list4.md @@ -113,17 +113,18 @@ 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 8bf57a7d..043f95f5 100644 --- a/vendor/plugins/maruku/tests/unittest/lists.md +++ b/vendor/plugins/maruku/tests/unittest/lists.md @@ -238,69 +238,57 @@ 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 0ae62d25..b74df732 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 268b5d39..85df9084 100644 --- a/vendor/plugins/maruku/tests/unittest/lists6.md +++ b/vendor/plugins/maruku/tests/unittest/lists6.md @@ -51,4 +51,5 @@ 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 d9316c52..c5420af9 100644 --- a/vendor/plugins/maruku/tests/unittest/lists7.md +++ b/vendor/plugins/maruku/tests/unittest/lists7.md @@ -76,23 +76,21 @@ 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 867b8e90..1d8ac9e8 100644 --- a/vendor/plugins/maruku/tests/unittest/lists7b.md +++ b/vendor/plugins/maruku/tests/unittest/lists7b.md @@ -133,21 +133,19 @@ 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 0f418fcb..bbe6a829 100644 --- a/vendor/plugins/maruku/tests/unittest/lists8.md +++ b/vendor/plugins/maruku/tests/unittest/lists8.md @@ -80,19 +80,15 @@ 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 b197cd84..f6666377 100644 --- a/vendor/plugins/maruku/tests/unittest/lists9.md +++ b/vendor/plugins/maruku/tests/unittest/lists9.md @@ -82,24 +82,21 @@ DuetretretreDue *** Output of Markdown.pl (parsed) *** -
-
    -
  • - Due -
      -
    1. - tre -
    2. -
    3. - tre -
    4. -
    5. - tre -
    6. -
    -
  • -
  • - Due -
  • -
-
\ No newline at end of file +
    +
  • Due +
      +
    1. tre
    2. +
    3. tre
    4. +
    5. tre
    6. +
  • +
  • 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 91aa9c3d..330b25d8 100644 --- a/vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md +++ b/vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md @@ -265,85 +265,45 @@ 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: - - Emphasis - - - tralla - - - Emph - -

-

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

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 bc927dec..42a7e608 100644 --- a/vendor/plugins/maruku/tests/unittest/lists_ol.md +++ b/vendor/plugins/maruku/tests/unittest/lists_ol.md @@ -321,93 +321,78 @@ 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. -
  3. - 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. -
    3. - Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id - sem consectetuer libero luctus adipiscing. -
    4. -
    -
  4. -
-

- 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. -
      3. - tre -
      4. -
      5. - tre -
      6. -
      -
    • -
    • - Due -
    • -
    -
  2. -
  3. -

    - Suspendisse id sem consectetuer libero luctus adipiscing. -

    -
  4. -
-

- 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. +
  3. 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. +
    3. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. +Suspendisse id sem consectetuer libero luctus adipiscing.
    4. +
  4. +

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. +
      3. tre
      4. +
      5. tre
      6. +
    • +
    • Due
    • +
  2. +
  3. Suspendisse id sem consectetuer libero luctus adipiscing.

  4. +

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 69c5527a..0ef74dba 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 2425fb65..9b9c7020 100644 --- a/vendor/plugins/maruku/tests/unittest/math/equations.md +++ b/vendor/plugins/maruku/tests/unittest/math/equations.md @@ -54,58 +54,25 @@ $$ x = y $$$$ x$$ x = y $$$$ x = y $$ *** Output of Markdown.pl *** -x=y +

$$ x = y $$

-x=y +

$$ x += y $$

-x=y +

$$ +x = y $$

-x=y +

$$ 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 2bc5462b..d2cc6bf8 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
  • -
  • x n+y nz 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 f0c97be8..66712932 100644 --- a/vendor/plugins/maruku/tests/unittest/math/inline.md +++ b/vendor/plugins/maruku/tests/unittest/math/inline.md @@ -48,104 +48,29 @@ 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:

-
    -
  • α
  • - -
  • x n+y nz 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:

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

That's it, nothing else is supported.

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

- Here are some formulas: -

-
    -
  • - - - α - - -
  • -
  • - - - - x - - - n - - - - + - - - - y - - - n - - - - ≠ - - - - 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.html b/vendor/plugins/maruku/tests/unittest/math/math2.html index 2e32abc1..32c3df18 100644 --- a/vendor/plugins/maruku/tests/unittest/math/math2.html +++ b/vendor/plugins/maruku/tests/unittest/math/math2.html @@ -4,9 +4,14 @@ "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd"> -
(1)α
\alpha +
(1) \alpha -
α
\alpha +
\alpha -
β
\beta -
γ
\gamma
\ No newline at end of file +
\alpha + +
\alpha + +
\beta +
\beta +
\gamma
\gamma
\ 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 9280fdd8..adbe7702 100644 --- a/vendor/plugins/maruku/tests/unittest/math/math2.md +++ b/vendor/plugins/maruku/tests/unittest/math/math2.md @@ -52,12 +52,50 @@ md_el(:document,[ - OK! +Failed tests: [:to_html] +*** Output of inspect *** +md_el(:document,[ + md_el(:equation,[],{:label=>"eq1",:math=>"\t\\alpha\n\n",:num=>1},[]), + md_el(:equation,[],{:label=>nil,:math=>"\t\\alpha\n\n",:num=>nil},[]), + md_el(:equation,[],{:label=>nil,:math=>" \\beta\n",:num=>nil},[]), + md_el(:equation,[],{:label=>nil,:math=>" \\gamma ",:num=>nil},[]) +],{},[]) +*** Output of to_html *** +-----| WARNING | ----- +
(1) \alpha + +
\alpha + +
\alpha + +
\alpha + +
\beta +
\beta +
\gamma
\gamma
+*** Output of to_latex *** +\begin{equation} +\alpha +\label{eq1}\end{equation} +\begin{displaymath} +\alpha +\end{displaymath} +\begin{displaymath} +\beta +\end{displaymath} +\begin{displaymath} +\gamma +\end{displaymath} +*** Output of to_md *** + +*** Output of to_s *** *** Output of Markdown.pl *** -α +

[ + \alpha +]

\begin{equation} \alpha @@ -69,19 +107,15 @@ md_el(:document,[

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

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

- \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 54f4c11e..72ce94a3 100644 --- a/vendor/plugins/maruku/tests/unittest/math/notmath.md +++ b/vendor/plugins/maruku/tests/unittest/math/notmath.md @@ -32,24 +32,13 @@ This is not $math$.[ \alpha ] *** Output of Markdown.pl *** -

This is not math.

+

This is not $math$.

-α +

[ \alpha ]

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

- This is not - - - math - - - . -

- - - α - - -
\ 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 ac463e46..7a5f8de2 100644 --- a/vendor/plugins/maruku/tests/unittest/math/table.md +++ b/vendor/plugins/maruku/tests/unittest/math/table.md @@ -27,49 +27,27 @@ 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 | ----- -α - - -
β
-*** Output of to_latex *** - -*** Output of to_md *** - -*** Output of to_s *** *** Output of Markdown.pl *** - α + $\alpha$ - +
β$\beta$
*** Output of Markdown.pl (parsed) *** -
- - - - α - - - - - -
- - - β - - -
-
\ 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 18e3e4ae..98b412f8 100644 --- a/vendor/plugins/maruku/tests/unittest/math/table2.md +++ b/vendor/plugins/maruku/tests/unittest/math/table2.md @@ -57,12 +57,11 @@ 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 159ee8e9..954ed9bf 100644 --- a/vendor/plugins/maruku/tests/unittest/misc_sw.md +++ b/vendor/plugins/maruku/tests/unittest/misc_sw.md @@ -612,326 +612,193 @@ 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 -

-
-

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

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 diff --git a/vendor/plugins/maruku/tests/unittest/notyet/escape.md b/vendor/plugins/maruku/tests/unittest/notyet/escape.md index 058211b7..d821d744 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/escape.md +++ b/vendor/plugins/maruku/tests/unittest/notyet/escape.md @@ -33,15 +33,12 @@ 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 d7affc26..4decb6b8 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md +++ b/vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md @@ -78,23 +78,12 @@ 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 515cfb56..cf38f4db 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/ticks.md +++ b/vendor/plugins/maruku/tests/unittest/notyet/ticks.md @@ -28,10 +28,9 @@ 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 d0acc4ae..ce6b03c8 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/triggering.md +++ b/vendor/plugins/maruku/tests/unittest/notyet/triggering.md @@ -203,53 +203,33 @@ 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 43f939ce..e0ccec2a 100644 --- a/vendor/plugins/maruku/tests/unittest/olist.md +++ b/vendor/plugins/maruku/tests/unittest/olist.md @@ -61,19 +61,15 @@ This is a list:onetwothree *** Output of Markdown.pl (parsed) *** -
-

- This is a list: -

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

This is a list:

    +
  1. one
  2. +
  3. two
  4. +
  5. three
  6. +
\ 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 4b62db34..f517cdd1 100644 --- a/vendor/plugins/maruku/tests/unittest/one.md +++ b/vendor/plugins/maruku/tests/unittest/one.md @@ -25,8 +25,7 @@ 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 01e500d3..711c1e57 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraph.md +++ b/vendor/plugins/maruku/tests/unittest/paragraph.md @@ -26,8 +26,7 @@ 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 348acb31..c5d6e8eb 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,8 +54,9 @@ 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 fc3869b5..5b074d96 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,11 +36,8 @@ 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 7357182b..aa0da151 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraphs.md +++ b/vendor/plugins/maruku/tests/unittest/paragraphs.md @@ -63,16 +63,13 @@ 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 b1445f55..441a250f 100644 --- a/vendor/plugins/maruku/tests/unittest/recover/recover_links.md +++ b/vendor/plugins/maruku/tests/unittest/recover/recover_links.md @@ -25,8 +25,7 @@ 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 fcf57570..3fa6dc1a 100644 --- a/vendor/plugins/maruku/tests/unittest/references/long_example.md +++ b/vendor/plugins/maruku/tests/unittest/references/long_example.md @@ -85,36 +85,16 @@ 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 5549e977..734cdaf8 100644 --- a/vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md +++ b/vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md @@ -25,4 +25,5 @@ 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 91949234..190de379 100644 --- a/vendor/plugins/maruku/tests/unittest/smartypants.md +++ b/vendor/plugins/maruku/tests/unittest/smartypants.md @@ -149,16 +149,16 @@ Line: Position: Last 80 unconsumed characters:
She was 6\"12\'. 

She was 6\"12\'. -/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' +/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' bin/marutest:200:in `new' bin/marutest:200:in `run_test' -bin/marutest:275:in `marutest' -bin/marutest:272:in `each' -bin/marutest:272:in `marutest' -bin/marutest:347 +bin/marutest:274:in `marutest' +bin/marutest:271:in `each' +bin/marutest:271:in `marutest' +bin/marutest:346 ... Missing end tag for 'here' (got "p") Line: diff --git a/vendor/plugins/maruku/tests/unittest/syntax_hl.md b/vendor/plugins/maruku/tests/unittest/syntax_hl.md index 51ab1292..526f6f46 100644 --- a/vendor/plugins/maruku/tests/unittest/syntax_hl.md +++ b/vendor/plugins/maruku/tests/unittest/syntax_hl.md @@ -63,8 +63,38 @@ This is ruby code:This is ruby code:

require 'maruku'
 
-puts Maruku.new(<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mi>stdin</mi><mo stretchy="false">)</mo><mo>.</mo><msub><mi>to</mi> <mi>html</mi></msub><mi>This</mi><mi>is</mi><mi>ruby</mi><mi>code</mi><mo>:</mo><mi>require</mi><mo>&prime;</mo><mi>maruku</mi><mo>&prime;</mo><mrow><mo>:</mo><mi>lang</mi><mo>=</mo><mi>ruby</mi><msub><mi>html</mi> <mi>use</mi></msub><msub><mo></mo><mi>syntax</mi></msub></mrow><mi>puts</mi><mi>Maruku</mi><mo>.</mo><mi>new</mi><mo stretchy="false">(</mo></math>stdin).to_html
+puts Maruku.new($stdin).to_html
+
+ +

This is ruby code:

+ +
require 'maruku'
+
+ +

{: lang=ruby htmlusesyntax}

+ +
puts Maruku.new($stdin).to_html
 
*** Output of Markdown.pl (parsed) *** -Error: # +

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 diff --git a/vendor/plugins/maruku/tests/unittest/table_attributes.md b/vendor/plugins/maruku/tests/unittest/table_attributes.md index d9c8dc7f..2c9b8e9e 100644 --- a/vendor/plugins/maruku/tests/unittest/table_attributes.md +++ b/vendor/plugins/maruku/tests/unittest/table_attributes.md @@ -49,13 +49,11 @@ 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 d8eea239..95ecd7cb 100644 --- a/vendor/plugins/maruku/tests/unittest/test.md +++ b/vendor/plugins/maruku/tests/unittest/test.md @@ -29,8 +29,7 @@ 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 4cb64de7..ff171db9 100644 --- a/vendor/plugins/maruku/tests/unittest/wrapping.md +++ b/vendor/plugins/maruku/tests/unittest/wrapping.md @@ -85,25 +85,18 @@ 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 598df0a8..7a4702e6 100644 --- a/vendor/plugins/maruku/tests/unittest/xml.md +++ b/vendor/plugins/maruku/tests/unittest/xml.md @@ -51,16 +51,20 @@ 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 a2c25b97..9bdcb6b4 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 4ded6cba..12d8aa89 100644 --- a/vendor/plugins/maruku/tests/unittest/xml3.md +++ b/vendor/plugins/maruku/tests/unittest/xml3.md @@ -41,13 +41,14 @@ 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 2bbff43d..17d71a7a 100644 --- a/vendor/plugins/maruku/tests/unittest/xml_instruction.md +++ b/vendor/plugins/maruku/tests/unittest/xml_instruction.md @@ -69,23 +69,10 @@ 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