again some things which cherry pick did not catch, sorry

[lyx.git] / src / Encoding.cpp

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 0bc8b0c4cb51f4a5b8ebab50f6583b8296e0b00d..b7c3f7dc555d31c1a78156e4c0ed7ca085ed1433 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -249,6 +249,10 @@ struct CharInfo {
        /// 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;
 };
 
 
@@ -420,15 +424,26 @@ bool Encodings::latexMathChar(char_type c, bool mathmode,
 }
 
 
-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;
                }
        }
@@ -436,8 +451,8 @@ char_type Encodings::fromLaTeXCommand(docstring const & cmd, bool & combining)
 }
 
 
-docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem,
-                                     int cmdtype)
+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;
@@ -521,6 +536,14 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem,
                                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)
@@ -533,32 +556,35 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem,
 }
 
 
-void Encodings::initUnicodeMath(Buffer const & buffer, bool clear_sets)
+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)clear_sets;
+       (void)for_master;
 #else
-       if (clear_sets) {
+       if (for_master) {
                mathcmd.clear();
                textcmd.clear();
                mathsym.clear();
        }
 
-       // Check master
+       // 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
-       BufferList::iterator bit = theBufferList().begin();
-       BufferList::iterator const bend = theBufferList().end();
+       ListOfBuffers blist = buffer.getDescendents();
+       ListOfBuffers::const_iterator bit = blist.begin();
+       ListOfBuffers::const_iterator const bend = blist.end();
        for (; bit != bend; ++bit)
-               if (buffer.isChild(*bit))
-                       initUnicodeMath(**bit, false);
+               initUnicodeMath(**bit, false);
 #endif
 }
 
@@ -574,11 +600,14 @@ void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
        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;
@@ -591,7 +620,8 @@ void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
                                        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;
@@ -659,6 +689,15 @@ bool Encodings::isCombiningChar(char_type c)
 }
 
 
+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);
@@ -689,6 +728,15 @@ bool Encodings::isMathAlpha(char_type 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);
@@ -761,6 +809,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                info.combining = false;
                info.textfeature = false;
                info.force = false;
+               info.notermination = false;
                while (!flags.empty()) {
                        string flag;
                        flags = split(flags, flag, ',');
@@ -771,6 +820,10 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                                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"
@@ -803,6 +856,10 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                        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())
@@ -825,7 +882,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
        // Now read the encodings
        enum {
                et_encoding = 1,
-               et_end,
+               et_end
        };
 
        LexerKeyword encodingtags[] = {