#include "Encoding.h"
#include "Buffer.h"
+#include "BufferList.h"
#include "InsetIterator.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
}
-docstring Encoding::latexChar(char_type c, bool for_mathed) const
+docstring Encoding::latexChar(char_type c, bool no_commands) const
{
// assure the used encoding is properly initialized
init();
return docstring(1, c);
if (encodable_.find(c) != encodable_.end())
return docstring(1, c);
- if (for_mathed)
+ if (no_commands)
return docstring();
// c cannot (or should not) be encoded in this encoding
}
-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
tmp.resize(tmp.size() - 1);
// If this is an exact match, we found a (longer)
- // matching command in the unicodesymbols file
+ // matching entry in the unicodesymbols file.
+ // If the entry doesn't start with '\', we take note
+ // of the match and continue (this is not a ultimate
+ // acceptance, as some other entry may match a longer
+ // portion of the cmd string). However, if the entry
+ // 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 the last
+ // character is a }.
if ((math == tmp || text == tmp)
- && ((tmp.size() == 1 && !isAlphaASCII(tmp[0]))
- || k == cmdend || !isAlphaASCII(cmd[k]))) {
+ && (tmp[0] != '\\'
+ || (tmp.size() == 2 && !isAlphaASCII(tmp[1]))
+ || 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
}
-Encoding const * Encodings::fromLaTeXName(string const & name) const
+Encoding const * Encodings::fromLaTeXName(string const & n) const
{
+ string name = n;
+ // FIXME: if we have to test for too many of these synonyms,
+ // we should instead extend the format of lib/encodings
+ if (n == "ansinew")
+ name = "cp1252";
+
// We don't use find_if because it makes copies of the pairs in
// the map.
// This linear search is OK since we don't have many encodings.
// Now read the encodings
enum {
et_encoding = 1,
- et_end,
+ et_end
};
LexerKeyword encodingtags[] = {