Do not overwrite read-only files. We now move the file to the backup directory and...

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 530275860bd3afc9a14abf305c1b8f8ecb406179..52a69bdc78e6daf448e5e6b4d26b07d027bcd510 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -285,22 +285,20 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
 
 bool LaTeXFeatures::useBabel() const
 {
+       if (usePolyglossia())
+               return false;
        return (lyxrc.language_package_selection != LyXRC::LP_NONE)
-               && !usePolyglossia()
-               && ((bufferParams().language->lang() != lyxrc.default_language
+               || (bufferParams().language->lang() != lyxrc.default_language
                    && !bufferParams().language->babel().empty())
-                   || this->hasLanguages());
+               || this->hasLanguages();
 }
 
 
 bool LaTeXFeatures::usePolyglossia() const
 {
        return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
-               && isRequired("xetex")
+               && isRequired("polyglossia")
                && isAvailable("polyglossia")
-               && ((bufferParams().language->lang() != lyxrc.default_language
-                    && !bufferParams().language->polyglossia().empty())
-                   || this->hasLanguages())
                && this->hasPolyglossiaLanguages();
 }