mathematical 1.6.14 → 1.6.18

data/ext/mathematical/lasem/itex2mml/itex2MML.y

@@ -1,5 +1,5 @@
-/*             itex2MML 1.4.5
- *   itex2MML.y last modified 10/2/2010
+/*             itex2MML 1.6.0
+ *   itex2MML.y last modified 03/23/2019
  */
 
 %parse-param {char **ret_str}
@@ -17,7 +17,8 @@
 
 #define yytext itex2MML_yytext
 
- extern int yylex (void);
+ extern int yylex ();
+ int itex2MML_do_html_filter (const char * buffer, size_t length, const int forbid_markup);
 
  extern char * yytext;
 
@@ -29,7 +30,7 @@
 
  void (*itex2MML_error) (const char * msg) = itex2MML_default_error;
 
- static void yyerror (char **ret_str, const char * s)
+ static void yyerror (char **ret_str, char * s)
    {
      char * msg = itex2MML_copy3 (s, " at token ", yytext);
      if (itex2MML_error)
@@ -39,7 +40,7 @@
 
  /* Note: If length is 0, then buffer is treated like a string; otherwise only length bytes are written.
   */
- static void itex2MML_default_write (const char * buffer, unsigned long length)
+ static void itex2MML_default_write (const char * buffer, size_t length)
    {
      if (buffer)
        {
@@ -61,48 +62,48 @@
 
     const char * itex2MML_output ()
     {
-        char * copy = (char *) malloc(strlen(itex2MML_output_string) +1);
+        char * copy = (char *) malloc((itex2MML_output_string ? strlen(itex2MML_output_string) : 0) + 1);
         if (copy)
           {
            if (itex2MML_output_string)
              {
                strcpy(copy, itex2MML_output_string);
-               if (itex2MML_output_string != "")
+               if (*itex2MML_output_string != '\0')
                    free(itex2MML_output_string);
              }
            else
              copy[0] = 0;
+           itex2MML_output_string = "";
           }
-        itex2MML_output_string = "";
         return copy;
     }
 
- static void itex2MML_capture (const char * buffer, unsigned long length)
+ static void itex2MML_capture (const char * buffer, size_t length)
     {
      if (buffer)
        {
          if (length)
            {
-              unsigned long first_length = itex2MML_output_string ? strlen(itex2MML_output_string) : 0;
+              size_t first_length = itex2MML_output_string ? strlen(itex2MML_output_string) : 0;
               char * copy  = (char *) malloc(first_length + length + 1);
               if (copy)
                 {
                   if (itex2MML_output_string)
                     {
                        strcpy(copy, itex2MML_output_string);
-                       if (itex2MML_output_string != "")
+                       if (*itex2MML_output_string != '\0')
                           free(itex2MML_output_string);
                     }
                   else
                      copy[0] = 0;
                   strncat(copy, buffer, length);
+                  itex2MML_output_string = copy;
                  }
-              itex2MML_output_string = copy;
             }
          else
             {
               char * copy = itex2MML_copy2(itex2MML_output_string, buffer);
-              if (itex2MML_output_string != "")
+              if (*itex2MML_output_string != '\0')
                  free(itex2MML_output_string);
               itex2MML_output_string = copy;
             }
@@ -112,18 +113,18 @@
     static void itex2MML_capture_mathml (const char * buffer)
     {
        char * temp = itex2MML_copy2(itex2MML_output_string, buffer);
-       if (itex2MML_output_string != "")
+       if (*itex2MML_output_string != '\0')
          free(itex2MML_output_string);
        itex2MML_output_string = temp;
     }
-    void (*itex2MML_write) (const char * buffer, unsigned long length) = itex2MML_capture;
+    void (*itex2MML_write) (const char * buffer, size_t length) = itex2MML_capture;
     void (*itex2MML_write_mathml) (const char * mathml) = itex2MML_capture_mathml;
 #else
-    void (*itex2MML_write) (const char * buffer, unsigned long length) = itex2MML_default_write;
+    void (*itex2MML_write) (const char * buffer, size_t length) = itex2MML_default_write;
     void (*itex2MML_write_mathml) (const char * mathml) = itex2MML_default_write_mathml;
 #endif 
 
- char * itex2MML_empty_string = (char *) "";
+ char * itex2MML_empty_string = "";
 
  /* Create a copy of a string, adding space for extra chars
   */
@@ -144,9 +145,9 @@
   */
  char * itex2MML_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;
+     size_t first_length =  first ? strlen( first) : 0;
+     size_t second_length = second ? strlen(second) : 0;
+     size_t third_length =  third ? strlen( third) : 0;
 
      char * copy = (char *) malloc(first_length + second_length + third_length + 1);
 
@@ -181,7 +182,7 @@
   */
  char * itex2MML_copy_escaped (const char * str)
    {
-     unsigned long length = 0;
+     size_t length = 0;
 
      const char * ptr1 = str;
 
@@ -262,7 +263,7 @@
 
  /* Create a hex character reference string corresponding to code
   */
- static char * itex2MML_character_reference (unsigned long int code)
+ char * itex2MML_character_reference (unsigned long int code)
    {
 #define ENTITY_LENGTH 10
      char * entity = (char *) malloc(ENTITY_LENGTH);
@@ -279,7 +280,7 @@
 %}
 
 %left TEXOVER TEXATOP
-%token CHAR STARTMATH STARTDMATH ENDMATH MI MIB MN MO SUP SUB MROWOPEN MROWCLOSE LEFT RIGHT BIG BBIG BIGG BBIGG BIGL BBIGL BIGGL BBIGGL FRAC TFRAC OPERATORNAME MATHOP MATHBIN MATHREL MOP MOL MOLL MOF MOR PERIODDELIM OTHERDELIM LEFTDELIM RIGHTDELIM MOS MOB SQRT ROOT BINOM TBINOM UNDER OVER OVERBRACE UNDERLINE UNDERBRACE UNDEROVER TENSOR MULTI ARRAYALIGN COLUMNALIGN ARRAY COLSEP ROWSEP ARRAYOPTS COLLAYOUT COLALIGN ROWALIGN ALIGN EQROWS EQCOLS ROWLINES COLLINES FRAME PADDING ATTRLIST ITALICS BOLD BOXED SLASHED RM BB ST END BBLOWERCHAR BBUPPERCHAR BBDIGIT CALCHAR FRAKCHAR CAL FRAK CLAP LLAP RLAP ROWOPTS TEXTSIZE SCSIZE SCSCSIZE DISPLAY TEXTSTY TEXTBOX TEXTSTRING XMLSTRING CELLOPTS ROWSPAN COLSPAN THINSPACE MEDSPACE THICKSPACE QUAD QQUAD NEGSPACE PHANTOM HREF UNKNOWNCHAR EMPTYMROW STATLINE TOOLTIP TOGGLE FGHIGHLIGHT BGHIGHLIGHT SPACE INTONE INTTWO INTTHREE BAR WIDEBAR VEC WIDEVEC HAT WIDEHAT CHECK WIDECHECK TILDE WIDETILDE DOT DDOT DDDOT DDDDOT UNARYMINUS UNARYPLUS BEGINENV ENDENV MATRIX PMATRIX BMATRIX BBMATRIX VMATRIX VVMATRIX SVG ENDSVG SMALLMATRIX CASES ALIGNED GATHERED SUBSTACK PMOD RMCHAR COLOR BGCOLOR XARROW OPTARGOPEN OPTARGCLOSE
+%token CHAR STARTMATH STARTDMATH ENDMATH MI MIB MN MO SUP SUB MROWOPEN MROWCLOSE LEFT RIGHT BIG BBIG BIGG BBIGG BIGL BBIGL BIGGL BBIGGL FRAC TFRAC OPERATORNAME MATHOP MATHBIN MATHREL MOP MOL MOLL MOF MOR PERIODDELIM OTHERDELIM LEFTDELIM RIGHTDELIM MOS MOB SQRT ROOT BINOM TBINOM UNDER OVER OVERBRACE UNDERLINE UNDERBRACE UNDEROVER TENSOR MULTI ARRAYALIGN COLUMNALIGN ARRAY COLSEP ROWSEP ARRAYOPTS COLLAYOUT COLALIGN ROWALIGN ALIGN EQROWS EQCOLS ROWLINES COLLINES FRAME PADDING ATTRLIST ITALICS SANS TT BOLD BOXED SLASHED RM BB ST END BBLOWERCHAR BBUPPERCHAR BBDIGIT CALCHAR FRAKCHAR CAL SCR FRAK CLAP LLAP RLAP ROWOPTS TEXTSIZE SCSIZE SCSCSIZE DISPLAY TEXTSTY TEXTBOX TEXTSTRING XMLSTRING CELLOPTS ROWSPAN COLSPAN THINSPACE MEDSPACE THICKSPACE QUAD QQUAD NEGSPACE NEGMEDSPACE NEGTHICKSPACE PHANTOM HREF UNKNOWNCHAR EMPTYMROW STATLINE TOOLTIP TOGGLE TOGGLESTART TOGGLEEND FGHIGHLIGHT BGHIGHLIGHT SPACE INTONE INTTWO INTTHREE BAR WIDEBAR VEC WIDEVEC WIDELVEC WIDELRVEC WIDEUVEC WIDEULVEC WIDEULRVEC HAT WIDEHAT CHECK WIDECHECK TILDE WIDETILDE DOT DDOT DDDOT DDDDOT UNARYMINUS UNARYPLUS BEGINENV ENDENV MATRIX PMATRIX BMATRIX BBMATRIX VMATRIX VVMATRIX SVG ENDSVG SMALLMATRIX CASES ALIGNED GATHERED SUBSTACK PMOD RMCHAR COLOR BGCOLOR XARROW OPTARGOPEN OPTARGCLOSE ITEXNUM RAISEBOX NEG
 
 %%
 
@@ -298,8 +299,11 @@ expression: STARTMATH ENDMATH {/* empty math group - ignore*/}
 | STARTDMATH ENDMATH {/* ditto */}
 | STARTMATH compoundTermList ENDMATH {
   char ** r = (char **) ret_str;
-  char * s = itex2MML_copy3("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'>", $2, "</math>");
-  itex2MML_free_string($2);
+  char * p = itex2MML_copy3("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow>", $2, "</mrow><annotation encoding='application/x-tex'>");
+  char * s = itex2MML_copy3(p, $3, "</annotation></semantics></math>");
+  itex2MML_free_string(p);
+  itex2MML_free_string($2);  
+  itex2MML_free_string($3);
   if (r) {
     (*r) = (s == itex2MML_empty_string) ? 0 : s;
   }
@@ -311,8 +315,11 @@ expression: STARTMATH ENDMATH {/* empty math group - ignore*/}
 }
 | STARTDMATH compoundTermList ENDMATH {
   char ** r = (char **) ret_str;
-  char * s = itex2MML_copy3("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'>", $2, "</math>");
-  itex2MML_free_string($2);
+  char * p = itex2MML_copy3("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><semantics><mrow>", $2, "</mrow><annotation encoding='application/x-tex'>");
+  char * s = itex2MML_copy3(p, $3, "</annotation></semantics></math>");
+  itex2MML_free_string(p);
+  itex2MML_free_string($2);  
+  itex2MML_free_string($3);
   if (r) {
     (*r) = (s == itex2MML_empty_string) ? 0 : s;
   }
@@ -500,11 +507,11 @@ compoundTerm: mob SUB closedTerm SUP closedTerm {
   itex2MML_free_string($3);
 }
 | SUB closedTerm {
-  $$ = itex2MML_copy3("<msub><mo></mo>", $2, "</msub>");
+  $$ = itex2MML_copy3("<msub><mo/>", $2, "</msub>");
   itex2MML_free_string($2);
 }
 | SUP closedTerm {
-  $$ = itex2MML_copy3("<msup><mo></mo>", $2, "</msup>");
+  $$ = itex2MML_copy3("<msup><mo/>", $2, "</msup>");
   itex2MML_free_string($2);
 }
 | closedTerm {
@@ -531,10 +538,16 @@ closedTerm: array
 | binom
 | msqrt 
 | mroot
+| raisebox
 | munder
 | mover
 | bar
 | vec
+| lvec
+| lrvec
+| uvec
+| ulvec
+| ulrvec
 | hat
 | dot
 | ddot
@@ -556,6 +569,8 @@ closedTerm: array
 | scriptsize
 | scriptscriptsize
 | italics
+| sans
+| mono
 | bold
 | roman
 | rmchars
@@ -564,6 +579,7 @@ closedTerm: array
 | slashed
 | boxed
 | cal
+| scr
 | space
 | textstring
 | thinspace
@@ -572,6 +588,8 @@ closedTerm: array
 | quad
 | qquad
 | negspace
+| negmedspace
+| negthickspace
 | phantom
 | href
 | statusline
@@ -730,11 +748,11 @@ unrecognized: UNKNOWNCHAR {
 };
 
 unaryminus: UNARYMINUS {
-  $$ = itex2MML_copy_string("<mo lspace=\"verythinmathspace\" rspace=\"0em\">&minus;</mo>");
+  $$ = itex2MML_copy_string("<mo lspace=\"0.11111em\" rspace=\"0em\">&minus;</mo>");
 };
 
 unaryplus: UNARYPLUS {
-  $$ = itex2MML_copy_string("<mo lspace=\"verythinmathspace\" rspace=\"0em\">+</mo>");
+  $$ = itex2MML_copy_string("<mo lspace=\"0.11111em\" rspace=\"0em\">+</mo>");
 };
 
 mi: MI;
@@ -745,11 +763,16 @@ mib: MIB {
   itex2MML_free_string($1);
 };
 
-mn: MN;
+mn: MN
+| ITEXNUM TEXTSTRING {
+  itex2MML_rowposn = 2;
+  $$ = itex2MML_copy_string($2);
+  itex2MML_free_string($2);
+};
 
 mob: MOB {
   itex2MML_rowposn = 2;
-  $$ = itex2MML_copy3("<mo lspace=\"thinmathspace\" rspace=\"thinmathspace\">", $1, "</mo>");
+  $$ = itex2MML_copy3("<mo lspace=\"0.16667em\" rspace=\"0.16667em\">", $1, "</mo>");
   itex2MML_free_string($1);
 };
 
@@ -793,44 +816,44 @@ mo: mob
 }
 | MOS {
   itex2MML_rowposn=2;
-  $$ = itex2MML_copy3("<mo lspace=\"mediummathspace\" rspace=\"mediummathspace\">", $1, "</mo>");
+  $$ = itex2MML_copy3("<mo lspace=\"0.22222em\" rspace=\"0.22222em\">", $1, "</mo>");
   itex2MML_free_string($1);
 }
 | MOP {
   itex2MML_rowposn = 2;
-  $$ = itex2MML_copy3("<mo lspace=\"0em\" rspace=\"thinmathspace\">", $1, "</mo>");
+  $$ = itex2MML_copy3("<mo lspace=\"0em\" rspace=\"0.16667em\">", $1, "</mo>");
   itex2MML_free_string($1);
 }
 | MOR {
   itex2MML_rowposn = 2;
-  $$ = itex2MML_copy3("<mo lspace=\"verythinmathspace\">", $1, "</mo>");
+  $$ = itex2MML_copy3("<mo lspace=\"0.11111em\">", $1, "</mo>");
   itex2MML_free_string($1);
 }
 | OPERATORNAME TEXTSTRING {
   itex2MML_rowposn = 2;
-  $$ = itex2MML_copy3("<mo lspace=\"0em\" rspace=\"thinmathspace\">", $2, "</mo>");
+  $$ = itex2MML_copy3("<mo lspace=\"0em\" rspace=\"0.16667em\">", $2, "</mo>");
   itex2MML_free_string($2);
 }
 | MATHOP TEXTSTRING {
   itex2MML_rowposn = 2;
-  $$ = itex2MML_copy3("<mo lspace=\"thinmathspace\" rspace=\"thinmathspace\">", $2, "</mo>");
+  $$ = itex2MML_copy3("<mo lspace=\"0.16667em\" rspace=\"0.16667em\">", $2, "</mo>");
   itex2MML_free_string($2);
 }
 | MATHBIN TEXTSTRING {
   itex2MML_rowposn = 2;
-  $$ = itex2MML_copy3("<mo lspace=\"mediummathspace\" rspace=\"mediummathspace\">", $2, "</mo>");
+  $$ = itex2MML_copy3("<mo lspace=\"0.22222em\" rspace=\"0.22222em\">", $2, "</mo>");
   itex2MML_free_string($2);
 }
 | MATHREL TEXTSTRING {
   itex2MML_rowposn = 2;
-  $$ = itex2MML_copy3("<mo lspace=\"thickmathspace\" rspace=\"thickmathspace\">", $2, "</mo>");
+  $$ = itex2MML_copy3("<mo lspace=\"0.27778em\" rspace=\"0.27778em\">", $2, "</mo>");
   itex2MML_free_string($2);
 };
 
 space: SPACE ST INTONE END ST INTTWO END ST INTTHREE END {
   char * s1 = itex2MML_copy3("<mspace height=\"", $3, "ex\" depth=\"");
   char * s2 = itex2MML_copy3($6, "ex\" width=\"", $9);
-  $$ = itex2MML_copy3(s1, s2, "em\"></mspace>");
+  $$ = itex2MML_copy3(s1, s2, "em\"/>");
   itex2MML_free_string(s1);
   itex2MML_free_string(s2);
   itex2MML_free_string($3);
@@ -860,6 +883,10 @@ toggle: TOGGLE closedTerm closedTerm {
   itex2MML_free_string(s1);
   itex2MML_free_string($2);
   itex2MML_free_string($3);
+}
+| TOGGLESTART compoundTermList TOGGLEEND {
+  $$ = itex2MML_copy3("<maction actiontype=\"toggle\">", $2, "</maction>");
+  itex2MML_free_string($2);
 };
 
 fghighlight: FGHIGHLIGHT ATTRLIST closedTerm {
@@ -894,17 +921,17 @@ color: COLOR ATTRLIST compoundTermList {
 };
 
 mathrlap: RLAP closedTerm {
-  $$ = itex2MML_copy3("<mpadded width=\"0\">", $2, "</mpadded>");
+  $$ = itex2MML_copy3("<mpadded width=\"0px\">", $2, "</mpadded>");
   itex2MML_free_string($2);
 };
 
 mathllap: LLAP closedTerm {
-  $$ = itex2MML_copy3("<mpadded width=\"0\" lspace=\"-100%width\">", $2, "</mpadded>");
+  $$ = itex2MML_copy3("<mpadded width=\"0px\" lspace=\"-100%width\">", $2, "</mpadded>");
   itex2MML_free_string($2);
 };
 
 mathclap: CLAP closedTerm {
-  $$ = itex2MML_copy3("<mpadded width=\"0\" lspace=\"-50%width\">", $2, "</mpadded>");
+  $$ = itex2MML_copy3("<mpadded width=\"0px\" lspace=\"-50%width\">", $2, "</mpadded>");
   itex2MML_free_string($2);
 };
 
@@ -913,27 +940,27 @@ textstring: TEXTBOX TEXTSTRING {
   itex2MML_free_string($2);
 };
 
-displaystyle: DISPLAY closedTerm {
+displaystyle: DISPLAY compoundTermList {
   $$ = itex2MML_copy3("<mstyle displaystyle=\"true\">", $2, "</mstyle>");
   itex2MML_free_string($2);
 };
 
-textstyle: TEXTSTY closedTerm {
+textstyle: TEXTSTY compoundTermList {
   $$ = itex2MML_copy3("<mstyle displaystyle=\"false\">", $2, "</mstyle>");
   itex2MML_free_string($2);
 };
 
-textsize: TEXTSIZE closedTerm {
+textsize: TEXTSIZE compoundTermList {
   $$ = itex2MML_copy3("<mstyle scriptlevel=\"0\">", $2, "</mstyle>");
   itex2MML_free_string($2);
 };
 
-scriptsize: SCSIZE closedTerm {
+scriptsize: SCSIZE compoundTermList {
   $$ = itex2MML_copy3("<mstyle scriptlevel=\"1\">", $2, "</mstyle>");
   itex2MML_free_string($2);
 };
 
-scriptscriptsize: SCSCSIZE closedTerm {
+scriptscriptsize: SCSCSIZE compoundTermList {
   $$ = itex2MML_copy3("<mstyle scriptlevel=\"2\">", $2, "</mstyle>");
   itex2MML_free_string($2);
 };
@@ -943,6 +970,16 @@ italics: ITALICS closedTerm {
   itex2MML_free_string($2);
 };
 
+sans: SANS closedTerm {
+  $$ = itex2MML_copy3("<mstyle mathvariant=\"sans-serif\">", $2, "</mstyle>");
+  itex2MML_free_string($2);
+};
+
+mono: TT closedTerm {
+  $$ = itex2MML_copy3("<mstyle mathvariant=\"monospace\">", $2, "</mstyle>");
+  itex2MML_free_string($2);
+};
+
 slashed: SLASHED closedTerm {
   $$ = itex2MML_copy3("<menclose notation=\"updiagonalstrike\">", $2, "</menclose>");
   itex2MML_free_string($2);
@@ -1029,6 +1066,11 @@ cal: CAL ST calletters END {
   itex2MML_free_string($3);
 };
 
+scr: SCR ST calletters END {
+  $$ = itex2MML_copy3("<mi class='mathscript'>", $3, "</mi>");
+  itex2MML_free_string($3);
+};
+
 calletters: calletter {
   $$ = itex2MML_copy_string($1);
   itex2MML_free_string($1);
@@ -1045,27 +1087,35 @@ calletter: CALCHAR {
 };
 
 thinspace: THINSPACE {
-  $$ = itex2MML_copy_string("<mspace width=\"thinmathspace\"></mspace>");
+  $$ = itex2MML_copy_string("<mspace width=\"0.16667em\"/>");
 };
 
 medspace: MEDSPACE {
-  $$ = itex2MML_copy_string("<mspace width=\"mediummathspace\"></mspace>");
+  $$ = itex2MML_copy_string("<mspace width=\"0.22222em\"/>");
 };
 
 thickspace: THICKSPACE {
-  $$ = itex2MML_copy_string("<mspace width=\"thickmathspace\"></mspace>");
+  $$ = itex2MML_copy_string("<mspace width=\"0.27778em\"/>");
 };
 
 quad: QUAD {
-  $$ = itex2MML_copy_string("<mspace width=\"1em\"></mspace>");
+  $$ = itex2MML_copy_string("<mspace width=\"1em\"/>");
 };
 
 qquad: QQUAD {
-  $$ = itex2MML_copy_string("<mspace width=\"2em\"></mspace>");
+  $$ = itex2MML_copy_string("<mspace width=\"2em\"/>");
 };
 
 negspace: NEGSPACE {
-  $$ = itex2MML_copy_string("<mspace width=\"-0.1667 em\"></mspace>");
+  $$ = itex2MML_copy_string("<mspace width=\"-0.16667em\"/>");
+};
+
+negmedspace: NEGMEDSPACE {
+  $$ = itex2MML_copy_string("<mspace width=\"-0.22222em\"/>");
+};
+
+negthickspace: NEGTHICKSPACE {
+  $$ = itex2MML_copy_string("<mspace width=\"-0.27778em\"/>");
 };
 
 phantom: PHANTOM closedTerm {
@@ -1074,9 +1124,11 @@ phantom: PHANTOM closedTerm {
 };
 
 href: HREF TEXTSTRING closedTerm {
-  char * s1 = itex2MML_copy3("<mrow xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:type=\"simple\" xlink:href=\"", $2, "\">");
-  $$ = itex2MML_copy3(s1, $3, "</mrow>");
+  char * s1 = itex2MML_copy3("<mrow href=\"", $2, "\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:type=\"simple\" xlink:href=\"");
+  char * s2 = itex2MML_copy3(s1, $2, "\">");
+  $$ = itex2MML_copy3(s2, $3, "</mrow>");
   itex2MML_free_string(s1);
+  itex2MML_free_string(s2);
   itex2MML_free_string($2);
   itex2MML_free_string($3);
 };
@@ -1098,7 +1150,7 @@ tensor: TENSOR closedTerm MROWOPEN subsupList MROWCLOSE {
 
 multi: MULTI MROWOPEN subsupList MROWCLOSE closedTerm MROWOPEN subsupList MROWCLOSE {
   char * s1 = itex2MML_copy3("<mmultiscripts>", $5, $7);
-  char * s2 = itex2MML_copy3("<mprescripts></mprescripts>", $3, "</mmultiscripts>");
+  char * s2 = itex2MML_copy3("<mprescripts/>", $3, "</mmultiscripts>");
   $$ = itex2MML_copy2(s1, s2);
   itex2MML_free_string(s1);
   itex2MML_free_string(s2);
@@ -1108,7 +1160,7 @@ multi: MULTI MROWOPEN subsupList MROWCLOSE closedTerm MROWOPEN subsupList MROWCL
 }
 | MULTI MROWOPEN subsupList MROWCLOSE closedTerm EMPTYMROW {
   char * s1 = itex2MML_copy2("<mmultiscripts>", $5);
-  char * s2 = itex2MML_copy3("<mprescripts></mprescripts>", $3, "</mmultiscripts>");
+  char * s2 = itex2MML_copy3("<mprescripts/>", $3, "</mmultiscripts>");
   $$ = itex2MML_copy2(s1, s2);
   itex2MML_free_string(s1);
   itex2MML_free_string(s2);
@@ -1139,15 +1191,15 @@ subsupTerm: SUB closedTerm SUP closedTerm {
   itex2MML_free_string($4);
 }
 | SUB closedTerm {
-  $$ = itex2MML_copy2($2, " <none></none>");
+  $$ = itex2MML_copy2($2, " <none/>");
   itex2MML_free_string($2);
 }
 | SUP closedTerm {
-  $$ = itex2MML_copy2("<none></none> ", $2);
+  $$ = itex2MML_copy2("<none/> ", $2);
   itex2MML_free_string($2);
 }
 | SUB SUP closedTerm {
-  $$ = itex2MML_copy2("<none></none> ", $3);
+  $$ = itex2MML_copy2("<none/> ", $3);
   itex2MML_free_string($3);
 };
 
@@ -1167,7 +1219,7 @@ mfrac: FRAC closedTerm closedTerm {
 };
 
 pmod: PMOD closedTerm {
-  $$ = itex2MML_copy3( "<mo lspace=\"mediummathspace\">(</mo><mo rspace=\"thinmathspace\">mod</mo>", $2, "<mo rspace=\"mediummathspace\">)</mo>");
+  $$ = itex2MML_copy3( "<mrow><mo lspace=\"0.22222em\">(</mo><mo rspace=\"0.16667em\">mod</mo>", $2, "<mo rspace=\"0.22222em\">)</mo></mrow>");
   itex2MML_free_string($2);
 }
 
@@ -1193,14 +1245,14 @@ texover: MROWOPEN compoundTermList TEXOVER compoundTermList MROWCLOSE {
 };
 
 texatop: MROWOPEN compoundTermList TEXATOP compoundTermList MROWCLOSE {
-  char * s1 = itex2MML_copy3("<mfrac linethickness=\"0\"><mrow>", $2, "</mrow><mrow>");
+  char * s1 = itex2MML_copy3("<mfrac linethickness=\"0px\"><mrow>", $2, "</mrow><mrow>");
   $$ = itex2MML_copy3(s1, $4, "</mrow></mfrac>");
   itex2MML_free_string(s1);
   itex2MML_free_string($2);
   itex2MML_free_string($4);
 }
 | left compoundTermList TEXATOP compoundTermList right {
-  char * s1 = itex2MML_copy3("<mrow>", $1, "<mfrac linethickness=\"0\"><mrow>");
+  char * s1 = itex2MML_copy3("<mrow>", $1, "<mfrac linethickness=\"0px\"><mrow>");
   char * s2 = itex2MML_copy3($2, "</mrow><mrow>", $4);
   char * s3 = itex2MML_copy3("</mrow></mfrac>", $5, "</mrow>");
   $$ = itex2MML_copy3(s1, s2, s3);
@@ -1214,14 +1266,14 @@ texatop: MROWOPEN compoundTermList TEXATOP compoundTermList MROWCLOSE {
 };
 
 binom: BINOM closedTerm closedTerm {
-  char * s1 = itex2MML_copy3("<mrow><mo>(</mo><mfrac linethickness=\"0\">", $2, $3);
+  char * s1 = itex2MML_copy3("<mrow><mo>(</mo><mfrac linethickness=\"0px\">", $2, $3);
   $$ = itex2MML_copy2(s1, "</mfrac><mo>)</mo></mrow>");
   itex2MML_free_string(s1);
   itex2MML_free_string($2);
   itex2MML_free_string($3);
 }
 | TBINOM closedTerm closedTerm {
-  char * s1 = itex2MML_copy3("<mrow><mo>(</mo><mstyle displaystyle=\"false\"><mfrac linethickness=\"0\">", $2, $3);
+  char * s1 = itex2MML_copy3("<mrow><mo>(</mo><mstyle displaystyle=\"false\"><mfrac linethickness=\"0px\">", $2, $3);
   $$ = itex2MML_copy2(s1, "</mfrac></mstyle><mo>)</mo></mrow>");
   itex2MML_free_string(s1);
   itex2MML_free_string($2);
@@ -1253,11 +1305,32 @@ bar: BAR closedTerm {
 };
 
 vec: VEC closedTerm {
-  $$ = itex2MML_copy3("<mover>", $2, "<mo stretchy=\"false\">&RightVector;</mo></mover>");
+  $$ = itex2MML_copy3("<mover>", $2, "<mo stretchy=\"false\">&rightarrow;</mo></mover>");
   itex2MML_free_string($2);
 }
 | WIDEVEC closedTerm {
-  $$ = itex2MML_copy3("<mover>", $2, "<mo>&RightVector;</mo></mover>");
+  $$ = itex2MML_copy3("<mover>", $2, "<mo>&rightarrow;</mo></mover>");
+  itex2MML_free_string($2);
+};
+
+lvec: WIDELVEC closedTerm {
+  $$ = itex2MML_copy3("<mover>", $2, "<mo>&leftarrow;</mo></mover>");
+  itex2MML_free_string($2);
+};
+lrvec: WIDELRVEC closedTerm {
+  $$ = itex2MML_copy3("<mover>", $2, "<mo>&leftrightarrow;</mo></mover>");
+  itex2MML_free_string($2);
+};
+uvec: WIDEUVEC closedTerm {
+  $$ = itex2MML_copy3("<munder>", $2, "<mo>&rightarrow;</mo></munder>");
+  itex2MML_free_string($2);
+};
+ulvec: WIDEULVEC closedTerm {
+  $$ = itex2MML_copy3("<munder>", $2, "<mo>&leftarrow;</mo></munder>");
+  itex2MML_free_string($2);
+};
+ulrvec: WIDEULRVEC closedTerm {
+  $$ = itex2MML_copy3("<munder>", $2, "<mo>&leftrightarrow;</mo></munder>");
   itex2MML_free_string($2);
 };
 
@@ -1328,6 +1401,73 @@ mroot: SQRT OPTARGOPEN compoundTermList OPTARGCLOSE closedTerm {
   itex2MML_free_string($3);
 };
 
+raisebox: RAISEBOX TEXTSTRING TEXTSTRING TEXTSTRING closedTerm {
+  char * s1 = itex2MML_copy3("<mpadded voffset='", $2, "' height='");
+  char * s2 = itex2MML_copy3(s1, $3, "' depth='");
+  char * s3 = itex2MML_copy3(s2, $4, "'>");
+  $$ = itex2MML_copy3(s3, $5, "</mpadded>");
+  itex2MML_free_string(s1);
+  itex2MML_free_string(s2);
+  itex2MML_free_string(s3);
+  itex2MML_free_string($2);
+  itex2MML_free_string($3);
+  itex2MML_free_string($4);
+  itex2MML_free_string($5);
+}
+| RAISEBOX NEG TEXTSTRING TEXTSTRING TEXTSTRING closedTerm {
+  char * s1 = itex2MML_copy3("<mpadded voffset='-", $3, "' height='");
+  char * s2 = itex2MML_copy3(s1, $4, "' depth='");
+  char * s3 = itex2MML_copy3(s2, $5, "'>");
+  $$ = itex2MML_copy3(s3, $6, "</mpadded>");
+  itex2MML_free_string(s1);
+  itex2MML_free_string(s2);
+  itex2MML_free_string(s3);
+  itex2MML_free_string($3);
+  itex2MML_free_string($4);
+  itex2MML_free_string($5);
+  itex2MML_free_string($6);
+}
+| RAISEBOX TEXTSTRING TEXTSTRING closedTerm {
+  char * s1 = itex2MML_copy3("<mpadded voffset='", $2, "' height='");
+  char * s2 = itex2MML_copy3(s1, $3, "' depth='depth'>");
+  $$ = itex2MML_copy3(s2, $4, "</mpadded>");
+  itex2MML_free_string(s1);
+  itex2MML_free_string(s2);
+  itex2MML_free_string($2);
+  itex2MML_free_string($3);
+  itex2MML_free_string($4);
+}
+| RAISEBOX NEG TEXTSTRING TEXTSTRING closedTerm {
+  char * s1 = itex2MML_copy3("<mpadded voffset='-", $3, "' height='");
+  char * s2 = itex2MML_copy3(s1, $4, "' depth='+");
+  char * s3 = itex2MML_copy3(s2, $3, "'>");
+  $$ = itex2MML_copy3(s3, $5, "</mpadded>");
+  itex2MML_free_string(s1);
+  itex2MML_free_string(s2);
+  itex2MML_free_string(s3);
+  itex2MML_free_string($3);
+  itex2MML_free_string($4);
+  itex2MML_free_string($5);
+}
+| RAISEBOX TEXTSTRING closedTerm {
+  char * s1 = itex2MML_copy3("<mpadded voffset='", $2, "' height='+");
+  char * s2 = itex2MML_copy3(s1, $2, "' depth='depth'>");
+  $$ = itex2MML_copy3(s2, $3, "</mpadded>");
+  itex2MML_free_string(s1);
+  itex2MML_free_string(s2);
+  itex2MML_free_string($2);
+  itex2MML_free_string($3);
+}
+| RAISEBOX NEG TEXTSTRING closedTerm {
+  char * s1 = itex2MML_copy3("<mpadded voffset='-", $3, "' height='0pt' depth='+");
+  char * s2 = itex2MML_copy3(s1, $3, "'>");
+  $$ = itex2MML_copy3(s2, $4, "</mpadded>");
+  itex2MML_free_string(s1);
+  itex2MML_free_string(s2);
+  itex2MML_free_string($3);
+  itex2MML_free_string($4);
+};
+
 munder: XARROW OPTARGOPEN compoundTermList OPTARGCLOSE EMPTYMROW {
   char * s1 = itex2MML_copy3("<munder><mo>", $1, "</mo><mrow>");
   $$ = itex2MML_copy3(s1, $3, "</mrow></munder>");
@@ -1378,51 +1518,51 @@ munderover: XARROW OPTARGOPEN compoundTermList OPTARGCLOSE closedTerm {
 };
 
 emptymrow: EMPTYMROW {
-  $$ = itex2MML_copy_string("<mrow></mrow>");
+  $$ = itex2MML_copy_string("<mrow/>");
 };
 
 mathenv: BEGINENV MATRIX tableRowList ENDENV MATRIX {
-  $$ = itex2MML_copy3("<mrow><mtable rowspacing=\"0.5ex\">", $3, "</mtable></mrow>");
+  $$ = itex2MML_copy3("<mrow><mtable displaystyle=\"false\" rowspacing=\"0.5ex\">", $3, "</mtable></mrow>");
   itex2MML_free_string($3);
 }
 |  BEGINENV GATHERED tableRowList ENDENV GATHERED {
-  $$ = itex2MML_copy3("<mrow><mtable rowspacing=\"1.0ex\">", $3, "</mtable></mrow>");
+  $$ = itex2MML_copy3("<mrow><mtable displaystyle=\"true\" rowspacing=\"1.0ex\">", $3, "</mtable></mrow>");
   itex2MML_free_string($3);
 }
 | BEGINENV PMATRIX tableRowList ENDENV PMATRIX {
-  $$ = itex2MML_copy3("<mrow><mo>(</mo><mrow><mtable rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>)</mo></mrow>");
+  $$ = itex2MML_copy3("<mrow><mo>(</mo><mrow><mtable displaystyle=\"false\" rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>)</mo></mrow>");
   itex2MML_free_string($3);
 }
 | BEGINENV BMATRIX tableRowList ENDENV BMATRIX {
-  $$ = itex2MML_copy3("<mrow><mo>[</mo><mrow><mtable rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>]</mo></mrow>");
+  $$ = itex2MML_copy3("<mrow><mo>[</mo><mrow><mtable displaystyle=\"false\" rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>]</mo></mrow>");
   itex2MML_free_string($3);
 }
 | BEGINENV VMATRIX tableRowList ENDENV VMATRIX {
-  $$ = itex2MML_copy3("<mrow><mo>&VerticalBar;</mo><mrow><mtable rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>&VerticalBar;</mo></mrow>");
+  $$ = itex2MML_copy3("<mrow><mo>&VerticalBar;</mo><mrow><mtable displaystyle=\"false\" rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>&VerticalBar;</mo></mrow>");
   itex2MML_free_string($3);
 }
 | BEGINENV BBMATRIX tableRowList ENDENV BBMATRIX {
-  $$ = itex2MML_copy3("<mrow><mo>{</mo><mrow><mtable rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>}</mo></mrow>");
+  $$ = itex2MML_copy3("<mrow><mo>{</mo><mrow><mtable displaystyle=\"false\" rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>}</mo></mrow>");
   itex2MML_free_string($3);
 }
 | BEGINENV VVMATRIX tableRowList ENDENV VVMATRIX {
-  $$ = itex2MML_copy3("<mrow><mo>&DoubleVerticalBar;</mo><mrow><mtable rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>&DoubleVerticalBar;</mo></mrow>");
+  $$ = itex2MML_copy3("<mrow><mo>&DoubleVerticalBar;</mo><mrow><mtable displaystyle=\"false\" rowspacing=\"0.5ex\">", $3, "</mtable></mrow><mo>&DoubleVerticalBar;</mo></mrow>");
   itex2MML_free_string($3);
 }
 | BEGINENV SMALLMATRIX tableRowList ENDENV SMALLMATRIX {
-  $$ = itex2MML_copy3("<mstyle scriptlevel=\"2\"><mrow><mtable rowspacing=\"0.5ex\">", $3, "</mtable></mrow></mstyle>");
+  $$ = itex2MML_copy3("<mstyle scriptlevel=\"2\"><mrow><mtable displaystyle=\"false\" rowspacing=\"0.5ex\">", $3, "</mtable></mrow></mstyle>");
   itex2MML_free_string($3);
 }
 | BEGINENV CASES tableRowList ENDENV CASES {
-  $$ = itex2MML_copy3("<mrow><mo>{</mo><mrow><mtable columnalign=\"left left\">", $3, "</mtable></mrow></mrow>");
+  $$ = itex2MML_copy3("<mrow><mo>{</mo><mrow><mtable displaystyle=\"false\" columnalign=\"left left\">", $3, "</mtable></mrow></mrow>");
   itex2MML_free_string($3);
 }
 | BEGINENV ALIGNED tableRowList ENDENV ALIGNED {
-  $$ = itex2MML_copy3("<mrow><mtable columnalign=\"right left right left right left right left right left\" columnspacing=\"0em\">", $3, "</mtable></mrow>");
+  $$ = itex2MML_copy3("<mrow><mtable displaystyle=\"true\" columnalign=\"right left right left right left right left right left\" columnspacing=\"0em\">", $3, "</mtable></mrow>");
   itex2MML_free_string($3);
 }
 | BEGINENV ARRAY ARRAYALIGN ST columnAlignList END tableRowList ENDENV ARRAY {
-  char * s1 = itex2MML_copy3("<mtable rowspacing=\"0.5ex\" align=\"", $3, "\" columnalign=\"");
+  char * s1 = itex2MML_copy3("<mtable displaystyle=\"false\" rowspacing=\"0.5ex\" align=\"", $3, "\" columnalign=\"");
   char * s2 = itex2MML_copy3(s1, $5, "\">");
   $$ = itex2MML_copy3(s2, $7, "</mtable>");
   itex2MML_free_string(s1);
@@ -1432,7 +1572,7 @@ mathenv: BEGINENV MATRIX tableRowList ENDENV MATRIX {
   itex2MML_free_string($7);
 }
 | BEGINENV ARRAY ST columnAlignList END tableRowList ENDENV ARRAY {
-  char * s1 = itex2MML_copy3("<mtable rowspacing=\"0.5ex\" columnalign=\"", $4, "\">");
+  char * s1 = itex2MML_copy3("<mtable displaystyle=\"false\" rowspacing=\"0.5ex\" columnalign=\"", $4, "\">");
   $$ = itex2MML_copy3(s1, $6, "</mtable>");
   itex2MML_free_string(s1);
   itex2MML_free_string($4);
@@ -1633,7 +1773,7 @@ arowopt: colalign {
 };
 
 tableCell:   {
-  $$ = itex2MML_copy_string("<mtd></mtd>");
+  $$ = itex2MML_copy_string("<mtd/>");
 }
 | compoundTermList {
   $$ = itex2MML_copy3("<mtd>", $1, "</mtd>");
@@ -1686,7 +1826,7 @@ colspan: COLSPAN ATTRLIST {
 
 %%
 
-char * itex2MML_parse (const char * buffer, unsigned long length)
+char * itex2MML_parse (const char * buffer, size_t length)
 {
   char * mathml = 0;
 
@@ -1705,7 +1845,7 @@ char * itex2MML_parse (const char * buffer, unsigned long length)
   return mathml;
 }
 
-int itex2MML_filter (const char * buffer, unsigned long length)
+int itex2MML_filter (const char * buffer, size_t length)
 {
   itex2MML_setup (buffer, length);
   itex2MML_restart ();
@@ -1716,6 +1856,7 @@ int itex2MML_filter (const char * buffer, unsigned long length)
 #define ITEX_DELIMITER_DOLLAR 0
 #define ITEX_DELIMITER_DOUBLE 1
 #define ITEX_DELIMITER_SQUARE 2
+#define ITEX_DELIMITER_PAREN  3
 
 static char * itex2MML_last_error = 0;
 
@@ -1729,7 +1870,17 @@ static void itex2MML_keep_error (const char * msg)
   itex2MML_last_error = itex2MML_copy_escaped (msg);
 }
 
-static int itex2MML_do_html_filter (const char * buffer, unsigned long length, const int forbid_markup)
+int itex2MML_html_filter (const char * buffer, size_t length)
+{
+  return itex2MML_do_html_filter (buffer, length, 0);
+}
+
+int itex2MML_strict_html_filter (const char * buffer, size_t length)
+{
+  return itex2MML_do_html_filter (buffer, length, 1);
+}
+
+int itex2MML_do_html_filter (const char * buffer, size_t length, const int forbid_markup)
 {
   int result = 0;
 
@@ -1756,7 +1907,7 @@ static int itex2MML_do_html_filter (const char * buffer, unsigned long length, c
       if (*ptr2 == '$') break;
       if ((*ptr2 == '\\') && (ptr2 + 1 < end))
 	{
-	  if (*(ptr2+1) == '[') break;
+	  if (*(ptr2+1) == '[' || *(ptr2+1) == '(') break;
 	}
       ++ptr2;
     }
@@ -1774,6 +1925,11 @@ static int itex2MML_do_html_filter (const char * buffer, unsigned long length, c
 	  type = ITEX_DELIMITER_SQUARE;
 	  ptr2 += 2;
 	}
+      else if ((*ptr2 == '\\') && (*(ptr2+1) == '('))
+	{
+	  type = ITEX_DELIMITER_PAREN;
+	  ptr2 += 2;
+	}
       else if ((*ptr2 == '$') && (*(ptr2+1) == '$'))
 	{
 	  type = ITEX_DELIMITER_DOUBLE;
@@ -1802,7 +1958,7 @@ static int itex2MML_do_html_filter (const char * buffer, unsigned long length, c
 	case '\\':
 	  if (ptr2 + 1 < end)
 	    {
-	      if (*(ptr2 + 1) == '[')
+	      if (*(ptr2 + 1) == '[' || *(ptr2 + 1) == '(')
 		{
 		  skip = 1;
 		}
@@ -1818,11 +1974,28 @@ static int itex2MML_do_html_filter (const char * buffer, unsigned long length, c
 		      skip = 1;
 		    }
 		}
+	      else if (*(ptr2 + 1) == ')')
+		{
+		  if (type == ITEX_DELIMITER_PAREN)
+		    {
+		      ptr2 += 2;
+		      match = 1;
+		    }
+	  else
+	    {
+	      skip = 1;
+	    }
+	}
+
 	    }
 	  break;
 
 	case '$':
-	  if (type == ITEX_DELIMITER_SQUARE)
+	  if (*(ptr2-1) == '\\')
+	    {
+	      skip = 0;
+	    }
+	  else if (type == ITEX_DELIMITER_SQUARE || type == ITEX_DELIMITER_PAREN)
 	    {
 	      skip = 1;
 	    }
@@ -1933,13 +2106,3 @@ static int itex2MML_do_html_filter (const char * buffer, unsigned long length, c
 
   return result;
 }
-
-int itex2MML_html_filter (const char * buffer, unsigned long length)
-{
-  return itex2MML_do_html_filter (buffer, length, 0);
-}
-
-int itex2MML_strict_html_filter (const char * buffer, unsigned long length)
-{
-  return itex2MML_do_html_filter (buffer, length, 1);
-}