From ee05118e8f6082faf8ff0e5ee3430fe1cd6ae0ad Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Wed, 7 Sep 2011 15:39:41 -0500
Subject: [PATCH] Update for itextomml 1.4.7

---
 Gemfile                                 |  3 +--
 app/views/layouts/tex.rhtml             | 10 ++++++++++
 test/functional/wiki_controller_test.rb | 10 ++++++++++
 test/unit/page_renderer_test.rb         |  8 ++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4d4721eb..82d1b225 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 gem "sqlite3-ruby", :require => "sqlite3"
-gem "itextomml", ">=1.4.6"
+gem "itextomml", ">=1.4.7"
 gem "rack", ">=1.1.0"
 gem "mongrel", ">=1.2.0.pre2"
 gem "rubyzip"
@@ -10,4 +10,3 @@ gem "nokogiri"
 gem "rake"
 gem "rdoc"
 gem "json"
-#gem "themes_for_rails"
diff --git a/app/views/layouts/tex.rhtml b/app/views/layouts/tex.rhtml
index 035352f1..66df61fd 100644
--- a/app/views/layouts/tex.rhtml
+++ b/app/views/layouts/tex.rhtml
@@ -12,6 +12,7 @@
 \usepackage{color}
 \usepackage{ucs}
 \usepackage[utf8x]{inputenc}
+\usepackage{xparse}
 \usepackage{hyperref}
 
 %----Macros----------
@@ -146,6 +147,15 @@
     {\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{.}
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 6997a309..d1193231 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/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{.}
diff --git a/test/unit/page_renderer_test.rb b/test/unit/page_renderer_test.rb
index c690087c..1b92b9ca 100644
--- a/test/unit/page_renderer_test.rb
+++ b/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/} +