Martin Vermeer wrote: > + case LFUN_INSERT_MATH: { > + bool const textarg = > + arg == "\\textbf" || arg == "\\textsf" || > + arg == "\\textrm" || arg == "\\textmd" || > + arg == "\\textit" || arg == "\\textsc" || > + arg == "\\textsl" || arg == "\\textup" || > + arg == "\\texttt" || arg == "\\textbb" || > + arg == "\\textnormal"; > + flag.enabled(currentMode() == MATH_MODE && !textarg > + || currentMode() == TEXT_MODE && textarg);
I think this should be + flag.enabled((currentMode() == MATH_MODE && !textarg) + || (currentMode() == TEXT_MODE && textarg)); > + break; > + } > + case LFUN_INSERT_MATRIX: > + flag.enabled(currentMode() == MATH_MODE); > + break; > + case LFUN_MATH_MODE: > + // i.e., "math-mode on" gets through in text mode > + flag.enabled(currentMode() == MATH_MODE || !arg.empty()); What does this do? Apart from this and the .ui file change this looks entirely reasonable to me: big improvement with little changes. Georg