mathematical 1.3.0 → 1.4.0

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

@@ -0,0 +1,85 @@
+#ifndef ENVIRONMENT_H
+#define ENVIRONMENT_H
+
+#include "../deps/uthash/uthash.h"
+#include "../deps/uthash/utarray.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {NONE = 0, TOPENCLOSE} encaseType;
+typedef enum {OTHER = 0, ENV_ALIGN, ENV_ALIGNAT, ENV_ALIGNED, ENV_EQUATION, ENV_GATHER, ENV_GATHERED, ENV_EQNARRAY, ENV_MULTLINE, ENV_MULTLINESTAR, ENV_SMALLMATRIX} envType;
+
+typedef struct {
+  char *rowspacing;
+  char *rowlines;
+  envType environment_type;
+  UT_array *eqn_numbers;
+  int line_count;
+} envdata_t;
+
+/* Move various symbols not easily supported inline within the `\begin` line
+This is so that the Bison parser can properly act on these. For example,
+`\hline`, `\hlinedash`, or `\\[2ex]` declerations.
+
+In order to properly address these situations, we need to parse them, find their symbols,
+and then modify the starting environment declaration to point out where those symbols are.
+
+Suppose there is an array like:
+
+\begin{array}{c:c}
+  \begin{array}{c|cclc}
+    \text{min} & 0 & 1 & 2 & 3\\
+    \hline
+    0 & 0 & 0 & 0 & 0\\
+    1 & 0 & 1 & 1 & 1\\
+    2 & 0 & 1 & 2 & 2\\
+    3 & 0 & 1 & 2 & 3
+  \end{array}
+&
+  \begin{array}{c|cccl}
+    \text{max}&0&1&2&3\\
+    \hline
+    0 & 0 & 1 & 2 & 3\\
+    1 & 1 & 1 & 2 & 3\\
+    2 & 2 & 2 & 2 & 3\\
+    3 & 3 & 3 & 3 & 3
+  \end{array}
+\end{array}
+
+The env_replacements function will push every line onto a stack. When an \end
+is detected, it starts popping off the stack until it reaches the corresponding
+\begin. It then modifies that stack with attribute strings, an arrangement of
+the symbols encountered while popping lines off. */
+void mtex2MML_env_replacements(UT_array **environment_data_stack, encaseType **encase, const char *environment);
+
+int mtex2MML_determine_environment(const char *environment);
+
+int mtex2MML_identify_eqn_number(envType environment_type, char *line);
+
+void mtex2MML_perform_replacement(UT_array **environment_data_stack, UT_array *rowlines_stack, envType environment_type, UT_array *has_eqn_number, UT_array *row_spacing_stack);
+
+/* determines the column border arrangement from the array environment definition (c|cc|c...) */
+char *mtex2MML_vertical_pipe_extract(char *string);
+
+/* removes placeholder pipe characters from columnalign (for example, c|c:c becomes "center s center d center")--we need to remove the "s" and "d" characters */
+char *mtex2MML_remove_excess_pipe_chars(char *string);
+
+/* return the proper rowlines information */
+char *mtex2MML_combine_row_data(UT_array **environment_data_stack);
+
+/* return the has_eqn_number value of the last row */
+int mtex2MML_fetch_eqn_number(UT_array **environment_data_stack);
+
+/* get the environment type of the top-most item */
+envType mtex2MML_current_env_type(UT_array **environment_data_stack);
+
+/* get the line count of the top-most item */
+int mtex2MML_current_env_line_count(UT_array **environment_data_stack);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ! ENVIRONMENT_H */

data/ext/mathematical/mtex2MML/src/{mtex2MML.l → lexer.l}

@@ -7,14 +7,16 @@
 
 #define YYSTYPE char *
 
-#include "y.tab.h"
+#include "parser.h"
 #include "mtex2MML.h"
-#include "parse_extras.h"
+#include "environment.h"
 #include "string_extras.h"
 
 #define YY_NEVER_INTERACTIVE 1
 #define YY_INPUT(buffer,result,max_size) result = s_mtex2MML_read (buffer, max_size)
 
+extern int fileno(FILE *); /* avoids gcc warning */
+
 static int s_mtex2MML_read (char * buffer, int max_size);
 
 #define yylval mtex2MML_yylval
@@ -37,9 +39,9 @@ char * mtex2MML_str;
 
 int mtex2MML_rowposn = 0;
 
-// TODO: I'm not sure what the next option does. My addition
-// of `display_style` is to fix issue776. Probably worth merging
-// these in the future?
+/* TODO: I'm not sure what the next option does. My addition
+   of `display_style` is to fix issue776. Probably worth merging
+   these in the future? */
 int mtex2MML_displaymode = 0;
 int display_style = 0;
 
@@ -49,8 +51,17 @@ int display_style = 0;
    if (mtex2MML_rowposn==2) mtex2MML_rowposn=1;
 %}
 
-<INITIAL>"$"{1,2}   BEGIN(MATH); mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; if (yyleng==2) { mtex2MML_displaymode=1; return STARTDMATH;}; mtex2MML_displaymode=0; return STARTMATH;
-<INITIAL>"\\[" BEGIN(MATH); mtex2MML_inoptarg[0] = 0; mtex2MML_rowposn=2; mtex2MML_displaymode=1; return STARTDMATH;
+ /* "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 */
+
+<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>"\\(" 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>EOF    return 0;
 <INITIAL>"\n" {mtex2MML_lineno++; yylval=mtex2MML_copy_string(yytext); return CHAR;}
 <INITIAL>.     {yylval=mtex2MML_copy_string(yytext); return CHAR;}
@@ -58,11 +69,11 @@ int display_style = 0;
 
 <MATH>{
 
+"$"{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;}
 
-"$"{1,2} |
-"\\]"           {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;}
 
 "\\limits"    return LIMITS;
 "\\nolimits"    return NOLIMITS;
@@ -123,7 +134,7 @@ int display_style = 0;
 "\\cr"[\n\r\t ]*      |
 "\\\\"[\n\r\t ]*          { mtex2MML_rowposn=2; return ROWSEP; }
 
-[0-9\.,]+(em|ex|px|in|cm|mm|mu|pt|pc|%) {char * normalized_px = str_replace(yytext, ",", "."); yylval=mtex2MML_copy_string(normalized_px); mtex2MML_free_string(normalized_px); return PXSTRING; }
+[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; }
 
 [a-zA-Z]       {yylval=mtex2MML_copy_string(yytext); return MI;}
 
@@ -1244,7 +1255,7 @@ int display_style = 0;
 <BRACKETLIST>{
 "\["  {return ST;}
 "\]"  {BEGIN(MATH); return END;}
-[0-9\.,]+(em|ex|px|in|cm|mm|mu|pt|pc|%) {char * normalized_px = str_replace(yytext, ",", "."); if (normalized_px[0] == '.') remove_first_char(normalized_px); yylval=mtex2MML_copy_string(normalized_px); mtex2MML_free_string(normalized_px); return PXSTRING; }
+[0-9\.,]+(em|ex|px|in|cm|mm|mu|pt|pc|%) {char * normalized_px = mtex2MML_str_replace(yytext, ",", "."); if (normalized_px[0] == '.') mtex2MML_remove_first_char(normalized_px); yylval=mtex2MML_copy_string(normalized_px); mtex2MML_free_string(normalized_px); return PXSTRING; }
 [0-9a-zA-Z ]+":"[0-9a-zA-Z ]+   {yylval=mtex2MML_copy_string(yytext); return STYLESTRING;}
 #?[0-9a-zA-Z]+            {yylval=mtex2MML_copy_string(yytext); return COLORSTRING;}
 [\t\n\r, ]+       ;
@@ -1470,21 +1481,21 @@ int display_style = 0;
 
 <SPACEWIDTH>{
 "\{"      { return ST;}
-[0-9\.,]+(em|ex|px|in|cm|mm|mu|pt|pc|%) {char * normalized_px = str_replace(yytext, ",", "."); yylval=mtex2MML_copy_string(normalized_px); mtex2MML_free_string(normalized_px); return PXSTRING; }
+[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; }
 "\}"      {BEGIN(SPACEHEIGHT); return ST;}
 [\t\n\r ]+       ;
 }
 
 <SPACEHEIGHT>{
 "\{"      { return ST;}
-[0-9\.,]+(em|ex|px|in|cm|mm|mu|pt|pc|%) {char * normalized_px = str_replace(yytext, ",", "."); yylval=mtex2MML_copy_string(normalized_px); mtex2MML_free_string(normalized_px); return PXSTRING; }
+[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; }
 "\}"      {BEGIN(SPACEDEPTH); return ST;}
 [\t\n\r ]+       ;
 }
 
 <SPACEDEPTH>{
 "\{"      { return ST;}
-[0-9\.,]+(em|ex|px|in|cm|mm|mu|pt|pc|%) {char * normalized_px = str_replace(yytext, ",", "."); yylval=mtex2MML_copy_string(normalized_px); mtex2MML_free_string(normalized_px); return PXSTRING; }
+[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; }
 "\}"      {BEGIN(MATH); return ST;}
 [\t\n\r ]+       ;
 }

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

@@ -9,6 +9,7 @@ int main (int argc, char ** argv)
   int bRawFilter = 0;
   int bInline    = 0;
   int bDisplay   = 0;
+  int bDelimiters   = 0;
 
   int bStop = 0;
   int bForbidMarkup = 0;
@@ -40,13 +41,17 @@ int main (int argc, char ** argv)
              "\n"
              "mtex2MML Options:\n"
              "\n"
-             "  --raw-filter    filter input stream, converting equations as found to MathML [stops on error]\n"
-             "  --inline        converts a single TeX equation, without any $ symbols, to inline MathML\n"
-             "  --display       converts a single TeX equation, without any $ symbols, to display-mode MathML\n"
-             "  --forbid-markup forbid markup (more precisely, the '<' and '>' characters) in TeX equations\n"
-             "  --print-mtex    used in conjuction with --inline or --display: prints the TeX string\n"
+             "  --raw-filter              filter input stream, converting equations as found to MathML [stops on error]\n"
+             "  --inline                  converts a single TeX equation, without any $ symbols, to inline MathML\n"
+             "  --display                 converts a single TeX equation, without any $ symbols, to display-mode MathML\n"
+             "  --forbid-markup           forbid markup (more precisely, the '<' and '>' characters) in TeX equations\n"
+             "  --print-mtex              used in conjuction with --inline or --display: prints the TeX string\n"
+             "  --use-dollar              uses `$..$` for inline math\n"
+             "  --use-double              uses `$$..$$` for display math\n"
+             "  --use-parens              uses `\\(..\\)` for inline math\n"
+             "  --use-brackets            uses `\\[..\\]` for display math\n"
              "\n"
-             "For further information, see https://github.com/gjtorikian/mtex2MML\n", stdout);
+             "For more information, see https://github.com/gjtorikian/mtex2MML\n", stdout);
 
       bStop = 1;
       break;
@@ -80,6 +85,22 @@ int main (int argc, char ** argv)
       bDisplay   = 0;
       continue;
     }
+    if (strcmp(args, "--use-dollar") == 0) {
+      bDelimiters |= MTEX2MML_DELIMITER_DOLLAR;
+      continue;
+    }
+    if (strcmp(args, "--use-double") == 0) {
+      bDelimiters |= MTEX2MML_DELIMITER_DOUBLE;
+      continue;
+    }
+    if (strcmp(args, "--use-parens") == 0) {
+      bDelimiters |= MTEX2MML_DELIMITER_PARENS;
+      continue;
+    }
+    if (strcmp(args, "--use-brackets") == 0) {
+      bDelimiters |= MTEX2MML_DELIMITER_BRACKETS;
+      continue;
+    }
   }
   if (bStop) { return 0; }
 
@@ -109,11 +130,11 @@ int main (int argc, char ** argv)
     char *s = utstring_body(mtex);
     int len = utstring_len(mtex);
     if (bRawFilter) {
-      mtex2MML_filter (s, len);
+      mtex2MML_filter (s, len, bDelimiters);
     } else if (bForbidMarkup) {
-      mtex2MML_strict_html_filter (s, len);
+      mtex2MML_strict_filter (s, len, bDelimiters);
     } else {
-      mtex2MML_html_filter (s, len);
+      mtex2MML_text_filter (s, len, bDelimiters);
     }
     utstring_free(mtex);
     return 0;
@@ -121,7 +142,7 @@ int main (int argc, char ** argv)
 
   char *s = utstring_body(mtex);
   int len = utstring_len(mtex);
-  char * mathml = mtex2MML_parse (s, len);
+  char * mathml = mtex2MML_parse(s, len, bDelimiters);
 
   if (mathml) {
     fputs (mathml, stdout);

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

@@ -1,7 +1,7 @@
 #ifndef MTEX2MML_H
 #define MTEX2MML_H
 
-#define MTEX2MML_VERSION "1.1.1"
+#define MTEX2MML_VERSION "1.2.2"
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,7 +11,7 @@ extern "C" {
 
 /* Step 1. Parse a buffer with mtex source; return value is mathml, or 0 on failure (e.g., parse error).
  */
-extern char * mtex2MML_parse (const char * buffer, unsigned long length);
+extern char * mtex2MML_parse (const char * buffer, unsigned long length, const int options);
 
 /* Step 2. Free the string from Step 1.
  */
@@ -20,11 +20,20 @@ extern void   mtex2MML_free_string (char * str);
 
 /* Alternatively, to filter generic source and converting embedded equations, use:
  */
-extern int    mtex2MML_filter (const char * buffer, unsigned long length);
+extern int    mtex2MML_filter (const char * buffer, unsigned long length, const int options);
+extern int    mtex2MML_text_filter (const char * buffer, unsigned long length, const int options);
+extern int    mtex2MML_strict_filter (const char * buffer, unsigned long length, const int options);
 
-extern int    mtex2MML_html_filter (const char * buffer, unsigned long length);
-extern int    mtex2MML_strict_html_filter (const char * buffer, unsigned long length);
+extern int mtex2MML_do_filter (const char * buffer, unsigned long length, const int forbid_markup, const int write, const int options);
 
+/** Types of delimiters
+ */
+#define MTEX2MML_DELIMITER_DEFAULT          0
+#define MTEX2MML_DELIMITER_DOLLAR           1
+#define MTEX2MML_DELIMITER_DOUBLE           2
+#define MTEX2MML_DELIMITER_PARENS           4
+#define MTEX2MML_DELIMITER_BRACKETS         8
+#define MTEX2MML_DELIMITER_ENVIRONMENTS     16
 
 /* To change output methods:
  *
@@ -38,7 +47,9 @@ extern void (*mtex2MML_error) (const char * msg);                          /* de
 /* Other stuff:
  */
 
-extern char * mtex2MML_global_parse (const char * buffer, unsigned long length, int global_start);
+extern char * mtex2MML_global_parse (const char * buffer, unsigned long length, const int options, const int global_start);
+
+extern int mtex2MML_delimiter_type();
 
 extern void   mtex2MML_setup (const char * buffer, unsigned long length);
 
@@ -47,7 +58,7 @@ extern void   mtex2MML_restart ();
 extern int mtex2MML_do_capture_eqn();
 extern int mtex2MML_capture_eqn_src();
 
-extern const char * mtex2MML_output ();
+extern char * mtex2MML_output ();
 
 extern char * mtex2MML_copy_string (const char * str);
 extern char * mtex2MML_copy_string_extra (const char * str, unsigned extra);
@@ -63,6 +74,7 @@ extern int    mtex2MML_rowposn;
 extern int    mtex2MML_displaymode;
 extern int    display_style;
 
+extern int    delimiter_options;
 extern int    global_label;
 extern int    line_counter;
 

data/ext/mathematical/mtex2MML/src/{mtex2MML.y → parser.y}

@@ -4,11 +4,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "mtex2MML.h"
-#include "parse_extras.h"
+#include "colors.h"
+#include "em.h"
+#include "environment.h"
 #include "string_extras.h"
 
+#include "../deps/strdup/strdup.h"
 #include "../deps/uthash/uthash.h"
 
 struct css_colors *colors = NULL;
@@ -19,8 +23,8 @@ struct css_colors *colors = NULL;
 /* set max nesting. utterly arbitrary number determined from http://git.io/FlWHfw */
 #define YYMAXDEPTH 430
 
-// #define YYDEBUG 1
-// yydebug = 1;
+/*#define YYDEBUG 1
+yydebug = 1;*/
 
 #define YYERROR_VERBOSE 1
 
@@ -28,189 +32,188 @@ struct css_colors *colors = NULL;
 
  UT_array *environment_data_stack;
 
- encaseType * encase = NONE;
+ encaseType encase = NONE;
 
  extern int yylex ();
 
  extern char * yytext;
 
- global_label = 1;
- line_counter = 1;
+ int global_label = 1;
+ int line_counter = 1;
+ int delimiter_options = 0;
 
  static void mtex2MML_default_error (const char * msg)
-   {
-     if (msg)
-       fprintf(stderr, "Line: %d Error: %s\n", mtex2MML_lineno, msg);
+ {
+   if (msg) {
+     fprintf(stderr, "Line: %d Error: %s\n", mtex2MML_lineno, msg);
    }
+ }
 
  void (*mtex2MML_error) (const char * msg) = mtex2MML_default_error;
 
- static void yyerror (char **ret_str, char * s)
-   {
-     char * msg = mtex2MML_copy3 (s, " at token ", yytext);
-     if (mtex2MML_error)
-       (*mtex2MML_error) (msg);
-     mtex2MML_free_string (msg);
+ static void yyerror (char **ret_str, const char * s)
+ {
+   char * msg = mtex2MML_copy3 (s, " at token ", yytext);
+   if (mtex2MML_error) {
+     (*mtex2MML_error) (msg);
    }
+   mtex2MML_free_string (msg);
+ }
 
  /* Note: If length is 0, then buffer is treated like a string; otherwise only length bytes are written.
   */
+
  static void mtex2MML_default_write (const char * buffer, unsigned long length)
-   {
-     if (buffer)
-       {
-   if (length)
-     fwrite (buffer, 1, length, stdout);
-   else
-     fputs (buffer, stdout);
-       }
+ {
+   if (buffer) {
+     if (length) {
+       fwrite (buffer, 1, length, stdout);
+     } else {
+       fputs (buffer, stdout);
+     }
    }
+ }
 
  static void mtex2MML_default_write_mathml (const char * mathml)
-   {
-     if (mtex2MML_write)
-       (*mtex2MML_write) (mathml, 0);
+ {
+   if (mtex2MML_write) {
+     (*mtex2MML_write) (mathml, 0);
    }
+ }
 
-#ifdef mtex2MML_CAPTURE
-    static char * mtex2MML_output_string = "" ;
-
-    const char * mtex2MML_output ()
-    {
-        char * copy = (char *) malloc((mtex2MML_output_string ? strlen(mtex2MML_output_string) : 0) + 1);
-        if (copy)
-          {
-           if (mtex2MML_output_string)
-             {
-               strcpy(copy, mtex2MML_output_string);
-               if (*mtex2MML_output_string != '\0')
-                   mtex2MML_free_string(mtex2MML_output_string);
-             }
-           else
-             copy[0] = 0;
-           mtex2MML_output_string = "";
-          }
-        return copy;
-    }
+ #ifdef mtex2MML_CAPTURE
+ static char * mtex2MML_output_string = "" ;
 
- static void mtex2MML_capture (const char * buffer, unsigned long length)
-    {
-     if (buffer)
-       {
-         if (length)
-           {
-              unsigned long first_length = mtex2MML_output_string ? strlen(mtex2MML_output_string) : 0;
-              char * copy  = (char *) malloc(first_length + length + 1);
-              if (copy)
-                {
-                  if (mtex2MML_output_string)
-                    {
-                       strcpy(copy, mtex2MML_output_string);
-                       if (*mtex2MML_output_string != '\0')
-                          mtex2MML_free_string(mtex2MML_output_string);
-                    }
-                  else
-                     copy[0] = 0;
-                  strncat(copy, buffer, length);
-                  mtex2MML_output_string = copy;
-                 }
-            }
-         else
-            {
-              char * copy = mtex2MML_copy2(mtex2MML_output_string, buffer);
-              if (*mtex2MML_output_string != '\0')
-                 mtex2MML_free_string(mtex2MML_output_string);
-              mtex2MML_output_string = copy;
-            }
-        }
-    }
+ char * mtex2MML_output ()
+ {
+   char * copy = (char *) malloc((mtex2MML_output_string ? strlen(mtex2MML_output_string) : 0) + 1);
+   if (copy) {
+     if (mtex2MML_output_string) {
+       strcpy(copy, mtex2MML_output_string);
+       if (*mtex2MML_output_string != '\0') {
+         mtex2MML_free_string(mtex2MML_output_string);
+       }
+     } else {
+       copy[0] = 0;
+     }
+     mtex2MML_output_string = "";
+   }
+   return copy;
+ }
 
-    static void mtex2MML_capture_mathml (const char * buffer)
-    {
-       char * temp = mtex2MML_copy2(mtex2MML_output_string, buffer);
-       if (*mtex2MML_output_string != '\0')
+ static void mtex2MML_capture (const char * buffer, unsigned long length)
+ {
+   if (buffer) {
+     if (length) {
+       unsigned long first_length = mtex2MML_output_string ? strlen(mtex2MML_output_string) : 0;
+       char * copy  = (char *) malloc(first_length + length + 1);
+       if (copy) {
+         if (mtex2MML_output_string) {
+           strcpy(copy, mtex2MML_output_string);
+           if (*mtex2MML_output_string != '\0') {
+             mtex2MML_free_string(mtex2MML_output_string);
+           }
+         } else {
+           copy[0] = 0;
+         }
+         strncat(copy, buffer, length);
+         mtex2MML_output_string = copy;
+       }
+     } else {
+       char * copy = mtex2MML_copy2(mtex2MML_output_string, buffer);
+       if (*mtex2MML_output_string != '\0') {
          mtex2MML_free_string(mtex2MML_output_string);
-       mtex2MML_output_string = temp;
-    }
-    void (*mtex2MML_write) (const char * buffer, unsigned long length) = mtex2MML_capture;
-    void (*mtex2MML_write_mathml) (const char * mathml) = mtex2MML_capture_mathml;
-#else
-    void (*mtex2MML_write) (const char * buffer, unsigned long length) = mtex2MML_default_write;
-    void (*mtex2MML_write_mathml) (const char * mathml) = mtex2MML_default_write_mathml;
-#endif
+       }
+       mtex2MML_output_string = copy;
+     }
+   }
+ }
+
+ static void mtex2MML_capture_mathml (const char * buffer)
+ {
+   char * temp = mtex2MML_copy2(mtex2MML_output_string, buffer);
+   if (*mtex2MML_output_string != '\0') {
+     mtex2MML_free_string(mtex2MML_output_string);
+   }
+   mtex2MML_output_string = temp;
+ }
+ void (*mtex2MML_write) (const char * buffer, unsigned long length) = mtex2MML_capture;
+ void (*mtex2MML_write_mathml) (const char * mathml) = mtex2MML_capture_mathml;
+ #else
+ void (*mtex2MML_write) (const char * buffer, unsigned long length) = mtex2MML_default_write;
+ void (*mtex2MML_write_mathml) (const char * mathml) = mtex2MML_default_write_mathml;
+ #endif
 
  char * mtex2MML_empty_string = (char *) "";
 
  /* Create a copy of a string, adding space for extra chars
   */
  char * mtex2MML_copy_string_extra (const char * str, unsigned extra)
-   {
-     char * copy = (char *) malloc(extra + (str ? strlen (str) : 0) + 1);
-     if (copy)
-       {
-   if (str)
-     strcpy(copy, str);
-   else
-     copy[0] = 0;
-       }
-     return copy ? copy : mtex2MML_empty_string;
+ {
+   char * copy = (char *) malloc(extra + (str ? strlen (str) : 0) + 1);
+   if (copy) {
+     if (str) {
+       strcpy(copy, str);
+     } else {
+       copy[0] = 0;
+     }
    }
+   return copy ? copy : mtex2MML_empty_string;
+ }
 
  /* Create a copy of a string, appending two strings
   */
  char * mtex2MML_copy3 (const char * first, const char * second, const char * third)
-   {
-     int  first_length =  first ? strlen( first) : 0;
-     int second_length = second ? strlen(second) : 0;
-     int  third_length =  third ? strlen( third) : 0;
-
-     char * copy = (char *) malloc(first_length + second_length + third_length + 1);
-
-     if (copy)
-       {
-   if (first)
-     strcpy(copy, first);
-   else
-     copy[0] = 0;
-
-   if (second) strcat(copy, second);
-   if ( third) strcat(copy,  third);
-       }
-     return copy ? copy : mtex2MML_empty_string;
+ {
+   int  first_length =  first ? strlen( first) : 0;
+   int second_length = second ? strlen(second) : 0;
+   int  third_length =  third ? strlen( third) : 0;
+
+   char * copy = (char *) malloc(first_length + second_length + third_length + 1);
+
+   if (copy) {
+     if (first) {
+       strcpy(copy, first);
+     } else {
+       copy[0] = 0;
+     }
+
+     if (second) { strcat(copy, second); }
+     if ( third) { strcat(copy,  third); }
    }
+   return copy ? copy : mtex2MML_empty_string;
+ }
 
  /* Create a copy of a string, appending a second string
   */
  char * mtex2MML_copy2 (const char * first, const char * second)
-   {
-     return mtex2MML_copy3(first, second, 0);
-   }
+ {
+   return mtex2MML_copy3(first, second, 0);
+ }
 
  /* Create a copy of a string
   */
  char * mtex2MML_copy_string (const char * str)
-   {
-     return mtex2MML_copy3(str, 0, 0);
-   }
+ {
+   return mtex2MML_copy3(str, 0, 0);
+ }
 
  /* Create a copy of a string, escaping unsafe characters for XML
   */
  char * mtex2MML_copy_escaped (const char * str)
-   {
-     unsigned long length = 0;
+ {
+   unsigned long length = 0;
 
-     const char * ptr1 = str;
+   const char * ptr1 = str;
 
-     char * ptr2 = 0;
-     char * copy = 0;
+   char * ptr2 = 0;
+   char * copy = 0;
 
-     if ( str == 0) return mtex2MML_empty_string;
-     if (*str == 0) return mtex2MML_empty_string;
+   if ( str == 0) { return mtex2MML_empty_string; }
+   if (*str == 0) { return mtex2MML_empty_string; }
 
-     while (*ptr1)
-       {
-   switch (*ptr1)
-     {
+   while (*ptr1) {
+     switch (*ptr1) {
      case '<':  /* &lt;   */
      case '>':  /* &gt;   */
        length += 4;
@@ -227,57 +230,55 @@ struct css_colors *colors = NULL;
        length += 1;
        break;
      }
-   ++ptr1;
-       }
-
-     copy = (char *) malloc (length + 1);
-
-     if (copy)
-       {
-   ptr1 = str;
-   ptr2 = copy;
+     ++ptr1;
+   }
 
-   while (*ptr1)
-     {
-       switch (*ptr1)
-         {
-         case '<':
-     strcpy (ptr2, "&lt;");
-     ptr2 += 4;
-     break;
-         case '>':
-     strcpy (ptr2, "&gt;");
-     ptr2 += 4;
-     break;
-         case '&':  /* &amp;  */
-     strcpy (ptr2, "&amp;");
-     ptr2 += 5;
-     break;
-         case '\'': /* &apos; */
-     strcpy (ptr2, "&apos;");
-     ptr2 += 6;
-     break;
-         case '"':  /* &quot; */
-     strcpy (ptr2, "&quot;");
-     ptr2 += 6;
-     break;
-         case '-':  /* &#x2d; */
-     strcpy (ptr2, "&#x2d;");
-     ptr2 += 6;
-     break;
-         default:
-     *ptr2++ = *ptr1;
-     break;
-         }
+   copy = (char *) malloc (length + 1);
+
+   if (copy) {
+     ptr1 = str;
+     ptr2 = copy;
+
+     while (*ptr1) {
+       switch (*ptr1) {
+       case '<':
+         strcpy (ptr2, "&lt;");
+         ptr2 += 4;
+         break;
+       case '>':
+         strcpy (ptr2, "&gt;");
+         ptr2 += 4;
+         break;
+       case '&':  /* &amp;  */
+         strcpy (ptr2, "&amp;");
+         ptr2 += 5;
+         break;
+       case '\'': /* &apos; */
+         strcpy (ptr2, "&apos;");
+         ptr2 += 6;
+         break;
+       case '"':  /* &quot; */
+         strcpy (ptr2, "&quot;");
+         ptr2 += 6;
+         break;
+       case '-':  /* &#x2d; */
+         strcpy (ptr2, "&#x2d;");
+         ptr2 += 6;
+         break;
+       default:
+         *ptr2++ = *ptr1;
+         break;
+       }
        ++ptr1;
      }
-   *ptr2 = 0;
-       }
-     return copy ? copy : mtex2MML_empty_string;
+     *ptr2 = 0;
    }
+   return copy ? copy : mtex2MML_empty_string;
+ }
 
  /* Returns a string representation of the global_label, and increments the label */
- char * mtex2MML_global_label() {
+ char * mtex2MML_global_label()
+ {
    char * n = (char *) malloc(256);
    snprintf(n, 256, "%d", global_label);
    global_label++;
@@ -290,18 +291,20 @@ struct css_colors *colors = NULL;
  /* Create a hex character reference string corresponding to code
   */
  char * mtex2MML_character_reference (unsigned long int code)
-   {
-#define ENTITY_LENGTH 10
-     char * entity = (char *) malloc(ENTITY_LENGTH);
-     sprintf(entity, "&#x%05lx;", code);
-     return entity;
-   }
+ {
+ #define ENTITY_LENGTH 10
+   char * entity = (char *) malloc(ENTITY_LENGTH);
+   sprintf(entity, "&#x%05lx;", code);
+   return entity;
+ }
 
  void mtex2MML_free_string (char * str)
-   {
-     if (str && str != mtex2MML_empty_string)
-       free(str);
+ {
+   if (str && str != mtex2MML_empty_string) {
+     free(str);
    }
+ }
+
 
 %}
 
@@ -460,7 +463,7 @@ compoundTerm: mob SUB closedTerm SUP closedTerm {
   mtex2MML_free_string($3);
 }
 | mob SUP closedTerm LIMITS SUB closedTerm {
-  char * mo = str_replace($1, "<mo>", "<mo movablelimits=\"false\">");
+  char * mo = mtex2MML_str_replace($1, "<mo>", "<mo movablelimits=\"false\">");
   char * s1 = mtex2MML_copy2("<munderover>", mo);
   char * s2 = mtex2MML_copy3($6, " ", $3);
   $$ = mtex2MML_copy3(s1, s2, "</munderover>");
@@ -473,7 +476,7 @@ compoundTerm: mob SUB closedTerm SUP closedTerm {
   mtex2MML_free_string($6);
 }
 | mob SUP closedTerm NOLIMITS SUB closedTerm {
-  char * mo = str_replace($1, "<mo>", "<mo movablelimits=\"false\">");
+  char * mo = mtex2MML_str_replace($1, "<mo>", "<mo movablelimits=\"false\">");
   char * s1 = mtex2MML_copy2("<msubsup>", mo);
   char * s2 = mtex2MML_copy3($6, " ", $3);
   $$ = mtex2MML_copy3(s1, s2, "</msubsup>");
@@ -1185,9 +1188,9 @@ color: COLOR ATTRLIST compoundTermList {
   mtex2MML_free_string($3);
 }
 | BBOX ST PXSTRING END closedTerm {
-  float padding = extract_number_from_pxstring($3);
-  char *px = extract_string_from_pxstring($3);
-  char *dbl_px = double_pixel(padding, px);
+  float padding = mtex2MML_extract_number_from_pxstring($3);
+  char *px = mtex2MML_extract_string_from_pxstring($3);
+  char *dbl_px = mtex2MML_double_pixel(padding, px);
 
   char *s1 = mtex2MML_copy3("<mpadded width=\"+", dbl_px, "\" height=\"+");
   char *s2 = mtex2MML_copy3(s1, $3, "\" depth=\"+");
@@ -1215,9 +1218,9 @@ color: COLOR ATTRLIST compoundTermList {
 | BBOX ST COLORSTRING PXSTRING END closedTerm {
   char *s1 = mtex2MML_copy3("<mstyle mathbackground=\"", $3, "\">");
 
-  float padding = extract_number_from_pxstring($4);
-  char *px = extract_string_from_pxstring($4);
-  char *dbl_px = double_pixel(padding, px);
+  float padding = mtex2MML_extract_number_from_pxstring($4);
+  char *px = mtex2MML_extract_string_from_pxstring($4);
+  char *dbl_px = mtex2MML_double_pixel(padding, px);
 
   char *s2 = mtex2MML_copy3(s1, "<mpadded width=\"+", dbl_px);
   char *s3 = mtex2MML_copy3(s2, "\" height=\"+", $4);
@@ -1242,9 +1245,9 @@ color: COLOR ATTRLIST compoundTermList {
   char *s1 = mtex2MML_copy3("<mstyle mathbackground=\"", $3, "\" style=\"");
   char *s2 = mtex2MML_copy3(s1, $4, "\">");
 
-  float padding = extract_number_from_pxstring($5);
-  char *px = extract_string_from_pxstring($5);
-  char *dbl_px = double_pixel(padding, px);
+  float padding = mtex2MML_extract_number_from_pxstring($5);
+  char *px = mtex2MML_extract_string_from_pxstring($5);
+  char *dbl_px = mtex2MML_double_pixel(padding, px);
 
   char *s3 = mtex2MML_copy3(s2, "<mpadded width=\"+", dbl_px);
   char *s4 = mtex2MML_copy3(s3, "\" height=\"+", $5);
@@ -1534,7 +1537,7 @@ mathpunct: MATHPUNCT closedTerm {
 };
 
 enclose: ENCLOSE ST ENCLOSENOTATION ST ENCLOSETEXT ST {
-  char * notation = str_replace($3, ",", " ");
+  char * notation = mtex2MML_str_replace($3, ",", " ");
   char * s1 = mtex2MML_copy3("<menclose notation=\"", notation, "\"><mi>");
   $$ = mtex2MML_copy3(s1, $5, "</mi></menclose>");
   mtex2MML_free_string(notation);
@@ -1543,11 +1546,11 @@ enclose: ENCLOSE ST ENCLOSENOTATION ST ENCLOSETEXT ST {
   mtex2MML_free_string($5);
 }
 | ENCLOSE ST ENCLOSENOTATION ST ENCLOSEATTR ST ENCLOSETEXT ST {
-  char * notation = str_replace($3, ",", " ");
-  char * attr = str_replace($5, ",", " ");
+  char * notation = mtex2MML_str_replace($3, ",", " ");
+  char * attr = mtex2MML_str_replace($5, ",", " ");
   if (strstr(attr, "arrow=1") != NULL) {
     mtex2MML_free_string(attr);
-    attr = str_replace($5, "arrow=1", "");
+    attr = mtex2MML_str_replace($5, "arrow=1", "");
 
     char *t = mtex2MML_copy_string(notation);
     mtex2MML_free_string(notation);
@@ -1593,7 +1596,7 @@ mbox: MBOX closedTerm {
 
 bold: BOLD closedTerm {
   /* TODO: stupid hack to get bold mover working */
-  char * b = str_replace($2, "<mi>", "<mi mathvariant=\"bold\">");
+  char * b = mtex2MML_str_replace($2, "<mi>", "<mi mathvariant=\"bold\">");
 
   $$ = mtex2MML_copy3("<mstyle mathvariant=\"bold\">", b, "</mstyle>");
   mtex2MML_free_string(b);
@@ -2323,117 +2326,117 @@ hat: HAT closedTerm {
 };
 
 skew: SKEW closedTerm ACUTE closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&acute;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&acute;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm BAR closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&#x000AF;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&#x000AF;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm BREVE closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&#x2d8;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&#x2d8;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm CHECK closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&#x2c7;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&#x2c7;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm DOT closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&dot;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&dot;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm DDOT closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&Dot;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&Dot;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm DDDOT closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&tdot;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&tdot;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm DDDDOT closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&DotDot;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&DotDot;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm GRAVE closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&#x60;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&#x60;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm HAT closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&#x5E;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&#x5E;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm TILDE closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&tilde;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&tilde;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm WIDEHAT closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&#x5E;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&#x5E;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
   mtex2MML_free_string($4);
 }
 | SKEW closedTerm WIDETILDE closedTerm {
-  char * em_skew = dbl2em($2);
+  char * em_skew = mtex2MML_dbl2em($2);
 
-  $$ = implement_skew($4, em_skew, "&#x5E;");
+  $$ = mtex2MML_implement_skew($4, em_skew, "&#x5E;");
 
   mtex2MML_free_string(em_skew);
   mtex2MML_free_string($2);
@@ -2461,7 +2464,7 @@ mroot: SQRT OPTARGOPEN compoundTermList OPTARGCLOSE closedTerm {
 };
 
 leftroot: LEFTROOT ST NUMBER END closedTerm {
-  char * spacing = root_pos_to_em($3);
+  char * spacing = mtex2MML_root_pos_to_em($3);
 
   char *s1 = mtex2MML_copy3("<mpadded width=\"", spacing, "\"><mrow>");
   $$ = mtex2MML_copy3(s1, $5, "</mrow></mpadded>");
@@ -2473,7 +2476,7 @@ leftroot: LEFTROOT ST NUMBER END closedTerm {
 };
 
 uproot: UPROOT ST NUMBER END closedTerm {
-  char * spacing = root_pos_to_em($3);
+  char * spacing = mtex2MML_root_pos_to_em($3);
 
   char *s1 = mtex2MML_copy3("<mpadded height=\"", spacing, "\" voffset=\"");
   char *s2 = mtex2MML_copy3(s1, spacing, "\"><mrow>");
@@ -2617,7 +2620,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string($3);
 }
 | BEGINENV MATRIX tableRowList ENDENV MATRIX {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"false\" ", row_data, ">");
   if (encase == TOPENCLOSE) {
@@ -2633,7 +2636,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV GATHERED ARRAYALIGN END tableRowList ENDENV GATHERED {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" align=\"", $3, "\" ");
   char * s2 = mtex2MML_copy3(s1, row_data, ">");
@@ -2652,7 +2655,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV GATHERED tableRowList ENDENV GATHERED {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" ", row_data, ">");
   if (encase == TOPENCLOSE) {
@@ -2668,7 +2671,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV EQNARRAY tableRowList ENDENV EQNARRAY {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnalign=\"right center left\" columnspacing=\"thickmathspace\" ", row_data, ">");
 
@@ -2685,7 +2688,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV EQNARRAY_STAR tableRowList ENDENV EQNARRAY_STAR {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnalign=\"right center left\" columnspacing=\"thickmathspace\" ", row_data, ">");
   if (encase == TOPENCLOSE) {
@@ -2701,7 +2704,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV GATHER tableRowList ENDENV GATHER {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" ", row_data, ">");
 
@@ -2718,7 +2721,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV GATHER_STAR tableRowList ENDENV GATHER_STAR {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" ", row_data, ">");
   if (encase == TOPENCLOSE) {
@@ -2734,7 +2737,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV MULTLINE tableRowList ENDENV MULTLINE {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" ", row_data, ">");
 
@@ -2751,7 +2754,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV MULTLINE_STAR tableRowList ENDENV MULTLINE_STAR {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnwidth=\"100%\" width=\"85%\" ", row_data, ">");
   if (encase == TOPENCLOSE) {
@@ -2767,7 +2770,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV PMATRIX tableRowList ENDENV PMATRIX {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mo>(</mo><mrow><mtable displaystyle=\"false\" ", row_data, ">");
 
@@ -2784,7 +2787,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV BMATRIX tableRowList ENDENV BMATRIX {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mo>[</mo><mrow><mtable displaystyle=\"false\" ", row_data, ">");
 
@@ -2801,7 +2804,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV VMATRIX tableRowList ENDENV VMATRIX {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mo>&VerticalBar;</mo><mrow><mtable displaystyle=\"false\" ", row_data, ">");
 
@@ -2818,7 +2821,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV BBMATRIX tableRowList ENDENV BBMATRIX {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mo>{</mo><mrow><mtable displaystyle=\"false\" ", row_data, ">");
 
@@ -2835,7 +2838,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV VVMATRIX tableRowList ENDENV VVMATRIX {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mo>&DoubleVerticalBar;</mo><mrow><mtable displaystyle=\"false\" ", row_data, ">");
 
@@ -2852,7 +2855,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV SMALLMATRIX tableRowList ENDENV SMALLMATRIX {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"false\" columnspacing=\"0.333em\" ", row_data, ">");
   if (encase == TOPENCLOSE) {
@@ -2868,7 +2871,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV CASES tableRowList ENDENV CASES {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mo>{</mo><mrow><mtable displaystyle=\"false\" columnalign=\"left left\" ", row_data, ">");
 
@@ -2885,7 +2888,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ALIGNED ARRAYALIGN END tableRowList ENDENV ALIGNED {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" align=\"", $3, "\" columnspacing=\"0em 2em 0em 2em 0em 2em 0em 2em 0em 2em 0em\" columnalign=\"right left right left right left right left right left\" ");
   char * s2 = mtex2MML_copy3(s1, row_data, ">");
@@ -2905,7 +2908,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ALIGNED tableRowList ENDENV ALIGNED {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnspacing=\"0em 2em 0em 2em 0em 2em 0em 2em 0em 2em 0em\" columnalign=\"right left right left right left right left right left\" ", row_data, ">");
 
@@ -2922,7 +2925,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ALIGNENV tableRowList ENDENV ALIGNENV {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnspacing=\"0em 2em 0em 2em 0em 2em 0em 2em 0em 2em 0em\" columnalign=\"right left right left right left right left right left\" ", row_data, ">");
 
@@ -2939,7 +2942,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ALIGNENV_STAR tableRowList ENDENV ALIGNENV_STAR {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnspacing=\"0em 2em 0em 2em 0em 2em 0em 2em 0em 2em 0em\" columnalign=\"right left right left right left right left right left\" ", row_data, ">");
 
@@ -2956,7 +2959,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ALIGNAT ALIGNATVALUE END tableRowList ENDENV ALIGNAT {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnalign=\"right left right left right left right left right left\" columnspacing=\"0em\" ", row_data, ">");
 
@@ -2974,7 +2977,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ALIGNAT_STAR ALIGNATVALUE END tableRowList ENDENV ALIGNAT_STAR {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnalign=\"right left right left right left right left right left\" columnspacing=\"0em\" ", row_data, ">");
 
@@ -2992,7 +2995,7 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ALIGNEDAT ALIGNATVALUE END tableRowList ENDENV ALIGNEDAT {
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnalign=\"right left right left right left right left right left\" columnspacing=\"0em\" ", row_data, ">");
 
@@ -3010,9 +3013,9 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ARRAY ARRAYALIGN ST columnAlignList END tableRowList ENDENV ARRAY {
-  const char *pipe_chars = vertical_pipe_extract($5);
-  const char *column_align = remove_excess_pipe_chars($5);
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *pipe_chars = mtex2MML_vertical_pipe_extract($5);
+  char *column_align = mtex2MML_remove_excess_pipe_chars($5);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mtable displaystyle=\"false\" align=\"", $3, "\" ");
   char * s2 = mtex2MML_copy3(s1, row_data, " columnalign=\"");
@@ -3039,9 +3042,9 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV ARRAY ST columnAlignList END tableRowList ENDENV ARRAY {
-  char *pipe_chars = vertical_pipe_extract($4);
-  char *column_align = remove_excess_pipe_chars($4);
-  char *row_data = combine_row_data(&environment_data_stack);
+  char *pipe_chars = mtex2MML_vertical_pipe_extract($4);
+  char *column_align = mtex2MML_remove_excess_pipe_chars($4);
+  char *row_data = mtex2MML_combine_row_data(&environment_data_stack);
 
   char * s1 = mtex2MML_copy3("<mtable displaystyle=\"false\" ", row_data, " columnalign=\"");
   char * s2 = mtex2MML_copy3(s1, column_align, "\" ");
@@ -3065,8 +3068,8 @@ mathenv: BEGINENV EQUATION tableRowList ENDENV EQUATION {
   mtex2MML_free_string(row_data);
 }
 | BEGINENV SUBARRAY ST columnAlignList END tableRowList ENDENV SUBARRAY {
-  char *pipe_chars = vertical_pipe_extract($4);
-  char *column_align = remove_excess_pipe_chars($4);
+  char *pipe_chars = mtex2MML_vertical_pipe_extract($4);
+  char *column_align = mtex2MML_remove_excess_pipe_chars($4);
 
   char * s1 = mtex2MML_copy3("<mtable displaystyle=\"false\" columnspacing=\"0em 0em 0em 0em\" rowspacing=\"0.1em\" columnalign=\"", column_align, "\" ");
   char * s2 = mtex2MML_copy3(s1, pipe_chars, "\">");
@@ -3270,7 +3273,7 @@ tableRowList: tableRow {
 };
 
 tableRow: simpleTableRow {
-  int has_eqn_number = fetch_eqn_number(&environment_data_stack);
+  int has_eqn_number = mtex2MML_fetch_eqn_number(&environment_data_stack);
 
   if (has_eqn_number && strcmp($1, "<mtd/>") != 0) {
     char * n = mtex2MML_global_label();
@@ -3333,11 +3336,11 @@ tableCell:   {
   $$ = mtex2MML_copy_string("<mtd/>");
 }
 | compoundTermList {
-  if (current_env_type(&environment_data_stack) != ENV_MULTLINE && current_env_type(&environment_data_stack) != ENV_MULTLINESTAR) {
+  if (mtex2MML_current_env_type(&environment_data_stack) != ENV_MULTLINE && mtex2MML_current_env_type(&environment_data_stack) != ENV_MULTLINESTAR) {
     $$ = mtex2MML_copy3("<mtd>", $1, "</mtd>");
   }
   else {
-    int total_lines = current_env_line_count(&environment_data_stack);
+    int total_lines = mtex2MML_current_env_line_count(&environment_data_stack);
     if (line_counter == 1) {
       $$ = mtex2MML_copy3("<mtd columnalign=\"left\">", $1, "</mtd>");
       line_counter++;
@@ -3400,7 +3403,7 @@ colspan: COLSPAN ATTRLIST {
 
 %%
 
-// see http://git.io/vk8Sz
+/* see http://git.io/vk8Sz */
 void envdata_copy(void *_dst, const void *_src)
 {
   envdata_t *dst = (envdata_t*)_dst, *src = (envdata_t*)_src;
@@ -3422,16 +3425,22 @@ void envdata_dtor(void *_elt)
 
 UT_icd envdata_icd = {sizeof(envdata_t), NULL, envdata_copy, envdata_dtor};
 
-const char *format_additions(const char *buffer)
+void format_additions(const char *buffer, const int options)
 {
   utarray_new(environment_data_stack, &envdata_icd);
 
   if (colors == NULL)
-    create_css_colors(&colors);
+    mtex2MML_create_css_colors(&colors);
+
+  if (options)
+    delimiter_options = options;
+  else
+    delimiter_options = MTEX2MML_DELIMITER_DEFAULT;
 
-  encase = NONE;
+  encaseType *encase_pointer = (encaseType *)NONE;
   line_counter = 1;
-  env_replacements(&environment_data_stack, &encase, buffer);
+  mtex2MML_env_replacements(&environment_data_stack, &encase_pointer, buffer);
+  encase = (encaseType) encase_pointer;
 }
 
 void free_additions()
@@ -3446,19 +3455,20 @@ void free_additions()
   }
 }
 
-char * mtex2MML_global_parse (const char * buffer, unsigned long length, int global_start)
+char * mtex2MML_global_parse (const char * buffer, unsigned long length, const int options, const int global_start)
 {
   global_label = global_start;
-  return mtex2MML_parse(buffer, length);
+  return mtex2MML_parse(buffer, length, options);
 }
 
-char * mtex2MML_parse (const char * buffer, unsigned long length)
+char * mtex2MML_parse (const char * buffer, unsigned long length, const int options)
 {
   char * mathml = 0;
 
   int result;
 
-  format_additions(buffer);
+  format_additions(buffer, options);
+
   mtex2MML_setup (buffer, length);
   mtex2MML_restart ();
 
@@ -3479,49 +3489,48 @@ char * mtex2MML_parse (const char * buffer, unsigned long length)
   return mathml;
 }
 
-int mtex2MML_filter (const char * buffer, unsigned long length)
+int mtex2MML_filter (const char * buffer, unsigned long length, const int options)
 {
-  global_label = 1;
-  format_additions(buffer);
-  mtex2MML_setup (buffer, length);
-  mtex2MML_restart ();
-
-  int result = mtex2MML_yyparse (0);
-  free_additions();
+  return mtex2MML_do_filter (buffer, length, 0, 0, options);
+}
 
-  return result;
+int mtex2MML_text_filter (const char * buffer, unsigned long length, const int options)
+{
+  return mtex2MML_do_filter (buffer, length, 0, 1, options);
 }
 
-#define MTEX_DELIMITER_DOLLAR 0
-#define MTEX_DELIMITER_DOUBLE 1
-#define MTEX_DELIMITER_SQUARE 2
+int mtex2MML_strict_filter (const char * buffer, unsigned long length, const int options)
+{
+  return mtex2MML_do_filter (buffer, length, 1, 1, options);
+}
 
 static char * mtex2MML_last_error = 0;
 
 static void mtex2MML_keep_error (const char * msg)
 {
-  if (mtex2MML_last_error)
-    {
-      mtex2MML_free_string (mtex2MML_last_error);
-      mtex2MML_last_error = 0;
-    }
+  if (mtex2MML_last_error) {
+    mtex2MML_free_string (mtex2MML_last_error);
+    mtex2MML_last_error = 0;
+  }
   mtex2MML_last_error = mtex2MML_copy_escaped (msg);
 }
 
-int mtex2MML_html_filter (const char * buffer, unsigned long length)
+int mtex2MML_delimiter_type(const int type)
 {
-  mtex2MML_do_html_filter (buffer, length, 0);
+  if (delimiter_options == MTEX2MML_DELIMITER_DEFAULT) {
+    return type & (MTEX2MML_DELIMITER_DOLLAR | MTEX2MML_DELIMITER_DOUBLE);
+  } else {
+    return delimiter_options & type;
+  }
 }
 
-int mtex2MML_strict_html_filter (const char * buffer, unsigned long length)
+int mtex2MML_do_filter (const char * buffer, unsigned long length, const int forbid_markup, const int write, const int options)
 {
-  mtex2MML_do_html_filter (buffer, length, 1);
-}
+  global_label = 1;
 
-int mtex2MML_do_html_filter (const char * buffer, unsigned long length, const int forbid_markup)
-{
-  int result = 0;
+  format_additions(buffer, options);
 
+  int result = 0;
   int type = 0;
   int skip = 0;
   int match = 0;
@@ -3537,189 +3546,185 @@ int mtex2MML_do_html_filter (const char * buffer, unsigned long length, const in
 
   mtex2MML_error = mtex2MML_keep_error;
 
- _until_math:
+_until_math:
   ptr2 = ptr1;
 
-  while (ptr2 < end)
-    {
-      if (*ptr2 == '$') break;
-      if ((*ptr2 == '\\') && (ptr2 + 1 < end))
-  {
-    if (*(ptr2+1) == '[') break;
-  }
-      ++ptr2;
+  /* Search for the first math part */
+  while (ptr2 < end) {
+    if (*ptr2 == '$' && (mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOLLAR) || mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOUBLE))) { break; }
+    if ((*ptr2 == '\\') && (ptr2 + 1 < end)) {
+      if (*(ptr2+1) == '[' && mtex2MML_delimiter_type(MTEX2MML_DELIMITER_BRACKETS)) { break; }
+      if (*(ptr2+1) == '(' && mtex2MML_delimiter_type(MTEX2MML_DELIMITER_PARENS)) { break; }
+      if (*(ptr2+1) == '$' && mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOLLAR)) { ptr2++; }
     }
-  if (mtex2MML_write && ptr2 > ptr1)
+    ++ptr2;
+  }
+  if (mtex2MML_write && ptr2 > ptr1 && write) {
     (*mtex2MML_write) (ptr1, ptr2 - ptr1);
+  }
 
-  if (ptr2 == end) goto _finish;
+  if (ptr2 == end) { goto _finish; }
 
- _until_html:
+  /*_until_html:*/
   ptr1 = ptr2;
 
-  if (ptr2 + 1 < end)
-    {
-      if ((*ptr2 == '\\') && (*(ptr2+1) == '['))
-  {
-    type = MTEX_DELIMITER_SQUARE;
-    ptr2 += 2;
-  }
-      else if ((*ptr2 == '$') && (*(ptr2+1) == '$'))
-  {
-    type = MTEX_DELIMITER_DOUBLE;
-    ptr2 += 2;
-  }
-      else
-  {
-    type = MTEX_DELIMITER_DOLLAR;
-    ptr2 += 2;
-  }
+  if (ptr2 + 1 < end) {
+    if ((*ptr2 == '\\') && (*(ptr2+1) == '[' && *(ptr2 - 1) != '\\') && mtex2MML_delimiter_type(MTEX2MML_DELIMITER_BRACKETS)) {
+      type = MTEX2MML_DELIMITER_BRACKETS;
+      ptr2 += 2;
+    } else if ((*ptr2 == '$') && (*(ptr2+1) == '$') && mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOUBLE)) {
+      type = MTEX2MML_DELIMITER_DOUBLE;
+      ptr2 += 2;
+    } else if ((*ptr2 == '\\') && (*(ptr2+1) == '(' && *(ptr2 - 1) != '\\') && mtex2MML_delimiter_type(MTEX2MML_DELIMITER_PARENS)) {
+      type = MTEX2MML_DELIMITER_PARENS;
+      ptr2 += 2;
+    } else if ((*ptr2 == '$') && !isspace(*(ptr2+1)) && mtex2MML_delimiter_type(MTEX2MML_DELIMITER_DOLLAR)) {
+      type = MTEX2MML_DELIMITER_DOLLAR;
+      ptr2++;
     }
-  else goto _finish;
+  } else { goto _finish; }
 
   skip = 0;
   match = 0;
 
-  while (ptr2 < end)
-    {
-      switch (*ptr2)
-  {
-  case '<':
-  case '>':
-    if (forbid_markup == 1) skip = 1;
-    break;
+  while (ptr2 < end) {
+    switch (*ptr2) {
+    case '<':
+    case '>':
+      if (forbid_markup == 1) { skip = 1; }
+      break;
 
-  case '\\':
-    if (ptr2 + 1 < end)
-      {
-        if (*(ptr2 + 1) == '[')
-    {
-      skip = 1;
-    }
-        else if (*(ptr2 + 1) == ']')
-    {
-      if (type == MTEX_DELIMITER_SQUARE)
-        {
-          ptr2 += 2;
-          match = 1;
-        }
-      else
-        {
+    case '\\':
+      if (ptr2 + 1 < end) {
+        if (*(ptr2 + 1) == '[' && type == MTEX2MML_DELIMITER_BRACKETS) {
           skip = 1;
+        } else if (*(ptr2 + 1) == ']') {
+          if (type == MTEX2MML_DELIMITER_BRACKETS) {
+            ptr2 += 2;
+            match = 1;
+          } else {
+            skip = 1;
+          }
+        } else if (*(ptr2 + 1) == '(' && type == MTEX2MML_DELIMITER_PARENS) {
+          skip = 1;
+        } else if (*(ptr2 + 1) == ')') {
+          if (type == MTEX2MML_DELIMITER_PARENS) {
+            ptr2 += 2;
+            match = 1;
+          } else {
+            skip = 1;
+          }
+        } else {
+          ptr2++;
         }
-    }
       }
-    break;
+      break;
 
-  case '$':
-    if (type == MTEX_DELIMITER_SQUARE)
-      {
+    case '\n':
+      /* we hit a newline in an unclosed inline equation -- skip this string */
+      if (type == MTEX2MML_DELIMITER_DOLLAR || type == MTEX2MML_DELIMITER_PARENS) {
         skip = 1;
       }
-    else if (ptr2 + 1 < end)
-      {
-        if (*(ptr2 + 1) == '$')
-    {
-      if (type == MTEX_DELIMITER_DOLLAR)
-        {
-          ptr2++;
-          match = 1;
-        }
-      else
-        {
-          ptr2 += 2;
-          match = 1;
+      break;
+
+    case '$':
+      if (type == MTEX2MML_DELIMITER_BRACKETS || type == MTEX2MML_DELIMITER_PARENS) {
+        // no op
+      } else if (ptr2 + 1 < end) {
+        if (*(ptr2 + 1) == '$') {
+          if (type == MTEX2MML_DELIMITER_DOLLAR) {
+            ptr2++;
+            match = 1;
+          } else {
+            ptr2 += 2;
+            match = 1;
+          }
+        } else {
+          if (type == MTEX2MML_DELIMITER_DOLLAR) {
+            if (isspace(*(ptr2 - 1))) {
+              skip = 1;
+            } else if (isdigit(*(ptr2 + 1))) {
+              if (write) {
+                (*mtex2MML_write) (ptr1, ptr2 - ptr1 + 2);
+              }
+              skip = 1;
+              ptr2 += 2;
+              ptr1 = ptr2;
+            } else {
+              ptr2++;
+              match = 1;
+            }
+          } else {
+            if (*(ptr2 - 1) != '\\') {
+              skip = 1;
+            }
+          }
         }
-    }
-        else
-    {
-      if (type == MTEX_DELIMITER_DOLLAR)
-        {
+      } else {
+        if (type == MTEX2MML_DELIMITER_DOLLAR) {
           ptr2++;
           match = 1;
-        }
-      else
-        {
+        } else {
           skip = 1;
         }
-    }
-      }
-    else
-      {
-        if (type == MTEX_DELIMITER_DOLLAR)
-    {
-      ptr2++;
-      match = 1;
-    }
-        else
-    {
-      skip = 1;
-    }
       }
-    break;
-
-  default:
-    break;
-  }
-      if (skip || match) break;
+      break;
 
-      ++ptr2;
-    }
-  if (skip)
-    {
-      if (type == MTEX_DELIMITER_DOLLAR)
-  {
-    if (mtex2MML_write)
-      (*mtex2MML_write) (ptr1, 1);
-    ptr1++;
-  }
-      else
-  {
-    if (mtex2MML_write)
-      (*mtex2MML_write) (ptr1, 2);
-    ptr1 += 2;
-  }
-      goto _until_math;
+    default:
+      break;
     }
-  if (match)
-    {
-      mathml = mtex2MML_parse (ptr1, ptr2 - ptr1);
+    if (skip || match) { break; }
 
-      if (mathml)
-  {
-    if (mtex2MML_write_mathml)
-      (*mtex2MML_write_mathml) (mathml);
-    mtex2MML_free_string (mathml);
-    mathml = 0;
+    ++ptr2;
   }
-      else
-  {
-    ++result;
-    if (mtex2MML_write)
-      {
-        if (type == MTEX_DELIMITER_DOLLAR)
-    (*mtex2MML_write) ("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><merror><mtext>", 0);
-        else
-    (*mtex2MML_write) ("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><merror><mtext>", 0);
-
-        (*mtex2MML_write) (mtex2MML_last_error, 0);
-        (*mtex2MML_write) ("</mtext></merror></math>", 0);
+  if (skip) {
+    if (type == MTEX2MML_DELIMITER_DOLLAR) {
+      if (mtex2MML_write && write) {
+        (*mtex2MML_write) (ptr1, 1);
       }
+      ptr1++;
+    } else {
+      if (mtex2MML_write && write) {
+        (*mtex2MML_write) (ptr1, 2);
+      }
+      ptr1 += 2;
+    }
+    goto _until_math;
   }
-      ptr1 = ptr2;
+  if (match) {
+    mtex2MML_setup (ptr1, ptr2 - ptr1);
+    mtex2MML_restart ();
 
-      goto _until_math;
+    mtex2MML_yyparse (&mathml);
+
+    if (mathml) {
+      if (mtex2MML_write_mathml) {
+        (*mtex2MML_write_mathml) (mathml);
+      }
+      mtex2MML_free_string (mathml);
+      mathml = 0;
+    } else {
+      ++result;
+      if (mtex2MML_write && write) {
+        /* A problematic error? Just leave the text alone. */
+        (*mtex2MML_write) (ptr1, ptr2 - ptr1);
+      }
     }
-  if (mtex2MML_write)
+    ptr1 = ptr2;
+
+    goto _until_math;
+  }
+  if (mtex2MML_write) {
     (*mtex2MML_write) (ptr1, ptr2 - ptr1);
+  }
 
- _finish:
-  if (mtex2MML_last_error)
-    {
-      mtex2MML_free_string (mtex2MML_last_error);
-      mtex2MML_last_error = 0;
-    }
+_finish:
+  if (mtex2MML_last_error) {
+    mtex2MML_free_string (mtex2MML_last_error);
+    mtex2MML_last_error = 0;
+  }
   mtex2MML_error = save_error_fn;
 
+  free_additions();
   return result;
 }