#include "Encoding.h"
+#include "Buffer.h"
+#include "InsetIterator.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "LyXRC.h"
typedef std::set<char_type> CharSet;
CharSet forced;
+typedef std::set<char_type> MathAlphaSet;
+MathAlphaSet mathalpha;
+
/// The highest code point in UCS4 encoding (1<<20 + 1<<16)
char_type const max_ucs4 = 0x110000;
if (!encoding || command.empty()) {
command = it->second.textcommand;
addTextCmd(c);
- } else if (mathmode)
+ }
+ if (mathmode)
addMathSym(c);
}
return use_math;
{
CharInfoMap::const_iterator const end = unicodesymbols.end();
CharInfoMap::const_iterator it = unicodesymbols.begin();
- for (; it != end; ++it) {
+ for (combining = false; it != end; ++it) {
docstring const math = it->second.mathcommand;
docstring const text = it->second.textcommand;
if (math == cmd || text == cmd) {
}
+void Encodings::initUnicodeMath(Buffer const & buffer)
+{
+ mathcmd.clear();
+ textcmd.clear();
+ mathsym.clear();
+
+ Inset & inset = buffer.inset();
+ InsetIterator it = inset_iterator_begin(inset);
+ InsetIterator const end = inset_iterator_end(inset);
+
+ for (; it != end; ++it)
+ it->initUnicodeMath();
+}
+
+
void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
{
CharInfoMap::const_iterator const it = unicodesymbols.find(c);
(!for_mathed && !it->second.textcommand.empty());
if (use_math) {
if (!it->second.mathpreamble.empty()) {
- if (it->second.mathfeature)
- features.require(it->second.mathpreamble);
- else
+ if (it->second.mathfeature) {
+ string feats = it->second.mathpreamble;
+ while (!feats.empty()) {
+ string feat;
+ feats = split(feats, feat, ',');
+ features.require(feat);
+ }
+ } else
features.addPreambleSnippet(it->second.mathpreamble);
}
}
if (use_text) {
if (!it->second.textpreamble.empty()) {
- if (it->second.textfeature)
- features.require(it->second.textpreamble);
- else
+ if (it->second.textfeature) {
+ string feats = it->second.textpreamble;
+ while (!feats.empty()) {
+ string feat;
+ feats = split(feats, feat, ',');
+ features.require(feat);
+ }
+ } else
features.addPreambleSnippet(it->second.textpreamble);
}
}
}
+bool Encodings::isMathAlpha(char_type c)
+{
+ return mathalpha.count(c);
+}
+
+
Encoding const * Encodings::fromLyXName(string const & name) const
{
EncodingList::const_iterator const it = encodinglist.find(name);
while (!flags.empty()) {
string flag;
flags = split(flags, flag, ',');
- if (flag == "combining")
+ if (flag == "combining") {
info.combining = true;
- else if (flag == "force") {
+ } else if (flag == "force") {
info.force = true;
forced.insert(symbol);
- } else
+ } else if (flag == "mathalpha") {
+ mathalpha.insert(symbol);
+ } else {
lyxerr << "Ignoring unknown flag `" << flag
<< "' for symbol `0x"
<< hex << symbol << dec
<< "'." << endl;
+ }
}
// mathcommand and mathpreamble have been added for 1.6.0.
// make them optional so that old files still work.