From 6eb056b30759d5d9925c516b8c29786736e37a2f Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Mon, 4 Oct 2021 01:06:07 -0500
Subject: [PATCH] Update for itextomml 1.6.1

---
 app/controllers/application_controller.rb | 2 +-
 app/views/layouts/tex.rhtml               | 9 +++++++++
 test/functional/wiki_controller_test.rb   | 9 +++++++++
 test/unit/page_renderer_test.rb           | 6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 86ae02d63..d0cdc9cc0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -298,7 +298,7 @@ module Instiki
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 30
-    TINY  = 2
+    TINY  = 3
     SUFFIX = '(MML+)'
     PRERELEASE = false
     if PRERELEASE
diff --git a/app/views/layouts/tex.rhtml b/app/views/layouts/tex.rhtml
index 1a5e0e45b..63c8ba471 100644
--- a/app/views/layouts/tex.rhtml
+++ b/app/views/layouts/tex.rhtml
@@ -141,6 +141,15 @@
 \re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121}
 \re@DeclareMathSymbol{\Vbar}{\mathrel}{symbolsC}{121}
 \re@DeclareMathSymbol{\sslash}{\mathrel}{stmry}{12}
+\re@DeclareMathSymbol{\boxslash}{\mathrel}{stmry}{27}
+\re@DeclareMathSymbol{\boxbslash}{\mathrel}{stmry}{28}
+\re@DeclareMathSymbol{\boxast}{\mathrel}{stmry}{24}
+\re@DeclareMathSymbol{\boxcircle}{\mathrel}{stmry}{29}
+\re@DeclareMathSymbol{\boxbox}{\mathrel}{stmry}{30}
+\re@DeclareMathSymbol{\obslash}{\mathrel}{stmry}{20}
+\re@DeclareMathSymbol{\obar}{\mathrel}{stmry}{58}
+\re@DeclareMathSymbol{\olessthan}{\mathrel}{stmry}{60}
+\re@DeclareMathSymbol{\ogreaterthan}{\mathrel}{stmry}{61}
 \re@DeclareMathSymbol{\bigsqcap}{\mathop}{stmry}{"64}
 \re@DeclareMathSymbol{\biginterleave}{\mathop}{stmry}{"6}
 \re@DeclareMathSymbol{\invamp}{\mathrel}{symbolsC}{77}
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 7d2b71ecc..a322d522f 100755
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -1425,6 +1425,15 @@ def set_tex_header
 \re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121}
 \re@DeclareMathSymbol{\Vbar}{\mathrel}{symbolsC}{121}
 \re@DeclareMathSymbol{\sslash}{\mathrel}{stmry}{12}
+\re@DeclareMathSymbol{\boxslash}{\mathrel}{stmry}{27}
+\re@DeclareMathSymbol{\boxbslash}{\mathrel}{stmry}{28}
+\re@DeclareMathSymbol{\boxast}{\mathrel}{stmry}{24}
+\re@DeclareMathSymbol{\boxcircle}{\mathrel}{stmry}{29}
+\re@DeclareMathSymbol{\boxbox}{\mathrel}{stmry}{30}
+\re@DeclareMathSymbol{\obslash}{\mathrel}{stmry}{20}
+\re@DeclareMathSymbol{\obar}{\mathrel}{stmry}{58}
+\re@DeclareMathSymbol{\olessthan}{\mathrel}{stmry}{60}
+\re@DeclareMathSymbol{\ogreaterthan}{\mathrel}{stmry}{61}
 \re@DeclareMathSymbol{\bigsqcap}{\mathop}{stmry}{"64}
 \re@DeclareMathSymbol{\biginterleave}{\mathop}{stmry}{"6}
 \re@DeclareMathSymbol{\invamp}{\mathrel}{symbolsC}{77}
diff --git a/test/unit/page_renderer_test.rb b/test/unit/page_renderer_test.rb
index 18134b1b6..ec13cd15d 100755
--- a/test/unit/page_renderer_test.rb
+++ b/test/unit/page_renderer_test.rb
@@ -430,6 +430,12 @@ def test_have_latest_itex2mml
       %{\\right\\rvert</annotation></semantics></math></p>},
       %{Foo $\\left\\llbracket\\begin{matrix}a\\\\ b\\\\ c\\end{matrix}\\right\\rrbracket \\left\\lVert\\begin{matrix}a\\\\ b\\\\ c\\end{matrix}\\right\\rvert$})
 
+      assert_markup_parsed_as(
+        %{<p>Foo <math class='maruku-mathml' display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><semantics>} +
+        %{<mrow><mo>⧄</mo><mo>⧅</mo><mo>⧆</mo><mo>⧇</mo><mo>⧈</mo></mrow><annotation encoding='application/x-tex'>} +
+        %{\\boxslash\\boxbslash\\boxast\\boxcircle\\boxbox</annotation></semantics></math></p>},
+        %{Foo $\\boxslash\\boxbslash\\boxast\\boxcircle\\boxbox$})
+
   end
 
   def test_blahtex