Avoid full metrics computation with Update:FitCursor

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index 9ad7a9c217e7b7633899b9023945e9b125b64254..60b897c134c289f33225e1421dcef5e2e54d89d9 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -18,7 +18,6 @@
 #include "BufferParams.h"
 #include "Encoding.h"
 #include "LaTeXFonts.h"
-#include "Lexer.h"
 #include "LyXRC.h"
 
 #include "support/debug.h"
@@ -26,6 +25,7 @@
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lassert.h"
+#include "support/Lexer.h"
 #include "support/lstrings.h"
 #include "support/qstring_helpers.h"
 #include "support/Messages.h"
@@ -57,22 +57,22 @@ bool Language::isBabelExclusive() const
 }
 
 
-docstring const Language::translateLayout(string const & m) const
+docstring const Language::translateLayout(string const & msg) const
 {
-       if (m.empty())
+       if (msg.empty())
                return docstring();
 
-       if (!isAscii(m)) {
-               lyxerr << "Warning: not translating `" << m
+       if (!isAscii(msg)) {
+               lyxerr << "Warning: not translating `" << msg
                       << "' because it is not pure ASCII.\n";
-               return from_utf8(m);
+               return from_utf8(msg);
        }
 
-       TranslationMap::const_iterator it = layoutTranslations_.find(m);
+       TranslationMap::const_iterator it = layoutTranslations_.find(msg);
        if (it != layoutTranslations_.end())
                return it->second;
 
-       docstring t = from_ascii(m);
+       docstring t = from_ascii(msg);
        cleanTranslation(t);
        return t;
 }
@@ -89,7 +89,7 @@ string Language::fontenc(BufferParams const & params) const
        // We check whether the used rm font supports an encoding our language supports
        LaTeXFont const & lf =
                theLaTeXFonts().getLaTeXFont(from_ascii(params.fontsRoman()));
-       vector<string> const lfe = lf.fontencs();
+       vector<string> const & lfe = lf.fontencs();
        for (auto & fe : fontenc_) {
                // ASCII means: support all T* encodings plus OT1
                if (fe == "ASCII") {