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

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index c52cff0878a2eb8e395c1fe192a3b803928ce3a5..a2013706df538275156e1b602a949254ded6d027 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -283,7 +283,7 @@ TeXEnvironment(Buffer const & buf,
                prev_env_language_ = par_language;
                if (runparams.encoding != prev_encoding) {
                        runparams.encoding = prev_encoding;
-                       if (!bparams.useXetex)
+                       if (!runparams.isFullUnicode())
                                os << setEncoding(prev_encoding->iconvName());
                }
        }
@@ -294,7 +294,7 @@ TeXEnvironment(Buffer const & buf,
                prev_env_language_ = par_language;
                if (runparams.encoding != prev_encoding) {
                        runparams.encoding = prev_encoding;
-                       if (!bparams.useXetex)
+                       if (!runparams.isFullUnicode())
                                os << setEncoding(prev_encoding->iconvName());
                }
        }
@@ -712,7 +712,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                os << '}';
                if (runparams.encoding != prev_encoding) {
                        runparams.encoding = prev_encoding;
-                       if (!bparams.useXetex)
+                       if (!runparams.isFullUnicode())
                                os << setEncoding(prev_encoding->iconvName());
                }
        }
@@ -865,11 +865,12 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
        // If this is the last paragraph, and a local_font was set upon entering
        // the inset, and we're using "auto" or "default" encoding, the encoding
        // should be set back to that local_font's encoding.
-       // However, do not change the encoding when XeTeX is used.
+       // However, do not change the encoding when a fully unicode aware backend
+       // such as XeTeX is used.
        if (nextpit == paragraphs.end() && runparams_in.local_font != 0
            && runparams_in.encoding != runparams_in.local_font->language()->encoding()
            && (bparams.inputenc == "auto" || bparams.inputenc == "default")
-           && (!bparams.useXetex)) {
+           && (!runparams.isFullUnicode())) {
                runparams_in.encoding = runparams_in.local_font->language()->encoding();
                os << setEncoding(runparams_in.encoding->iconvName());
        }