Starmath has now full support of HTML colors.

Some of them have been added to the UI ( from Css3 ).
There was not a criteria for color picking so I chose those whose name told me something, those I liked and some to have a more complete palette.
It would be nice to be able to ask our users whose colors from https://developer.mozilla.org/en-US/docs/Web/CSS/color_value#Color_Keywords they want in the UI.
The color names have been left in alphabetical order.
Starmathdatabse has clang format.

Change-Id: I6ac1bdbc9e3ed10bff75a99b90bf92d3dcdcabcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105892
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 439 insertions, 275 deletions

diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 020d22fb37b4..d7db4772e81c 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -89,7 +89,7 @@ class SmParser
 
     // Moves between tokens inside starmath code.
     void            NextToken();
-    void            NextTokenColor();
+    void            NextTokenColor(bool dvipload);
     void            NextTokenFontSize();
     sal_Int32       GetTokenIndex() const   { return m_nTokenIndex; }
     void            Replace( sal_Int32 nPos, sal_Int32 nLen, const OUString &rText );
diff --git a/starmath/inc/starmathdatabase.hxx b/starmath/inc/starmathdatabase.hxx
index 31e7f4651285..10e177493e68 100644
--- a/starmath/inc/starmathdatabase.hxx
+++ b/starmath/inc/starmathdatabase.hxx
@@ -43,9 +43,138 @@ constexpr Color COL_SM_BLUE(0x0000FF);
 constexpr Color COL_SM_TEAL(0x008080);
 constexpr Color COL_SM_AQUA(0x00FFFF);
 /* CSS Level 2 */
-// TODO
+constexpr Color COL_SM_ORANGE(0xFFA500);
 /* CSS Level 3 */
-// TODO
+constexpr Color COL_SM_ALICEBLUE(0xF0F8FF);
+constexpr Color COL_SM_ANTIQUEWHITE(0xFAEBD7);
+constexpr Color COL_SM_AQUAMARINE(0x7FFFD4);
+constexpr Color COL_SM_AZURE(0xF0FFFF);
+constexpr Color COL_SM_BEIGE(0xF5F5DC);
+constexpr Color COL_SM_BISQUE(0xFFE4C4);
+constexpr Color COL_SM_BLANCHEDALMOND(0xFFEBCD);
+constexpr Color COL_SM_BLUEVIOLET(0x8A2BE2);
+constexpr Color COL_SM_BROWN(0xA52A2A);
+constexpr Color COL_SM_BURLYWOOD(0xDEB887);
+constexpr Color COL_SM_CADETBLUE(0x5F9EA0);
+constexpr Color COL_SM_CHARTREUSE(0x7FFF00);
+constexpr Color COL_SM_CHOCOLATE(0xD2691E);
+constexpr Color COL_SM_CORAL(0xFF7F50);
+constexpr Color COL_SM_CORNFLOWERBLUE(0x6495ED);
+constexpr Color COL_SM_CORNSILK(0xFFF8DC);
+constexpr Color COL_SM_CRIMSON(0xDC143C);
+constexpr Color COL_SM_CYAN(0x00FFFF);
+constexpr Color COL_SM_DARKBLUE(0x00008B);
+constexpr Color COL_SM_DARKCYAN(0x008B8B);
+constexpr Color COL_SM_DARKGOLDENROD(0xB8860B);
+constexpr Color COL_SM_DARKGRAY(0xA9A9A9);
+constexpr Color COL_SM_DARKGREEN(0x006400);
+constexpr Color COL_SM_DARKGREY(0xA9A9A9);
+constexpr Color COL_SM_DARKKHAKI(0xBDB76B);
+constexpr Color COL_SM_DARKMAGENTA(0x8B008B);
+constexpr Color COL_SM_DARKOLIVEGREEN(0x556B2F);
+constexpr Color COL_SM_DARKORANGE(0xFF8C00);
+constexpr Color COL_SM_DARKORCHID(0x9932CC);
+constexpr Color COL_SM_DARKRED(0x8B0000);
+constexpr Color COL_SM_DARKSALMON(0xE9967A);
+constexpr Color COL_SM_DARKSEAGREEN(0x8FBC8F);
+constexpr Color COL_SM_DARKSLATEBLUE(0x483D8B);
+constexpr Color COL_SM_DARKSLATEGRAY(0x2F4F4F);
+constexpr Color COL_SM_DARKSLATEGREY(0x2F4F4F);
+constexpr Color COL_SM_DARKTURQUOISE(0x00CED1);
+constexpr Color COL_SM_DARKVIOLET(0x9400D3);
+constexpr Color COL_SM_DEEPPINK(0xFF1493);
+constexpr Color COL_SM_DEEPSKYBLUE(0x00BFFF);
+constexpr Color COL_SM_DIMGRAY(0x696969);
+constexpr Color COL_SM_DIMGREY(0x696969);
+constexpr Color COL_SM_DODGERBLUE(0x1E90FF);
+constexpr Color COL_SM_FIREBRICK(0xB22222);
+constexpr Color COL_SM_FLORALWHITE(0xFFFAF0);
+constexpr Color COL_SM_FORESTGREEN(0x228B22);
+constexpr Color COL_SM_GAINSBORO(0xDCDCDC);
+constexpr Color COL_SM_GHOSTWHITE(0xF8F8FF);
+constexpr Color COL_SM_GOLD(0xFFD700);
+constexpr Color COL_SM_GOLDENROD(0xDAA520);
+constexpr Color COL_SM_GREENYELLOW(0xADFF2F);
+constexpr Color COL_SM_GREY(0x808080);
+constexpr Color COL_SM_HONEYDEW(0xF0FFF0);
+constexpr Color COL_SM_HOTPINK(0xFF69B4);
+constexpr Color COL_SM_INDIANRED(0xCD5C5C);
+constexpr Color COL_SM_INDIGO(0x4B0082);
+constexpr Color COL_SM_IVORY(0xFFFFF0);
+constexpr Color COL_SM_KHAKI(0xF0E68C);
+constexpr Color COL_SM_LAVENDER(0xE6E6FA);
+constexpr Color COL_SM_LAVENDERBLUSH(0xFFF0F5);
+constexpr Color COL_SM_LAWNGREEN(0x7CFC00);
+constexpr Color COL_SM_LEMONCHIFFON(0xFFFACD);
+constexpr Color COL_SM_LIGHTBLUE(0xADD8E6);
+constexpr Color COL_SM_LIGHTCORAL(0xF08080);
+constexpr Color COL_SM_LIGHTCYAN(0xE0FFFF);
+constexpr Color COL_SM_LIGHTGOLDENRODYELLOW(0xFAFAD2);
+constexpr Color COL_SM_LIGHTGRAY(0xD3D3D3);
+constexpr Color COL_SM_LIGHTGREEN(0x90EE90);
+constexpr Color COL_SM_LIGHTGREY(0xD3D3D3);
+constexpr Color COL_SM_LIGHTPINK(0xFFB6C1);
+constexpr Color COL_SM_LIGHTSALMON(0xFFA07A);
+constexpr Color COL_SM_LIGHTSEAGREEN(0x20B2AA);
+constexpr Color COL_SM_LIGHTSKYBLUE(0x87CEFA);
+constexpr Color COL_SM_LIGHTSLATEGRAY(0x778899);
+constexpr Color COL_SM_LIGHTSLATEGREY(0x778899);
+constexpr Color COL_SM_LIGHTSTEELBLUE(0xB0C4DE);
+constexpr Color COL_SM_LIGHTYELLOW(0xFFFFE0);
+constexpr Color COL_SM_LIMEGREEN(0x32CD32);
+constexpr Color COL_SM_LINEN(0xFAF0E6);
+constexpr Color COL_SM_MAGENTA(0xFF00FF);
+constexpr Color COL_SM_MEDIUMAQUAMARINE(0x66CDAA);
+constexpr Color COL_SM_MEDIUMBLUE(0x0000CD);
+constexpr Color COL_SM_MEDIUMORCHID(0xBA55D3);
+constexpr Color COL_SM_MEDIUMPURPLE(0x9370DB);
+constexpr Color COL_SM_MEDIUMSEAGREEN(0x3CB371);
+constexpr Color COL_SM_MEDIUMSLATEBLUE(0x7B68EE);
+constexpr Color COL_SM_MEDIUMSPRINGGREEN(0x00FA9A);
+constexpr Color COL_SM_MEDIUMTURQUOISE(0x48D1CC);
+constexpr Color COL_SM_MEDIUMVIOLETRED(0xC71585);
+constexpr Color COL_SM_MIDNIGHTBLUE(0x191970);
+constexpr Color COL_SM_MINTCREAM(0xF5FFFA);
+constexpr Color COL_SM_MISTYROSE(0xFFE4E1);
+constexpr Color COL_SM_MOCCASIN(0xFFE4B5);
+constexpr Color COL_SM_NAVAJOWHITE(0xFFDEAD);
+constexpr Color COL_SM_OLDLACE(0xFDF5E6);
+constexpr Color COL_SM_OLIVEDRAB(0x6B8E23);
+constexpr Color COL_SM_ORANGERED(0xFF4500);
+constexpr Color COL_SM_ORCHID(0xDA70D6);
+constexpr Color COL_SM_PALEGOLDENROD(0xEEE8AA);
+constexpr Color COL_SM_PALEGREEN(0x98FB98);
+constexpr Color COL_SM_PALETURQUOISE(0xAFEEEE);
+constexpr Color COL_SM_PALEVIOLETRED(0xDB7093);
+constexpr Color COL_SM_PAPAYAWHIP(0xFFEFD5);
+constexpr Color COL_SM_PEACHPUFF(0xFFDAB9);
+constexpr Color COL_SM_PERU(0xCD853F);
+constexpr Color COL_SM_PINK(0xFFC0CB);
+constexpr Color COL_SM_PLUM(0xDDA0DD);
+constexpr Color COL_SM_POWDERBLUE(0xB0E0E6);
+constexpr Color COL_SM_ROSYBROWN(0xBC8F8F);
+constexpr Color COL_SM_ROYALBLUE(0x4169E1);
+constexpr Color COL_SM_SADDLEBROWN(0x8B4513);
+constexpr Color COL_SM_SALMON(0xFA8072);
+constexpr Color COL_SM_SANDYBROWN(0xF4A460);
+constexpr Color COL_SM_SEAGREEN(0x2E8B57);
+constexpr Color COL_SM_SEASHELL(0xFFF5EE);
+constexpr Color COL_SM_SIENNA(0xA0522D);
+constexpr Color COL_SM_SKYBLUE(0x87CEEB);
+constexpr Color COL_SM_SLATEBLUE(0x6A5ACD);
+constexpr Color COL_SM_SLATEGRAY(0x708090);
+constexpr Color COL_SM_SLATEGREY(0x708090);
+constexpr Color COL_SM_SNOW(0xFFFAFA);
+constexpr Color COL_SM_SPRINGGREEN(0x00FF7F);
+constexpr Color COL_SM_STEELBLUE(0x4682B4);
+constexpr Color COL_SM_TAN(0xD2B48C);
+constexpr Color COL_SM_THISTLE(0xD8BFD8);
+constexpr Color COL_SM_TOMATO(0xFF6347);
+constexpr Color COL_SM_TURQUOISE(0x40E0D0);
+constexpr Color COL_SM_VIOLET(0xEE82EE);
+constexpr Color COL_SM_WHEAT(0xF5DEB3);
+constexpr Color COL_SM_WHITESMOKE(0xF5F5F5);
+constexpr Color COL_SM_YELLOWGREEN(0x9ACD32);
 /* CSS Level 4 */
 constexpr Color COL_SM_REBECCAPURPLE(0x663399);
 /* dvipsnames */
@@ -68,8 +197,8 @@ constexpr Color COL_SM_LO_GREEN(0x00A500);
 namespace starmathdatabase
 {
 // Variables containing color information.
-extern const SmColorTokenTableEntry aColorTokenTableParse[31];
-extern const SmColorTokenTableEntry aColorTokenTableHTML[20];
+extern const SmColorTokenTableEntry aColorTokenTableParse[159];
+extern const SmColorTokenTableEntry aColorTokenTableHTML[148];
 extern const SmColorTokenTableEntry aColorTokenTableDVIPSNAMES[5];
 
 /**
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index c93de7c026d1..499d263a4607 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -205,6 +205,17 @@
 #define RID_COLORX_RGB_HELP                 NC_("RID_COLORX_RGB_HELP", "Color RGB" )
 #define RID_COLORX_RGBA_HELP                NC_("RID_COLORX_RGBA_HELP", "Color RGBA" )
 #define RID_COLORX_HEX_HELP                 NC_("RID_COLORX_HEX_HELP", "Color hexadecimal" )
+#define RID_COLORX_CORAL_HELP               NC_("RID_COLORX_CORAL_HELP", "Color Coral" )
+#define RID_COLORX_CRIMSON_HELP             NC_("RID_COLORX_CRIMSON_HELP", "Color Crimson" )
+#define RID_COLORX_MIDNIGHT_HELP            NC_("RID_COLORX_MIDNIGHT_HELP", "Color Midnight blue" )
+#define RID_COLORX_VIOLET_HELP              NC_("RID_COLORX_VIOLET_HELP", "Color Violet" )
+#define RID_COLORX_ORANGE_HELP              NC_("RID_COLORX_ORANGE_HELP", "Color Orange" )
+#define RID_COLORX_ORANGERED_HELP           NC_("RID_COLORX_ORANGERED_HELP", "Color Orangered" )
+#define RID_COLORX_SEAGREEN_HELP            NC_("RID_COLORX_SEAGREEN_HELP", "Color Seagreen" )
+#define RID_COLORX_INDIGO_HELP              NC_("RID_COLORX_INDIGO_HELP", "Color Indigo" )
+#define RID_COLORX_HOTPINK_HELP             NC_("RID_COLORX_HOTPINK_HELP", "Color Hot pink" )
+#define RID_COLORX_LAVENDER_HELP            NC_("RID_COLORX_LAVENDER_HELP", "Color Lavender" )
+#define RID_COLORX_SNOW_HELP                NC_("RID_COLORX_SNOW_HELP", "Color Snow" )
 #define RID_LRGROUPX_HELP                   NC_("RID_LRGROUPX_HELP", "Group Brackets" )
 #define RID_LRPARENTX_HELP                  NC_("RID_LRPARENTX_HELP", "Round Brackets" )
 #define RID_LRBRACKETX_HELP                 NC_("RID_LRBRACKETX_HELP", "Square Brackets" )
@@ -337,6 +348,17 @@
 #define STR_SILVER                          NC_("STR_SILVER", "silver" )
 #define STR_TEAL                            NC_("STR_TEAL", "teal" )
 #define STR_YELLOW                          NC_("STR_YELLOW", "yellow" )
+#define STR_CORAL                           NC_("STR_CORAL", "coral" )
+#define STR_CRIMSON                         NC_("STR_CRIMSON", "crimson" )
+#define STR_MIDNIGHT                        NC_("STR_MIDNIGHT", "midnight" )
+#define STR_VIOLET                          NC_("STR_VIOLET", "violet" )
+#define STR_ORANGE                          NC_("STR_ORANGE", "orange" )
+#define STR_ORANGERED                       NC_("STR_ORANGERED", "orangered" )
+#define STR_LAVENDER                        NC_("STR_LAVENDER", "lavender" )
+#define STR_SNOW                            NC_("STR_SNOW", "snow" )
+#define STR_SEAGREEN                        NC_("STR_SEAGREEN", "seagreen" )
+#define STR_INDIGO                          NC_("STR_INDIGO", "indigo" )
+#define STR_HOTPINK                         NC_("STR_HOTPINK", "hotpink" )
 #define STR_RGB                             NC_("STR_RGB", "rgb" )
 #define STR_RGBA                            NC_("STR_RGBA", "rgba" )
 #define STR_HEX                             NC_("STR_HEX", "hex" )
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index fe537df552b6..15b41ec03dab 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -16,277 +16,288 @@
 #ifndef INCLUDED_STARMATH_INC_STRINGS_HXX
 #define INCLUDED_STARMATH_INC_STRINGS_HXX
 
-#define RID_UNDOFORMATNAME  "Format"
+#define RID_UNDOFORMATNAME      "Format"
 
-#define RID_PLUSX           "+<?> "
-#define RID_MINUSX          "-<?> "
-#define RID_PLUSMINUSX      "+-<?> "
-#define RID_MINUSPLUSX      "-+<?> "
-#define RID_NEGX            "neg <?> "
-#define RID_XPLUSY          "<?> + <?> "
-#define RID_XMINUSY         "<?> - <?> "
-#define RID_XCDOTY          "<?> cdot <?> "
-#define RID_XTIMESY         "<?> times <?> "
-#define RID_XSYMTIMESY      "<?> * <?> "
-#define RID_XSYMDIVIDEY     "<?> / <?> "
-#define RID_XDIVY           "<?> div <?> "
-#define RID_XOVERY          "{<?>} over {<?>} "
-#define RID_FRACXY          "frac {<?>} {<?>} "
-#define RID_XODIVIDEY       "<?> odivide <?> "
-#define RID_XODOTY          "<?> odot <?> "
-#define RID_XOMINUSY        "<?> ominus <?> "
-#define RID_XOPLUSY         "<?> oplus <?> "
-#define RID_XOTIMESY        "<?> otimes <?> "
-#define RID_XANDY           "<?> and <?> "
-#define RID_XORY            "<?> or <?> "
-#define RID_XEQY            "<?> = <?> "
-#define RID_XNEQY           "<?> <> <?> "
-#define RID_XLTY            "<?> < <?> "
-#define RID_XGTY            "<?> > <?> "
-#define RID_XLEY            "<?> <= <?> "
-#define RID_XGEY            "<?> >= <?> "
-#define RID_XLESLANTY       "<?> leslant <?> "
-#define RID_XGESLANTY       "<?> geslant <?> "
-#define RID_XLLY            "<?> << <?> "
-#define RID_XGGY            "<?> >> <?> "
-#define RID_XDEFY           "<?> def <?> "
-#define RID_XEQUIVY         "<?> equiv <?> "
-#define RID_XAPPROXY        "<?> approx <?> "
-#define RID_XSIMY           "<?> sim <?> "
-#define RID_XSIMEQY         "<?> simeq <?> "
-#define RID_XPROPY          "<?> prop <?> "
-#define RID_XORTHOY         "<?> ortho <?> "
-#define RID_XPARALLELY      "<?> parallel <?> "
-#define RID_XTOWARDY        "<?> toward <?> "
-#define RID_XTRANSLY        "<?> transl <?> "
-#define RID_XTRANSRY        "<?> transr <?> "
-#define RID_XINY            "<?> in <?> "
-#define RID_XNOTINY         "<?> notin <?> "
-#define RID_XOWNSY          "<?> owns <?> "
-#define RID_XUNIONY         "<?> union <?> "
-#define RID_XINTERSECTIONY  "<?> intersection <?> "
-#define RID_XSETMINUSY      "<?> setminus <?> "
-#define RID_XSETQUOTIENTY   "<?> setquotient <?> "
-#define RID_XSUBSETY        "<?> subset <?> "
-#define RID_XSUBSETEQY      "<?> subseteq <?> "
-#define RID_XSUPSETY        "<?> supset <?> "
-#define RID_XSUPSETEQY      "<?> supseteq <?> "
-#define RID_XNSUBSETY       "<?> nsubset <?> "
-#define RID_XNSUBSETEQY     "<?> nsubseteq <?> "
-#define RID_XNSUPSETY       "<?> nsupset <?> "
-#define RID_XNSUPSETEQY     "<?> nsupseteq <?> "
-#define RID_FUNCX           "func func(<?>) "
-#define RID_ABSX            "abs{<?>} "
-#define RID_FACTX           "fact{<?>} "
-#define RID_SQRTX           "sqrt{<?>} "
-#define RID_NROOTXY         "nroot{<?>}{<?>} "
-#define RID_EX              "func e^{<?>} "
-#define RID_EXPX            "exp(<?>) "
-#define RID_LNX             "ln(<?>) "
-#define RID_LOGX            "log(<?>) "
-#define RID_SINX            "sin(<?>) "
-#define RID_COSX            "cos(<?>) "
-#define RID_TANX            "tan(<?>) "
-#define RID_COTX            "cot(<?>) "
-#define RID_ARCSINX         "arcsin(<?>) "
-#define RID_ARCCOSX         "arccos(<?>) "
-#define RID_ARCTANX         "arctan(<?>) "
-#define RID_ARCCOTX         "arccot(<?>) "
-#define RID_SINHX           "sinh(<?>) "
-#define RID_COSHX           "cosh(<?>) "
-#define RID_TANHX           "tanh(<?>) "
-#define RID_COTHX           "coth(<?>) "
-#define RID_ARSINHX         "arsinh(<?>) "
-#define RID_ARCOSHX         "arcosh(<?>) "
-#define RID_ARTANHX         "artanh(<?>) "
-#define RID_ARCOTHX         "arcoth(<?>) "
-#define RID_OPERX           "oper oper <?> "
-#define RID_OPER_FROMX      "oper oper from{<?>} <?> "
-#define RID_OPER_TOX        "oper oper to{<?>} <?> "
-#define RID_OPER_FROMTOX    "oper oper from{<?>} to{<?>} <?> "
-#define RID_SUMX            "sum <?> "
-#define RID_SUM_FROMX       "sum from{<?>} <?> "
-#define RID_SUM_TOX         "sum to{<?>} <?> "
-#define RID_SUM_FROMTOX     "sum from{<?>} to{<?>} <?> "
-#define RID_PRODX           "prod <?> "
-#define RID_PROD_FROMX      "prod from{<?>} <?> "
-#define RID_PROD_TOX        "prod to{<?>} <?> "
-#define RID_PROD_FROMTOX    "prod from{<?>} to{<?>} <?> "
-#define RID_COPRODX         "coprod <?> "
-#define RID_COPROD_FROMX    "coprod from{<?>} <?> "
-#define RID_COPROD_TOX      "coprod to{<?>} <?> "
-#define RID_COPROD_FROMTOX  "coprod from{<?>} to{<?>} <?> "
-#define RID_LIMX            "lim <?> "
-#define RID_LIM_FROMX       "lim from{<?>} <?> "
-#define RID_LIM_TOX         "lim to{<?>} <?> "
-#define RID_LIM_FROMTOX     "lim from{<?>} to{<?>} <?> "
-#define RID_LIMINFX         "liminf <?> "
-#define RID_LIMINF_FROMX    "liminf from{<?>} <?> "
-#define RID_LIMINF_TOX      "liminf to{<?>} <?> "
-#define RID_LIMINF_FROMTOX  "liminf from{<?>} to{<?>} <?> "
-#define RID_LIMSUPX         "limsup <?> "
-#define RID_LIMSUP_FROMX    "limsup from{<?>} <?> "
-#define RID_LIMSUP_TOX      "limsup to{<?>} <?> "
-#define RID_LIMSUP_FROMTOX  "limsup from{<?>} to{<?>} <?> "
-#define RID_EXISTS          "exists "
-#define RID_NOTEXISTS       "notexists "
-#define RID_FORALL          "forall "
-#define RID_INTX            "int <?> "
-#define RID_INT_FROMX       "int from{<?>} <?> "
-#define RID_INT_TOX         "int to{<?>} <?> "
-#define RID_INT_FROMTOX     "int from{<?>} to{<?>} <?> "
-#define RID_IINTX           "iint <?> "
-#define RID_IINT_FROMX      "iint from{<?>} <?> "
-#define RID_IINT_TOX        "iint to{<?>} <?> "
-#define RID_IINT_FROMTOX    "iint from{<?>} to{<?>} <?> "
-#define RID_IIINTX          "iiint <?> "
-#define RID_IIINT_FROMX     "iiint from{<?>} <?> "
-#define RID_IIINT_TOX       "iiint to{<?>} <?> "
-#define RID_IIINT_FROMTOX   "iiint from{<?>} to{<?>} <?> "
-#define RID_LINTX           "lint <?> "
-#define RID_LINT_FROMX      "lint from{<?>} <?> "
-#define RID_LINT_TOX        "lint to{<?>} <?> "
-#define RID_LINT_FROMTOX    "lint from{<?>} to{<?>} <?> "
-#define RID_LLINTX          "llint <?> "
-#define RID_LLINT_FROMX     "llint from{<?>} <?> "
-#define RID_LLINT_TOX       "llint to{<?>} <?> "
-#define RID_LLINT_FROMTOX   "llint from{<?>} to{<?>} <?> "
-#define RID_LLLINTX         "lllint <?> "
-#define RID_LLLINT_FROMX    "lllint from{<?>} <?> "
-#define RID_LLLINT_TOX      "lllint to{<?>} <?> "
-#define RID_LLLINT_FROMTOX  "lllint from{<?>} to{<?>} <?> "
-#define RID_FROMX           "from{<?>} <?> "
-#define RID_TOX             "to{<?>} <?> "
-#define RID_FROMXTOY        "from{<?>} to{<?>} <?> "
-#define RID_ACUTEX          "acute <?> "
-#define RID_BARX            "bar <?> "
-#define RID_BREVEX          "breve <?> "
-#define RID_CHECKX          "check <?> "
-#define RID_CIRCLEX         "circle <?> "
-#define RID_DOTX            "dot <?> "
-#define RID_DDOTX           "ddot <?> "
-#define RID_DDDOTX          "dddot <?> "
-#define RID_GRAVEX          "grave <?> "
-#define RID_HATX            "hat <?> "
-#define RID_TILDEX          "tilde <?> "
-#define RID_VECX            "vec <?> "
-#define RID_HARPOONX        "harpoon <?> "
-#define RID_UNDERLINEX      "underline {<?>} "
-#define RID_OVERLINEX       "overline {<?>} "
-#define RID_OVERSTRIKEX     "overstrike {<?>} "
-#define RID_PHANTOMX        "phantom {<?>} "
-#define RID_BOLDX           "bold <?> "
-#define RID_ITALX           "ital <?> "
-#define RID_SIZEXY          "size <?> {<?>} "
-#define RID_FONTXY          "font <?> {<?>} "
-#define RID_COLORX_BLACK    "color black {<?>} "
-#define RID_COLORX_BLUE     "color blue {<?>} "
-#define RID_COLORX_GREEN    "color green {<?>} "
-#define RID_COLORX_RED      "color red {<?>} "
-#define RID_COLORX_AQUA     "color aqua {<?>} "
-#define RID_COLORX_FUCHSIA  "color fuchsia {<?>} "
-#define RID_COLORX_GRAY     "color gray {<?>} "
-#define RID_COLORX_LIME     "color lime {<?>} "
-#define RID_COLORX_MAROON   "color maroon {<?>} "
-#define RID_COLORX_NAVY     "color navy {<?>} "
-#define RID_COLORX_OLIVE    "color olive {<?>} "
-#define RID_COLORX_PURPLE   "color purple {<?>} "
-#define RID_COLORX_SILVER   "color silver {<?>} "
-#define RID_COLORX_TEAL     "color teal {<?>} "
-#define RID_COLORX_YELLOW   "color yellow {<?>} "
-#define RID_COLORX_RGB      "color rgb 0 0 0 {<?>} "
-#define RID_COLORX_RGBA     "color rgba 0 0 0 0 {<?>} "
-#define RID_COLORX_HEX      "color hex 000000 {<?>} "
-#define RID_LRGROUPX        "{<?>} "
-#define RID_LRPARENTX       "(<?>) "
-#define RID_LRBRACKETX      "[<?>] "
-#define RID_LRDBRACKETX     "ldbracket <?> rdbracket "
-#define RID_LRBRACEX        "lbrace <?> rbrace "
-#define RID_LRANGLEX        "langle <?> rangle "
-#define RID_LRCEILX         "lceil <?> rceil "
-#define RID_LRFLOORX        "lfloor <?> rfloor "
-#define RID_LRLINEX         "lline <?> rline "
-#define RID_LRDLINEX        "ldline <?> rdline "
-#define RID_LMRANGLEXY      "langle <?> mline <?> rangle "
-#define RID_SLRPARENTX      "left ( <?> right ) "
-#define RID_SLRBRACKETX     "left [ <?> right ] "
-#define RID_SLRDBRACKETX    "left ldbracket <?> right rdbracket "
-#define RID_SLRBRACEX       "left lbrace <?> right rbrace "
-#define RID_SLRANGLEX       "left langle <?> right rangle "
-#define RID_SLRCEILX        "left lceil <?> right rceil "
-#define RID_SLRFLOORX       "left lfloor <?> right rfloor "
-#define RID_SLRLINEX        "left lline <?> right rline "
-#define RID_SLRDLINEX       "left ldline <?> right rdline "
-#define RID_SLMRANGLEXY     "left langle <?> mline <?> right rangle "
-#define RID_XEVALUATEDATY   "left none {<?>} right rline_{<?>} "
-#define RID_XOVERBRACEY     "{<?>} overbrace {<?>} "
-#define RID_XUNDERBRACEY    "{<?>} underbrace {<?>} "
-#define RID_EVALX           "evaluate <?> "
-#define RID_EVAL_FROMX      "evaluate {<?>} from{<?>} "
-#define RID_EVAL_TOX        "evaluate {<?>} to{<?>} "
-#define RID_EVAL_FROMTOX    "evaluate {<?>} from{<?>} to{<?>} "
-#define RID_RSUBX           "<?>_{<?>}"
-#define RID_RSUPX           "<?>^{<?>}"
-#define RID_LSUBX           "<?> lsub{<?>} "
-#define RID_LSUPX           "<?> lsup{<?>} "
-#define RID_CSUBX           "<?> csub{<?>} "
-#define RID_CSUPX           "<?> csup{<?>} "
-#define RID_SBLANK          "`"
-#define RID_BLANK           "~"
-#define RID_NEWLINE         "newline "
-#define RID_BINOMXY         "binom{<?>}{<?>} "
-#define RID_STACK           "stack{<?> # <?> # <?>} "
-#define RID_MATRIX          "matrix{<?> # <?> ## <?> # <?>} "
-#define RID_ALIGNLX         "alignl <?> "
-#define RID_ALIGNCX         "alignc <?> "
-#define RID_ALIGNRX         "alignr <?> "
-#define RID_ALEPH           "aleph "
-#define RID_EMPTYSET        "emptyset "
-#define RID_RE              "Re "
-#define RID_IM              "Im "
-#define RID_INFINITY        "infinity "
-#define RID_PARTIAL         "partial "
-#define RID_NABLA           "nabla "
-#define RID_WP              "wp "
-#define RID_LAPLACE         "laplace "
-#define RID_FOURIER         "fourier "
-#define RID_DOTSAXIS        "dotsaxis "
-#define RID_DOTSUP          "dotsup "
-#define RID_DOTSDOWN        "dotsdown "
-#define RID_DOTSLOW         "dotslow "
-#define RID_DOTSVERT        "dotsvert "
-#define RID_XCIRCY          "<?> circ <?> "
-#define RID_XWIDESLASHY     "{<?>} wideslash {<?>} "
-#define RID_XWIDEBSLASHY    "{<?>} widebslash {<?>} "
-#define RID_XDIVIDESY       "<?> divides <?> "
-#define RID_XNDIVIDESY      "<?> ndivides <?> "
-#define RID_DLARROW         "<?> dlarrow <?> "
-#define RID_DLRARROW        "<?> dlrarrow <?> "
-#define RID_DRARROW         "<?> drarrow <?> "
-#define RID_SETN            "setN "
-#define RID_SETZ            "setZ "
-#define RID_SETQ            "setQ "
-#define RID_SETR            "setR "
-#define RID_SETC            "setC "
-#define RID_WIDEHATX        "widehat {<?>} "
-#define RID_WIDETILDEX      "widetilde {<?>} "
-#define RID_WIDEVECX        "widevec {<?>} "
-#define RID_WIDEHARPOONX    "wideharpoon {<?>} "
-#define RID_HBAR            "hbar "
-#define RID_LAMBDABAR       "lambdabar "
-#define RID_LEFTARROW       "leftarrow "
-#define RID_RIGHTARROW      "rightarrow "
-#define RID_UPARROW         "uparrow "
-#define RID_DOWNARROW       "downarrow "
-#define RID_NOSPACE         "nospace {<?>} "
-#define RID_XPRECEDESY      "<?> prec <?> "
-#define RID_XPRECEDESEQUALY "<?> preccurlyeq <?> "
-#define RID_XPRECEDESEQUIVY "<?> precsim <?> "
-#define RID_XSUCCEEDSY      "<?> succ <?> "
-#define RID_XSUCCEEDSEQUALY "<?> succcurlyeq <?> "
-#define RID_XSUCCEEDSEQUIVY "<?> succsim <?> "
-#define RID_XNOTPRECEDESY   "<?> nprec <?> "
-#define RID_XNOTSUCCEEDSY   "<?> nsucc <?> "
+#define RID_PLUSX               "+<?> "
+#define RID_MINUSX              "-<?> "
+#define RID_PLUSMINUSX          "+-<?> "
+#define RID_MINUSPLUSX          "-+<?> "
+#define RID_NEGX                "neg <?> "
+#define RID_XPLUSY              "<?> + <?> "
+#define RID_XMINUSY             "<?> - <?> "
+#define RID_XCDOTY              "<?> cdot <?> "
+#define RID_XTIMESY             "<?> times <?> "
+#define RID_XSYMTIMESY          "<?> * <?> "
+#define RID_XSYMDIVIDEY         "<?> / <?> "
+#define RID_XDIVY               "<?> div <?> "
+#define RID_XOVERY              "{<?>} over {<?>} "
+#define RID_FRACXY              "frac {<?>} {<?>} "
+#define RID_XODIVIDEY           "<?> odivide <?> "
+#define RID_XODOTY              "<?> odot <?> "
+#define RID_XOMINUSY            "<?> ominus <?> "
+#define RID_XOPLUSY             "<?> oplus <?> "
+#define RID_XOTIMESY            "<?> otimes <?> "
+#define RID_XANDY               "<?> and <?> "
+#define RID_XORY                "<?> or <?> "
+#define RID_XEQY                "<?> = <?> "
+#define RID_XNEQY               "<?> <> <?> "
+#define RID_XLTY                "<?> < <?> "
+#define RID_XGTY                "<?> > <?> "
+#define RID_XLEY                "<?> <= <?> "
+#define RID_XGEY                "<?> >= <?> "
+#define RID_XLESLANTY           "<?> leslant <?> "
+#define RID_XGESLANTY           "<?> geslant <?> "
+#define RID_XLLY                "<?> << <?> "
+#define RID_XGGY                "<?> >> <?> "
+#define RID_XDEFY               "<?> def <?> "
+#define RID_XEQUIVY             "<?> equiv <?> "
+#define RID_XAPPROXY            "<?> approx <?> "
+#define RID_XSIMY               "<?> sim <?> "
+#define RID_XSIMEQY             "<?> simeq <?> "
+#define RID_XPROPY              "<?> prop <?> "
+#define RID_XORTHOY             "<?> ortho <?> "
+#define RID_XPARALLELY          "<?> parallel <?> "
+#define RID_XTOWARDY            "<?> toward <?> "
+#define RID_XTRANSLY            "<?> transl <?> "
+#define RID_XTRANSRY            "<?> transr <?> "
+#define RID_XINY                "<?> in <?> "
+#define RID_XNOTINY             "<?> notin <?> "
+#define RID_XOWNSY              "<?> owns <?> "
+#define RID_XUNIONY             "<?> union <?> "
+#define RID_XINTERSECTIONY      "<?> intersection <?> "
+#define RID_XSETMINUSY          "<?> setminus <?> "
+#define RID_XSETQUOTIENTY       "<?> setquotient <?> "
+#define RID_XSUBSETY            "<?> subset <?> "
+#define RID_XSUBSETEQY          "<?> subseteq <?> "
+#define RID_XSUPSETY            "<?> supset <?> "
+#define RID_XSUPSETEQY          "<?> supseteq <?> "
+#define RID_XNSUBSETY           "<?> nsubset <?> "
+#define RID_XNSUBSETEQY         "<?> nsubseteq <?> "
+#define RID_XNSUPSETY           "<?> nsupset <?> "
+#define RID_XNSUPSETEQY         "<?> nsupseteq <?> "
+#define RID_FUNCX               "func func(<?>) "
+#define RID_ABSX                "abs{<?>} "
+#define RID_FACTX               "fact{<?>} "
+#define RID_SQRTX               "sqrt{<?>} "
+#define RID_NROOTXY             "nroot{<?>}{<?>} "
+#define RID_EX                  "func e^{<?>} "
+#define RID_EXPX                "exp(<?>) "
+#define RID_LNX                 "ln(<?>) "
+#define RID_LOGX                "log(<?>) "
+#define RID_SINX                "sin(<?>) "
+#define RID_COSX                "cos(<?>) "
+#define RID_TANX                "tan(<?>) "
+#define RID_COTX                "cot(<?>) "
+#define RID_ARCSINX             "arcsin(<?>) "
+#define RID_ARCCOSX             "arccos(<?>) "
+#define RID_ARCTANX             "arctan(<?>) "
+#define RID_ARCCOTX             "arccot(<?>) "
+#define RID_SINHX               "sinh(<?>) "
+#define RID_COSHX               "cosh(<?>) "
+#define RID_TANHX               "tanh(<?>) "
+#define RID_COTHX               "coth(<?>) "
+#define RID_ARSINHX             "arsinh(<?>) "
+#define RID_ARCOSHX             "arcosh(<?>) "
+#define RID_ARTANHX             "artanh(<?>) "
+#define RID_ARCOTHX             "arcoth(<?>) "
+#define RID_OPERX               "oper oper <?> "
+#define RID_OPER_FROMX          "oper oper from{<?>} <?> "
+#define RID_OPER_TOX            "oper oper to{<?>} <?> "
+#define RID_OPER_FROMTOX        "oper oper from{<?>} to{<?>} <?> "
+#define RID_SUMX                "sum <?> "
+#define RID_SUM_FROMX           "sum from{<?>} <?> "
+#define RID_SUM_TOX             "sum to{<?>} <?> "
+#define RID_SUM_FROMTOX         "sum from{<?>} to{<?>} <?> "
+#define RID_PRODX               "prod <?> "
+#define RID_PROD_FROMX          "prod from{<?>} <?> "
+#define RID_PROD_TOX            "prod to{<?>} <?> "
+#define RID_PROD_FROMTOX        "prod from{<?>} to{<?>} <?> "
+#define RID_COPRODX             "coprod <?> "
+#define RID_COPROD_FROMX        "coprod from{<?>} <?> "
+#define RID_COPROD_TOX          "coprod to{<?>} <?> "
+#define RID_COPROD_FROMTOX      "coprod from{<?>} to{<?>} <?> "
+#define RID_LIMX                "lim <?> "
+#define RID_LIM_FROMX           "lim from{<?>} <?> "
+#define RID_LIM_TOX             "lim to{<?>} <?> "
+#define RID_LIM_FROMTOX         "lim from{<?>} to{<?>} <?> "
+#define RID_LIMINFX             "liminf <?> "
+#define RID_LIMINF_FROMX        "liminf from{<?>} <?> "
+#define RID_LIMINF_TOX          "liminf to{<?>} <?> "
+#define RID_LIMINF_FROMTOX      "liminf from{<?>} to{<?>} <?> "
+#define RID_LIMSUPX             "limsup <?> "
+#define RID_LIMSUP_FROMX        "limsup from{<?>} <?> "
+#define RID_LIMSUP_TOX          "limsup to{<?>} <?> "
+#define RID_LIMSUP_FROMTOX      "limsup from{<?>} to{<?>} <?> "
+#define RID_EXISTS              "exists "
+#define RID_NOTEXISTS           "notexists "
+#define RID_FORALL              "forall "
+#define RID_INTX                "int <?> "
+#define RID_INT_FROMX           "int from{<?>} <?> "
+#define RID_INT_TOX             "int to{<?>} <?> "
+#define RID_INT_FROMTOX         "int from{<?>} to{<?>} <?> "
+#define RID_IINTX               "iint <?> "
+#define RID_IINT_FROMX          "iint from{<?>} <?> "
+#define RID_IINT_TOX            "iint to{<?>} <?> "
+#define RID_IINT_FROMTOX        "iint from{<?>} to{<?>} <?> "
+#define RID_IIINTX              "iiint <?> "
+#define RID_IIINT_FROMX         "iiint from{<?>} <?> "
+#define RID_IIINT_TOX           "iiint to{<?>} <?> "
+#define RID_IIINT_FROMTOX       "iiint from{<?>} to{<?>} <?> "
+#define RID_LINTX               "lint <?> "
+#define RID_LINT_FROMX          "lint from{<?>} <?> "
+#define RID_LINT_TOX            "lint to{<?>} <?> "
+#define RID_LINT_FROMTOX        "lint from{<?>} to{<?>} <?> "
+#define RID_LLINTX              "llint <?> "
+#define RID_LLINT_FROMX         "llint from{<?>} <?> "
+#define RID_LLINT_TOX           "llint to{<?>} <?> "
+#define RID_LLINT_FROMTOX       "llint from{<?>} to{<?>} <?> "
+#define RID_LLLINTX             "lllint <?> "
+#define RID_LLLINT_FROMX        "lllint from{<?>} <?> "
+#define RID_LLLINT_TOX          "lllint to{<?>} <?> "
+#define RID_LLLINT_FROMTOX      "lllint from{<?>} to{<?>} <?> "
+#define RID_FROMX               "from{<?>} <?> "
+#define RID_TOX                 "to{<?>} <?> "
+#define RID_FROMXTOY            "from{<?>} to{<?>} <?> "
+#define RID_ACUTEX              "acute <?> "
+#define RID_BARX                "bar <?> "
+#define RID_BREVEX              "breve <?> "
+#define RID_CHECKX              "check <?> "
+#define RID_CIRCLEX             "circle <?> "
+#define RID_DOTX                "dot <?> "
+#define RID_DDOTX               "ddot <?> "
+#define RID_DDDOTX              "dddot <?> "
+#define RID_GRAVEX              "grave <?> "
+#define RID_HATX                "hat <?> "
+#define RID_TILDEX              "tilde <?> "
+#define RID_VECX                "vec <?> "
+#define RID_HARPOONX            "harpoon <?> "
+#define RID_UNDERLINEX          "underline {<?>} "
+#define RID_OVERLINEX           "overline {<?>} "
+#define RID_OVERSTRIKEX         "overstrike {<?>} "
+#define RID_PHANTOMX            "phantom {<?>} "
+#define RID_BOLDX               "bold <?> "
+#define RID_ITALX               "ital <?> "
+#define RID_SIZEXY              "size <?> {<?>} "
+#define RID_FONTXY              "font <?> {<?>} "
+#define RID_COLORX_BLACK        "color black {<?>} "
+#define RID_COLORX_BLUE         "color blue {<?>} "
+#define RID_COLORX_GREEN        "color green {<?>} "
+#define RID_COLORX_RED          "color red {<?>} "
+#define RID_COLORX_AQUA         "color aqua {<?>} "
+#define RID_COLORX_FUCHSIA      "color fuchsia {<?>} "
+#define RID_COLORX_GRAY         "color gray {<?>} "
+#define RID_COLORX_LIME         "color lime {<?>} "
+#define RID_COLORX_MAROON       "color maroon {<?>} "
+#define RID_COLORX_NAVY         "color navy {<?>} "
+#define RID_COLORX_OLIVE        "color olive {<?>} "
+#define RID_COLORX_PURPLE       "color purple {<?>} "
+#define RID_COLORX_SILVER       "color silver {<?>} "
+#define RID_COLORX_TEAL         "color teal {<?>} "
+#define RID_COLORX_YELLOW       "color yellow {<?>} "
+#define RID_COLORX_RGB          "color rgb 0 0 0 {<?>} "
+#define RID_COLORX_RGBA         "color rgba 0 0 0 0 {<?>} "
+#define RID_COLORX_HEX          "color hex 000000 {<?>} "
+#define RID_COLORX_CORAL        "color coral {<?>} "
+#define RID_COLORX_CRIMSON      "color crimson {<?>} "
+#define RID_COLORX_MIDNIGHT     "color mignightblue {<?>} "
+#define RID_COLORX_VIOLET       "color violet {<?>} "
+#define RID_COLORX_ORANGE       "color orange {<?>} "
+#define RID_COLORX_ORANGERED    "color orangered {<?>} "
+#define RID_COLORX_SEAGREEN     "color seagreen {<?>} "
+#define RID_COLORX_INDIGO       "color indigo {<?>} "
+#define RID_COLORX_HOTPINK      "color hotpink {<?>} "
+#define RID_COLORX_LAVENDER     "color lavender {<?>} "
+#define RID_COLORX_SNOW         "color snow {<?>} "
+#define RID_LRGROUPX            "{<?>} "
+#define RID_LRPARENTX           "(<?>) "
+#define RID_LRBRACKETX          "[<?>] "
+#define RID_LRDBRACKETX         "ldbracket <?> rdbracket "
+#define RID_LRBRACEX            "lbrace <?> rbrace "
+#define RID_LRANGLEX            "langle <?> rangle "
+#define RID_LRCEILX             "lceil <?> rceil "
+#define RID_LRFLOORX            "lfloor <?> rfloor "
+#define RID_LRLINEX             "lline <?> rline "
+#define RID_LRDLINEX            "ldline <?> rdline "
+#define RID_LMRANGLEXY          "langle <?> mline <?> rangle "
+#define RID_SLRPARENTX          "left ( <?> right ) "
+#define RID_SLRBRACKETX         "left [ <?> right ] "
+#define RID_SLRDBRACKETX        "left ldbracket <?> right rdbracket "
+#define RID_SLRBRACEX           "left lbrace <?> right rbrace "
+#define RID_SLRANGLEX           "left langle <?> right rangle "
+#define RID_SLRCEILX            "left lceil <?> right rceil "
+#define RID_SLRFLOORX           "left lfloor <?> right rfloor "
+#define RID_SLRLINEX            "left lline <?> right rline "
+#define RID_SLRDLINEX           "left ldline <?> right rdline "
+#define RID_SLMRANGLEXY         "left langle <?> mline <?> right rangle "
+#define RID_XEVALUATEDATY       "left none {<?>} right rline_{<?>} "
+#define RID_XOVERBRACEY         "{<?>} overbrace {<?>} "
+#define RID_XUNDERBRACEY        "{<?>} underbrace {<?>} "
+#define RID_EVALX               "evaluate <?> "
+#define RID_EVAL_FROMX          "evaluate {<?>} from{<?>} "
+#define RID_EVAL_TOX            "evaluate {<?>} to{<?>} "
+#define RID_EVAL_FROMTOX        "evaluate {<?>} from{<?>} to{<?>} "
+#define RID_RSUBX               "<?>_{<?>} "
+#define RID_RSUPX               "<?>^{<?>} "
+#define RID_LSUBX               "<?> lsub{<?>} "
+#define RID_LSUPX               "<?> lsup{<?>} "
+#define RID_CSUBX               "<?> csub{<?>} "
+#define RID_CSUPX               "<?> csup{<?>} "
+#define RID_SBLANK              "` "
+#define RID_BLANK               "~ "
+#define RID_NEWLINE             "newline "
+#define RID_BINOMXY             "binom{<?>}{<?>} "
+#define RID_STACK               "stack{<?> # <?> # <?>} "
+#define RID_MATRIX              "matrix{<?> # <?> ## <?> # <?>} "
+#define RID_ALIGNLX             "alignl <?> "
+#define RID_ALIGNCX             "alignc <?> "
+#define RID_ALIGNRX             "alignr <?> "
+#define RID_ALEPH               "aleph "
+#define RID_EMPTYSET            "emptyset "
+#define RID_RE                  "Re "
+#define RID_IM                  "Im "
+#define RID_INFINITY            "infinity "
+#define RID_PARTIAL             "partial "
+#define RID_NABLA               "nabla "
+#define RID_WP                  "wp "
+#define RID_LAPLACE             "laplace "
+#define RID_FOURIER             "fourier "
+#define RID_DOTSAXIS            "dotsaxis "
+#define RID_DOTSUP              "dotsup "
+#define RID_DOTSDOWN            "dotsdown "
+#define RID_DOTSLOW             "dotslow "
+#define RID_DOTSVERT            "dotsvert "
+#define RID_XCIRCY              "<?> circ <?> "
+#define RID_XWIDESLASHY         "{<?>} wideslash {<?>} "
+#define RID_XWIDEBSLASHY        "{<?>} widebslash {<?>} "
+#define RID_XDIVIDESY           "<?> divides <?> "
+#define RID_XNDIVIDESY          "<?> ndivides <?> "
+#define RID_DLARROW             "<?> dlarrow <?> "
+#define RID_DLRARROW            "<?> dlrarrow <?> "
+#define RID_DRARROW             "<?> drarrow <?> "
+#define RID_SETN                "setN "
+#define RID_SETZ                "setZ "
+#define RID_SETQ                "setQ "
+#define RID_SETR                "setR "
+#define RID_SETC                "setC "
+#define RID_WIDEHATX            "widehat {<?>} "
+#define RID_WIDETILDEX          "widetilde {<?>} "
+#define RID_WIDEVECX            "widevec {<?>} "
+#define RID_WIDEHARPOONX        "wideharpoon {<?>} "
+#define RID_HBAR                "hbar "
+#define RID_LAMBDABAR           "lambdabar "
+#define RID_LEFTARROW           "leftarrow "
+#define RID_RIGHTARROW          "rightarrow "
+#define RID_UPARROW             "uparrow "
+#define RID_DOWNARROW           "downarrow "
+#define RID_NOSPACE             "nospace {<?>} "
+#define RID_XPRECEDESY          "<?> prec <?> "
+#define RID_XPRECEDESEQUALY     "<?> preccurlyeq <?> "
+#define RID_XPRECEDESEQUIVY     "<?> precsim <?> "
+#define RID_XSUCCEEDSY          "<?> succ <?> "
+#define RID_XSUCCEEDSEQUALY     "<?> succcurlyeq <?> "
+#define RID_XSUCCEEDSEQUIVY     "<?> succsim <?> "
+#define RID_XNOTPRECEDESY       "<?> nprec <?> "
+#define RID_XNOTSUCCEEDSY       "<?> nsucc <?> "
 
 #endif
 
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index 0c3788fd8966..da33c818105b 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -64,6 +64,7 @@ namespace o3tl {
 // Tokens identifiers. Allow to know what kind of information the node contains.
 enum SmTokenType
 {
+    // clang-format off
     // Uncategorized
     TEND,           TSPECIAL,       TNONE,          TESCAPE,        TUNKNOWN,
     TBLANK,         TSBLANK,        TPLACE,         TNOSPACE,       TDOTSDOWN,
@@ -139,6 +140,7 @@ enum SmTokenType
     // Color
     TRGB,           TRGBA,          THEX,           THTMLCOL,       TDVIPSNAMESCOL,
     TICONICCOL
+    // clang-format on
 };
 
 struct SmTokenTableEntry