Merge pull request #142 from distler/master

Fix Uninitialized eq2eqid Hash

lib/maruku/ext/math/elements.rb

@@ -9,7 +9,6 @@ def md_equation(math, label, numerate)
       math = math.gsub(reglabel, '') if label = math[reglabel, 1]
       num = nil
       if (label || numerate) && @doc # take number
-        @doc.eqid2eq ||= {}
         num = @doc.eqid2eq.size + 1
         label = "eq#{num}" unless label # TODO do id for document
       end

lib/maruku/ext/math/parsing.rb

@@ -5,6 +5,10 @@ class MDDocument
     # @return [String => MDElement]
     attr_accessor :eqid2eq
 
+    def eqid2eq
+      @eqid2eq ||= {}
+    end
+
     def is_math_enabled?
       get_setting :math_enabled
     end

spec/block_docs/math/Instiki_Issue_52.md

@@ -0,0 +1,21 @@
+Fixes Uninitialized eq2eqid hash
+*** Parameters: ***
+require 'maruku/ext/math';{:html_math_engine => 'itex2mml'}
+*** Markdown input: ***
+This is an unresolved equation reference (eq:xyz).
+
+*** Output of inspect ***
+md_el(:document, md_par([
+       	"This is an unresolved equation reference ",
+       	md_el(:eqref, [], {:eqid=>"xyz"}),
+       	"."
+]))
+*** Output of to_html ***
+<p>This is an unresolved equation reference (eq:xyz).</p>
+
+*** Output of to_latex ***
+This is an unresolved equation reference \eqref{xyz}.
+*** Output of to_md ***
+
+*** Output of to_s ***
+

spec/block_docs/math/Instiki_Issue_52_bis.md

@@ -0,0 +1,40 @@
+Fixes Uninitialized eq2eqid hash
+*** Parameters: ***
+require 'maruku/ext/math';{:html_math_engine => 'itex2mml'}
+*** Markdown input: ***
+Here is an equation
+\[\label{xxx}
+\sin(\theta)
+\]
+Here we refer back to it (eq:xxx). Or \eqref{xxx}.
+*** Output of inspect ***
+md_el(:document, [
+        md_par("Here is an equation"),
+        md_el(:equation, [], {:math=>"\n\\sin(\\theta)\n\n", :label=>"xxx", :num=>1}),
+        md_par([
+        "Here we refer back to it ",
+        md_el(:eqref, [], {:eqid=>"xxx"}),
+        ". Or ",
+        md_el(:eqref, [], {:eqid=>"xxx"}),
+        "."
+        ])
+])
+*** Output of to_html ***
+<p>Here is an equation</p>
+<div class='maruku-equation' id='eq:xxx'><span class='maruku-eq-number'>(1)</span><math class='maruku-mathml' display='block' xmlns='http://www.w3.org/1998/Math/MathML'><semantics><mrow><mi>sin</mi><mo stretchy='false'>(</mo><mi>θ</mi><mo stretchy='false'>)</mo></mrow><annotation encoding='application/x-tex'>
+\sin(\theta)
+
+</annotation></semantics></math></div>
+<p>Here we refer back to it <a class='maruku-eqref' href='#eq:xxx'>(1)</a>. Or <a class='maruku-eqref' href='#eq:xxx'>(1)</a>.</p>
+
+*** Output of to_latex ***
+Here is an equation
+
+\begin{equation}
+\sin(\theta)
+\label{xxx}\end{equation}
+Here we refer back to it \eqref{xxx}. Or \eqref{xxx}.
+*** Output of to_md ***
+
+*** Output of to_s ***
+