tex2lyx/text.cpp: fix 2 typos

[lyx.git] / src / Encoding.cpp

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 899d8e178600ee7d39dd273c74a717fa697bc3c8..a8846527b44727d14d04131358a3e888ef5b5282 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -344,7 +344,7 @@ void Encoding::init() const
 }
 
 
-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();
@@ -355,7 +355,7 @@ docstring Encoding::latexChar(char_type c, bool for_mathed) const
                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
@@ -436,8 +436,11 @@ char_type Encodings::fromLaTeXCommand(docstring const & cmd, bool & combining)
 }
 
 
-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();
@@ -468,8 +471,10 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
                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
@@ -528,32 +533,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
 }
 
@@ -601,7 +609,7 @@ void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
                }
        }
        if (for_mathed && isMathSym(c)) {
-               features.require("relsize");
+               features.require("amstext");
                features.require("lyxmathsym");
        }
 #endif
@@ -691,8 +699,14 @@ Encoding const * Encodings::fromLyXName(string const & name) const
 }
 
 
-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.
@@ -792,6 +806,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())
@@ -814,7 +832,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
        // Now read the encodings
        enum {
                et_encoding = 1,
-               et_end,
+               et_end
        };
 
        LexerKeyword encodingtags[] = {