mathematical 1.5.12 → 1.6.0

data/ext/mathematical/mtex2MML/deps/uthash/utringbuffer.h

@@ -0,0 +1,108 @@
+/*
+Copyright (c) 2008-2016, Troy D. Hanson   http://troydhanson.github.com/uthash/
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* a ring-buffer implementation using macros
+ */
+#ifndef UTRINGBUFFER_H
+#define UTRINGBUFFER_H
+
+#define UTRINGBUFFER_VERSION 2.0.1
+ 
+#include <stdlib.h>
+#include <string.h>
+#include "utarray.h"  // for "UT_icd"
+ 
+typedef struct {
+    unsigned i;       /* index of next available slot; wraps at n */
+    unsigned n;       /* capacity */
+    unsigned char f;  /* full */
+    UT_icd icd;       /* initializer, copy and destructor functions */
+    char *d;          /* n slots of size icd->sz */
+} UT_ringbuffer;
+ 
+#define utringbuffer_init(a, _n, _icd) do {                               \
+  memset(a, 0, sizeof(UT_ringbuffer));                                    \
+  (a)->icd = *(_icd);                                                     \
+  (a)->n = (_n);                                                          \
+  if ((a)->n) { (a)->d = (char*)malloc((a)->n * (_icd)->sz); }            \
+} while(0)
+ 
+#define utringbuffer_clear(a) do {                                        \
+  if ((a)->icd.dtor) {                                                    \
+    if ((a)->f) {                                                         \
+      unsigned _ut_i;                                                     \
+      for (_ut_i = 0; _ut_i < (a)->n; ++_ut_i) {                          \
+        (a)->icd.dtor(utringbuffer_eltptr(a, _ut_i));                     \
+      }                                                                   \
+    } else {                                                              \
+      unsigned _ut_i;                                                     \
+      for (_ut_i = 0; _ut_i < (a)->i; ++_ut_i) {                          \
+        (a)->icd.dtor(utringbuffer_eltptr(a, _ut_i));                     \
+      }                                                                   \
+    }                                                                     \
+  }                                                                       \
+  (a)->i = 0;                                                             \
+  (a)->f = 0;                                                             \
+} while(0)
+ 
+#define utringbuffer_done(a) do {                                         \
+  utringbuffer_clear(a);                                                  \
+  free((a)->d); (a)->d = NULL;                                            \
+  (a)->n = 0;                                                             \
+} while(0)
+ 
+#define utringbuffer_new(a,n,_icd) do {                                   \
+  a = (UT_ringbuffer*)malloc(sizeof(UT_ringbuffer));                      \
+  utringbuffer_init(a, n, _icd);                                          \
+} while(0)
+ 
+#define utringbuffer_free(a) do {                                         \
+  utringbuffer_done(a);                                                   \
+  free(a);                                                                \
+} while(0)
+ 
+#define utringbuffer_push_back(a,p) do {                                                \
+  if ((a)->icd.dtor && (a)->f) { (a)->icd.dtor(_utringbuffer_internalptr(a,(a)->i)); }  \
+  if ((a)->icd.copy) { (a)->icd.copy( _utringbuffer_internalptr(a,(a)->i), p); }        \
+  else { memcpy(_utringbuffer_internalptr(a,(a)->i), p, (a)->icd.sz); };                \
+  if (++(a)->i == (a)->n) { (a)->i = 0; (a)->f = 1; }                                   \
+} while(0)
+ 
+#define utringbuffer_len(a) ((a)->f ? (a)->n : (a)->i)
+#define utringbuffer_empty(a) ((a)->i == 0 && !(a)->f)
+#define utringbuffer_full(a) ((a)->f != 0)
+ 
+#define _utringbuffer_real_idx(a,j) ((a)->f ? ((j) + (a)->i) % (a)->n : (j))
+#define _utringbuffer_internalptr(a,j) ((void*)((a)->d + ((a)->icd.sz * (j))))
+#define utringbuffer_eltptr(a,j) ((0 <= (j) && (j) < utringbuffer_len(a)) ? _utringbuffer_internalptr(a,_utringbuffer_real_idx(a,j)) : NULL)
+ 
+#define _utringbuffer_fake_idx(a,j) ((a)->f ? ((j) + (a)->n - (a)->i) % (a)->n : (j))
+#define _utringbuffer_internalidx(a,e) (((char*)(e) >= (a)->d) ? (((char*)(e) - (a)->d)/(a)->icd.sz) : -1)
+#define utringbuffer_eltidx(a,e) _utringbuffer_fake_idx(a, _utringbuffer_internalidx(a,e))
+ 
+#define utringbuffer_front(a) utringbuffer_eltptr(a,0)
+#define utringbuffer_next(a,e) ((e)==NULL ? utringbuffer_front(a) : utringbuffer_eltptr(a, utringbuffer_eltidx(a,e)+1))
+#define utringbuffer_prev(a,e) ((e)==NULL ? utringbuffer_back(a) : utringbuffer_eltptr(a, utringbuffer_eltidx(a,e)-1))
+#define utringbuffer_back(a) (utringbuffer_empty(a) ? NULL : utringbuffer_eltptr(a, utringbuffer_len(a) - 1))
+
+#endif /* UTRINGBUFFER_H */

data/ext/mathematical/mtex2MML/deps/uthash/utstring.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2014, Troy D. Hanson   http://troydhanson.github.com/uthash/
+Copyright (c) 2008-2016, Troy D. Hanson   http://troydhanson.github.com/uthash/
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef UTSTRING_H
 #define UTSTRING_H
 
-#define UTSTRING_VERSION 1.9.9
+#define UTSTRING_VERSION 2.0.1
 
 #ifdef __GNUC__
 #define _UNUSED_ __attribute__ ((__unused__))
@@ -38,7 +38,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
+
+#ifndef oom
 #define oom() exit(-1)
+#endif
 
 typedef struct {
     char *d;
@@ -49,9 +52,11 @@ typedef struct {
 #define utstring_reserve(s,amt)                            \
 do {                                                       \
   if (((s)->n - (s)->i) < (size_t)(amt)) {                 \
-     (s)->d = (char*)realloc((s)->d, (s)->n + amt);        \
-     if ((s)->d == NULL) oom();                            \
-     (s)->n += amt;                                        \
+    char *utstring_tmp = (char*)realloc(                   \
+      (s)->d, (s)->n + (amt));                             \
+    if (utstring_tmp == NULL) oom();                       \
+    (s)->d = utstring_tmp;                                 \
+    (s)->n += (amt);                                       \
   }                                                        \
 } while(0)
 
@@ -59,7 +64,7 @@ do {                                                       \
 do {                                                       \
   (s)->n = 0; (s)->i = 0; (s)->d = NULL;                   \
   utstring_reserve(s,100);                                 \
-  (s)->d[0] = '\0'; \
+  (s)->d[0] = '\0';                                        \
 } while(0)
 
 #define utstring_done(s)                                   \
@@ -98,10 +103,10 @@ do {                                                       \
 
 #define utstring_bincpy(s,b,l)                             \
 do {                                                       \
-  utstring_reserve((s),(l)+1);                               \
+  utstring_reserve((s),(l)+1);                             \
   if (l) memcpy(&(s)->d[(s)->i], b, l);                    \
-  (s)->i += l;                                               \
-  (s)->d[(s)->i]='\0';                                         \
+  (s)->i += (l);                                           \
+  (s)->d[(s)->i]='\0';                                     \
 } while(0)
 
 #define utstring_concat(dst,src)                                 \
@@ -119,7 +124,7 @@ do {                                                             \
 _UNUSED_ static void utstring_printf_va(UT_string *s, const char *fmt, va_list ap) {
    int n;
    va_list cp;
-   while (1) {
+   for (;;) {
 #ifdef _WIN32
       cp = ap;
 #else

data/ext/mathematical/mtex2MML/script/bootstrap

@@ -5,7 +5,7 @@ set -e
 echo "==> Installing required libraries…"
 
 if [ "$(uname)" == "Darwin" ]; then
-  for pkg in flex bison cmake; do
+  for pkg in flex bison cmake valgrind; do
     if brew list -1 | grep -q "^${pkg}\$"; then
         echo "Package '$pkg' is installed"
     else
@@ -14,17 +14,11 @@ if [ "$(uname)" == "Darwin" ]; then
     fi
   done
 elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-  sudo apt-get -qq -y install flex bison cmake
-fi
-
-if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]
-then
-    echo 'yes' | sudo add-apt-repository ppa:kalakris/cmake
-    sudo apt-get update -qq
-    sudo apt-get install -qq cmake python3 valgrind
-elif [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]
-then
-    echo "Building without python3, to make sure that works."
+  if [ -z "$TRAVIS" ]; then
+    sudo apt-get -qq -y install flex bison cmake valgrind
+  else
+    echo "Packages already installed on Travis CI."
+  fi
 fi
 
 mkdir -p build

data/ext/mathematical/mtex2MML/script/cibuild

@@ -1,10 +1,56 @@
-#!/bin/bash
+#!/bin/sh
 
 mkdir -p build
 cd build
 cmake ..
 make
 ctest -V
+
+echo 'inline'
+echo '\sin y'     | ./mtex2MML --inline | grep "display='inline'" || exit 1
+echo ''
+
+echo 'display'
+echo '\sin y'     | ./mtex2MML --display | grep "display='block'" || exit 1
+echo ''
+
+echo 'inline print-mtex'
+echo '\sin y'     | ./mtex2MML --inline --print-mtex | grep '$\\sin y\$'|| exit 1
+echo ''
+
+echo 'display print-mtex'
+echo '\sin y'     | ./mtex2MML --display --print-mtex | grep '$$\\sin y\$\$' || exit 1
+echo ''
+
+echo 'dollar'
+echo '$\sin y$'   | ./mtex2MML | grep "display='inline'" || exit 1
+
+echo 'double dollar'
+echo '$$\sin y$$' | ./mtex2MML | grep "display='block'" || exit 1
+
+echo 'parens'
+echo '\(\sin y\)' | ./mtex2MML | grep "display='inline'" || exit 1
+
+echo 'brackets'
+echo '\[\sin y\]' | ./mtex2MML | grep "display='block'" || exit 1
+
+echo 'dollar use-dollar'
+echo '$\sin y$'   | ./mtex2MML --use-dollar | grep "display='inline'" || exit 1
+
+echo 'double dollar use-double'
+echo '$$\sin y$$' | ./mtex2MML --use-double | grep "display='block'" || exit 1
+
+echo 'parens use-parens'
+echo '\(\sin y\)' | ./mtex2MML --use-parens | grep "display='inline'" || exit 1
+
+echo 'brackets use-brackets'
+echo '\[\sin y\]' | ./mtex2MML --use-brackets | grep "display='block'" || exit 1
+
+echo 'env use-env'
+echo '\\begin{align}3x + 9y &=  -12\\end{align}' | ./mtex2MML --use-env | grep "display='block'" || exit 1
+
+echo 'DONE with command check'
+
 if [ -n "$CI" ]
 then
   make memcheck

data/ext/mathematical/mtex2MML/script/{release → tag}

@@ -20,7 +20,7 @@ puts "Creating tag #{TAG_NAME}..."
 `git tag #{TAG_NAME}`
 
 puts 'Creating release...'
-client = Octokit::Client.new(:access_token => ENV['MY_PERSONAL_TOKEN'])
+client = Octokit::Client.new(:access_token => ENV['GITHUB_TOKEN'])
 release_response = client.create_release 'gjtorikian/mtex2MML', TAG_NAME, \
                                         :name => VERSION
 

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

@@ -10,6 +10,8 @@
 static const char *BEGIN = "\\begin";
 static const char *END = "\\end";
 static const char *BEGIN_SVG = "begin{svg}";
+static const char *BEGIN_SUBSTACK = "\\substack";
+static const char *BEGIN_CASES = "\\cases";
 
 const char *HLINE = "\\hline", *HDASHLINE = "\\hdashline",
             *LINE_SEPARATOR = "\\\\",
@@ -20,26 +22,54 @@ const char *HLINE = "\\hline", *HDASHLINE = "\\hdashline",
 
 int mtex2MML_determine_environment(const char *environment)
 {
-  if (strstr(environment, "\\end{smallmatrix}") != NULL) {
-    return ENV_SMALLMATRIX;
+  if (strstr(environment, "\\end{align}") != NULL) {
+    return ENV_ALIGN;
+  } else if (strstr(environment, "\\end{align*}") != NULL) {
+    return ENV_ALIGNSTAR;
+  } else if (strstr(environment, "\\end{alignat") != NULL) {
+    return ENV_ALIGNAT;
+  } else if (strstr(environment, "\\end{aligned}") != NULL) {
+    return ENV_ALIGNED;
+  } else if (strstr(environment, "\\end{alignedat}") != NULL) {
+    return ENV_ALIGNEDAT;
+  } else if (strstr(environment, "\\end{array}") != NULL) {
+    return ENV_ARRAY;
+  } else if (strstr(environment, "\\end{bmatrix}") != NULL) {
+    return ENV_BMATRIX;
+  } else if (strstr(environment, "\\end{Bmatrix}") != NULL) {
+    return ENV_BBMATRIX;
+  } else if (strstr(environment, "\\end{cases}") != NULL) {
+    return ENV_CASES;
+  } else if (strstr(environment, "\\end{eqnarray") != NULL) {
+    return ENV_EQNARRAY;
+  } else if (strstr(environment, "\\end{equation}") != NULL) {
+    return ENV_EQUATION;
   } else if (strstr(environment, "\\end{gather}") != NULL) {
     return ENV_GATHER;
+  } else if (strstr(environment, "\\end{gather*}") != NULL) {
+    return ENV_GATHERSTAR;
   } else if (strstr(environment, "\\end{gathered}") != NULL) {
     return ENV_GATHERED;
-  } else if (strstr(environment, "\\end{eqnarray") != NULL) {
-    return ENV_EQNARRAY;
+  } else if (strstr(environment, "\\end{matrix}") != NULL) {
+    return ENV_MATRIX;
   } else if (strstr(environment, "\\end{multline}") != NULL) {
     return ENV_MULTLINE;
   } else if (strstr(environment, "\\end{multline*}") != NULL) {
     return ENV_MULTLINESTAR;
-  } else if (strstr(environment, "\\end{alignat") != NULL) {
-    return ENV_ALIGNAT;
-  } else if (strstr(environment, "\\end{aligned}") != NULL) {
-    return ENV_ALIGNED;
-  } else if (strstr(environment, "\\end{equation}") != NULL) {
-    return ENV_EQUATION;
-  } else if (strstr(environment, "\\end{align}") != NULL) {
-    return ENV_ALIGN;
+  } else if (strstr(environment, "\\end{pmatrix}") != NULL) {
+    return ENV_PMATRIX;
+  } else if (strstr(environment, "\\end{smallmatrix}") != NULL) {
+    return ENV_SMALLMATRIX;
+  } else if (strstr(environment, "\\end{split}") != NULL) {
+    return ENV_SPLIT;
+  } else if (strstr(environment, "\\end{subarray}") != NULL) {
+    return ENV_SUBARRAY;
+  } else if (strstr(environment, "\\substack") != NULL) {
+    return ENV_SUBSTACK;
+  } else if (strstr(environment, "\\end{vmatrix}") != NULL) {
+    return ENV_VMATRIX;
+  } else if (strstr(environment, "\\end{Vmatrix}") != NULL) {
+    return ENV_VVMATRIX;
   }
 
   return OTHER;
@@ -65,6 +95,36 @@ int mtex2MML_identify_eqn_number(envType environment_type, char *line)
 
 void mtex2MML_env_replacements(UT_array **environment_data_stack, encaseType **encase, const char *environment)
 {
+  /* TODO: these next detections are gross, but substack and cases are rather special */
+  if (strstr(environment, BEGIN_SUBSTACK) != NULL) {
+    UT_array *eqn_number_stack;
+    utarray_new(eqn_number_stack, &ut_int_icd);
+    envdata_t env_data;
+    env_data.rowspacing = "";
+    env_data.rowlines = "";
+    env_data.environment_type = ENV_SUBSTACK;
+    env_data.eqn_numbers = eqn_number_stack;
+    env_data.line_count = 0;
+
+    utarray_push_back(*environment_data_stack, &env_data);
+    utarray_free(eqn_number_stack);
+
+    return;
+  }
+  if (strstr(environment, BEGIN_CASES) != NULL) {
+    UT_array *eqn_number_stack;
+    utarray_new(eqn_number_stack, &ut_int_icd);
+    envdata_t env_data;
+    env_data.rowspacing = "";
+    env_data.rowlines = "";
+    env_data.environment_type = ENV_CASES;
+    env_data.eqn_numbers = eqn_number_stack;
+    env_data.line_count = 0;
+
+    utarray_push_back(*environment_data_stack, &env_data);
+    utarray_free(eqn_number_stack);
+    return;
+  }
   /* if not an environment, don't bother going on */
   if ((strstr(environment, BEGIN) == NULL && strstr(environment, END) == NULL) || strstr(environment, BEGIN_SVG)) {
     return;
@@ -435,7 +495,7 @@ int mtex2MML_fetch_eqn_number(UT_array **environment_data_stack)
 envType mtex2MML_current_env_type(UT_array **environment_data_stack)
 {
   if (utarray_len(*environment_data_stack) == 0) {
-    return -1;
+    return OTHER;
   }
 
   envdata_t *row_data_elem = (envdata_t*) utarray_front(*environment_data_stack);

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

@@ -9,7 +9,7 @@ extern "C" {
 #endif
 
 typedef enum {NONE = 0, TOPENCLOSE} encaseType;
-typedef enum {OTHER = 0, ENV_ALIGN, ENV_ALIGNAT, ENV_ALIGNATSTAR, ENV_ALIGNED, ENV_EQUATION, ENV_GATHER, ENV_GATHERED, ENV_EQNARRAY, ENV_MULTLINE, ENV_MULTLINESTAR, ENV_SMALLMATRIX} envType;
+typedef enum {OTHER = 0, ENV_ALIGN, ENV_ALIGNSTAR, ENV_ALIGNAT, ENV_ALIGNATSTAR, ENV_ALIGNED, ENV_ALIGNEDAT, ENV_ARRAY, ENV_BMATRIX, ENV_BBMATRIX, ENV_CASES, ENV_EQUATION, ENV_GATHER, ENV_GATHERSTAR, ENV_GATHERED, ENV_EQNARRAY, ENV_MATRIX, ENV_MULTLINE, ENV_MULTLINESTAR, ENV_PMATRIX, ENV_SMALLMATRIX, ENV_SPLIT, ENV_SUBARRAY, ENV_SUBSTACK, ENV_VMATRIX, ENV_VVMATRIX} envType;
 
 typedef struct {
   char *rowspacing;

data/ext/mathematical/mtex2MML/src/lexer.l

@@ -13,7 +13,11 @@
 #include "string_extras.h"
 
 #define YY_NEVER_INTERACTIVE 1
-#define YY_INPUT(buffer,result,max_size) result = s_mtex2MML_read (buffer, max_size)
+#define YY_INPUT(buffer,result,max_size) result = s_mtex2MML_read (buffer, max_size);
+
+#if defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __DragonFly__
+#undef fileno
+#endif
 
 extern int fileno(FILE *); /* avoids gcc warning */
 
@@ -39,6 +43,9 @@ char * mtex2MML_str;
 
 int mtex2MML_rowposn = 0;
 
+typedef enum {NO_PARSE = 0, OPEN_PARSE, CLOSE_PARSE} parsingEnv;
+int parsing_environment = NO_PARSE;
+
 envType environment_type;
 
 /* TODO: I'm not sure what the next option does. My addition
@@ -54,16 +61,18 @@ int display_style = 0;
 %}
 
  /* "Basic heuristic is: opening $ can't be followed by whitespace, closing $ can't be followed by
-   a digit or preceded by whitespace." -- @jgm, http://bit.ly/1HVtemx */
+     a digit or preceded by whitespace." -- @jgm, http://bit.ly/1HVtemx */
 
-<INITIAL>"$$" if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOUBLE)) { BEGIN(MATH); mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; mtex2MML_displaymode=1; return STARTDMATH; }
+<INITIAL>"$$" if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOUBLE)) {BEGIN(MATH); mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; mtex2MML_displaymode=1; return STARTDMATH; }
 
-<INITIAL>"$"[\t\r\n ]? if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOLLAR)) { mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; if (yyleng==2) { BEGIN(ENDMATH); return INITIAL;}; BEGIN(MATH);  mtex2MML_displaymode=0; return STARTMATH; }
+<INITIAL>"$"[\t\r\n ]? if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOLLAR)) {mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; if (yyleng==2) { BEGIN(ENDMATH); return INITIAL;}; BEGIN(MATH);  mtex2MML_displaymode=0; return STARTMATH; }
 
 <INITIAL>"\\(" if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_PARENS)) {BEGIN(MATH); mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; mtex2MML_displaymode=0; return STARTMATH; }
 
 <INITIAL>"\\[" if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_BRACKETS)) {BEGIN(MATH); mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; mtex2MML_displaymode=1; return STARTDMATH; }
 
+<INITIAL>"\\begin" if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_ENVIRONMENTS)) {BEGIN(MATHENV); parsing_environment = OPEN_PARSE; mtex2MML_env_start = 1; mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; mtex2MML_displaymode=0; return BEGINENV; }
+
 <INITIAL>EOF    return 0;
 <INITIAL>"\n" {mtex2MML_lineno++; yylval=mtex2MML_copy_string(yytext); return CHAR;}
 <INITIAL>.     {yylval=mtex2MML_copy_string(yytext); return CHAR;}
@@ -73,7 +82,7 @@ int display_style = 0;
 
 "$"{1,2} if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOLLAR) || mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOUBLE)) { mtex2MML_eqn_src[mtex2MML_eqn_end-mtex2MML_eqn_src-yyleng]=0; mtex2MML_eqn_end=mtex2MML_eqn_src; yylval=mtex2MML_copy_escaped(mtex2MML_eqn_src); BEGIN(INITIAL); return ENDMATH;} else {yylval=mtex2MML_copy_string("$"); return MI;}
 
-"\\)"    if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_PARENS)) {mtex2MML_eqn_src[mtex2MML_eqn_end-mtex2MML_eqn_src-yyleng]=0; mtex2MML_eqn_end=mtex2MML_eqn_src; yylval=mtex2MML_copy_escaped(mtex2MML_eqn_src); BEGIN(INITIAL); return ENDMATH;}
+"\\)"    if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_PARENS))   {mtex2MML_eqn_src[mtex2MML_eqn_end-mtex2MML_eqn_src-yyleng]=0; mtex2MML_eqn_end=mtex2MML_eqn_src; yylval=mtex2MML_copy_escaped(mtex2MML_eqn_src); BEGIN(INITIAL); return ENDMATH;}
 
 "\\]"    if (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_BRACKETS)) {mtex2MML_eqn_src[mtex2MML_eqn_end-mtex2MML_eqn_src-yyleng]=0; mtex2MML_eqn_end=mtex2MML_eqn_src; yylval=mtex2MML_copy_escaped(mtex2MML_eqn_src); BEGIN(INITIAL); return ENDMATH;}
 
@@ -134,7 +143,7 @@ int display_style = 0;
 "\\\\"[\n\r\t ]*\[[0-9\.]+(em|ex|px|in|cm|mm|mu|pt|pc|%)\] |
 "\\newline"[\n\r\t ]* |
 "\\cr"[\n\r\t ]*      |
-"\\\\"[\n\r\t ]*          { mtex2MML_rowposn=2; return ROWSEP; }
+"\\\\"[\n\r\t ]*          { mtex2MML_rowposn=2; if (mtex2MML_current_env_type(mtex2MML_get_environment_data_stack()) == OTHER) return NEWLINE; return ROWSEP;}
 
 [0-9\.,]+(em|ex|px|in|cm|mm|mu|pt|pc|%) {char * normalized_px = mtex2MML_str_replace(yytext, ",", "."); yylval=mtex2MML_copy_string(normalized_px); mtex2MML_free_string(normalized_px); return PXSTRING; }
 
@@ -751,6 +760,10 @@ int display_style = 0;
 "\\bigtriangledown" |
 "\\nprec"  {yylval=mtex2MML_copy2(yytext, ";"); if (yylval != mtex2MML_empty_string) yylval[0]='&'; return MOL;}
 
+"\\textgreater" |
+" > "               {yylval=mtex2MML_copy_string("&gt;"); return MOL;}
+"\\textless"    |
+" < "               {yylval=mtex2MML_copy_string("&lt;"); return MOL;}
 "\\land"  {yylval=mtex2MML_copy_string("&and;"); return MOL;}
 "\\lor"   {yylval=mtex2MML_copy_string("&or;"); return MOL;}
 "\\surd"  {yylval=mtex2MML_copy_string("&radic;"); return MOL;}
@@ -1137,7 +1150,7 @@ int display_style = 0;
 "\\mathcal"     {BEGIN(CALLIGRAPHIC); return CAL;}
 
 "\\begin"        {mtex2MML_env_start = 1; BEGIN(MATHENV); return BEGINENV;}
-"\\end"          {environment_type = OTHER;BEGIN(MATHENV); return ENDENV;}
+"\\end"          { if (parsing_environment == OPEN_PARSE) parsing_environment = CLOSE_PARSE; environment_type = OTHER; BEGIN(MATHENV); return ENDENV;}
 
 "\\notag" |
 "\\nonumber"     { /* ignore, but address in .y */}
@@ -1291,34 +1304,34 @@ int display_style = 0;
 }
 
 <MATHENV>{
-"\{equation\}" { BEGIN(MATH); return EQUATION;}
-"\{equation*\}" { BEGIN(MATH); return EQUATION_STAR;}
-"\{matrix\}" {BEGIN(MATH); return MATRIX;}
-"\{pmatrix\}" {BEGIN(MATH); return PMATRIX;}
-"\{bmatrix\}" {BEGIN(MATH); return BMATRIX;}
-"\{Bmatrix\}" {BEGIN(MATH); return BBMATRIX;}
-"\{vmatrix\}" {BEGIN(MATH); return VMATRIX;}
-"\{Vmatrix\}" {BEGIN(MATH); return VVMATRIX;}
-"\{smallmatrix\}" {BEGIN(MATH); return SMALLMATRIX;}
-"\{cases\}" {BEGIN(MATH); return CASES;}
+"\{equation\}" { if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return EQUATION;}
+"\{equation*\}" { if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return EQUATION_STAR;}
+"\{matrix\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return MATRIX;}
+"\{pmatrix\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return PMATRIX;}
+"\{bmatrix\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return BMATRIX;}
+"\{Bmatrix\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return BBMATRIX;}
+"\{vmatrix\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return VMATRIX;}
+"\{Vmatrix\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return VVMATRIX;}
+"\{smallmatrix\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); }; return SMALLMATRIX;}
+"\{cases\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return CASES;}
 "\{aligned\}[" {BEGIN(ENVOPTIONS); return ALIGNED;}
-"\{aligned\}" {BEGIN(MATH); return ALIGNED;}
-"\{align\}" {BEGIN(MATH); return ALIGNENV;}
-"\{align*\}" {BEGIN(MATH); return ALIGNENV_STAR;}
-"\{alignat\}" {environment_type = ENV_ALIGNAT; if (mtex2MML_env_start == 1) BEGIN(ALIGNATOPTS); else BEGIN(MATH); return ALIGNAT;}
-"\{alignat*\}" {environment_type = ENV_ALIGNATSTAR; if (mtex2MML_env_start == 1) BEGIN(ALIGNATOPTS); else BEGIN(MATH); return ALIGNAT_STAR;}
-"\{alignedat\}" {if (mtex2MML_env_start == 1) BEGIN(ALIGNATOPTS); else BEGIN(MATH); return ALIGNEDAT;}
-"\{eqnarray*\}" {BEGIN(MATH); return EQNARRAY_STAR;}
-"\{eqnarray\}" {BEGIN(MATH); return EQNARRAY;}
-"\{gather\}" {BEGIN(MATH); return GATHER;}
-"\{gather*\}" {BEGIN(MATH); return GATHER_STAR;}
+"\{aligned\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return ALIGNED;}
+"\{align\}" { if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return ALIGNENV;}
+"\{align*\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return ALIGNENV_STAR;}
+"\{alignat\}" {environment_type = ENV_ALIGNAT; if (mtex2MML_env_start == 1) BEGIN(ALIGNATOPTS); else if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return ALIGNAT;}
+"\{alignat*\}" {environment_type = ENV_ALIGNATSTAR; if (mtex2MML_env_start == 1) BEGIN(ALIGNATOPTS); else if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return ALIGNAT_STAR;}
+"\{alignedat\}" {if (mtex2MML_env_start == 1) BEGIN(ALIGNATOPTS); else if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return ALIGNEDAT;}
+"\{eqnarray*\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return EQNARRAY_STAR;}
+"\{eqnarray\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return EQNARRAY;}
+"\{gather\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return GATHER;}
+"\{gather*\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return GATHER_STAR;}
 "\{gathered\}[" {BEGIN(ENVOPTIONS); return GATHERED;}
-"\{gathered\}" {BEGIN(MATH); return GATHERED;}
-"\{multline*\}" {BEGIN(MATH); return MULTLINE_STAR;}
-"\{multline\}" {BEGIN(MATH); return MULTLINE;}
-"\{split\}" {BEGIN(MATH); return ALIGNED;}
-"\{array\}" {if (mtex2MML_env_start == 1) BEGIN(ARRAYOPTIONS); else BEGIN(MATH); return ARRAY;}
-"\{subarray\}" {if (mtex2MML_env_start == 1) BEGIN(ARRAYOPTIONS); else BEGIN(MATH); return SUBARRAY;}
+"\{gathered\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return GATHERED;}
+"\{multline*\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return MULTLINE_STAR;}
+"\{multline\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return MULTLINE;}
+"\{split\}" {if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return ALIGNED;}
+"\{array\}" {if (mtex2MML_env_start == 1) BEGIN(ARRAYOPTIONS); else if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return ARRAY;}
+"\{subarray\}" {if (mtex2MML_env_start == 1) BEGIN(ARRAYOPTIONS); else if (parsing_environment == CLOSE_PARSE) { mtex2MML_reset_parsing_environment(); } else { BEGIN(MATH); } return SUBARRAY;}
 "\{svg\}" {mtex2MML_env_start = 0; BEGIN(SVGENV); return SVG;}
 }
 
@@ -1365,27 +1378,27 @@ int display_style = 0;
 }
 
 <ROMAN>{
-"\{"  {mtex2MML_variant_start = 1; return ST;}
-"\}"  {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
-[a-zA-Z]+   {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return RMCHAR;}
+"\{"     {mtex2MML_variant_start = 1; return ST;}
+"\}"     {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
+"\\ "    {yylval=mtex2MML_copy_string(" "); return RMCHAR;}
+[^ ]     {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return RMCHAR;}
 [\t\n\r ]+       ;
-.           {return yytext[0];}
 }
 
 <SCRIPT>{
-"\{"  {mtex2MML_variant_start = 1; return ST;}
-"\}"  {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
-[a-zA-Z]+   {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return SCRCHAR;}
+"\{"     {mtex2MML_variant_start = 1; return ST;}
+"\}"     {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
+"\\ "    {yylval=mtex2MML_copy_string(" "); return SCRCHAR;}
+[^ ]     {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return SCRCHAR;}
 [\t\n\r ]+       ;
-.           {return yytext[0];}
 }
 
 <PMBSTRING>{
-"\{"  {mtex2MML_variant_start = 1; return ST;}
-"\}"  {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
-[a-zA-Z]+   {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return PMBCHAR;}
+"\{"     {mtex2MML_variant_start = 1; return ST;}
+"\}"     {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
+"\\ "    {yylval=mtex2MML_copy_string(" "); return PMBCHAR;}
+[^ ]     {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return PMBCHAR;}
 [\t\n\r ]+       ;
-.           {return yytext[0];}
 }
 
 <BBOLD>{
@@ -1399,19 +1412,19 @@ int display_style = 0;
 }
 
 <CALLIGRAPHIC>{
-"\{"  {mtex2MML_variant_start = 1; return ST;}
-"\}"  {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
-[a-zA-Z]+   {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return CALCHAR;}
+"\{"     {mtex2MML_variant_start = 1; return ST;}
+"\}"     {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
+"\\ "    {yylval=mtex2MML_copy_string(" "); return CALCHAR;}
+[^ ]     {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return CALCHAR;}
 [\t\n\r ]+       ;
-.           {return yytext[0];}
 }
 
 <FRAKTUR>{
-"\{"  {mtex2MML_variant_start = 1; return ST;}
-"\}"  {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
-[a-zA-Z]+   {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return FRAKCHAR;}
+"\{"     {mtex2MML_variant_start = 1; return ST;}
+"\}"     {mtex2MML_variant_start = 0; BEGIN(MATH); return END;}
+"\\ "    {yylval=mtex2MML_copy_string(" "); return FRAKCHAR;}
+[^ ]     {yylval=mtex2MML_copy_string(yytext); if (mtex2MML_variant_start == 0) BEGIN(MATH); return FRAKCHAR;}
 [\t\n\r ]+       ;
-.           {return yytext[0];}
 }
 
 <PLAINTEXT>{
@@ -1509,6 +1522,15 @@ void mtex2MML_restart ()
   BEGIN(INITIAL);
 }
 
+void mtex2MML_reset_parsing_environment()
+{
+  parsing_environment = NO_PARSE;
+  mtex2MML_eqn_src[mtex2MML_eqn_end-mtex2MML_eqn_src-yyleng]=0;
+  mtex2MML_eqn_end=mtex2MML_eqn_src;
+
+  BEGIN(INITIAL);
+}
+
 static const char *  s_mtex2MML_buffer = 0;
 static unsigned long s_mtex2MML_length = 0;