itextomml 1.5.8 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e380da3a3978c9bb66045896c1c7cfee64a5bb941f11e9191b73f64cacb82769
-  data.tar.gz: e2e837c310254f9b4f391c1b9784df72f99159fd533784d944709044fb93bd77
+  metadata.gz: add3965127a551a420cba76b8f78a96e347e6baee4f66ba0d4f1dc7743dcacba
+  data.tar.gz: dd8e3d85a41a83a093642cc673ea159e6185d77c3d9332e342ded55557a9b365
 SHA512:
-  metadata.gz: 7933e90cc9d9a59f82b3aff0694ebbd72c44a6e20800f448a7b44a37251007e9b4c5edc306a40afb5368898e46cada181a44abfac151603e034ce7f8725a11ee
-  data.tar.gz: 6988a222af344cf97b07767542c53d202bc06bb9962d345e5302b75535576d5491a82e96c9f066a1ecef661296a48ace3d804edf594f45169033f6ee00e07446
+  metadata.gz: 5c83be31c867ab3cc6357ac64c1ace106adb4cb4634d2e874f7b647b277786c8d0d06ac35a7ea4d864459785c6c36878f19203847bd56e11e6fefac600db5912
+  data.tar.gz: cfccba901d5d6cdb8797ce6a7d1300faf995a71be77fe3b8322bf33f3969e87aa78436e405988d453e64240130e892df9167a15a526233795ae508bb377a2d84

data/ext/itex2MML.h

@@ -1,11 +1,11 @@
-/*             itex2MML 1.5.8
- *   itex2MML.h last modified 10/19/2018
+/*             itex2MML 1.6.0
+ *   itex2MML.h last modified 03/23/2019
  */
 
 #ifndef ITEX2MML_H
 #define ITEX2MML_H
 
-#define ITEX2MML_VERSION "1.5.8"
+#define ITEX2MML_VERSION "1.6.0"
 
 #ifdef __cplusplus
 extern "C" {

data/ext/y.tab.c

@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.5.  */
+/* A Bison parser, made by GNU Bison 3.3.1.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -40,11 +41,14 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.5"
+#define YYBISON_VERSION "3.3.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -69,8 +73,8 @@
 #define yylval          itex2MML_yylval
 #define yychar          itex2MML_yychar
 
-/* Copy the first part of user declarations.  */
-#line 7 "itex2MML.y" /* yacc.c:339  */
+/* First part of user prologue.  */
+#line 7 "itex2MML.y" /* yacc.c:337  */
 
 #include <stdio.h>
 #include <string.h>
@@ -345,13 +349,16 @@
    }
 
 
-#line 349 "y.tab.c" /* yacc.c:339  */
-
+#line 353 "y.tab.c" /* yacc.c:337  */
 # ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
+#  if defined __cplusplus
+#   if 201103L <= __cplusplus
+#    define YY_NULLPTR nullptr
+#   else
+#    define YY_NULLPTR 0
+#   endif
 #  else
-#   define YY_NULLPTR 0
+#   define YY_NULLPTR ((void*)0)
 #  endif
 # endif
 
@@ -742,9 +749,7 @@ int itex2MML_yyparse (char **ret_str);
 
 #endif /* !YY_ITEX2MML_YY_Y_TAB_H_INCLUDED  */
 
-/* Copy the second part of user declarations.  */
 
-#line 748 "y.tab.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -765,13 +770,13 @@ typedef signed char yytype_int8;
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 yytype_uint16;
 #else
-typedef unsigned short int yytype_uint16;
+typedef unsigned short yytype_uint16;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 yytype_int16;
 #else
-typedef short int yytype_int16;
+typedef short yytype_int16;
 #endif
 
 #ifndef YYSIZE_T
@@ -783,7 +788,7 @@ typedef short int yytype_int16;
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
-#  define YYSIZE_T unsigned int
+#  define YYSIZE_T unsigned
 # endif
 #endif
 
@@ -819,15 +824,6 @@ typedef short int yytype_int16;
 # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
 #endif
 
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
 # define YYUSE(E) ((void) (E))
@@ -835,7 +831,7 @@ typedef short int yytype_int16;
 # define YYUSE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \
@@ -997,16 +993,16 @@ union yyalloc
 /* YYNSTATES -- Number of states.  */
 #define YYNSTATES  594
 
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   429
 
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, with out-of-bounds checking.  */
 #define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+   as returned by yylex.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -2563,22 +2559,22 @@ static const yytype_uint8 yyr2[] =
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (ret_str, YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
+#define YYBACKUP(Token, Value)                                    \
+  do                                                              \
+    if (yychar == YYEMPTY)                                        \
+      {                                                           \
+        yychar = (Token);                                         \
+        yylval = (Value);                                         \
+        YYPOPSTACK (yylen);                                       \
+        yystate = *yyssp;                                         \
+        goto yybackup;                                            \
+      }                                                           \
+    else                                                          \
+      {                                                           \
+        yyerror (ret_str, YY_("syntax error: cannot back up")); \
+        YYERROR;                                                  \
+      }                                                           \
+  while (0)
 
 /* Error token number */
 #define YYTERROR        1
@@ -2618,38 +2614,38 @@ do {                                                                      \
 } while (0)
 
 
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
+/*-----------------------------------.
+| Print this symbol's value on YYO.  |
+`-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, char **ret_str)
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, char **ret_str)
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
+  FILE *yyoutput = yyo;
+  YYUSE (yyoutput);
   YYUSE (ret_str);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
   YYUSE (yytype);
 }
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO.  |
+`---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, char **ret_str)
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, char **ret_str)
 {
-  YYFPRINTF (yyoutput, "%s %s (",
+  YYFPRINTF (yyo, "%s %s (",
              yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, ret_str);
-  YYFPRINTF (yyoutput, ")");
+  yy_symbol_value_print (yyo, yytype, yyvaluep, ret_str);
+  YYFPRINTF (yyo, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -2683,7 +2679,7 @@ do {                                                            \
 static void
 yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, char **ret_str)
 {
-  unsigned long int yylno = yyrline[yyrule];
+  unsigned long yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
@@ -2694,7 +2690,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, char **ret_str
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
                        yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                       &yyvsp[(yyi + 1) - (yynrhs)]
                                               , ret_str);
       YYFPRINTF (stderr, "\n");
     }
@@ -2798,7 +2794,10 @@ yytnamerr (char *yyres, const char *yystr)
           case '\\':
             if (*++yyp != '\\')
               goto do_not_strip_quotes;
-            /* Fall through.  */
+            else
+              goto append;
+
+          append:
           default:
             if (yyres)
               yyres[yyn] = *yyp;
@@ -2816,7 +2815,7 @@ yytnamerr (char *yyres, const char *yystr)
   if (! yyres)
     return yystrlen (yystr);
 
-  return yystpcpy (yyres, yystr) - yyres;
+  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
@@ -2894,10 +2893,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yyarg[yycount++] = yytname[yyx];
                 {
                   YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+                    yysize = yysize1;
+                  else
                     return 2;
-                  yysize = yysize1;
                 }
               }
         }
@@ -2921,9 +2920,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 
   {
     YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+      yysize = yysize1;
+    else
       return 2;
-    yysize = yysize1;
   }
 
   if (*yymsg_alloc < yysize)
@@ -3050,23 +3050,31 @@ yyparse (char **ret_str)
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
+
 /*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
+| yynewstate -- push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
- yynewstate:
+yynewstate:
   /* In all cases, when you get here, the value and location stacks
      have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
- yysetstate:
-  *yyssp = yystate;
+
+/*--------------------------------------------------------------------.
+| yynewstate -- set current state (the top of the stack) to yystate.  |
+`--------------------------------------------------------------------*/
+yysetstate:
+  *yyssp = (yytype_int16) yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+    goto yyexhaustedlab;
+#else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
 
-#ifdef yyoverflow
+# if defined yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
@@ -3082,14 +3090,10 @@ yyparse (char **ret_str)
                     &yyss1, yysize * sizeof (*yyssp),
                     &yyvs1, yysize * sizeof (*yyvsp),
                     &yystacksize);
-
         yyss = yyss1;
         yyvs = yyvs1;
       }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
         goto yyexhaustedlab;
@@ -3105,22 +3109,22 @@ yyparse (char **ret_str)
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-#  undef YYSTACK_RELOCATE
+# undef YYSTACK_RELOCATE
         if (yyss1 != yyssa)
           YYSTACK_FREE (yyss1);
       }
 # endif
-#endif /* no yyoverflow */
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+                  (unsigned long) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
     }
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
@@ -3129,11 +3133,11 @@ yyparse (char **ret_str)
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
-
   /* Do appropriate processing given the current state.  Read a
      lookahead token if we need one and don't already have one.  */
 
@@ -3206,7 +3210,7 @@ yydefault:
 
 
 /*-----------------------------.
-| yyreduce -- Do a reduction.  |
+| yyreduce -- do a reduction.  |
 `-----------------------------*/
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
@@ -3227,68 +3231,68 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 287 "itex2MML.y" /* yacc.c:1648  */
+#line 287 "itex2MML.y" /* yacc.c:1652  */
     {/* all processing done in body*/}
-#line 3233 "y.tab.c" /* yacc.c:1648  */
+#line 3237 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 3:
-#line 290 "itex2MML.y" /* yacc.c:1648  */
+#line 290 "itex2MML.y" /* yacc.c:1652  */
     {/* nothing - do nothing*/}
-#line 3239 "y.tab.c" /* yacc.c:1648  */
+#line 3243 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 4:
-#line 291 "itex2MML.y" /* yacc.c:1648  */
+#line 291 "itex2MML.y" /* yacc.c:1652  */
     {/* proc done in body*/}
-#line 3245 "y.tab.c" /* yacc.c:1648  */
+#line 3249 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 5:
-#line 292 "itex2MML.y" /* yacc.c:1648  */
+#line 292 "itex2MML.y" /* yacc.c:1652  */
     {/* all proc. in body*/}
-#line 3251 "y.tab.c" /* yacc.c:1648  */
+#line 3255 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 6:
-#line 293 "itex2MML.y" /* yacc.c:1648  */
+#line 293 "itex2MML.y" /* yacc.c:1652  */
     {/* all proc. in body*/}
-#line 3257 "y.tab.c" /* yacc.c:1648  */
+#line 3261 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 7:
-#line 294 "itex2MML.y" /* yacc.c:1648  */
+#line 294 "itex2MML.y" /* yacc.c:1652  */
     {/* all proc. in body*/}
-#line 3263 "y.tab.c" /* yacc.c:1648  */
+#line 3267 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 8:
-#line 296 "itex2MML.y" /* yacc.c:1648  */
-    {printf("%s", (yyvsp[0]));}
-#line 3269 "y.tab.c" /* yacc.c:1648  */
+#line 296 "itex2MML.y" /* yacc.c:1652  */
+    {printf("%s", yyvsp[0]);}
+#line 3273 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 9:
-#line 298 "itex2MML.y" /* yacc.c:1648  */
+#line 298 "itex2MML.y" /* yacc.c:1652  */
     {/* empty math group - ignore*/}
-#line 3275 "y.tab.c" /* yacc.c:1648  */
+#line 3279 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 10:
-#line 299 "itex2MML.y" /* yacc.c:1648  */
+#line 299 "itex2MML.y" /* yacc.c:1652  */
     {/* ditto */}
-#line 3281 "y.tab.c" /* yacc.c:1648  */
+#line 3285 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 11:
-#line 300 "itex2MML.y" /* yacc.c:1648  */
+#line 300 "itex2MML.y" /* yacc.c:1652  */
     {
   char ** r = (char **) ret_str;
-  char * p = itex2MML_copy3("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow>", (yyvsp[-1]), "</mrow><annotation encoding='application/x-tex'>");
-  char * s = itex2MML_copy3(p, (yyvsp[0]), "</annotation></semantics></math>");
+  char * p = itex2MML_copy3("<math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><semantics><mrow>", yyvsp[-1], "</mrow><annotation encoding='application/x-tex'>");
+  char * s = itex2MML_copy3(p, yyvsp[0], "</annotation></semantics></math>");
   itex2MML_free_string(p);
-  itex2MML_free_string((yyvsp[-1]));  
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);  
+  itex2MML_free_string(yyvsp[0]);
   if (r) {
     (*r) = (s == itex2MML_empty_string) ? 0 : s;
   }
@@ -3298,18 +3302,18 @@ yyreduce:
     itex2MML_free_string(s);
   }
 }
-#line 3302 "y.tab.c" /* yacc.c:1648  */
+#line 3306 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 12:
-#line 316 "itex2MML.y" /* yacc.c:1648  */
+#line 316 "itex2MML.y" /* yacc.c:1652  */
     {
   char ** r = (char **) ret_str;
-  char * p = itex2MML_copy3("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><semantics><mrow>", (yyvsp[-1]), "</mrow><annotation encoding='application/x-tex'>");
-  char * s = itex2MML_copy3(p, (yyvsp[0]), "</annotation></semantics></math>");
+  char * p = itex2MML_copy3("<math xmlns='http://www.w3.org/1998/Math/MathML' display='block'><semantics><mrow>", yyvsp[-1], "</mrow><annotation encoding='application/x-tex'>");
+  char * s = itex2MML_copy3(p, yyvsp[0], "</annotation></semantics></math>");
   itex2MML_free_string(p);
-  itex2MML_free_string((yyvsp[-1]));  
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);  
+  itex2MML_free_string(yyvsp[0]);
   if (r) {
     (*r) = (s == itex2MML_empty_string) ? 0 : s;
   }
@@ -3319,2520 +3323,2520 @@ yyreduce:
     itex2MML_free_string(s);
   }
 }
-#line 3323 "y.tab.c" /* yacc.c:1648  */
+#line 3327 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 13:
-#line 333 "itex2MML.y" /* yacc.c:1648  */
+#line 333 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string((yyvsp[0]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string(yyvsp[0]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3332 "y.tab.c" /* yacc.c:1648  */
+#line 3336 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 14:
-#line 337 "itex2MML.y" /* yacc.c:1648  */
+#line 337 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy2((yyvsp[-1]), (yyvsp[0]));
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy2(yyvsp[-1], yyvsp[0]);
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3342 "y.tab.c" /* yacc.c:1648  */
+#line 3346 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 15:
-#line 343 "itex2MML.y" /* yacc.c:1648  */
+#line 343 "itex2MML.y" /* yacc.c:1652  */
     {
   if (itex2MML_displaymode == 1) {
-    char * s1 = itex2MML_copy3("<munderover>", (yyvsp[-4]), " ");
-    char * s2 = itex2MML_copy3((yyvsp[-2]), " ", (yyvsp[0]));
-    (yyval) = itex2MML_copy3(s1, s2, "</munderover>");
+    char * s1 = itex2MML_copy3("<munderover>", yyvsp[-4], " ");
+    char * s2 = itex2MML_copy3(yyvsp[-2], " ", yyvsp[0]);
+    yyval = itex2MML_copy3(s1, s2, "</munderover>");
     itex2MML_free_string(s1);
     itex2MML_free_string(s2);
   }
   else {
-    char * s1 = itex2MML_copy3("<msubsup>", (yyvsp[-4]), " ");
-    char * s2 = itex2MML_copy3((yyvsp[-2]), " ", (yyvsp[0]));
-    (yyval) = itex2MML_copy3(s1, s2, "</msubsup>");
+    char * s1 = itex2MML_copy3("<msubsup>", yyvsp[-4], " ");
+    char * s2 = itex2MML_copy3(yyvsp[-2], " ", yyvsp[0]);
+    yyval = itex2MML_copy3(s1, s2, "</msubsup>");
     itex2MML_free_string(s1);
     itex2MML_free_string(s2);
   }
-  itex2MML_free_string((yyvsp[-4]));
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-4]);
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3366 "y.tab.c" /* yacc.c:1648  */
+#line 3370 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 16:
-#line 362 "itex2MML.y" /* yacc.c:1648  */
+#line 362 "itex2MML.y" /* yacc.c:1652  */
     {
   if (itex2MML_displaymode == 1) {
-    char * s1 = itex2MML_copy3("<munder>", (yyvsp[-2]), " ");
-    (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</munder>");
+    char * s1 = itex2MML_copy3("<munder>", yyvsp[-2], " ");
+    yyval = itex2MML_copy3(s1, yyvsp[0], "</munder>");
     itex2MML_free_string(s1);
   }
   else {
-    char * s1 = itex2MML_copy3("<msub>", (yyvsp[-2]), " ");
-    (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</msub>");
+    char * s1 = itex2MML_copy3("<msub>", yyvsp[-2], " ");
+    yyval = itex2MML_copy3(s1, yyvsp[0], "</msub>");
     itex2MML_free_string(s1);
   }
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3385 "y.tab.c" /* yacc.c:1648  */
+#line 3389 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 17:
-#line 376 "itex2MML.y" /* yacc.c:1648  */
+#line 376 "itex2MML.y" /* yacc.c:1652  */
     {
   if (itex2MML_displaymode == 1) {
-    char * s1 = itex2MML_copy3("<munderover>", (yyvsp[-4]), " ");
-    char * s2 = itex2MML_copy3((yyvsp[0]), " ", (yyvsp[-2]));
-    (yyval) = itex2MML_copy3(s1, s2, "</munderover>");
+    char * s1 = itex2MML_copy3("<munderover>", yyvsp[-4], " ");
+    char * s2 = itex2MML_copy3(yyvsp[0], " ", yyvsp[-2]);
+    yyval = itex2MML_copy3(s1, s2, "</munderover>");
     itex2MML_free_string(s1);
     itex2MML_free_string(s2);
   }
   else {
-    char * s1 = itex2MML_copy3("<msubsup>", (yyvsp[-4]), " ");
-    char * s2 = itex2MML_copy3((yyvsp[0]), " ", (yyvsp[-2]));
-    (yyval) = itex2MML_copy3(s1, s2, "</msubsup>");
+    char * s1 = itex2MML_copy3("<msubsup>", yyvsp[-4], " ");
+    char * s2 = itex2MML_copy3(yyvsp[0], " ", yyvsp[-2]);
+    yyval = itex2MML_copy3(s1, s2, "</msubsup>");
     itex2MML_free_string(s1);
     itex2MML_free_string(s2);
   }
-  itex2MML_free_string((yyvsp[-4]));
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-4]);
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3409 "y.tab.c" /* yacc.c:1648  */
+#line 3413 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 18:
-#line 395 "itex2MML.y" /* yacc.c:1648  */
+#line 395 "itex2MML.y" /* yacc.c:1652  */
     {
   if (itex2MML_displaymode == 1) {
-    char * s1 = itex2MML_copy3("<mover>", (yyvsp[-2]), " ");
-    (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</mover>");
+    char * s1 = itex2MML_copy3("<mover>", yyvsp[-2], " ");
+    yyval = itex2MML_copy3(s1, yyvsp[0], "</mover>");
     itex2MML_free_string(s1);
   }
   else {
-    char * s1 = itex2MML_copy3("<msup>", (yyvsp[-2]), " ");
-    (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</msup>");
+    char * s1 = itex2MML_copy3("<msup>", yyvsp[-2], " ");
+    yyval = itex2MML_copy3(s1, yyvsp[0], "</msup>");
     itex2MML_free_string(s1);
   }
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3428 "y.tab.c" /* yacc.c:1648  */
+#line 3432 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 19:
-#line 409 "itex2MML.y" /* yacc.c:1648  */
+#line 409 "itex2MML.y" /* yacc.c:1652  */
     {
   if (itex2MML_displaymode == 1) {
-    char * s1 = itex2MML_copy3("<munderover>", (yyvsp[-4]), " ");
-    char * s2 = itex2MML_copy3((yyvsp[-2]), " ", (yyvsp[0]));
-    (yyval) = itex2MML_copy3(s1, s2, "</munderover>");
+    char * s1 = itex2MML_copy3("<munderover>", yyvsp[-4], " ");
+    char * s2 = itex2MML_copy3(yyvsp[-2], " ", yyvsp[0]);
+    yyval = itex2MML_copy3(s1, s2, "</munderover>");
     itex2MML_free_string(s1);
     itex2MML_free_string(s2);
   }
   else {
-    char * s1 = itex2MML_copy3("<msubsup>", (yyvsp[-4]), " ");
-    char * s2 = itex2MML_copy3((yyvsp[-2]), " ", (yyvsp[0]));
-    (yyval) = itex2MML_copy3(s1, s2, "</msubsup>");
+    char * s1 = itex2MML_copy3("<msubsup>", yyvsp[-4], " ");
+    char * s2 = itex2MML_copy3(yyvsp[-2], " ", yyvsp[0]);
+    yyval = itex2MML_copy3(s1, s2, "</msubsup>");
     itex2MML_free_string(s1);
     itex2MML_free_string(s2);
   }
-  itex2MML_free_string((yyvsp[-4]));
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-4]);
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3452 "y.tab.c" /* yacc.c:1648  */
+#line 3456 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 20:
-#line 428 "itex2MML.y" /* yacc.c:1648  */
+#line 428 "itex2MML.y" /* yacc.c:1652  */
     {
   if (itex2MML_displaymode == 1) {
-    char * s1 = itex2MML_copy3("<munder>", (yyvsp[-2]), " ");
-    (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</munder>");
+    char * s1 = itex2MML_copy3("<munder>", yyvsp[-2], " ");
+    yyval = itex2MML_copy3(s1, yyvsp[0], "</munder>");
     itex2MML_free_string(s1);
   }
   else {
-    char * s1 = itex2MML_copy3("<msub>", (yyvsp[-2]), " ");
-    (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</msub>");
+    char * s1 = itex2MML_copy3("<msub>", yyvsp[-2], " ");
+    yyval = itex2MML_copy3(s1, yyvsp[0], "</msub>");
     itex2MML_free_string(s1);
   }
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3471 "y.tab.c" /* yacc.c:1648  */
+#line 3475 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 21:
-#line 442 "itex2MML.y" /* yacc.c:1648  */
+#line 442 "itex2MML.y" /* yacc.c:1652  */
     {
   if (itex2MML_displaymode == 1) {
-    char * s1 = itex2MML_copy3("<munderover>", (yyvsp[-4]), " ");
-    char * s2 = itex2MML_copy3((yyvsp[0]), " ", (yyvsp[-2]));
-    (yyval) = itex2MML_copy3(s1, s2, "</munderover>");
+    char * s1 = itex2MML_copy3("<munderover>", yyvsp[-4], " ");
+    char * s2 = itex2MML_copy3(yyvsp[0], " ", yyvsp[-2]);
+    yyval = itex2MML_copy3(s1, s2, "</munderover>");
     itex2MML_free_string(s1);
     itex2MML_free_string(s2);
   }
   else {
-    char * s1 = itex2MML_copy3("<msubsup>", (yyvsp[-4]), " ");
-    char * s2 = itex2MML_copy3((yyvsp[0]), " ", (yyvsp[-2]));
-    (yyval) = itex2MML_copy3(s1, s2, "</msubsup>");
+    char * s1 = itex2MML_copy3("<msubsup>", yyvsp[-4], " ");
+    char * s2 = itex2MML_copy3(yyvsp[0], " ", yyvsp[-2]);
+    yyval = itex2MML_copy3(s1, s2, "</msubsup>");
     itex2MML_free_string(s1);
     itex2MML_free_string(s2);
   }
-  itex2MML_free_string((yyvsp[-4]));
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-4]);
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3495 "y.tab.c" /* yacc.c:1648  */
+#line 3499 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 22:
-#line 461 "itex2MML.y" /* yacc.c:1648  */
+#line 461 "itex2MML.y" /* yacc.c:1652  */
     {
   if (itex2MML_displaymode == 1) {
-    char * s1 = itex2MML_copy3("<mover>", (yyvsp[-2]), " ");
-    (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</mover>");
+    char * s1 = itex2MML_copy3("<mover>", yyvsp[-2], " ");
+    yyval = itex2MML_copy3(s1, yyvsp[0], "</mover>");
     itex2MML_free_string(s1);
   }
   else {
-    char * s1 = itex2MML_copy3("<msup>", (yyvsp[-2]), " ");
-    (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</msup>");
+    char * s1 = itex2MML_copy3("<msup>", yyvsp[-2], " ");
+    yyval = itex2MML_copy3(s1, yyvsp[0], "</msup>");
     itex2MML_free_string(s1);
   }
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3514 "y.tab.c" /* yacc.c:1648  */
+#line 3518 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 23:
-#line 475 "itex2MML.y" /* yacc.c:1648  */
+#line 475 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<msubsup>", (yyvsp[-4]), " ");
-  char * s2 = itex2MML_copy3((yyvsp[-2]), " ", (yyvsp[0]));
-  (yyval) = itex2MML_copy3(s1, s2, "</msubsup>");
+  char * s1 = itex2MML_copy3("<msubsup>", yyvsp[-4], " ");
+  char * s2 = itex2MML_copy3(yyvsp[-2], " ", yyvsp[0]);
+  yyval = itex2MML_copy3(s1, s2, "</msubsup>");
   itex2MML_free_string(s1);
   itex2MML_free_string(s2);
-  itex2MML_free_string((yyvsp[-4]));
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-4]);
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3529 "y.tab.c" /* yacc.c:1648  */
+#line 3533 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 24:
-#line 485 "itex2MML.y" /* yacc.c:1648  */
+#line 485 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<msubsup>", (yyvsp[-4]), " ");
-  char * s2 = itex2MML_copy3((yyvsp[0]), " ", (yyvsp[-2]));
-  (yyval) = itex2MML_copy3(s1, s2, "</msubsup>");
+  char * s1 = itex2MML_copy3("<msubsup>", yyvsp[-4], " ");
+  char * s2 = itex2MML_copy3(yyvsp[0], " ", yyvsp[-2]);
+  yyval = itex2MML_copy3(s1, s2, "</msubsup>");
   itex2MML_free_string(s1);
   itex2MML_free_string(s2);
-  itex2MML_free_string((yyvsp[-4]));
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-4]);
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3544 "y.tab.c" /* yacc.c:1648  */
+#line 3548 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 25:
-#line 495 "itex2MML.y" /* yacc.c:1648  */
+#line 495 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<msub>", (yyvsp[-2]), " ");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</msub>");
+  char * s1 = itex2MML_copy3("<msub>", yyvsp[-2], " ");
+  yyval = itex2MML_copy3(s1, yyvsp[0], "</msub>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3556 "y.tab.c" /* yacc.c:1648  */
+#line 3560 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 26:
-#line 502 "itex2MML.y" /* yacc.c:1648  */
+#line 502 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<msup>", (yyvsp[-2]), " ");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</msup>");
+  char * s1 = itex2MML_copy3("<msup>", yyvsp[-2], " ");
+  yyval = itex2MML_copy3(s1, yyvsp[0], "</msup>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3568 "y.tab.c" /* yacc.c:1648  */
+#line 3572 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 27:
-#line 509 "itex2MML.y" /* yacc.c:1648  */
+#line 509 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<msub><mo/>", (yyvsp[0]), "</msub>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<msub><mo/>", yyvsp[0], "</msub>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3577 "y.tab.c" /* yacc.c:1648  */
+#line 3581 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 28:
-#line 513 "itex2MML.y" /* yacc.c:1648  */
+#line 513 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<msup><mo/>", (yyvsp[0]), "</msup>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<msup><mo/>", yyvsp[0], "</msup>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3586 "y.tab.c" /* yacc.c:1648  */
+#line 3590 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 29:
-#line 517 "itex2MML.y" /* yacc.c:1648  */
+#line 517 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string((yyvsp[0]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string(yyvsp[0]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3595 "y.tab.c" /* yacc.c:1648  */
+#line 3599 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 34:
-#line 526 "itex2MML.y" /* yacc.c:1648  */
+#line 526 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mi>", (yyvsp[0]), "</mi>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mi>", yyvsp[0], "</mi>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3604 "y.tab.c" /* yacc.c:1648  */
+#line 3608 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 35:
-#line 530 "itex2MML.y" /* yacc.c:1648  */
+#line 530 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mn>", (yyvsp[0]), "</mn>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mn>", yyvsp[0], "</mn>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3613 "y.tab.c" /* yacc.c:1648  */
+#line 3617 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 105:
-#line 603 "itex2MML.y" /* yacc.c:1648  */
+#line 603 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[-1]));
+  yyval = itex2MML_copy_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 3622 "y.tab.c" /* yacc.c:1648  */
+#line 3626 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 106:
-#line 607 "itex2MML.y" /* yacc.c:1648  */
+#line 607 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mrow>", (yyvsp[-1]), "</mrow>");
-  itex2MML_free_string((yyvsp[-1]));
+  yyval = itex2MML_copy3("<mrow>", yyvsp[-1], "</mrow>");
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 3631 "y.tab.c" /* yacc.c:1648  */
+#line 3635 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 107:
-#line 611 "itex2MML.y" /* yacc.c:1648  */
+#line 611 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<mrow>", (yyvsp[-2]), (yyvsp[-1]));
-  (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</mrow>");
+  char * s1 = itex2MML_copy3("<mrow>", yyvsp[-2], yyvsp[-1]);
+  yyval = itex2MML_copy3(s1, yyvsp[0], "</mrow>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-2]));
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-2]);
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3644 "y.tab.c" /* yacc.c:1648  */
+#line 3648 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 112:
-#line 624 "itex2MML.y" /* yacc.c:1648  */
+#line 624 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo>", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo>", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3654 "y.tab.c" /* yacc.c:1648  */
+#line 3658 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 113:
-#line 629 "itex2MML.y" /* yacc.c:1648  */
+#line 629 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo>", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo>", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3664 "y.tab.c" /* yacc.c:1648  */
+#line 3668 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 114:
-#line 634 "itex2MML.y" /* yacc.c:1648  */
+#line 634 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy_string("");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string("");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3674 "y.tab.c" /* yacc.c:1648  */
+#line 3678 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 115:
-#line 640 "itex2MML.y" /* yacc.c:1648  */
+#line 640 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo>", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo>", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3683 "y.tab.c" /* yacc.c:1648  */
+#line 3687 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 116:
-#line 644 "itex2MML.y" /* yacc.c:1648  */
+#line 644 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo>", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo>", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3692 "y.tab.c" /* yacc.c:1648  */
+#line 3696 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 117:
-#line 648 "itex2MML.y" /* yacc.c:1648  */
+#line 648 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string("");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3701 "y.tab.c" /* yacc.c:1648  */
+#line 3705 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 118:
-#line 653 "itex2MML.y" /* yacc.c:1648  */
+#line 653 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3711 "y.tab.c" /* yacc.c:1648  */
+#line 3715 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 119:
-#line 658 "itex2MML.y" /* yacc.c:1648  */
+#line 658 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3720 "y.tab.c" /* yacc.c:1648  */
+#line 3724 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 120:
-#line 662 "itex2MML.y" /* yacc.c:1648  */
+#line 662 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3729 "y.tab.c" /* yacc.c:1648  */
+#line 3733 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 121:
-#line 666 "itex2MML.y" /* yacc.c:1648  */
+#line 666 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3739 "y.tab.c" /* yacc.c:1648  */
+#line 3743 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 122:
-#line 671 "itex2MML.y" /* yacc.c:1648  */
+#line 671 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3748 "y.tab.c" /* yacc.c:1648  */
+#line 3752 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 123:
-#line 675 "itex2MML.y" /* yacc.c:1648  */
+#line 675 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3757 "y.tab.c" /* yacc.c:1648  */
+#line 3761 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 124:
-#line 679 "itex2MML.y" /* yacc.c:1648  */
+#line 679 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3767 "y.tab.c" /* yacc.c:1648  */
+#line 3771 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 125:
-#line 684 "itex2MML.y" /* yacc.c:1648  */
+#line 684 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3776 "y.tab.c" /* yacc.c:1648  */
+#line 3780 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 126:
-#line 688 "itex2MML.y" /* yacc.c:1648  */
+#line 688 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3785 "y.tab.c" /* yacc.c:1648  */
+#line 3789 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 127:
-#line 692 "itex2MML.y" /* yacc.c:1648  */
+#line 692 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3795 "y.tab.c" /* yacc.c:1648  */
+#line 3799 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 128:
-#line 697 "itex2MML.y" /* yacc.c:1648  */
+#line 697 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3804 "y.tab.c" /* yacc.c:1648  */
+#line 3808 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 129:
-#line 701 "itex2MML.y" /* yacc.c:1648  */
+#line 701 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3813 "y.tab.c" /* yacc.c:1648  */
+#line 3817 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 130:
-#line 705 "itex2MML.y" /* yacc.c:1648  */
+#line 705 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3823 "y.tab.c" /* yacc.c:1648  */
+#line 3827 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 131:
-#line 710 "itex2MML.y" /* yacc.c:1648  */
+#line 710 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.2em\" minsize=\"1.2em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3833 "y.tab.c" /* yacc.c:1648  */
+#line 3837 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 132:
-#line 715 "itex2MML.y" /* yacc.c:1648  */
+#line 715 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3843 "y.tab.c" /* yacc.c:1648  */
+#line 3847 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 133:
-#line 720 "itex2MML.y" /* yacc.c:1648  */
+#line 720 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"1.8em\" minsize=\"1.8em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3853 "y.tab.c" /* yacc.c:1648  */
+#line 3857 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 134:
-#line 725 "itex2MML.y" /* yacc.c:1648  */
+#line 725 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3863 "y.tab.c" /* yacc.c:1648  */
+#line 3867 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 135:
-#line 730 "itex2MML.y" /* yacc.c:1648  */
+#line 730 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"2.4em\" minsize=\"2.4em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3873 "y.tab.c" /* yacc.c:1648  */
+#line 3877 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 136:
-#line 735 "itex2MML.y" /* yacc.c:1648  */
+#line 735 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3883 "y.tab.c" /* yacc.c:1648  */
+#line 3887 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 137:
-#line 740 "itex2MML.y" /* yacc.c:1648  */
+#line 740 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo maxsize=\"3em\" minsize=\"3em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3893 "y.tab.c" /* yacc.c:1648  */
+#line 3897 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 138:
-#line 746 "itex2MML.y" /* yacc.c:1648  */
+#line 746 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<merror><mtext>Unknown character</mtext></merror>");
+  yyval = itex2MML_copy_string("<merror><mtext>Unknown character</mtext></merror>");
 }
-#line 3901 "y.tab.c" /* yacc.c:1648  */
+#line 3905 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 139:
-#line 750 "itex2MML.y" /* yacc.c:1648  */
+#line 750 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mo lspace=\"verythinmathspace\" rspace=\"0em\">&minus;</mo>");
+  yyval = itex2MML_copy_string("<mo lspace=\"0.11111em\" rspace=\"0em\">&minus;</mo>");
 }
-#line 3909 "y.tab.c" /* yacc.c:1648  */
+#line 3913 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 140:
-#line 754 "itex2MML.y" /* yacc.c:1648  */
+#line 754 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mo lspace=\"verythinmathspace\" rspace=\"0em\">+</mo>");
+  yyval = itex2MML_copy_string("<mo lspace=\"0.11111em\" rspace=\"0em\">+</mo>");
 }
-#line 3917 "y.tab.c" /* yacc.c:1648  */
+#line 3921 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 142:
-#line 760 "itex2MML.y" /* yacc.c:1648  */
+#line 760 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn=2;
-  (yyval) = itex2MML_copy3("<mi>", (yyvsp[0]), "</mi>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mi>", yyvsp[0], "</mi>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3927 "y.tab.c" /* yacc.c:1648  */
+#line 3931 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 144:
-#line 767 "itex2MML.y" /* yacc.c:1648  */
+#line 767 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy_string((yyvsp[0]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string(yyvsp[0]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3937 "y.tab.c" /* yacc.c:1648  */
+#line 3941 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 145:
-#line 773 "itex2MML.y" /* yacc.c:1648  */
+#line 773 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo lspace=\"thinmathspace\" rspace=\"thinmathspace\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo lspace=\"0.16667em\" rspace=\"0.16667em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3947 "y.tab.c" /* yacc.c:1648  */
+#line 3951 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 148:
-#line 781 "itex2MML.y" /* yacc.c:1648  */
+#line 781 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo>", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo>", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3957 "y.tab.c" /* yacc.c:1648  */
+#line 3961 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 149:
-#line 786 "itex2MML.y" /* yacc.c:1648  */
+#line 786 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo>", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo>", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3967 "y.tab.c" /* yacc.c:1648  */
+#line 3971 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 150:
-#line 791 "itex2MML.y" /* yacc.c:1648  */
+#line 791 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mstyle scriptlevel=\"0\"><mo>", (yyvsp[0]), "</mo></mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle scriptlevel=\"0\"><mo>", yyvsp[0], "</mo></mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3977 "y.tab.c" /* yacc.c:1648  */
+#line 3981 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 151:
-#line 796 "itex2MML.y" /* yacc.c:1648  */
+#line 796 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo stretchy=\"false\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo stretchy=\"false\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3986 "y.tab.c" /* yacc.c:1648  */
+#line 3990 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 152:
-#line 800 "itex2MML.y" /* yacc.c:1648  */
+#line 800 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo stretchy=\"false\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo stretchy=\"false\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 3996 "y.tab.c" /* yacc.c:1648  */
+#line 4000 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 153:
-#line 805 "itex2MML.y" /* yacc.c:1648  */
+#line 805 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo stretchy=\"false\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo stretchy=\"false\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4005 "y.tab.c" /* yacc.c:1648  */
+#line 4009 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 154:
-#line 809 "itex2MML.y" /* yacc.c:1648  */
+#line 809 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo stretchy=\"false\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo stretchy=\"false\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4014 "y.tab.c" /* yacc.c:1648  */
+#line 4018 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 155:
-#line 813 "itex2MML.y" /* yacc.c:1648  */
+#line 813 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mo>", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo>", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4023 "y.tab.c" /* yacc.c:1648  */
+#line 4027 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 156:
-#line 817 "itex2MML.y" /* yacc.c:1648  */
+#line 817 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn=2;
-  (yyval) = itex2MML_copy3("<mo lspace=\"mediummathspace\" rspace=\"mediummathspace\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo lspace=\"0.22222em\" rspace=\"0.22222em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4033 "y.tab.c" /* yacc.c:1648  */
+#line 4037 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 157:
-#line 822 "itex2MML.y" /* yacc.c:1648  */
+#line 822 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo lspace=\"0em\" rspace=\"thinmathspace\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo lspace=\"0em\" rspace=\"0.16667em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4043 "y.tab.c" /* yacc.c:1648  */
+#line 4047 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 158:
-#line 827 "itex2MML.y" /* yacc.c:1648  */
+#line 827 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo lspace=\"verythinmathspace\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo lspace=\"0.11111em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4053 "y.tab.c" /* yacc.c:1648  */
+#line 4057 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 159:
-#line 832 "itex2MML.y" /* yacc.c:1648  */
+#line 832 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo lspace=\"0em\" rspace=\"thinmathspace\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo lspace=\"0em\" rspace=\"0.16667em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4063 "y.tab.c" /* yacc.c:1648  */
+#line 4067 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 160:
-#line 837 "itex2MML.y" /* yacc.c:1648  */
+#line 837 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo lspace=\"thinmathspace\" rspace=\"thinmathspace\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo lspace=\"0.16667em\" rspace=\"0.16667em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4073 "y.tab.c" /* yacc.c:1648  */
+#line 4077 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 161:
-#line 842 "itex2MML.y" /* yacc.c:1648  */
+#line 842 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo lspace=\"mediummathspace\" rspace=\"mediummathspace\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo lspace=\"0.22222em\" rspace=\"0.22222em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4083 "y.tab.c" /* yacc.c:1648  */
+#line 4087 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 162:
-#line 847 "itex2MML.y" /* yacc.c:1648  */
+#line 847 "itex2MML.y" /* yacc.c:1652  */
     {
   itex2MML_rowposn = 2;
-  (yyval) = itex2MML_copy3("<mo lspace=\"thickmathspace\" rspace=\"thickmathspace\">", (yyvsp[0]), "</mo>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mo lspace=\"0.27778em\" rspace=\"0.27778em\">", yyvsp[0], "</mo>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4093 "y.tab.c" /* yacc.c:1648  */
+#line 4097 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 163:
-#line 853 "itex2MML.y" /* yacc.c:1648  */
+#line 853 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<mspace height=\"", (yyvsp[-7]), "ex\" depth=\"");
-  char * s2 = itex2MML_copy3((yyvsp[-4]), "ex\" width=\"", (yyvsp[-1]));
-  (yyval) = itex2MML_copy3(s1, s2, "em\"/>");
+  char * s1 = itex2MML_copy3("<mspace height=\"", yyvsp[-7], "ex\" depth=\"");
+  char * s2 = itex2MML_copy3(yyvsp[-4], "ex\" width=\"", yyvsp[-1]);
+  yyval = itex2MML_copy3(s1, s2, "em\"/>");
   itex2MML_free_string(s1);
   itex2MML_free_string(s2);
-  itex2MML_free_string((yyvsp[-7]));
-  itex2MML_free_string((yyvsp[-4]));
-  itex2MML_free_string((yyvsp[-1]));
+  itex2MML_free_string(yyvsp[-7]);
+  itex2MML_free_string(yyvsp[-4]);
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 4108 "y.tab.c" /* yacc.c:1648  */
+#line 4112 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 164:
-#line 864 "itex2MML.y" /* yacc.c:1648  */
+#line 864 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<maction actiontype=\"statusline\">", (yyvsp[0]), "<mtext>");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[-1]), "</mtext></maction>");
+  char * s1 = itex2MML_copy3("<maction actiontype=\"statusline\">", yyvsp[0], "<mtext>");
+  yyval = itex2MML_copy3(s1, yyvsp[-1], "</mtext></maction>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4120 "y.tab.c" /* yacc.c:1648  */
+#line 4124 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 165:
-#line 872 "itex2MML.y" /* yacc.c:1648  */
+#line 872 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<maction actiontype=\"tooltip\">", (yyvsp[0]), "<mtext>");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[-1]), "</mtext></maction>");
+  char * s1 = itex2MML_copy3("<maction actiontype=\"tooltip\">", yyvsp[0], "<mtext>");
+  yyval = itex2MML_copy3(s1, yyvsp[-1], "</mtext></maction>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4132 "y.tab.c" /* yacc.c:1648  */
+#line 4136 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 166:
-#line 880 "itex2MML.y" /* yacc.c:1648  */
+#line 880 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<maction actiontype=\"toggle\" selection=\"2\">", (yyvsp[-1]), " ");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</maction>");
+  char * s1 = itex2MML_copy3("<maction actiontype=\"toggle\" selection=\"2\">", yyvsp[-1], " ");
+  yyval = itex2MML_copy3(s1, yyvsp[0], "</maction>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4144 "y.tab.c" /* yacc.c:1648  */
+#line 4148 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 167:
-#line 887 "itex2MML.y" /* yacc.c:1648  */
+#line 887 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<maction actiontype=\"toggle\">", (yyvsp[-1]), "</maction>");
-  itex2MML_free_string((yyvsp[-1]));
+  yyval = itex2MML_copy3("<maction actiontype=\"toggle\">", yyvsp[-1], "</maction>");
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 4153 "y.tab.c" /* yacc.c:1648  */
+#line 4157 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 168:
-#line 892 "itex2MML.y" /* yacc.c:1648  */
+#line 892 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<maction actiontype=\"highlight\" other='color=", (yyvsp[-1]), "'>");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</maction>");
+  char * s1 = itex2MML_copy3("<maction actiontype=\"highlight\" other='color=", yyvsp[-1], "'>");
+  yyval = itex2MML_copy3(s1, yyvsp[0], "</maction>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4165 "y.tab.c" /* yacc.c:1648  */
+#line 4169 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 169:
-#line 900 "itex2MML.y" /* yacc.c:1648  */
+#line 900 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<maction actiontype=\"highlight\" other='background=", (yyvsp[-1]), "'>");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</maction>");
+  char * s1 = itex2MML_copy3("<maction actiontype=\"highlight\" other='background=", yyvsp[-1], "'>");
+  yyval = itex2MML_copy3(s1, yyvsp[0], "</maction>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4177 "y.tab.c" /* yacc.c:1648  */
+#line 4181 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 170:
-#line 908 "itex2MML.y" /* yacc.c:1648  */
+#line 908 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<mstyle mathcolor=", (yyvsp[-1]), ">");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</mstyle>");
+  char * s1 = itex2MML_copy3("<mstyle mathcolor=", yyvsp[-1], ">");
+  yyval = itex2MML_copy3(s1, yyvsp[0], "</mstyle>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4189 "y.tab.c" /* yacc.c:1648  */
+#line 4193 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 171:
-#line 915 "itex2MML.y" /* yacc.c:1648  */
+#line 915 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<mstyle mathbackground=", (yyvsp[-1]), ">");
-  (yyval) = itex2MML_copy3(s1, (yyvsp[0]), "</mstyle>");
+  char * s1 = itex2MML_copy3("<mstyle mathbackground=", yyvsp[-1], ">");
+  yyval = itex2MML_copy3(s1, yyvsp[0], "</mstyle>");
   itex2MML_free_string(s1);
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4201 "y.tab.c" /* yacc.c:1648  */
+#line 4205 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 172:
-#line 923 "itex2MML.y" /* yacc.c:1648  */
+#line 923 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mpadded width=\"0\">", (yyvsp[0]), "</mpadded>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mpadded width=\"0px\">", yyvsp[0], "</mpadded>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4210 "y.tab.c" /* yacc.c:1648  */
+#line 4214 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 173:
-#line 928 "itex2MML.y" /* yacc.c:1648  */
+#line 928 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mpadded width=\"0\" lspace=\"-100%width\">", (yyvsp[0]), "</mpadded>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mpadded width=\"0px\" lspace=\"-100%width\">", yyvsp[0], "</mpadded>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4219 "y.tab.c" /* yacc.c:1648  */
+#line 4223 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 174:
-#line 933 "itex2MML.y" /* yacc.c:1648  */
+#line 933 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mpadded width=\"0\" lspace=\"-50%width\">", (yyvsp[0]), "</mpadded>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mpadded width=\"0px\" lspace=\"-50%width\">", yyvsp[0], "</mpadded>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4228 "y.tab.c" /* yacc.c:1648  */
+#line 4232 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 175:
-#line 938 "itex2MML.y" /* yacc.c:1648  */
+#line 938 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mtext>", (yyvsp[0]), "</mtext>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mtext>", yyvsp[0], "</mtext>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4237 "y.tab.c" /* yacc.c:1648  */
+#line 4241 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 176:
-#line 943 "itex2MML.y" /* yacc.c:1648  */
+#line 943 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle displaystyle=\"true\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle displaystyle=\"true\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4246 "y.tab.c" /* yacc.c:1648  */
+#line 4250 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 177:
-#line 948 "itex2MML.y" /* yacc.c:1648  */
+#line 948 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle displaystyle=\"false\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle displaystyle=\"false\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4255 "y.tab.c" /* yacc.c:1648  */
+#line 4259 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 178:
-#line 953 "itex2MML.y" /* yacc.c:1648  */
+#line 953 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle scriptlevel=\"0\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle scriptlevel=\"0\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4264 "y.tab.c" /* yacc.c:1648  */
+#line 4268 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 179:
-#line 958 "itex2MML.y" /* yacc.c:1648  */
+#line 958 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle scriptlevel=\"1\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle scriptlevel=\"1\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4273 "y.tab.c" /* yacc.c:1648  */
+#line 4277 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 180:
-#line 963 "itex2MML.y" /* yacc.c:1648  */
+#line 963 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle scriptlevel=\"2\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle scriptlevel=\"2\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4282 "y.tab.c" /* yacc.c:1648  */
+#line 4286 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 181:
-#line 968 "itex2MML.y" /* yacc.c:1648  */
+#line 968 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle mathvariant=\"italic\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle mathvariant=\"italic\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4291 "y.tab.c" /* yacc.c:1648  */
+#line 4295 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 182:
-#line 973 "itex2MML.y" /* yacc.c:1648  */
+#line 973 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle mathvariant=\"sans-serif\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle mathvariant=\"sans-serif\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4300 "y.tab.c" /* yacc.c:1648  */
+#line 4304 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 183:
-#line 978 "itex2MML.y" /* yacc.c:1648  */
+#line 978 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle mathvariant=\"monospace\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle mathvariant=\"monospace\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4309 "y.tab.c" /* yacc.c:1648  */
+#line 4313 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 184:
-#line 983 "itex2MML.y" /* yacc.c:1648  */
+#line 983 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<menclose notation=\"updiagonalstrike\">", (yyvsp[0]), "</menclose>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<menclose notation=\"updiagonalstrike\">", yyvsp[0], "</menclose>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4318 "y.tab.c" /* yacc.c:1648  */
+#line 4322 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 185:
-#line 988 "itex2MML.y" /* yacc.c:1648  */
+#line 988 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<menclose notation=\"box\">", (yyvsp[0]), "</menclose>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<menclose notation=\"box\">", yyvsp[0], "</menclose>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4327 "y.tab.c" /* yacc.c:1648  */
+#line 4331 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 186:
-#line 993 "itex2MML.y" /* yacc.c:1648  */
+#line 993 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mstyle mathvariant=\"bold\">", (yyvsp[0]), "</mstyle>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mstyle mathvariant=\"bold\">", yyvsp[0], "</mstyle>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4336 "y.tab.c" /* yacc.c:1648  */
+#line 4340 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 187:
-#line 998 "itex2MML.y" /* yacc.c:1648  */
+#line 998 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mi mathvariant=\"normal\">", (yyvsp[-1]), "</mi>");
-  itex2MML_free_string((yyvsp[-1]));
+  yyval = itex2MML_copy3("<mi mathvariant=\"normal\">", yyvsp[-1], "</mi>");
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 4345 "y.tab.c" /* yacc.c:1648  */
+#line 4349 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 188:
-#line 1003 "itex2MML.y" /* yacc.c:1648  */
+#line 1003 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string((yyvsp[0]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string(yyvsp[0]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4354 "y.tab.c" /* yacc.c:1648  */
+#line 4358 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 189:
-#line 1007 "itex2MML.y" /* yacc.c:1648  */
+#line 1007 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy2((yyvsp[-1]), (yyvsp[0]));
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy2(yyvsp[-1], yyvsp[0]);
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4364 "y.tab.c" /* yacc.c:1648  */
+#line 4368 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 190:
-#line 1013 "itex2MML.y" /* yacc.c:1648  */
+#line 1013 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mi>", (yyvsp[-1]), "</mi>");
-  itex2MML_free_string((yyvsp[-1]));
+  yyval = itex2MML_copy3("<mi>", yyvsp[-1], "</mi>");
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 4373 "y.tab.c" /* yacc.c:1648  */
+#line 4377 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 191:
-#line 1018 "itex2MML.y" /* yacc.c:1648  */
+#line 1018 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string((yyvsp[0]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string(yyvsp[0]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4382 "y.tab.c" /* yacc.c:1648  */
+#line 4386 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 192:
-#line 1022 "itex2MML.y" /* yacc.c:1648  */
+#line 1022 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy2((yyvsp[-1]), (yyvsp[0]));
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy2(yyvsp[-1], yyvsp[0]);
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4392 "y.tab.c" /* yacc.c:1648  */
+#line 4396 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 193:
-#line 1028 "itex2MML.y" /* yacc.c:1648  */
+#line 1028 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("&", (yyvsp[0]), "opf;");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("&", yyvsp[0], "opf;");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4401 "y.tab.c" /* yacc.c:1648  */
+#line 4405 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 194:
-#line 1032 "itex2MML.y" /* yacc.c:1648  */
+#line 1032 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("&", (yyvsp[0]), "opf;");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("&", yyvsp[0], "opf;");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4410 "y.tab.c" /* yacc.c:1648  */
+#line 4414 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 195:
-#line 1036 "itex2MML.y" /* yacc.c:1648  */
+#line 1036 "itex2MML.y" /* yacc.c:1652  */
     {
   /* Blackboard digits 0-9 correspond to Unicode characters 0x1D7D8-0x1D7E1 */
-  char * end = (yyvsp[0]) + 1;
-  int code = 0x1D7D8 + strtoul((yyvsp[0]), &end, 10);
-  (yyval) = itex2MML_character_reference(code);
-  itex2MML_free_string((yyvsp[0]));
+  char * end = yyvsp[0] + 1;
+  int code = 0x1D7D8 + strtoul(yyvsp[0], &end, 10);
+  yyval = itex2MML_character_reference(code);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4422 "y.tab.c" /* yacc.c:1648  */
+#line 4426 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 196:
-#line 1044 "itex2MML.y" /* yacc.c:1648  */
+#line 1044 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mi>", (yyvsp[-1]), "</mi>");
-  itex2MML_free_string((yyvsp[-1]));
+  yyval = itex2MML_copy3("<mi>", yyvsp[-1], "</mi>");
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 4431 "y.tab.c" /* yacc.c:1648  */
+#line 4435 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 197:
-#line 1049 "itex2MML.y" /* yacc.c:1648  */
+#line 1049 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string((yyvsp[0]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string(yyvsp[0]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4440 "y.tab.c" /* yacc.c:1648  */
+#line 4444 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 198:
-#line 1053 "itex2MML.y" /* yacc.c:1648  */
+#line 1053 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy2((yyvsp[-1]), (yyvsp[0]));
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy2(yyvsp[-1], yyvsp[0]);
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4450 "y.tab.c" /* yacc.c:1648  */
+#line 4454 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 199:
-#line 1059 "itex2MML.y" /* yacc.c:1648  */
+#line 1059 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("&", (yyvsp[0]), "fr;");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("&", yyvsp[0], "fr;");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4459 "y.tab.c" /* yacc.c:1648  */
+#line 4463 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 200:
-#line 1064 "itex2MML.y" /* yacc.c:1648  */
+#line 1064 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mi>", (yyvsp[-1]), "</mi>");
-  itex2MML_free_string((yyvsp[-1]));
+  yyval = itex2MML_copy3("<mi>", yyvsp[-1], "</mi>");
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 4468 "y.tab.c" /* yacc.c:1648  */
+#line 4472 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 201:
-#line 1069 "itex2MML.y" /* yacc.c:1648  */
+#line 1069 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mi class='mathscript'>", (yyvsp[-1]), "</mi>");
-  itex2MML_free_string((yyvsp[-1]));
+  yyval = itex2MML_copy3("<mi class='mathscript'>", yyvsp[-1], "</mi>");
+  itex2MML_free_string(yyvsp[-1]);
 }
-#line 4477 "y.tab.c" /* yacc.c:1648  */
+#line 4481 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 202:
-#line 1074 "itex2MML.y" /* yacc.c:1648  */
+#line 1074 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string((yyvsp[0]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy_string(yyvsp[0]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4486 "y.tab.c" /* yacc.c:1648  */
+#line 4490 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 203:
-#line 1078 "itex2MML.y" /* yacc.c:1648  */
+#line 1078 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy2((yyvsp[-1]), (yyvsp[0]));
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy2(yyvsp[-1], yyvsp[0]);
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4496 "y.tab.c" /* yacc.c:1648  */
+#line 4500 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 204:
-#line 1084 "itex2MML.y" /* yacc.c:1648  */
+#line 1084 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("&", (yyvsp[0]), "scr;");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("&", yyvsp[0], "scr;");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4505 "y.tab.c" /* yacc.c:1648  */
+#line 4509 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 205:
-#line 1089 "itex2MML.y" /* yacc.c:1648  */
+#line 1089 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mspace width=\"thinmathspace\"/>");
+  yyval = itex2MML_copy_string("<mspace width=\"0.16667em\"/>");
 }
-#line 4513 "y.tab.c" /* yacc.c:1648  */
+#line 4517 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 206:
-#line 1093 "itex2MML.y" /* yacc.c:1648  */
+#line 1093 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mspace width=\"mediummathspace\"/>");
+  yyval = itex2MML_copy_string("<mspace width=\"0.22222em\"/>");
 }
-#line 4521 "y.tab.c" /* yacc.c:1648  */
+#line 4525 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 207:
-#line 1097 "itex2MML.y" /* yacc.c:1648  */
+#line 1097 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mspace width=\"thickmathspace\"/>");
+  yyval = itex2MML_copy_string("<mspace width=\"0.27778em\"/>");
 }
-#line 4529 "y.tab.c" /* yacc.c:1648  */
+#line 4533 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 208:
-#line 1101 "itex2MML.y" /* yacc.c:1648  */
+#line 1101 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mspace width=\"1em\"/>");
+  yyval = itex2MML_copy_string("<mspace width=\"1em\"/>");
 }
-#line 4537 "y.tab.c" /* yacc.c:1648  */
+#line 4541 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 209:
-#line 1105 "itex2MML.y" /* yacc.c:1648  */
+#line 1105 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mspace width=\"2em\"/>");
+  yyval = itex2MML_copy_string("<mspace width=\"2em\"/>");
 }
-#line 4545 "y.tab.c" /* yacc.c:1648  */
+#line 4549 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 210:
-#line 1109 "itex2MML.y" /* yacc.c:1648  */
+#line 1109 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mspace width=\"negativethinmathspace\"/>");
+  yyval = itex2MML_copy_string("<mspace width=\"-0.16667em\"/>");
 }
-#line 4553 "y.tab.c" /* yacc.c:1648  */
+#line 4557 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 211:
-#line 1113 "itex2MML.y" /* yacc.c:1648  */
+#line 1113 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mspace width=\"negativemediummathspace\"/>");
+  yyval = itex2MML_copy_string("<mspace width=\"-0.22222em\"/>");
 }
-#line 4561 "y.tab.c" /* yacc.c:1648  */
+#line 4565 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 212:
-#line 1117 "itex2MML.y" /* yacc.c:1648  */
+#line 1117 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy_string("<mspace width=\"negativethickmathspace\"/>");
+  yyval = itex2MML_copy_string("<mspace width=\"-0.27778em\"/>");
 }
-#line 4569 "y.tab.c" /* yacc.c:1648  */
+#line 4573 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 213:
-#line 1121 "itex2MML.y" /* yacc.c:1648  */
+#line 1121 "itex2MML.y" /* yacc.c:1652  */
     {
-  (yyval) = itex2MML_copy3("<mphantom>", (yyvsp[0]), "</mphantom>");
-  itex2MML_free_string((yyvsp[0]));
+  yyval = itex2MML_copy3("<mphantom>", yyvsp[0], "</mphantom>");
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4578 "y.tab.c" /* yacc.c:1648  */
+#line 4582 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 214:
-#line 1126 "itex2MML.y" /* yacc.c:1648  */
+#line 1126 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<mrow href=\"", (yyvsp[-1]), "\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:type=\"simple\" xlink:href=\"");
-  char * s2 = itex2MML_copy3(s1, (yyvsp[-1]), "\">");
-  (yyval) = itex2MML_copy3(s2, (yyvsp[0]), "</mrow>");
+  char * s1 = itex2MML_copy3("<mrow href=\"", yyvsp[-1], "\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:type=\"simple\" xlink:href=\"");
+  char * s2 = itex2MML_copy3(s1, yyvsp[-1], "\">");
+  yyval = itex2MML_copy3(s2, yyvsp[0], "</mrow>");
   itex2MML_free_string(s1);
   itex2MML_free_string(s2);
-  itex2MML_free_string((yyvsp[-1]));
-  itex2MML_free_string((yyvsp[0]));
+  itex2MML_free_string(yyvsp[-1]);
+  itex2MML_free_string(yyvsp[0]);
 }
-#line 4592 "y.tab.c" /* yacc.c:1648  */
+#line 4596 "y.tab.c" /* yacc.c:1652  */
     break;
 
   case 215:
-#line 1136 "itex2MML.y" /* yacc.c:1648  */
+#line 1136 "itex2MML.y" /* yacc.c:1652  */
     {
-  char * s1 = itex2MML_copy3("<mmultiscripts>", (yyvsp[-3]), (yyvsp[-1]));
-  (yyval) = itex2MML_copy2(s1, "</mmultiscripts>");
+  char * s1 = itex2MML_copy3("<mmultiscripts>", yyvsp[-3], yyvsp[-1]);
++