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

test/functional/wiki_controller_test.rb

@@ -1065,6 +1065,7 @@ class WikiControllerTest < ActionController::TestCase
 \usepackage{color}
 \usepackage{ucs}
 \usepackage[utf8x]{inputenc}
+\usepackage{xparse}
 \usepackage{hyperref}
 
 %----Macros----------
@@ -1199,6 +1200,15 @@ class WikiControllerTest < ActionController::TestCase
     {\ooalign{\box\tw@ \cr \box\z@}}}
 \makeatother
 
+% \mathraisebox{voffset}[height][depth]{something}
+\makeatletter
+\NewDocumentCommand\mathraisebox{moom}{%
+\IfNoValueTF{#2}{\def\@temp##1##2{\raisebox{#1}{$\m@th##1##2$}}}{%
+\IfNoValueTF{#3}{\def\@temp##1##2{\raisebox{#1}[#2]{$\m@th##1##2$}}%
+}{\def\@temp##1##2{\raisebox{#1}[#2][#3]{$\m@th##1##2$}}}}%
+\mathpalette\@temp{#4}}
+\makeatletter
+
 % udots  (taken from yhmath)
 \makeatletter
 \def\udots{\mathinner{\mkern2mu\raise\p@\hbox{.}

test/unit/page_renderer_test.rb

@@ -275,6 +275,14 @@ END_THM
 
   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>x</mi><menclose notation='box'><mp} +
+        %{added depth='2ex' height='3ex' voffset='5ex'><} +
+        %{mi>x</mi></mpadded></menclose></math></p>},
+        "equation $x\\boxed{\\mathraisebox{5ex}[3ex][2ex]{x}}$")
+
       assert_markup_parsed_as(
         %{<p>equation <math class='maruku-mathml' displa} +
         %{y='inline' xmlns='http://www.w3.org/1998/Math/} +