#include "Encoding.h"
#include "Buffer.h"
+#include "BufferList.h"
#include "InsetIterator.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
/// Always force the LaTeX command, even if the encoding contains
/// this character?
bool force;
+ /// TIPA shortcut
+ string tipashortcut;
+ /// This macro needs no termination (such as {} or space).
+ bool notermination;
};
}
-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
}
-char_type Encodings::fromLaTeXCommand(docstring const & cmd, bool & combining)
+char_type Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype,
+ bool & combining, set<string> * req)
{
CharInfoMap::const_iterator const end = unicodesymbols.end();
CharInfoMap::const_iterator it = unicodesymbols.begin();
for (combining = false; it != end; ++it) {
docstring const math = it->second.mathcommand;
docstring const text = it->second.textcommand;
- if (math == cmd || text == cmd) {
+ if ((cmdtype && MATH_CMD) && math == cmd) {
combining = it->second.combining;
+ if (req && it->second.mathfeature &&
+ !it->second.mathpreamble.empty())
+ req->insert(it->second.mathpreamble);
+ return it->first;
+ }
+ if ((cmdtype & TEXT_CMD) && text == cmd) {
+ combining = it->second.combining;
+ if (req && it->second.textfeature &&
+ !it->second.textpreamble.empty())
+ req->insert(it->second.textpreamble);
return it->first;
}
}
}
-docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
+docstring Encodings::fromLaTeXCommand(docstring const & cmd, int cmdtype,
+ docstring & rem, set<string> * req)
{
+ 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
// 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;
unicmd_size = cur_size;
+ if (req) {
+ if (math == tmp && it->second.mathfeature &&
+ !it->second.mathpreamble.empty())
+ req->insert(it->second.mathpreamble);
+ if (text == tmp && it->second.textfeature &&
+ !it->second.textpreamble.empty())
+ req->insert(it->second.textpreamble);
+ }
}
}
if (unicmd_size)
}
-void Encodings::initUnicodeMath(Buffer const & buffer)
+void Encodings::initUnicodeMath(Buffer const & buffer, bool for_master)
{
#ifdef TEX2LYX
// The code below is not needed in tex2lyx and requires additional stuff
(void)buffer;
+ (void)for_master;
#else
- mathcmd.clear();
- textcmd.clear();
- mathsym.clear();
+ if (for_master) {
+ mathcmd.clear();
+ textcmd.clear();
+ mathsym.clear();
+ }
+ // Check this buffer
Inset & inset = buffer.inset();
InsetIterator it = inset_iterator_begin(inset);
InsetIterator const end = inset_iterator_end(inset);
-
for (; it != end; ++it)
it->initUnicodeMath();
+
+ if (!for_master)
+ return;
+
+ // Check children
+ ListOfBuffers blist = buffer.getDescendents();
+ ListOfBuffers::const_iterator bit = blist.begin();
+ ListOfBuffers::const_iterator const bend = blist.end();
+ for (; bit != bend; ++bit)
+ initUnicodeMath(**bit, false);
#endif
}
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
if (it != unicodesymbols.end()) {
// In mathed, c could be used both in textmode and mathmode
- bool const use_math = (for_mathed && isMathCmd(c)) ||
+ bool const math_mode = for_mathed && isMathCmd(c);
+ bool const use_math = math_mode ||
(!for_mathed && it->second.textcommand.empty());
bool const use_text = (for_mathed && isTextCmd(c)) ||
(!for_mathed && !it->second.textcommand.empty());
- if (use_math) {
+ bool const plain_utf8 = (features.runparams().encoding->name() == "utf8-plain");
+ // with utf8-plain, we only load packages when in mathed (see #7766)
+ if (math_mode || (use_math && !plain_utf8)) {
if (!it->second.mathpreamble.empty()) {
if (it->second.mathfeature) {
string feats = it->second.mathpreamble;
features.addPreambleSnippet(it->second.mathpreamble);
}
}
- if (use_text) {
+ // with utf8-plain, we do not load packages (see #7766)
+ if (use_text && !plain_utf8) {
if (!it->second.textpreamble.empty()) {
if (it->second.textfeature) {
string feats = it->second.textpreamble;
}
}
if (for_mathed && isMathSym(c)) {
- features.require("relsize");
+ features.require("amstext");
features.require("lyxmathsym");
}
#endif
}
+string const Encodings::TIPAShortcut(char_type c)
+{
+ CharInfoMap::const_iterator const it = unicodesymbols.find(c);
+ if (it != unicodesymbols.end())
+ return it->second.tipashortcut;
+ return string();
+}
+
+
bool Encodings::isKnownScriptChar(char_type const c, string & preamble)
{
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
}
+bool Encodings::needsTermination(char_type c)
+{
+ CharInfoMap::const_iterator const it = unicodesymbols.find(c);
+ if (it != unicodesymbols.end())
+ return !it->second.notermination;
+ return true;
+}
+
+
Encoding const * Encodings::fromLyXName(string const & name) const
{
EncodingList::const_iterator const it = encodinglist.find(name);
}
-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.
info.combining = false;
info.textfeature = false;
info.force = false;
+ info.notermination = false;
while (!flags.empty()) {
string flag;
flags = split(flags, flag, ',');
forced.insert(symbol);
} else if (flag == "mathalpha") {
mathalpha.insert(symbol);
+ } else if (flag == "notermination") {
+ info.notermination = true;
+ } else if (contains(flag, "tipashortcut=")) {
+ info.tipashortcut = split(flag, '=');
} else {
lyxerr << "Ignoring unknown flag `" << flag
<< "' for symbol `0x"
breakout = true;
}
+ // backward compatibility
+ if (info.mathpreamble == "esintoramsmath")
+ info.mathpreamble = "esint|amsmath";
+
if (!info.textpreamble.empty())
info.textfeature = info.textpreamble[0] != '\\';
if (!info.mathpreamble.empty())
// Now read the encodings
enum {
et_encoding = 1,
- et_end,
+ et_end
};
LexerKeyword encodingtags[] = {
projects / lyx.git / blobdiff