mathematical 0.5.0 → 0.6.0

data/lib/mathematical/corrections.rb

@@ -2,21 +2,7 @@ module Mathematical
   module Corrections
 
     def apply_corrections(maths)
-      maths = adjust_alignment(maths)
-      maths = adjust_frac(maths)
       maths = adjust_lt_gt(maths)
-      maths = adjust_limits(maths)
-    end
-
-    # `{align}` *should* be valid, according to AMS-Latex, but it seems itex@1.5.1 does not like it.
-    def adjust_alignment(maths)
-      maths = maths.gsub(/\\begin\{align\}/, "\\begin{aligned}")
-      maths.gsub(/\\end\{align\}/, "\\end{aligned}")
-    end
-
-    # seems like KaTeX/MathJax supports \frac\d\d, but itex does not
-    def adjust_frac(maths)
-      maths.gsub(/\\frac(\d)(\d)/, '\frac{\1}{\2}')
     end
 
     # from the itex website:
@@ -26,9 +12,5 @@ module Mathematical
     def adjust_lt_gt(maths)
       maths.gsub(/</, '\lt').gsub(/>/, '\gt')
     end
-
-    def adjust_limits(maths)
-      maths.gsub(/\\int\\limits_/, '\int_')
-    end
   end
 end

data/lib/mathematical/version.rb

@@ -1,3 +1,3 @@
 module Mathematical
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/test/mathematical/corrections_test.rb

@@ -4,41 +4,6 @@ class Mathematical::CorrectionsTest < Test::Unit::TestCase
 
   def setup
     @render = Mathematical::Render.new
-    @slash_maths = '''
-$$
-\dot{x} & = \sigma(y-x) \\\\
-\dot{y} & = \rho x - y - xz \\\\
-\dot{z} & = -\beta z + xy
-$$
-'''
-
-    @aligned_maths = '''
-$$
-\begin{align}
-\dot{x} & = \sigma(y-x) \\\\
-\dot{y} & = \rho x - y - xz \\\\
-\dot{z} & = -\beta z + xy
-\end{align}
-$$
-'''
-  end
-
-  def test_expect_slashes_failures
-    @render.expects(:apply_corrections).returns(@slash_maths)
-
-    printed = capture_stderr do
-      @render.render @slash_maths
-    end
-    assert_match /Failed to parse mtex/, printed
-  end
-
-  def test_adjust_aligned
-    assert_no_match /align\}/, @render.apply_corrections(@aligned_maths)
-  end
-
-  def test_adjust_fracs
-    simple_frac = '$\frac25$'
-    assert_match /frac\{2\}\{5\}/, @render.apply_corrections(simple_frac)
   end
 
   def test_adjust_lt_gt
@@ -48,9 +13,4 @@ $$
     simple_gt = '$|q| > 1$'
     assert_match /|q| \\gt 1/, @render.apply_corrections(simple_gt)
   end
-
-  def test_adjust_limits
-    integral = '\int\limits_{-\pi}^{\pi}'
-    assert_equal '\int_{-\pi}^{\pi}', @render.apply_corrections(integral)
-  end
 end

data/test/mathematical/fixtures/performance/big_file.text

@@ -103,9 +103,8 @@ compactifying divisors of $\tilde{X}$. The principal result of \cite{HZ} was tha
 We show $j_{\ast} C_n^c = T_n^c$ (Proposition~\ref{CnTn}), and hence the Hirzebruch-Zagier theorem follows easily from Theorem~\ref{FMHZ-main} above, see Theorem~\ref{HZTheorem}.
 
 The main work in \cite{HZ} was to show that the generating function
-\[\vspace{-.1cm}
-F(\tau) = \sum_{n=0}^{\infty} (T_n^c \cdot T_m) q^n \vspace{-.1cm}
-\]
+
+
 for the intersection numbers in $\tilde{X}$ of $T^c_n$ with a fixed $T_m$ is a modular form of weight $2$. The Hirzebruch-Zagier proof of the modularity of $F$ was a remarkable synthesis of algebraic geometry, combinatorics, and modular forms. They explicitly computed the intersection numbers $T_n^c \cdot T_m$ as the sum of two terms, $T_n^c \cdot T_m = (T_n \cdot T_m)_X  + ({T}_n \cdot {T}_m)_{\infty}$, where $(T_n \cdot T_m)_X $ is the geometric intersection number of $T_n$ and $T_m$ in the interior of $X$ and $({T}_n \cdot {T}_m)_{\infty}$ which they called the ``contribution from infinity''. They then proved both generating functions $\sum_{n=0}^{\infty} (T_n \cdot T_m)_X  q^n$ and $\sum_{n=0}^{\infty}  (T_n \cdot T_m)_{\infty} q^n$ are the holomorphic parts of two non-holomorphic forms $F_X$ and $F_{\infty}$ with the {\it same} non-holomorphic part (with opposite signs). Hence combining these two forms gives $F(\tau)$.
 
 We recover this feature of the original Hirzebruch-Zagier proof via \eqref{mappingconelift} with $C=C_m$. The first term on the right hand side of \eqref{mappingconelift} was studied in the thesis of the first author of this paper \cite{FCompo} and gives the interior intersections $(T_n \cdot T_m)_X$ encoded in $F_X$. So via Theorem~\ref{FMHZ-main} the second term on the right hand side of \eqref{mappingconelift} must match the boundary contribution $F_{\infty}$ in \cite{HZ}, that is, we obtain
@@ -677,13 +676,7 @@ glueing homeomorphism $f \in  SL(2,\Z)$ on $H_1(T^2, \Z)$ for linking numbers fo
 
 This immediately leads to an explicit formula for the numbers $Lk(\partial C_n, \partial C_m)$. Using Lemma~\ref{LemmaB} we obtain
 
-\begin{theorem}\label{LinkCnCm}
-Let $g = (f^{-1} - I)^{-1}$. Then
- \[
- Lk( (\partial C_n)_P, (\partial C_m)_P) = \sum_{ \substack{x\in \G_M \back \mathcal{L}_W \\ (x,x)=2n}} \sum_{\substack{x'\in \G_M \back \mathcal{L}_W \\ (x,x)=2m}} (\min_{\lambda \in \Lambda_W}  {\hspace{-5pt}'}
- |(\lambda,x)|) (\min_{\mu \in \Lambda_W}  {\hspace{-5pt}'}
-|(\mu,x')|) \langle g(Jx),Jx' \rangle.
-\]
+
 Here $Jx$ is properly oriented primitive vector in $\Lambda_W$ such that $(Jx,x)=0$.
  \end{theorem}
 
@@ -1244,10 +1237,7 @@ and $\tilde{\psi'}_{0,1}(n)$ has bidegree $(0,1)$ (here we use the obvious base/
 
 \begin{lemma}\label{LemmaA}
 Under the hypothesis on $\eta$ in Proposition~\ref{finalintegral} we have
-\[
- \int_{A_n} \eta = \sum_{ \substack{x\in \G_M \back \mathcal{L}_W \\ (x,x)=2n}} \min_{\la \in \Lambda_W} {\hspace{-5pt}'} |(\la,x)| \int_{a_x} \eta
-\]
-\end{lemma}
+
 
 \begin{proof}
 We use Lemma~\ref{LemmaB}. Write $\eta = d \omega$ for some $1$-form $\omega$ which by the support condition on $\eta$ is closed in $F_n$. Since $c_{x+ku}$ and  $c_x$ are parallel hence homologous circles in $F_x$, we see $\int_{a_{x+ku}} \eta = \int_{c_{x+ku}} \omega = \int_{c_x} \omega = \int_{a_x} \eta$.
@@ -1262,9 +1252,8 @@ Proposition~\ref{finalintegral} will now follow from
 
 \begin{proposition}
 Under the hypothesis on $\eta$ in Proposition~\ref{finalintegral}, we have for any positive length vector $x \in \calL_W$
-\[
-\int_{e'(P)} \eta \wedge  \sum_{ \g \in \G_M} \g^{\ast} \tilde{\psi'}_{0,1}(x) = (\min_{\la \in \Lambda_W}   {\hspace{-2pt}'}|(\la,x)|) \left(\int_{a_x} \eta \right) e^{-\pi (x,x)}.
-\]
+
+
 \end{proposition}
 
 
@@ -1296,9 +1285,8 @@ Here $\omega_3$ is the $dw_3$ component of $\omega$ and we used that $\partial D
 of $\omega$ over (homologous) horizontal translates of the cycle $c_{e_2}$. But the restriction of $\omega$ to $F_x$ is closed so $\int_{c_{e_2}} \omega(0,w_2,w_3)$ is independent of $w_2$ and the last integral becomes
 $\left(  \int_{T^2/ c_{e_2}} dw_2 \right)\left( \int_{c_{e_2}} \omega \right)e^{- \pi \mu^2}$.
  But $\int_{c_{e_2}} \omega = \int_{A_{e_2}} \eta$. The proposition is then a consequence of
-\[
-|\mu| \int_{T^2/ \partial c_{e_2}} dw_2  = |\mu|  \min_{\la \in \Lambda_W}  {\hspace{-2pt}'} |(\la,e_2)| = \min_{\la \in \Lambda_W}  {\hspace{-2pt}'} |(\la,x)|,
-\]
+
+
 which follows from the fact that the map $W \to R$ given by $w \mapsto (w,e_2)$ induces an isomorphism $T^2/ \partial C_{e_2} \simeq R / (\min_{\la \in \Lambda_W}'|(\la,e_2)|)\Z$.
 
 \end{proof}

data/test/mathematical/maliciousness_test.rb

@@ -5,8 +5,9 @@ class Mathematical::MaliciousnessTest < Test::Unit::TestCase
   def test_it_does_not_error_on_unrecognized_commands
     render = Mathematical::Render.new
     output = nil
-    # In C, we raise a ParseError, but Mathematical suppresses it.
-    assert_nothing_raised { output = render.render('$\not_real_comment$') }
+    # In mtex2MML, we raise a ParseError, but Mathematical suppresses it and returns the string.
+    assert_nothing_raised { output = render.render('$not__thisisnotreal$') }
+    assert output == '$not__thisisnotreal$'
   end
 
   def test_it_does_not_blow_up_on_bad_arguments
@@ -76,4 +77,13 @@ class Mathematical::MaliciousnessTest < Test::Unit::TestCase
       render = Mathematical::Render.new.render("No dollars")
     end
   end
+
+  def test_it_returns_unmodified_string_for_max_parsing
+    render = Mathematical::Render.new
+    output = nil
+    # Much like above, this fails in mtx2MML, but should do nothing here
+    text = '$\Huge \sqrt\sqrt\sqrt\sqrt\sqrt\sqrt\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{\sqrt{}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
+    assert_nothing_raised { output = render.render(text) }
+    assert output == text
+  end
 end

data/test/mathematical/mathjax_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class Mathematical::MathJaxTest < Test::Unit::TestCase
+
+  render = Mathematical::Render.new
+
+  MATHJAX_TEST_TEST_DIR = File.join('ext', 'mathematical', 'mtex2MML', 'test', 'fixtures', 'MathJax')
+  MATHJAX_TEST_TEX_DIR = File.join(MATHJAX_TEST_TEST_DIR, 'LaTeXToMathML-tex')
+  puts MATHJAX_TEST_TEX_DIR
+  Dir["#{MATHJAX_TEST_TEX_DIR}/**/*.tex"].each do |tex|
+    define_method "test_#{tex}" do
+      tex_contents = File.read(tex)
+      assert_nothing_raised { render.render(tex_contents) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathematical
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -303,12 +303,16 @@ files:
 - ext/mathematical/lasem/tools/generate-entity-array.c
 - ext/mathematical/mathematical.c
 - ext/mathematical/mtex2MML/ext/extconf.rb
+- ext/mathematical/mtex2MML/src/color_definitions.c
+- ext/mathematical/mtex2MML/src/deps/uthash/utarray.h
+- ext/mathematical/mtex2MML/src/deps/uthash/uthash.h
+- ext/mathematical/mtex2MML/src/deps/uthash/utlist.h
+- ext/mathematical/mtex2MML/src/deps/uthash/utstring.h
 - ext/mathematical/mtex2MML/src/lex.yy.c
 - ext/mathematical/mtex2MML/src/mtex2MML.h
+- ext/mathematical/mtex2MML/src/mtex2MML_ruby.c
 - ext/mathematical/mtex2MML/src/parse_extras.c
 - ext/mathematical/mtex2MML/src/parse_extras.h
-- ext/mathematical/mtex2MML/src/stack.c
-- ext/mathematical/mtex2MML/src/stack.h
 - ext/mathematical/mtex2MML/src/string_extras.c
 - ext/mathematical/mtex2MML/src/string_extras.h
 - ext/mathematical/mtex2MML/src/y.tab.c
@@ -350,6 +354,7 @@ files:
 - test/mathematical/fixtures/png/pmatrix.png
 - test/mathematical/fixtures_test.rb
 - test/mathematical/maliciousness_test.rb
+- test/mathematical/mathjax_test.rb
 - test/mathematical/mathml_test.rb
 - test/mathematical/performance_test.rb
 - test/mathematical/png_test.rb
@@ -412,6 +417,7 @@ test_files:
 - test/mathematical/fixtures/png/pmatrix.png
 - test/mathematical/fixtures_test.rb
 - test/mathematical/maliciousness_test.rb
+- test/mathematical/mathjax_test.rb
 - test/mathematical/mathml_test.rb
 - test/mathematical/performance_test.rb
 - test/mathematical/png_test.rb

data/ext/mathematical/mtex2MML/src/stack.c

@@ -1,80 +0,0 @@
-/*
- *          File: stack.c
- *        Author: Robert I. Pitts <rip@cs.bu.edu>
- * Last Modified: March 7, 2000
- *         Topic: Stack - Array Implementation
- * ----------------------------------------------------------------
- *
- * This is an array implementation of a character stack.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "stack.h"
-
-/************************ Function Definitions **********************/
-
-void StackInit(stackT *stackP, int maxSize)
-{
-  stackElementT *newContents;
-
-  /* Allocate a new array to hold the contents. */
-
-  newContents = (stackElementT *)malloc(sizeof(stackElementT) * maxSize);
-
-  if (newContents == NULL) {
-    fprintf(stderr, "Insufficient memory to initialize stack.\n");
-    exit(1);  /* Exit, returning error code. */
-  }
-
-  stackP->contents = newContents;
-  stackP->maxSize = maxSize;
-  stackP->top = -1;  /* I.e., empty */
-}
-
-void StackDestroy(stackT *stackP)
-{
-  /* Get rid of array. */
-  free(stackP->contents);
-
-  stackP->contents = NULL;
-  stackP->maxSize = 0;
-  stackP->top = -1;  /* I.e., empty */
-}
-
-void StackPush(stackT *stackP, stackElementT element)
-{
-  if (StackIsFull(stackP)) {
-    fprintf(stderr, "Can't push element on stack: stack is full.\n");
-    exit(1);  /* Exit, returning error code. */
-  }
-
-  /* Put information in array; update top. */
-
-  stackP->contents[++stackP->top] = element;
-}
-
-stackElementT StackPop(stackT *stackP)
-{
-  if (StackIsEmpty(stackP)) {
-    fprintf(stderr, "Can't pop element from stack: stack is empty.\n");
-    exit(1);  /* Exit, returning error code. */
-  }
-
-  return stackP->contents[stackP->top--];
-}
-
-int StackIsEmpty(stackT *stackP)
-{
-  return stackP->top < 0;
-}
-
-int StackIsFull(stackT *stackP)
-{
-  return stackP->top >= stackP->maxSize - 1;
-}
-
-stackElementT StackTop(stackT *stackP)
-{
-  return stackP->contents[stackP->top];
-}

data/ext/mathematical/mtex2MML/src/stack.h

@@ -1,101 +0,0 @@
-/*
- *          File: stack.h
- *        Author: Robert I. Pitts <rip@cs.bu.edu>
- * Last Modified: March 7, 2000
- *         Topic: Stack - Array Implementation
- * ----------------------------------------------------------------
- *
- * This is the interface for a stack of characters.
- */
-
-#ifndef _STACK_H
-#define _STACK_H
-
-typedef struct {
-  char *line;
-  int  line_pos;
-} stackElementT;
-
-/*
- * Type: stackElementT
- * -------------------
- * This is the type of the objects entered in the stack.
- * Edit it to change the type of things to be placed in
- * the stack.
- */
-
-// typedef char* stackElementT;
-
-/*
- * Type: stackT
- * --------------
- * This is the type for a stack, i.e., it is a type that
- * holds the information necessary to keep track of a stack.
- * It has a pointer `contents' to a dynamically-allocated
- * array (used to hold the contents of the stack), an integer
- * `maxSize' that holds the size of this array (i.e., the
- * maximum number of things that can be held in the stack),
- * and another integer `top,' which stores the array index of
- * the element at the top of the stack.
- */
-
-typedef struct {
-  stackElementT *contents;
-  int maxSize;
-  int top;
-} stackT;
-
-/*
- * Function: StackInit
- * Usage: StackInit(&stack, maxSize);
- * -------------------------
- * A new stack variable is initialized.  The initialized
- * stack is made empty.  MaxSize is used to determine the
- * maximum number of character that can be held in the
- * stack.
- */
-
-void StackInit(stackT *stackP, int maxSize);
-
-/* Function: StackDestroy
- * Usage: StackDestroy(&stack);
- * -----------------------
- * This function frees all memory associated with the stack.
- * The `stack' variable may not be used again unless
- * StackInit(&stack, maxSize) is first called on the stack.
- */
-
-void StackDestroy(stackT *stackP);
-
-/*
- * Functions: StackPush, StackPop
- * Usage: StackPush(&stack, element); element = StackPop(&stack);
- * --------------------------------------------
- * These are the fundamental stack operations that add an element to
- * the top of the stack and remove an element from the top of the stack.
- * A call to StackPop on an empty stack or to StackPush on a full stack
- * is an error.  Make use of StackIsEmpty()/StackIsFull() (see below)
- * to avoid these errors.
- */
-
-void StackPush(stackT *stackP, stackElementT element);
-stackElementT StackPop(stackT *stackP);
-
-/*
- * Functions: StackIsEmpty, StackIsFull
- * Usage: if (StackIsEmpty(&stack)) ...
- * -----------------------------------
- * These return a true value if the stack is empty
- * or full (respectively).
- */
-
-int StackIsEmpty(stackT *stackP);
-int StackIsFull(stackT *stackP);
-
-// Retrieve the top-most element from the stack
-stackElementT StackTop(stackT *stackP);
-
-// Retrieve the bottom-most element from the stack
-stackElementT StackBottom(stackT *stackP);
-
-#endif  /* not defined _STACK_H */