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

2009-09-13 11:27:01 -05:00 · 2009-09-13 11:27:01 -05:00 · e489d77579
commit e489d77579
parent e652af4e73 affc47fc22
2 changed files with 9 additions and 0 deletions
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@ -1,5 +1,6 @@
 require 'fileutils'
 require 'maruku'
+require 'maruku/ext/math'
 require 'zip/zip'
 require 'stringsupport'
 require 'resolv'
--- a/test/unit/page_renderer_test.rb
+++ b/test/unit/page_renderer_test.rb
@ -211,6 +211,14 @@ END_THM
  end
  
  def test_have_latest_itex2mml  
+  
+      assert_markup_parsed_as(
+        %{<p>equation <math class='maruku-mathml' displa} +
+        %{y='inline' xmlns='http://www.w3.org/1998/Math/} +
+        %{MathML'><mi>A</mi><mo>\342\206\255</mo><mi>B</} +
+        %{mi></math></p>},
+        "equation $A \\leftrightsquigarrow B$")
+
    assert_markup_parsed_as(
        %{<p>equation <math class='maruku-mathml' displa} +
        %{y='inline' xmlns='http://www.w3.org/1998/Math/} +