X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_parser.C;h=c0e7a4165343556cba2c705b79e2cfd8bfda9069;hb=5c40a062b2034f48f5b79079017bbaac8ba9363c;hp=959527a3af067b897a6256257bee10f6bbc45f99;hpb=4a40b711f2fe6ce8638a15f5bc7644a581cab016;p=lyx.git

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 959527a3af..c0e7a41653 100644
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -28,22 +28,22 @@
 #include "math_parser.h"
 #include "array.h"
 #include "math_inset.h"
+#include "math_arrayinset.h"
+#include "math_bigopinset.h"
+#include "math_dotsinset.h"
+#include "math_decorationinset.h"
+#include "math_deliminset.h"
+#include "math_fracinset.h"
+#include "math_funcinset.h"
 #include "math_macro.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
-#include "math_root.h"
-#include "math_arrayinset.h"
-#include "math_sqrtinset.h"
 #include "math_matrixinset.h"
-#include "math_bigopinset.h"
-#include "math_funcinset.h"
-#include "math_spaceinset.h"
-#include "math_sizeinset.h"
+#include "math_rootinset.h"
 #include "math_scriptinset.h"
-#include "math_dotsinset.h"
-#include "math_fracinset.h"
-#include "math_deliminset.h"
-#include "math_decorationinset.h"
+#include "math_sizeinset.h"
+#include "math_spaceinset.h"
+#include "math_sqrtinset.h"
 #include "debug.h"
 #include "mathed/support.h"
 #include "lyxlex.h"
@@ -93,16 +93,16 @@ const unsigned char LM_TK_CLOSE = '}';
 
 enum {
 	FLAG_BRACE      = 1 << 0,  //  A { needed              //}
-	FLAG_BRACE_LAST = 1 << 3,  //  // { Last } ends the parsing process
-	FLAG_RIGHT      = 1 << 5,  //  Next right ends the parsing process
-	FLAG_END        = 1 << 6,  //  Next end ends the parsing process
-	FLAG_BRACE_FONT = 1 << 7,  //  // { Next } closes a font
-	FLAG_BRACK_END  = 1 << 9,  //  // [ Next ] ends the parsing process
-	FLAG_AMPERSAND  = 1 << 10, //  Next & ends the parsing process
-	FLAG_NEWLINE    = 1 << 11, //  Next \\ ends the parsing process
-	FLAG_ITEM       = 1 << 12, //  read a (possibly braced token)
-	FLAG_LEAVE      = 1 << 13, //  marker for leaving the 
-	FLAG_OPTARG     = 1 << 14  //  reads an argument in []
+	FLAG_BRACE_LAST = 1 << 1,  //  // { Last } ends the parsing process
+	FLAG_RIGHT      = 1 << 2,  //  Next right ends the parsing process
+	FLAG_END        = 1 << 3,  //  Next end ends the parsing process
+	FLAG_BRACE_FONT = 1 << 4,  //  // { Next } closes a font
+	FLAG_BRACK_END  = 1 << 5,  //  // [ Next ] ends the parsing process
+	FLAG_AMPERSAND  = 1 << 6,  //  Next & ends the parsing process
+	FLAG_NEWLINE    = 1 << 7,  //  Next \\ ends the parsing process
+	FLAG_ITEM       = 1 << 8,  //  read a (possibly braced token)
+	FLAG_LEAVE      = 1 << 9,  //  marker for leaving the 
+	FLAG_OPTARG     = 1 << 10  //  reads an argument in []
 };
 
 ///
@@ -630,7 +630,7 @@ void mathed_parse(MathArray & array, unsigned flags)
 		
 		case LM_TK_SYM:
 			if (yylval.l->id < 256) {
-				MathTextCodes tc = MathIsBOPS(yylval.l->id) ? LM_TC_BOPS: LM_TC_SYMB;
+				MathTextCodes tc = MathIsBOPS(yylval.l->id) ? LM_TC_BOPS : LM_TC_SYMB;
 				array.push_back(yylval.l->id, tc);
 			} else 
 				array.push_back(new MathFuncInset(yylval.l->name));