#include "Encoding.h"
#include "Buffer.h"
+#include "BufferList.h"
#include "InsetIterator.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
// does start with '\', we accept the match only if
// this is a valid macro, i.e., either it is a single
// (nonletter) char macro, or nothing else follows,
- // or what follows is a nonletter char.
+ // or what follows is a nonletter char, or the last
+ // character is a }.
if ((math == tmp || text == tmp)
&& (tmp[0] != '\\'
|| (tmp.size() == 2 && !isAlphaASCII(tmp[1]))
- || k == cmdend || !isAlphaASCII(cmd[k]))) {
+ || k == cmdend
+ || !isAlphaASCII(cmd[k])
+ || tmp[tmp.size() - 1] == '}')
+ ) {
c = it->first;
j = k - 1;
i = j + 1;
}
-void Encodings::initUnicodeMath(Buffer const & buffer)
+void Encodings::initUnicodeMath(Buffer const & buffer, bool clear_sets)
{
#ifdef TEX2LYX
// The code below is not needed in tex2lyx and requires additional stuff
(void)buffer;
+ (void)clear_sets;
#else
- mathcmd.clear();
- textcmd.clear();
- mathsym.clear();
+ if (clear_sets) {
+ mathcmd.clear();
+ textcmd.clear();
+ mathsym.clear();
+ }
+ // Check master
Inset & inset = buffer.inset();
InsetIterator it = inset_iterator_begin(inset);
InsetIterator const end = inset_iterator_end(inset);
-
for (; it != end; ++it)
it->initUnicodeMath();
+
+ // Check children
+ BufferList::iterator bit = theBufferList().begin();
+ BufferList::iterator const bend = theBufferList().end();
+ for (; bit != bend; ++bit)
+ if (buffer.isChild(*bit))
+ initUnicodeMath(**bit, false);
#endif
}
}
}
if (for_mathed && isMathSym(c)) {
- features.require("relsize");
+ features.require("amstext");
features.require("lyxmathsym");
}
#endif