maruku 0.7.0 → 0.7.1

data/spec/block_docs/footnotes2.md

@@ -61,7 +61,10 @@ md_el(:document,[
 </ol>
 <a href="#fnref:3" rev="footnote">↩</a></li><li id="fn:4">
 <p>Like this:</p>
-<div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml"><mi>x</mi><mo>=</mo><mi>r</mi><mi>cos</mi><mi>θ</mi></math><span class="maruku-eq-tex"><code style="display: none">x = r\cos\theta</code></span></div><a href="#fnref:4" rev="footnote">↩</a></li></ol></div>
+<div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml"><semantics><mrow><mi>x</mi><mo>=</mo><mi>r</mi><mi>cos</mi><mi>θ</mi></mrow><annotation encoding="application/x-tex">
+x = r\cos\theta
+
+</annotation></semantics></math></div><a href="#fnref:4" rev="footnote">↩</a></li></ol></div>
 *** Output of to_latex ***
 Ruby on Rails is a web-framework\footnote{a reusable set of libraries} . It uses the MVC\footnote{Model View Controller}  architecture pattern. It has its good points\footnote{Here are its good points
 

data/spec/block_docs/ignore_bad_header.md

@@ -0,0 +1,9 @@
+Pass weird messed up header through to output without blowing up. Secondary issue noticed via https://github.com/bhollis/maruku/issues/124
+*** Parameters: ***
+{:on_error => :raise}
+*** Markdown input: ***
+= Markdown, with some ruby =
+*** Output of inspect ***
+md_el(:document, md_par(["= Markdown, with some ruby ="]))
+*** Output of to_html ***
+<p>= Markdown, with some ruby =</p>

data/spec/block_docs/issue106.md

@@ -0,0 +1,78 @@
+Code with list-delimiters in it - https://github.com/bhollis/maruku/issues/106
+*** Parameters: ***
+{}
+*** Markdown input: ***
+
+This is code (4 spaces):
+
+    * Code
+      * Code (again)
+
+This is also code
+
+    * Code
+	* Code (again)
+
+This is code (1 tab):
+
+	* Code
+		* Code (again)
+
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par(["This is code (4 spaces):"]),
+	md_el(:code,[],{:raw_code=>"* Code
+  * Code (again)", :lang=>nil},[]),
+	md_par(["This is also code"]),
+	md_el(:code,[],{:raw_code=>"* Code
+* Code (again)", :lang=>nil},[]),
+	md_par(["This is code (1 tab):"]),
+	md_el(:code,[],{:raw_code=>"* Code
+	* Code (again)", :lang=>nil},[])
+],{},[])
+*** Output of to_html ***
+<p>This is code (4 spaces):</p>
+
+<pre><code>* Code
+  * Code (again)</code></pre>
+
+<p>This is also code</p>
+
+<pre><code>* Code
+* Code (again)</code></pre>
+
+<p>This is code (1 tab):</p>
+
+<pre><code>* Code
+	* Code (again)</code></pre>
+*** Output of to_latex ***
+This is code (4 spaces):
+
+\begin{verbatim}* Code
+  * Code (again)\end{verbatim}
+This is also code
+
+\begin{verbatim}* Code
+* Code (again)\end{verbatim}
+This is code (1 tab):
+
+\begin{verbatim}* Code
+	* Code (again)\end{verbatim}
+*** Output of to_md ***
+This is code (4 spaces):
+
+     * Code
+       * Code (again)
+
+This is also code
+
+     * Code
+     * Code (again)
+
+This is code (1 tab):
+
+     * Code
+         * Code (again)
+*** Output of to_s ***
+This is code (4 spaces):This is also codeThis is code (1 tab):

data/spec/block_docs/issue115.md

@@ -0,0 +1,20 @@
+Markdown in comments should not be parsed. https://github.com/bhollis/maruku/issues/115
+Note that output is kind of weird because we modify the comment in order to let REXML parse it due to https://bugs.ruby-lang.org/issues/9277.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+<!--
+Header
+------
+-->
+
+<!-- -- -->
+*** Output of inspect ***
+md_el(:document,[md_html("<!--\nHeader\n- - - - - - \n-->"), md_html("<!-- - - -->")])
+*** Output of to_html ***
+<!--
+Header
+- - - - - - 
+-->
+
+<!-- - - -->

data/spec/block_docs/issue117.md

@@ -0,0 +1,13 @@
+Section tags should not get <p> put around them. https://github.com/bhollis/maruku/issues/117
+*** Parameters: ***
+{}
+*** Markdown input: ***
+<section markdown="1">
+## Header
+</section>
+*** Output of inspect ***
+
+*** Output of to_html ***
+<section>
+<h2>Header</h2>
+</section>

data/spec/block_docs/issue120.md

@@ -0,0 +1,48 @@
+Style tags should be OK with unescaped angle brackets and ampersands. https://github.com/bhollis/maruku/issues/120
+NOTE: Commented CDATA is output because we use XHTML - for HTML mode it should be omitted.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+<style type="text/css">
+  p > .highlight {
+    color: red;
+    background-image: url('/foo?bar&baz');
+  }
+</style>
+
+<style type="text/css">/*<![CDATA[*/
+  p > .highlight {
+    color: red;
+    background-image: url('/foo?bar&baz');
+  }
+/*]]>*/</style>
+
+<style type="text/css">
+/*<![CDATA[*/
+  p > .highlight {
+    color: red;
+    background-image: url('/foo?bar&baz');
+  }
+/*]]>*/
+</style>
+*** Output of inspect ***
+
+*** Output of to_html ***
+<style type='text/css'>/*<![CDATA[*/
+  p > .highlight {
+    color: red;
+    background-image: url('/foo?bar&baz');
+  }
+/*]]>*/</style><style type='text/css'>/*<![CDATA[*/
+  p > .highlight {
+    color: red;
+    background-image: url('/foo?bar&baz');
+  }
+/*]]>*/</style><style type='text/css'>
+/*<![CDATA[*/
+  p > .highlight {
+    color: red;
+    background-image: url('/foo?bar&baz');
+  }
+/*]]>*/
+</style>

data/spec/block_docs/issue123.md

@@ -0,0 +1,11 @@
+Handle script tag without a newline. https://github.com/bhollis/maruku/issues/123
+*** Parameters: ***
+{ }
+*** Markdown input: ***
+Lets add Jade to our dependencies:
+<script src="https://gist.github.com/7360992.js"> </script>
+*** Output of inspect ***
+
+*** Output of to_html ***
+<p>Lets add Jade to our dependencies:</p>
+<script src='https://gist.github.com/7360992.js'> </script>

data/spec/block_docs/issue124.md

@@ -0,0 +1,16 @@
+Handle blocks of inline HTML without a newline without complaining. https://github.com/bhollis/maruku/issues/124
+*** Parameters: ***
+{:on_error => :raise}
+*** Markdown input: ***
+What follows uses ruby
+<ruby>
+    <rb>東</rb><rp>(</rp><rt>トウ</rt><rp>)</rp>
+    <rb>京</rb><rp>(</rp><rt>キョウ</rt><rp>)</rp>
+</ruby>.
+*** Output of inspect ***
+
+*** Output of to_html ***
+<p>What follows uses ruby <ruby>
+    <rb>東</rb><rp>(</rp><rt>トウ</rt><rp>)</rp>
+    <rb>京</rb><rp>(</rp><rt>キョウ</rt><rp>)</rp>
+</ruby>.</p>

data/spec/block_docs/issue40.md

@@ -20,21 +20,33 @@ NOTE: CDATA is output because we use XHTML - for HTML mode it should be omitted.
   var x = true && true;
 ]]>
 </script>
-*** Output of inspect ***
 
-*** Output of to_html ***
-<script><![CDATA[
+<script>//<![CDATA[
   var x = true && true;
-]]></script>
-
-<script><![CDATA[foo && bar]]></script>
+//]]></script>
 
-<script><![CDATA[
+<script>
+//<![CDATA[
   var x = true && true;
-]]></script>
-
-<script><![CDATA[foo && bar]]></script>
+//]]>
+</script>
+*** Output of inspect ***
 
-<script><![CDATA[
+*** Output of to_html ***
+<script>//<![CDATA[
   var x = true && true;
-]]></script>
+//]]></script><script>//<![CDATA[
+foo && bar
+//]]></script><script><![CDATA[
+  var x = true && true;
+]]></script><script><![CDATA[foo && bar]]></script><script>
+<![CDATA[
+  var x = true && true;
+]]>
+</script><script>//<![CDATA[
+  var x = true && true;
+//]]></script><script>
+//<![CDATA[
+  var x = true && true;
+//]]>
+</script>

data/spec/block_docs/issue89.md

@@ -6,7 +6,7 @@ https://github.com/bhollis/maruku/issues/89 - Markdown extra .class ALD parsing
 [![Alt text](/Understanding-Big-Data-Cover-201x300.jpg){.alignright}](http://testsite.com/big-data)
 
 *** Output of inspect ***
-md_el(:document, 
+md_el(:document,
   md_par(md_im_link(md_im_image("Alt text", "/Understanding-Big-Data-Cover-201x300.jpg", nil, [[:class, "alignright"]]), "http://testsite.com/big-data", nil)))
 *** Output of to_html ***
 <p><a href="http://testsite.com/big-data"><img class="alignright" src="/Understanding-Big-Data-Cover-201x300.jpg" alt="Alt text" /></a></p>

data/spec/block_docs/lists_nested_blankline.md

@@ -1,4 +1,4 @@
-PENDING - Nesting lists should handle newlines inbetween list items.
+Nesting lists should handle newlines inbetween list items.
 *** Parameters: ***
 {} # params 
 *** Markdown input: ***
@@ -9,20 +9,26 @@ PENDING - Nesting lists should handle newlines inbetween list items.
 *** Output of inspect ***
 md_el(:document, md_el(:ul, [
 	md_li([
-	  "Bar",
+	  md_par("Bar"),
 	  md_el(:ul, [
-	    md_li(md_par("Bax"), false),
-	    md_li(md_par("Bar"), false)
+	    md_li(md_par("Bax"), true),
+	    md_li(md_par("boo"), false)
           ], {}, [])
-       ],{},[])
+       ],true)
 ],{},[]))
 *** Output of to_html ***
 <ul>
-<li>Bar
+<li>
+<p>Bar</p>
 
 <ul>
-<li><p>Bax</p></li>
-<li><p>boo</p></li>
+<li>
+<p>Bax</p>
+</li>
+
+<li>
+<p>boo</p>
+</li>
 </ul>
 </li>
 </ul>

data/spec/block_docs/lists_ol.md

@@ -145,7 +145,7 @@ md_el(:document,[
 <li>
 <p>This is a list item with two paragraphs.</p>
 
-<p>This is the second paragraph in the list item. You&#8217;re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
+<p>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.</p>
 </li>
 
 <li>
@@ -225,7 +225,7 @@ This is the second paragraph in the list item. You're only required to indent th
 
 Ancora
 
-1.  
+1.
     This is a list item with two
     paragraphs. Lorem ipsum dolor sit amet,
     consectetuer adipiscing elit. Aliquam
@@ -233,18 +233,18 @@ Ancora
     ATTENZIONE!
     - Uno
     - Due
-    
+
     1.  tre
     2.  tre
     3.  tre
     - Due
-2.  
+2.
     Suspendisse id sem consectetuer libero
     luctus adipiscing.
 
 Ancora
 
-- 
+-
 This is a list item with two
 paragraphs.
 This is the second paragraph in the

data/spec/block_docs/lists_paraindent.md

@@ -1,4 +1,4 @@
-PENDING - Indentation is weird...
+Indentation is weird...
 *** Parameters: ***
 {} # params 
 *** Markdown input: ***
@@ -17,27 +17,22 @@ md_el(:document, md_el(:ul, [
 	md_li([
 	"Bar",
 	md_el(:ul, [
-	md_el(:li_span, "Bax", {:want_my_paragraph=>false}),
-	md_el(:li_span, "Bap", {:want_my_paragraph=>false})
+	md_li("Bax Bap", false)
 ])
-], true)
+], false)
 ])
-], true),
-	md_li(md_par("Another list item"), false)
+], false),
+	md_li("Another list item", false)
 ]))
 *** Output of to_html ***
 <ul>
 <li>A list item
-
 <ul>
 <li>Foo</li>
 
 <li>Bar
-
 <ul>
-<li>Bax</li>
-
-<li>Bap</li>
+<li>Bax Bap</li>
 </ul>
 </li>
 </ul>

data/spec/block_docs/math-blahtex/equations.md

@@ -5,26 +5,25 @@ require 'maruku/ext/math';{:html_math_engine => 'blahtex'}
 
 $$ x = y $$
 
-$$ x 
+$$ x
 = y $$
 
-$$ 
+$$
 x = y $$
 
-$$ x = y 
+$$ x = y
 $$
 
 *** Output of inspect ***
 
 *** Output of to_html ***
-<div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml">
-<mrow><mi>x</mi><mo lspace="0.278em" rspace="0.278em">=</mo><mi>y</mi></mrow>
-</math><span class="maruku-eq-tex"><code style="display: none">x = y</code></span></div><div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml">
-<mrow><mi>x</mi><mo lspace="0.278em" rspace="0.278em">=</mo><mi>y</mi></mrow>
-</math><span class="maruku-eq-tex"><code style="display: none">x 
-= y</code></span></div><div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml">
-<mrow><mi>x</mi><mo lspace="0.278em" rspace="0.278em">=</mo><mi>y</mi></mrow>
-</math><span class="maruku-eq-tex"><code style="display: none">x = y</code></span></div><div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml">
-<mrow><mi>x</mi><mo lspace="0.278em" rspace="0.278em">=</mo><mi>y</mi></mrow>
-</math><span class="maruku-eq-tex"><code style="display: none">x = y</code></span></div>
+<div class="maruku-equation"><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
+<mrow><mi>x</mi><mo lspace='0.278em' rspace='0.278em'>=</mo><mi>y</mi></mrow>
+</math></div><div class="maruku-equation"><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
+<mrow><mi>x</mi><mo lspace='0.278em' rspace='0.278em'>=</mo><mi>y</mi></mrow>
+</math></div><div class="maruku-equation"><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
+<mrow><mi>x</mi><mo lspace='0.278em' rspace='0.278em'>=</mo><mi>y</mi></mrow>
+</math></div><div class="maruku-equation"><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
+<mrow><mi>x</mi><mo lspace='0.278em' rspace='0.278em'>=</mo><mi>y</mi></mrow>
+</math></div>
 *** Output of to_latex ***

data/spec/block_docs/math-blahtex/math2.md

@@ -25,7 +25,15 @@ md_el(:document,[
 	md_el(:equation,[],{:label=>nil,:math=>" \\gamma ",:num=>nil},[])
 ],{},[])
 *** Output of to_html ***
-<div class="maruku-equation" id="eq:eq1"><span class="maruku-eq-number">(1)</span><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml"><mi>α</mi></math><span class="maruku-eq-tex"><code style="display: none">\alpha</code></span></div><div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml"><mi>α</mi></math><span class="maruku-eq-tex"><code style="display: none">\alpha</code></span></div><div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml"><mi>β</mi></math><span class="maruku-eq-tex"><code style="display: none">\beta</code></span></div><div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml"><mi>γ</mi></math><span class="maruku-eq-tex"><code style="display: none">\gamma</code></span></div>
+<div class="maruku-equation" id="eq:eq1"><span class="maruku-eq-number">(1)</span><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
+<mi>&#x3b1;</mi>
+</math></div><div class="maruku-equation"><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
+<mi>&#x3b1;</mi>
+</math></div><div class="maruku-equation"><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
+<mi>&#x3b2;</mi>
+</math></div><div class="maruku-equation"><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
+<mi>&#x3b3;</mi>
+</math></div>
 *** Output of to_latex ***
 \begin{equation}
 \alpha
@@ -42,4 +50,3 @@ md_el(:document,[
 *** Output of to_md ***
 
 *** Output of to_s ***
-