}
-docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
+docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem,
+ int cmdtype)
{
+ bool const mathmode = cmdtype & MATH_CMD;
+ bool const textmode = cmdtype & TEXT_CMD;
docstring symbols;
size_t i = 0;
size_t const cmdend = cmd.size();
size_t unicmd_size = 0;
char_type c = 0;
for (; it != uniend; ++it) {
- docstring const math = it->second.mathcommand;
- docstring const text = it->second.textcommand;
+ docstring const math = mathmode ? it->second.mathcommand
+ : docstring();
+ docstring const text = textmode ? it->second.textcommand
+ : docstring();
size_t cur_size = max(math.size(), text.size());
// The current math or text unicode command cannot
// match, or we already matched a longer one
#ifdef TEX2LYX
// The code below is not needed in tex2lyx and requires additional stuff
(void)buffer;
+ (void)clear_sets;
#else
if (clear_sets) {
mathcmd.clear();
}
}
if (for_mathed && isMathSym(c)) {
- features.require("relsize");
+ features.require("amstext");
features.require("lyxmathsym");
}
#endif