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

test/functional/wiki_controller_test.rb

@@ -964,6 +964,8 @@ class WikiControllerTest < ActionController::TestCase
 \re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121}
 \re@DeclareMathSymbol{\Vbar}{\mathrel}{symbolsC}{121}
 \re@DeclareMathSymbol{\sslash}{\mathrel}{stmry}{12}
+\re@DeclareMathSymbol{\invamp}{\mathrel}{symbolsC}{77}
+\re@DeclareMathSymbol{\parr}{\mathrel}{symbolsC}{77}
 \makeatother
 
 % Widecheck

test/unit/page_renderer_test.rb

@@ -207,6 +207,16 @@ END_THM
   
   end
   
+  def test_have_latest_itex2mml
+#    set_web_property :markup, :markdownMML
+  
+    assert_markup_parsed_as(
+        %{<p>equation <math class='maruku-mathml' } +
+        %{display='inline' xmlns='http://www.w3.org/1998/Math/MathML'>} +
+        %{<mi>A</mi><mo>\342\205\213</mo><mi>B</mi></math></p>},
+        "equation $A \\invamp B$")
+  end
+  
   def test_markdown_hyperlink_with_slash
     # in response to a bug, see http://dev.instiki.org/attachment/ticket/177
     set_web_property :markup, :markdown